From 5e9e1146e1a37ed2a623ed52b5f562986c4d779f Mon Sep 17 00:00:00 2001 From: Default email Date: Sat, 5 Aug 2023 00:07:22 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 18036c0be90f4e308ae3ebcab0e14aae0336fe42 --- third_party/nixpkgs/.github/CODEOWNERS | 13 +- .../nixpkgs/.github/PULL_REQUEST_TEMPLATE.md | 4 +- third_party/nixpkgs/.gitignore | 1 + .../doc/builders/packages/ibus.section.md | 4 +- third_party/nixpkgs/doc/common.nix | 4 + .../coding-conventions.chapter.md | 2 +- .../contributing-to-documentation.chapter.md | 30 +- third_party/nixpkgs/doc/default.nix | 8 +- third_party/nixpkgs/doc/hooks/index.md | 1 + third_party/nixpkgs/doc/hooks/zig.section.md | 59 + .../doc/languages-frameworks/cuda.section.md | 7 +- .../doc/languages-frameworks/go.section.md | 4 +- .../doc/languages-frameworks/maven.section.md | 159 +- .../languages-frameworks/python.section.md | 8 +- .../doc/languages-frameworks/rust.section.md | 6 +- third_party/nixpkgs/doc/shell.nix | 20 + .../nixpkgs/doc/stdenv/meta.chapter.md | 2 +- .../nixpkgs/doc/stdenv/stdenv.chapter.md | 9 +- third_party/nixpkgs/lib/README.md | 73 + third_party/nixpkgs/lib/attrsets.nix | 36 + third_party/nixpkgs/lib/generators.nix | 5 +- third_party/nixpkgs/lib/licenses.nix | 7 + third_party/nixpkgs/lib/lists.nix | 70 +- third_party/nixpkgs/lib/meta.nix | 11 +- third_party/nixpkgs/lib/modules.nix | 2 +- third_party/nixpkgs/lib/path/README.md | 21 + third_party/nixpkgs/lib/path/default.nix | 133 + third_party/nixpkgs/lib/path/tests/prop.sh | 7 +- third_party/nixpkgs/lib/path/tests/unit.nix | 49 +- third_party/nixpkgs/lib/systems/default.nix | 11 +- third_party/nixpkgs/lib/systems/platforms.nix | 1 - third_party/nixpkgs/lib/tests/misc.nix | 126 +- third_party/nixpkgs/lib/tests/modules.sh | 33 +- .../tests/modules/merge-typeless-option.nix | 25 + .../tests/modules/module-argument-default.nix | 9 + third_party/nixpkgs/lib/tests/sources.sh | 7 + .../nixpkgs/maintainers/maintainer-list.nix | 412 +- .../scripts/haskell/update-hackage.sh | 2 +- .../scripts/haskell/update-stackage.sh | 2 +- .../maintainers/scripts/luarocks-packages.csv | 1 + third_party/nixpkgs/maintainers/team-list.nix | 18 +- .../nixpkgs/nixos/doc/manual/common.nix | 4 + .../contributing-to-this-manual.chapter.md | 2 + .../nixpkgs/nixos/doc/manual/default.nix | 21 +- .../writing-nixos-tests.section.md | 205 +- .../manual/installation/installing.chapter.md | 8 +- .../manual/release-notes/rl-2305.section.md | 2 + .../manual/release-notes/rl-2311.section.md | 36 + .../nixpkgs/nixos/doc/manual/shell.nix | 20 + third_party/nixpkgs/nixos/lib/eval-config.nix | 10 +- .../nixpkgs/nixos/lib/make-disk-image.nix | 2 +- third_party/nixpkgs/nixos/lib/systemd-lib.nix | 24 +- .../lib/test-driver/extract-docstrings.py | 66 + .../nixos-test-driver-docstrings.nix | 13 + .../lib/test-driver/test_driver/machine.py | 230 +- .../nixpkgs/nixos/lib/testing/driver.nix | 6 +- .../nixos/modules/config/fonts/fontconfig.nix | 4 +- .../nixos/modules/config/fonts/fontdir.nix | 2 +- .../nixos/modules/config/fonts/fonts.nix | 47 - .../modules/config/fonts/ghostscript.nix | 30 +- .../nixos/modules/config/fonts/packages.nix | 43 + .../nixos/modules/config/nix-channel.nix | 60 +- .../nixpkgs/nixos/modules/config/qt.nix | 3 +- .../{usb-wwan.nix => usb-modeswitch.nix} | 13 +- .../nixos/modules/hardware/wooting.nix | 4 +- .../modules/i18n/input-method/fcitx5.nix | 34 +- .../modules/image/amend-repart-definitions.py | 112 + .../nixpkgs/nixos/modules/image/repart.md | 137 + .../nixpkgs/nixos/modules/image/repart.nix | 209 + .../modules/installer/tools/nixos-install.sh | 2 +- .../nixos/modules/installer/tools/tools.nix | 2 +- .../nixpkgs/nixos/modules/module-list.nix | 19 +- .../nixos/modules/profiles/macos-builder.nix | 3 +- .../nixpkgs/nixos/modules/programs/atop.nix | 72 +- .../nixos/modules/programs/firefox.nix | 1 - .../nixpkgs/nixos/modules/programs/fish.nix | 2 +- .../nixos/modules/programs/hyprland.nix | 47 +- .../nixos/modules/programs/miriway.nix | 2 +- .../nixos/modules/programs/ns-usbloader.nix | 18 + .../nixos/modules/programs/oddjobd.nix | 33 + .../modules/programs/wayland/wayfire.nix | 48 + .../programs/wayland/wayland-session.nix | 2 +- third_party/nixpkgs/nixos/modules/rename.nix | 11 +- .../modules/security/apparmor/includes.nix | 9 +- .../modules/services/audio/jmusicbot.nix | 2 +- .../modules/services/backup/borgbackup.nix | 2 +- .../nixos/modules/services/backup/tarsnap.nix | 12 +- .../services/cluster/patroni/default.nix | 7 +- .../services/computing/boinc/client.nix | 1 + .../buildkite-agents.nix | 261 +- .../jenkins/default.nix | 6 +- .../modules/services/databases/pgbouncer.nix | 632 + .../modules/services/databases/postgresql.nix | 4 +- .../nixos/modules/services/editors/emacs.nix | 2 +- .../modules/services/hardware/udisks2.nix | 14 +- .../services/home-automation/ebusd.nix | 270 + .../home-automation/home-assistant.nix | 1 + .../services/matrix/appservice-irc.nix | 11 +- .../nixos/modules/services/matrix/conduit.nix | 2 + .../services/matrix/matrix-sliding-sync.nix | 96 + .../nixos/modules/services/misc/atuin.nix | 67 +- .../nixos/modules/services/misc/bcg.nix | 175 + .../nixos/modules/services/misc/cgminer.nix | 2 +- .../modules/services/misc/evdevremapkeys.nix | 59 + .../nixos/modules/services/misc/gitea.nix | 5 +- .../nixos/modules/services/misc/gitlab.nix | 2 +- .../nixos/modules/services/misc/gogs.nix | 8 +- .../modules/services/misc/mqtt2influxdb.nix | 253 + .../nixos/modules/services/misc/paperless.nix | 36 +- .../services/misc/sourcehut/default.nix | 6 +- .../nixos/modules/services/misc/sssd.nix | 2 +- .../modules/services/monitoring/munin.nix | 2 +- .../modules/services/monitoring/netdata.nix | 2 +- .../modules/services/monitoring/osquery.nix | 97 + .../monitoring/prometheus/exporters/ipmi.nix | 1 + .../monitoring/prometheus/exporters/pve.nix | 12 +- .../network-filesystems/samba-wsdd.nix | 19 +- .../modules/services/networking/biboumi.nix | 3 +- .../modules/services/networking/bird.nix | 2 +- .../modules/services/networking/cjdns.nix | 2 +- .../modules/services/networking/dhcpd.nix | 230 - .../modules/services/networking/hostapd.nix | 8 +- .../modules/services/networking/libreswan.nix | 4 +- .../modules/services/networking/mosquitto.nix | 65 +- .../modules/services/networking/murmur.nix | 52 +- .../services/networking/networkmanager.nix | 2 + .../nixos/modules/services/networking/nsd.nix | 4 +- .../modules/services/networking/ssh/lshd.nix | 4 +- .../modules/services/networking/syncthing.nix | 627 +- .../modules/services/networking/tailscale.nix | 38 +- .../modules/services/networking/twingate.nix | 2 +- .../modules/services/networking/xrdp.nix | 2 +- .../modules/services/scheduling/fcron.nix | 2 +- .../modules/services/search/typesense.nix | 125 + .../modules/services/security/kanidm.nix | 17 +- .../services/security/vaultwarden/default.nix | 2 +- .../nixos/modules/services/system/bpftune.nix | 22 + .../modules/services/system/nix-daemon.nix | 10 +- .../nixos/modules/services/ttys/kmscon.nix | 2 +- .../nixos/modules/services/video/frigate.nix | 17 +- .../nixos/modules/services/wayland/cage.nix | 10 + .../modules/services/web-apps/cloudlog.nix | 2 + .../modules/services/web-apps/engelsystem.nix | 1 + .../modules/services/web-apps/freshrss.nix | 61 +- .../modules/services/web-apps/hedgedoc.nix | 24 +- .../modules/services/web-apps/invidious.nix | 2 +- .../services/web-apps/invoiceplane.nix | 2 +- .../nixos/modules/services/web-apps/lemmy.nix | 82 +- .../modules/services/web-apps/miniflux.nix | 12 + .../nixos/modules/services/web-apps/nexus.nix | 22 +- .../modules/services/web-apps/peertube.nix | 2 +- .../nixos/modules/services/web-apps/slskd.nix | 211 + .../nixos/modules/services/web-apps/sogo.nix | 4 +- .../services/web-servers/lighttpd/cgit.nix | 2 +- .../services/web-servers/nginx/default.nix | 43 +- .../services/x11/desktop-managers/budgie.nix | 2 +- .../x11/desktop-managers/cinnamon.nix | 2 +- .../services/x11/desktop-managers/deepin.nix | 2 +- .../x11/desktop-managers/enlightenment.nix | 2 +- .../services/x11/desktop-managers/gnome.nix | 2 +- .../x11/desktop-managers/pantheon.nix | 5 +- .../services/x11/desktop-managers/phosh.nix | 2 +- .../services/x11/desktop-managers/plasma5.nix | 2 +- .../services/x11/desktop-managers/xfce.nix | 18 +- .../lightdm-greeters/slick.nix | 2 +- .../nixos/modules/services/x11/xserver.nix | 6 +- .../modules/system/boot/initrd-network.nix | 21 +- .../modules/system/boot/kernel_config.nix | 7 +- .../modules/system/boot/loader/grub/grub.nix | 9 +- .../nixos/modules/system/boot/networkd.nix | 4 +- .../nixos/modules/system/boot/stage-1.nix | 4 +- .../nixos/modules/system/boot/systemd.nix | 5 + .../modules/system/boot/systemd/repart.nix | 25 +- .../modules/system/boot/systemd/shutdown.nix | 6 +- .../modules/system/boot/systemd/sysupdate.nix | 136 + .../modules/system/boot/systemd/user.nix | 2 +- .../nixpkgs/nixos/modules/system/etc/etc.nix | 2 +- .../nixos/modules/tasks/filesystems/zfs.nix | 21 +- .../nixos/modules/virtualisation/docker.nix | 12 +- .../nixos/modules/virtualisation/lxd.nix | 2 +- .../modules/virtualisation/podman/default.nix | 5 + .../modules/virtualisation/proxmox-image.nix | 31 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 12 +- .../nixos/tests/appliance-repart-image.nix | 116 + third_party/nixpkgs/nixos/tests/atuin.nix | 2 + .../nixpkgs/nixos/tests/binary-cache.nix | 10 +- third_party/nixpkgs/nixos/tests/bpftune.nix | 20 + third_party/nixpkgs/nixos/tests/budgie.nix | 10 +- .../nixpkgs/nixos/tests/buildkite-agents.nix | 6 +- third_party/nixpkgs/nixos/tests/cage.nix | 2 +- .../nixos/tests/common/gpg-keyring.nix | 21 + third_party/nixpkgs/nixos/tests/cups-pdf.nix | 2 +- .../nixpkgs/nixos/tests/curl-impersonate.nix | 157 + third_party/nixpkgs/nixos/tests/deepin.nix | 4 +- .../nixos/tests/fontconfig-default-fonts.nix | 4 +- .../nixos/tests/freshrss-http-auth.nix | 20 + third_party/nixpkgs/nixos/tests/gitea.nix | 31 +- .../nixpkgs/nixos/tests/gnome-flashback.nix | 14 +- third_party/nixpkgs/nixos/tests/hibernate.nix | 136 +- .../tests/initrd-network-ssh/default.nix | 18 +- .../nixos/tests/installed-tests/default.nix | 1 + .../nixos/tests/installed-tests/upower.nix | 9 + third_party/nixpkgs/nixos/tests/installer.nix | 110 +- .../nixpkgs/nixos/tests/installer/flake.nix | 20 + third_party/nixpkgs/nixos/tests/jenkins.nix | 4 +- third_party/nixpkgs/nixos/tests/kanidm.nix | 9 +- .../nixpkgs/nixos/tests/kernel-generic.nix | 8 +- third_party/nixpkgs/nixos/tests/keymap.nix | 37 +- third_party/nixpkgs/nixos/tests/lemmy.nix | 10 +- third_party/nixpkgs/nixos/tests/miniflux.nix | 6 + third_party/nixpkgs/nixos/tests/miriway.nix | 2 +- third_party/nixpkgs/nixos/tests/mumble.nix | 4 + .../nixpkgs/nixos/tests/networking.nix | 78 +- .../nixpkgs/nixos/tests/nextcloud/basic.nix | 6 +- .../nixos/tests/nextcloud/openssl-sse.nix | 2 +- .../with-declarative-redis-and-secrets.nix | 14 +- .../nextcloud/with-mysql-and-memcached.nix | 2 +- .../nextcloud/with-postgresql-and-redis.nix | 2 +- .../tests/nginx-proxyprotocol/default.nix | 4 + .../nixpkgs/nixos/tests/nginx-status-page.nix | 72 + .../nixos/tests/nixos-test-driver/busybox.nix | 16 + .../noto-fonts-cjk-qt-default-weight.nix | 2 +- .../nixpkgs/nixos/tests/noto-fonts.nix | 2 +- third_party/nixpkgs/nixos/tests/osquery.nix | 52 + third_party/nixpkgs/nixos/tests/pgbouncer.nix | 61 + .../nixpkgs/nixos/tests/samba-wsdd.nix | 6 +- third_party/nixpkgs/nixos/tests/sftpgo.nix | 10 +- third_party/nixpkgs/nixos/tests/sing-box.nix | 5 +- third_party/nixpkgs/nixos/tests/sway.nix | 2 +- .../nixpkgs/nixos/tests/syncthing-init.nix | 8 +- .../nixos/tests/syncthing-no-settings.nix | 18 + .../tests/systemd-initrd-networkd-ssh.nix | 17 +- ...temd-networkd-dhcpserver-static-leases.nix | 2 +- .../tests/systemd-networkd-dhcpserver.nix | 2 +- .../nixpkgs/nixos/tests/systemd-nspawn.nix | 22 +- .../nixpkgs/nixos/tests/systemd-shutdown.nix | 2 +- .../nixpkgs/nixos/tests/systemd-sysupdate.nix | 66 + .../nixos/tests/terminal-emulators.nix | 7 +- third_party/nixpkgs/nixos/tests/twingate.nix | 4 + third_party/nixpkgs/nixos/tests/typesense.nix | 23 + third_party/nixpkgs/nixos/tests/vscodium.nix | 2 +- .../nixpkgs/nixos/tests/wpa_supplicant.nix | 1 + .../audio/airwindows-lv2/default.nix | 4 +- .../audio/alsa-scarlett-gui/default.nix | 6 +- .../audio/bambootracker/default.nix | 26 +- .../audio/bitwig-studio/bitwig-studio5.nix | 126 + .../applications/audio/cadence/default.nix | 1 + .../pkgs/applications/audio/cava/default.nix | 1 + .../applications/audio/cmusfm/default.nix | 4 +- .../applications/audio/denemo/default.nix | 4 +- .../audio/easyeffects/default.nix | 1 + .../applications/audio/espeak-ng/default.nix | 1 + .../applications/audio/famistudio/default.nix | 23 +- .../pkgs/applications/audio/faust/faust1.nix | 207 - .../applications/audio/feishin/darwin.nix | 41 + .../applications/audio/feishin/default.nix | 26 + .../pkgs/applications/audio/feishin/linux.nix | 71 + .../applications/audio/fluidsynth/default.nix | 18 +- .../audio/gnome-podcasts/Cargo.lock | 2196 +- .../audio/gnome-podcasts/default.nix | 41 +- .../audio/go-musicfox/default.nix | 6 +- .../applications/audio/helvum/default.nix | 1 + .../applications/audio/jamesdsp/default.nix | 15 +- .../applications/audio/jmusicbot/default.nix | 2 +- .../applications/audio/lollypop/default.nix | 1 + .../audio/milkytracker/default.nix | 86 +- .../audio/miniaudicle/default.nix | 2 +- .../audio/monkeys-audio/default.nix | 4 +- .../pkgs/applications/audio/mpc/default.nix | 1 + .../applications/audio/mpdevil/default.nix | 1 + .../pkgs/applications/audio/muse/default.nix | 2 +- .../applications/audio/musescore/darwin.nix | 35 - .../applications/audio/musescore/default.nix | 139 +- .../applications/audio/ncmpcpp/default.nix | 1 + .../applications/audio/ncspot/default.nix | 6 +- .../audio/netease-cloud-music-gtk/Cargo.lock | 1217 +- .../audio/netease-cloud-music-gtk/default.nix | 11 +- .../applications/audio/opustags/default.nix | 2 +- .../audio/pavucontrol/default.nix | 1 + .../applications/audio/pianoteq/default.nix | 115 +- .../applications/audio/pianoteq/pianoteq.svg | 116 + .../applications/audio/picoloop/default.nix | 2 +- .../applications/audio/plexamp/default.nix | 6 +- .../pkgs/applications/audio/psst/update.sh | 7 +- .../applications/audio/qpwgraph/default.nix | 6 +- .../applications/audio/reaper/default.nix | 6 +- .../audio/roomeqwizard/default.nix | 6 +- .../audio/soundkonverter/default.nix | 2 +- .../audio/soundsource/default.nix | 35 + .../audio/speech-denoiser/default.nix | 2 +- .../pkgs/applications/audio/spot/default.nix | 2 +- .../applications/audio/spotify/darwin.nix | 10 +- .../applications/audio/spotify/default.nix | 1 + .../applications/audio/squeezelite/update.sh | 3 +- .../applications/audio/strawberry/default.nix | 1 + .../applications/audio/tageditor/default.nix | 1 + .../applications/audio/tagutil/default.nix | 2 +- .../applications/audio/tenacity/default.nix | 6 +- .../applications/audio/transcribe/default.nix | 6 +- .../applications/audio/whipper/default.nix | 2 +- .../applications/audio/yoshimi/default.nix | 2 +- .../audio/youtube-music/default.nix | 1 + .../applications/audio/ytmdesktop/default.nix | 1 + .../applications/backup/ludusavi/default.nix | 6 +- .../backup/unifi-protect-backup/default.nix | 5 +- .../applications/backup/vorta/default.nix | 7 +- .../blockchains/aperture/default.nix | 27 + .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 4 +- .../blockchains/erigon/default.nix | 6 +- .../blockchains/gridcoin-research/default.nix | 73 + .../blockchains/haven-cli/default.nix | 4 +- .../ledger-live-desktop/default.nix | 4 +- .../blockchains/polkadot/Cargo.lock | 1409 +- .../blockchains/polkadot/default.nix | 19 +- .../blockchains/solana-validator/default.nix | 8 +- .../blockchains/solana-validator/pin.json | 4 +- .../blockchains/solana-validator/update.sh | 18 +- .../blockchains/stellar-core/default.nix | 4 +- .../blockchains/sumokoin/default.nix | 4 +- .../blockchains/taproot-assets/default.nix | 4 +- .../display-managers/greetd/default.nix | 6 +- .../display-managers/greetd/regreet.nix | 1 + .../display-managers/lemurs/default.nix | 33 + .../editors/android-studio/default.nix | 13 +- .../applications/editors/codux/default.nix | 4 +- .../applications/editors/edit/default.nix | 39 +- .../manual-packages/tsc/default.nix | 6 +- .../manual-packages/tsc/src.json | 4 +- .../manual-packages/tsc/update.py | 16 +- .../applications/editors/emacs/sources.nix | 7 +- .../applications/editors/geany/default.nix | 1 + .../applications/editors/gedit/default.nix | 1 + .../jetbrains/JetbrainsRemoteDev.patch | 17 + .../editors/jetbrains/default.nix | 49 +- .../applications/editors/jetbrains/linux.nix | 11 +- .../editors/jetbrains/plugins/default.nix | 16 +- .../editors/jetbrains/plugins/plugins.json | 251 +- .../editors/jetbrains/plugins/tests.nix | 26 + .../editors/jetbrains/versions.json | 312 +- .../jupyter-kernels/clojupyter/deps.edn | 2 +- .../jupyter-kernels/clojupyter/deps.nix | 252 +- .../jupyter-kernels/octave/default.nix | 2 +- .../editors/jupyter-kernels/octave/kernel.nix | 8 +- .../applications/editors/micro/default.nix | 1 + .../applications/editors/nano/default.nix | 1 + .../applications/editors/neovim/default.nix | 35 +- .../pkgs/applications/editors/neovim/qt.nix | 2 +- .../applications/editors/netbeans/default.nix | 4 +- .../applications/editors/openvi/default.nix | 16 +- .../applications/editors/orbiton/default.nix | 4 +- .../applications/editors/pulsar/default.nix | 6 +- .../applications/editors/rehex/default.nix | 4 +- .../applications/editors/rstudio/default.nix | 2 + .../applications/editors/setzer/default.nix | 7 +- .../editors/standardnotes/src.json | 10 +- .../applications/editors/texmacs/darwin.nix | 8 +- .../editors/texstudio/default.nix | 36 +- .../editors/textadept/default.nix | 52 +- .../applications/editors/textadept/deps.nix | 44 +- .../applications/editors/tijolo/default.nix | 42 + .../applications/editors/tijolo/shards.nix | 27 + .../pkgs/applications/editors/vim/common.nix | 1 + .../editors/vim/plugins/generated.nix | 1124 +- .../vim/plugins/nvim-treesitter/generated.nix | 319 +- .../editors/vim/plugins/overrides.nix | 26 +- .../editors/vim/plugins/vim-clap/Cargo.lock | 478 +- .../editors/vim/plugins/vim-clap/default.nix | 4 +- .../editors/vim/plugins/vim-plugin-names | 12 +- .../editors/vscode/extensions/default.nix | 186 +- .../ms-vscode-remote.remote-ssh/default.nix | 2 +- .../build-deps/package.json | 2 +- .../rust-lang.rust-analyzer/default.nix | 5 +- .../extensions/vadimcn.vscode-lldb/update.sh | 8 +- .../applications/editors/vscode/generic.nix | 14 +- .../applications/editors/vscode/vscode.nix | 16 +- .../applications/editors/vscode/vscodium.nix | 14 +- .../editors/vscode/with-extensions.nix | 2 +- .../emulators/basiliskii/default.nix | 6 +- .../emulators/bsnes/ares/default.nix | 4 +- .../applications/emulators/cemu/default.nix | 5 +- .../emulators/commanderx16/emulator.nix | 46 +- .../emulators/commanderx16/rom.nix | 38 +- .../emulators/craftos-pc/default.nix | 11 +- .../test-eval-hello-world/default.nix | 4 +- .../test-eval-periphemu/default.nix | 4 +- .../emulators/darling/default.nix | 1 + .../applications/emulators/dosbox/default.nix | 9 +- .../emulators/emulationstation/default.nix | 1 + .../applications/emulators/mame/default.nix | 5 +- .../emulators/melonDS/default.nix | 1 + .../applications/emulators/mgba/default.nix | 1 + .../emulators/mupen64plus/default.nix | 1 + .../emulators/nestopia/default.nix | 1 + .../applications/emulators/pcsxr/default.nix | 1 + .../applications/emulators/py65/default.nix | 25 - .../emulators/retroarch/cores.nix | 11 + .../emulators/retroarch/default.nix | 12 - .../emulators/retroarch/hashes.json | 182 +- .../retroarch/retroarch-joypad-autoconfig.nix | 28 + .../emulators/retroarch/update_cores.py | 1 + ...-libretro_info_path-assets_directory.patch | 34 - .../emulators/retroarch/wrapper.nix | 18 +- ...gine-IntelJITEvents-only-use-ITTAPI_.patch | 62 - .../applications/emulators/rpcs3/default.nix | 69 +- .../applications/emulators/rpcs3/update.sh | 9 +- .../emulators/ryujinx/default.nix | 6 +- .../applications/emulators/ryujinx/deps.nix | 2 +- .../applications/emulators/snes9x/default.nix | 1 + .../emulators/tamatool/default.nix | 78 + .../applications/emulators/uxn/default.nix | 19 +- .../applications/emulators/wine/sources.nix | 10 +- .../applications/emulators/xemu/default.nix | 7 +- .../applications/emulators/yuzu/generic.nix | 2 +- .../applications/emulators/yuzu/sources.nix | 14 +- .../emulators/yuzu/vulkan_version.patch | 13 + .../file-managers/browsr/default.nix | 4 +- .../file-managers/clifm/default.nix | 4 +- .../file-managers/felix-fm/Cargo.lock | 2 +- .../file-managers/felix-fm/default.nix | 4 +- .../file-managers/krusader/default.nix | 1 + .../applications/file-managers/mc/default.nix | 1 + .../file-managers/mucommander/default.nix | 6 +- .../nnn/darwin-fix-file-mime-opts.patch | 15 + .../file-managers/nnn/default.nix | 5 + .../file-managers/pcmanfm/default.nix | 1 + .../portfolio-filemanager/default.nix | 4 +- .../file-managers/ranger/default.nix | 1 + .../file-managers/xplorer/default.nix | 2 +- .../graphics/ImageMagick/default.nix | 6 +- .../applications/graphics/artem/default.nix | 20 +- .../applications/graphics/digikam/default.nix | 3 +- .../applications/graphics/djv/default.nix | 2 +- .../applications/graphics/feh/default.nix | 1 + .../graphics/foxotron/default.nix | 4 +- .../graphics/glabels-qt/default.nix | 31 + .../graphics/gscreenshot/default.nix | 4 +- .../graphics/hello-wayland/default.nix | 2 + .../graphics/imgbrd-grabber/default.nix | 2 +- .../graphics/inkscape/default.nix | 17 +- .../graphics/inkscape/fix-ps2pdf-path.patch | 36 + .../applications/graphics/ipe/default.nix | 9 +- .../graphics/ipe/headers-lookup.patch | 13 - .../applications/graphics/komikku/default.nix | 4 +- .../applications/graphics/oculante/Cargo.lock | 109 +- .../graphics/oculante/default.nix | 4 +- .../graphics/openscad/default.nix | 1 + .../graphics/pineapple-pictures/default.nix | 2 + .../graphics/pixelnuke/default.nix | 6 +- .../graphics/processing/default.nix | 15 +- .../graphics/scantailor/advanced.nix | 4 +- .../graphics/shotwell/default.nix | 4 +- .../graphics/synfigstudio/default.nix | 6 +- .../graphics/tesseract/tesseract5.nix | 1 + .../graphics/vengi-tools/default.nix | 4 +- .../graphics/vipsdisp/default.nix | 4 +- .../applications/graphics/vpv/default.nix | 2 +- .../graphics/xournalpp/default.nix | 11 +- .../applications/graphics/xpano/default.nix | 66 + .../graphics/xpano/skip_prefix_check.patch | 18 + .../pkgs/applications/graphics/xv/default.nix | 4 +- .../pkgs/applications/kde/spectacle.nix | 12 +- .../logging/sosreport/default.nix | 2 +- .../misc/1password-gui/default.nix | 1 + .../applications/misc/1password/default.nix | 2 +- .../pkgs/applications/misc/acpic/default.nix | 29 + .../applications/misc/anytype/default.nix | 4 +- .../applications/misc/archivebox/default.nix | 11 + .../applications/misc/ausweisapp2/default.nix | 4 +- .../pkgs/applications/misc/authy/default.nix | 1 + .../misc/azuredatastudio/default.nix | 6 +- .../applications/misc/barrier/default.nix | 1 + .../applications/misc/batsignal/default.nix | 1 + .../applications/misc/binocle/default.nix | 2 +- .../applications/misc/bleachbit/default.nix | 1 + .../applications/misc/blender/default.nix | 8 +- .../applications/misc/blender/draco.patch | 26 + .../applications/misc/bloodhound/default.nix | 127 + .../applications/misc/bottles/default.nix | 1 + .../pkgs/applications/misc/candle/default.nix | 2 +- .../applications/misc/cartridges/default.nix | 56 + .../misc/collision/collision-shards.nix | 42 + .../applications/misc/collision/default.nix | 50 + .../applications/misc/collision/make.patch | 20 + .../applications/misc/confetty/default.nix | 27 + .../pkgs/applications/misc/confy/default.nix | 26 +- .../misc/crow-translate/default.nix | 4 +- .../fix-qttranslations-path.patch | 6 +- .../applications/misc/dbeaver/default.nix | 2 +- .../applications/misc/dialect/default.nix | 4 +- .../pkgs/applications/misc/dmenu/default.nix | 1 + .../pkgs/applications/misc/dunst/default.nix | 1 + .../applications/misc/dupeguru/default.nix | 1 + .../pkgs/applications/misc/fluidd/default.nix | 4 +- .../applications/misc/fontpreview/default.nix | 1 + .../pkgs/applications/misc/fuzzel/default.nix | 4 +- .../misc/goldendict-ng/default.nix | 83 + .../applications/misc/goldendict/default.nix | 2 +- .../applications/misc/gtkradiant/default.nix | 120 +- .../pkgs/applications/misc/gum/default.nix | 6 +- .../pkgs/applications/misc/haunt/default.nix | 19 + .../pkgs/applications/misc/hugo/default.nix | 8 +- .../applications/misc/hyprdim/default.nix | 40 + .../applications/misc/ipatool/default.nix | 51 + .../pkgs/applications/misc/iptsd/default.nix | 4 +- .../misc/johnny-reborn/with-data.nix | 40 +- .../misc/joplin-desktop/default.nix | 4 +- .../pkgs/applications/misc/josm/default.nix | 6 +- .../pkgs/applications/misc/kbt/default.nix | 39 + .../applications/misc/keepass/default.nix | 1 + .../applications/misc/keepassxc/default.nix | 4 +- .../applications/misc/lemonade/default.nix | 2 +- .../pkgs/applications/misc/logseq/default.nix | 12 +- .../applications/misc/lscolors/default.nix | 9 +- .../pkgs/applications/misc/lutris/default.nix | 1 + .../applications/misc/mainsail/default.nix | 4 +- .../misc/mediainfo-gui/default.nix | 1 + .../applications/misc/mediainfo/default.nix | 1 + .../misc/mission-center/Cargo.lock | 2183 ++ .../misc/mission-center/default.nix | 124 + .../misc/mission-center/proxy-Cargo.lock | 522 + .../pkgs/applications/misc/mkgmap/default.nix | 4 +- .../pkgs/applications/misc/mupdf/default.nix | 1 + .../pkgs/applications/misc/mya/argp.patch | 26 + .../pkgs/applications/misc/mya/default.nix | 67 + .../misc/mysql-workbench/default.nix | 5 +- .../applications/misc/notesnook/default.nix | 76 + .../misc/ns-usbloader/99-ns-usbloader.rules | 4 + .../misc/ns-usbloader/default.nix | 88 + .../ns-usbloader/make-deterministic.patch | 130 + .../misc/ns-usbloader/no-launch4j.patch | 70 + .../misc/numberstation/default.nix | 2 +- .../misc/nwg-displays/default.nix | 60 + .../applications/misc/obsidian/default.nix | 4 +- .../applications/misc/onthespot/default.nix | 64 + .../misc/openbangla-keyboard/default.nix | 2 +- .../applications/misc/openrgb/default.nix | 1 + .../pkgs/applications/misc/oranda/default.nix | 6 +- .../applications/misc/organicmaps/default.nix | 8 +- .../applications/misc/owmods-cli/Cargo.lock | 4830 ++++ .../applications/misc/owmods-cli/default.nix | 65 + .../applications/misc/pgmodeler/default.nix | 4 +- .../pkgs/applications/misc/plots/default.nix | 77 + .../pkgs/applications/misc/pop/default.nix | 40 + .../pkgs/applications/misc/pot/Cargo.lock | 559 +- .../pkgs/applications/misc/pot/default.nix | 13 +- .../misc/process-compose/default.nix | 6 +- .../applications/misc/pytrainer/default.nix | 4 + .../applications/misc/qdirstat/default.nix | 1 + .../pkgs/applications/misc/qsudo/default.nix | 2 +- .../applications/misc/rofi-rbw/default.nix | 1 + .../misc/rofi-screenshot/default.nix | 58 + .../pkgs/applications/misc/rofi/default.nix | 1 + .../pkgs/applications/misc/rofi/wayland.nix | 4 +- .../pkgs/applications/misc/rtfm/default.nix | 91 + .../patches/enable-write-permissions.patch | 10 + .../rtfm/patches/friendly-docs-path.patch | 11 + .../applications/misc/rtfm/patches/make.patch | 30 + .../pkgs/applications/misc/rtfm/shards.nix | 42 + .../applications/misc/safeeyes/default.nix | 11 +- .../applications/misc/shipments/default.nix | 10 +- .../pkgs/applications/misc/siglo/default.nix | 2 +- .../misc/smb3-foundry/default.nix | 52 + .../misc/smb3-foundry/fix-relative-dirs.patch | 34 + .../pkgs/applications/misc/solaar/default.nix | 5 +- .../misc/spacenav-cube-example/default.nix | 6 +- .../misc/spicetify-cli/default.nix | 7 +- .../pkgs/applications/misc/ssw/default.nix | 4 +- .../applications/misc/subsurface/default.nix | 2 +- .../misc/syncthingtray/default.nix | 3 +- .../default.nix | 6 +- .../misc/tandoor-recipes/common.nix | 4 +- .../misc/tandoor-recipes/default.nix | 2 +- .../misc/tandoor-recipes/frontend.nix | 2 +- .../misc/tandoor-recipes/update.sh | 7 +- .../applications/misc/tellico/default.nix | 4 +- .../applications/misc/thedesk/default.nix | 4 +- .../pkgs/applications/misc/tickrs/default.nix | 6 +- .../pkgs/applications/misc/tint2/default.nix | 19 +- .../pkgs/applications/misc/toot/default.nix | 6 +- .../misc/transifex-cli/default.nix | 6 +- .../applications/misc/trenchbroom/default.nix | 69 +- .../pkgs/applications/misc/ttdl/default.nix | 6 +- .../pkgs/applications/misc/tuba/default.nix | 10 +- .../pkgs/applications/misc/typer/default.nix | 27 + .../applications/misc/typioca/default.nix | 40 + .../applications/misc/urlscan/default.nix | 30 +- .../pkgs/applications/misc/valent/default.nix | 6 +- .../pkgs/applications/misc/vhs/default.nix | 6 +- .../applications/misc/wallust/default.nix | 30 +- .../pkgs/applications/misc/waybar/default.nix | 5 +- .../pkgs/applications/misc/wofi/default.nix | 1 + .../applications/misc/wttrbar/default.nix | 30 + .../pkgs/applications/misc/xastir/default.nix | 4 +- .../pkgs/applications/misc/xmrig/default.nix | 4 +- .../pkgs/applications/misc/yambar/default.nix | 27 +- .../misc/yubioath-flutter/helper.nix | 2 +- .../pkgs/applications/misc/zettlr/default.nix | 45 +- .../pkgs/applications/misc/zettlr/generic.nix | 42 + .../networking/avalanchego/default.nix | 6 +- .../networking/browsers/brave/default.nix | 4 +- .../networking/browsers/browsh/default.nix | 2 +- .../networking/browsers/chromium/README.md | 10 +- .../networking/browsers/chromium/browser.nix | 4 +- .../networking/browsers/chromium/common.nix | 97 +- .../browsers/chromium/cross-compile.patch | 31 + .../networking/browsers/chromium/default.nix | 43 +- .../networking/browsers/chromium/update.py | 31 +- .../browsers/chromium/upstream-info.json | 64 - .../browsers/chromium/upstream-info.nix | 65 + .../browsers/firefox-bin/beta_sources.nix | 810 +- .../firefox-bin/devedition_sources.nix | 810 +- .../browsers/firefox-bin/release_sources.nix | 810 +- .../networking/browsers/firefox/common.nix | 1 - .../networking/browsers/firefox/packages.nix | 25 +- .../networking/browsers/firefox/wrapper.nix | 9 +- .../networking/browsers/ladybird/default.nix | 6 +- .../networking/browsers/lagrange/default.nix | 4 +- .../networking/browsers/librewolf/src.json | 10 +- .../browsers/microsoft-edge/browser.nix | 8 +- .../browsers/microsoft-edge/update.py | 5 +- .../networking/browsers/netsurf/browser.nix | 123 +- .../browsers/netsurf/buildsystem.nix | 24 +- .../networking/browsers/netsurf/default.nix | 25 +- .../networking/browsers/netsurf/libcss.nix | 35 +- .../networking/browsers/netsurf/libdom.nix | 30 +- .../networking/browsers/netsurf/libhubbub.nix | 28 +- .../networking/browsers/netsurf/libnsbmp.nix | 24 +- .../networking/browsers/netsurf/libnsfb.nix | 29 +- .../networking/browsers/netsurf/libnsgif.nix | 27 +- .../networking/browsers/netsurf/libnslog.nix | 32 +- .../networking/browsers/netsurf/libnspsl.nix | 24 +- .../browsers/netsurf/libnsutils.nix | 24 +- .../browsers/netsurf/libparserutils.nix | 30 +- .../browsers/netsurf/libsvgtiny.nix | 35 +- .../browsers/netsurf/libutf8proc.nix | 16 +- .../browsers/netsurf/libwapcaplet.nix | 24 +- .../networking/browsers/netsurf/nsgenbind.nix | 32 +- .../networking/browsers/offpunk/default.nix | 5 +- .../networking/browsers/palemoon/bin.nix | 6 +- .../tor-browser-bundle-bin/default.nix | 6 +- .../networking/browsers/vieb/default.nix | 6 +- .../networking/browsers/vivaldi/default.nix | 6 +- .../browsers/vivaldi/ffmpeg-codecs.nix | 18 +- .../browsers/yandex-browser/default.nix | 4 +- .../networking/cawbird/default.nix | 2 +- .../networking/clash-verge/default.nix | 5 +- .../networking/cloudflared/default.nix | 5 +- .../networking/cluster/argo/default.nix | 6 +- .../networking/cluster/argocd/default.nix | 4 +- .../networking/cluster/bosh-cli/default.nix | 4 +- .../networking/cluster/civo/default.nix | 6 +- .../cluster/docker-machine/default.nix | 2 +- .../cluster/eks-node-viewer/default.nix | 6 +- .../networking/cluster/glooctl/default.nix | 4 +- .../cluster/helm/plugins/default.nix | 2 + .../cluster/helm/plugins/helm-unittest.nix | 34 + .../networking/cluster/helm/wrapper.nix | 5 +- .../networking/cluster/helmfile/default.nix | 23 +- .../networking/cluster/helmsman/default.nix | 6 +- .../networking/cluster/istioctl/default.nix | 6 +- .../networking/cluster/k3d/default.nix | 11 +- .../networking/cluster/k3s/1_26/versions.nix | 8 +- .../networking/cluster/k3s/1_27/versions.nix | 8 +- .../networking/cluster/k3s/update-script.sh | 2 +- .../networking/cluster/k8sgpt/default.nix | 6 +- .../networking/cluster/kfctl/default.nix | 2 +- .../networking/cluster/kops/default.nix | 16 +- .../networking/cluster/kubecfg/default.nix | 6 +- .../cluster/kubeconform/default.nix | 4 +- .../cluster/kubectl-cnpg/default.nix | 6 +- .../cluster/kubectl-explore/default.nix | 24 + .../networking/cluster/kubefirst/default.nix | 6 +- .../networking/cluster/kubemqctl/default.nix | 2 +- .../networking/cluster/kubergrunt/default.nix | 4 +- .../kubernetes-metrics-server/default.nix | 4 +- .../networking/cluster/kubernetes/default.nix | 4 +- .../networking/cluster/kubeseal/default.nix | 7 +- .../networking/cluster/kubeshark/default.nix | 6 +- .../networking/cluster/kubevpn/default.nix | 26 + .../networking/cluster/kyverno/default.nix | 4 +- .../networking/cluster/linkerd/edge.nix | 6 +- .../networking/cluster/minikube/default.nix | 6 +- .../networking/cluster/nerdctl/default.nix | 6 +- .../networking/cluster/nomad/default.nix | 17 +- .../networking/cluster/nova/default.nix | 8 +- .../networking/cluster/openshift/default.nix | 11 +- .../networking/cluster/pluto/default.nix | 4 +- .../networking/cluster/pv-migrate/default.nix | 6 +- .../networking/cluster/rke/default.nix | 4 +- .../networking/cluster/rke2/default.nix | 24 +- .../temporal-cli/darwin-sandbox-fix.patch | 20 + .../cluster/temporal-cli/default.nix | 43 +- .../networking/cluster/temporal/default.nix | 4 +- .../cluster/terraform-backend-git/default.nix | 4 +- .../terraform-providers/providers.json | 267 +- .../terraform-providers/update-provider | 2 +- .../networking/cluster/terraform/default.nix | 4 +- .../networking/cluster/terragrunt/default.nix | 4 +- .../networking/cluster/tilt/default.nix | 22 +- .../networking/cluster/timoni/default.nix | 46 + .../networking/cluster/velero/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 +- .../networking/cyberduck/default.nix | 35 + .../networking/davmail/default.nix | 1 + .../applications/networking/deck/default.nix | 8 +- .../networking/dropbox/default.nix | 1 + .../networking/expressvpn/default.nix | 6 +- .../networking/filebrowser/default.nix | 2 +- .../networking/firewalld/default.nix | 2 +- .../networking/flexget/default.nix | 4 +- .../networking/freefilesync/default.nix | 15 +- .../applications/networking/geph/default.nix | 4 +- .../applications/networking/gnmic/default.nix | 45 + .../networking/ids/suricata/default.nix | 11 +- .../instant-messengers/armcord/default.nix | 7 +- .../caprine-bin/default.nix | 7 +- .../instant-messengers/discord/default.nix | 5 +- .../instant-messengers/discord/linux.nix | 1 + .../element/element-desktop.nix | 3 +- .../element/element-web.nix | 2 +- .../element/keytar/default.nix | 2 +- .../element/keytar/pin.json | 2 +- .../element/keytar/update.sh | 4 +- .../instant-messengers/element/pin.nix | 10 +- .../element/seshat/default.nix | 8 +- .../element/seshat/pin.json | 2 +- .../element/seshat/update.sh | 4 +- .../instant-messengers/element/update.sh | 4 +- .../flare-signal/Cargo.lock | 454 +- .../flare-signal/default.nix | 21 +- .../instant-messengers/fluffychat/default.nix | 2 +- .../instant-messengers/freetalk/default.nix | 36 +- .../hydrogen-web/unwrapped.nix | 65 + .../hydrogen-web/wrapper.nix | 26 + ...in-bin-dbus-cx.ring.Ring.CallManager.patch | 52 - .../instant-messengers/jami/default.nix | 43 +- .../instant-messengers/pidgin/default.nix | 212 +- .../pidgin-plugins/carbons/default.nix | 0 .../pidgin/pidgin-plugins/default.nix | 70 + .../pidgin-plugins/msn-pecan/default.nix | 0 .../pidgin-plugins/otr/default.nix | 0 .../pidgin-indicator/default.nix | 0 .../pidgin-plugins/pidgin-latex/default.nix | 0 .../pidgin-plugins/pidgin-mra/default.nix | 0 .../pidgin-opensteamworks/default.nix | 2 +- .../pidgin-plugins/pidgin-osd/default.nix | 0 .../pidgin-skypeweb/default.nix | 0 .../pidgin-xmpp-receipts/default.nix | 0 .../pidgin-plugins/purple-discord/default.nix | 0 .../purple-facebook/default.nix | 0 .../purple-googlechat/default.nix | 0 .../purple-hangouts/default.nix | 0 .../pidgin-plugins/purple-lurch/default.nix | 0 .../pidgin-plugins/purple-matrix/default.nix | 0 .../pidgin-plugins/purple-mm-sms/default.nix | 2 +- .../purple-plugin-pack/default.nix | 0 .../pidgin-plugins/purple-signald/default.nix | 0 .../pidgin-plugins/purple-slack/default.nix | 0 .../purple-vk-plugin/default.nix | 0 .../purple-xmpp-http-upload/default.nix | 0 .../pidgin-plugins/sipe/default.nix | 0 .../pidgin-plugins/tdlib-purple/default.nix | 0 .../pidgin-plugins/tox-prpl/default.nix | 0 .../pidgin-plugins/window-merge/default.nix | 0 .../instant-messengers/qq/default.nix | 9 +- .../instant-messengers/rambox/default.nix | 4 +- .../session-desktop/default.nix | 4 +- .../signal-desktop/default.nix | 4 +- .../signalbackup-tools/default.nix | 4 +- .../instant-messengers/slack-term/default.nix | 1 + .../instant-messengers/slack/default.nix | 13 +- .../teams-for-linux/default.nix | 6 +- .../instant-messengers/teams/default.nix | 1 + .../instant-messengers/teamspeak/client.nix | 35 +- .../telegram/telegram-cli/default.nix | 59 - .../telegram/telegram-desktop/default.nix | 1 + .../threema-desktop/default.nix | 6 +- .../instant-messengers/zoom-us/default.nix | 12 +- .../networking/irc/thelounge/default.nix | 7 +- .../networking/irc/tiny/Cargo.lock.patch | 11 + .../networking/irc/tiny/default.nix | 13 +- .../networking/irc/weechat/default.nix | 1 + .../kubo-migrator/all-migrations.nix | 2 +- .../networking/kubo-migrator/unwrapped.nix | 2 +- .../networking/localproxy/default.nix | 39 + .../networking/maestral-qt/default.nix | 4 +- .../mailreaders/himalaya/default.nix | 6 +- .../mailreaders/mailspring/default.nix | 4 +- .../mailreaders/notmuch/muchsync.nix | 1 + .../mailreaders/thunderbird/packages.nix | 4 +- .../mailreaders/tutanota-desktop/default.nix | 4 +- .../networking/misc/zammad/source.json | 2 +- .../networking/mkchromecast/default.nix | 6 +- .../applications/networking/mullvad/libwg.nix | 2 +- .../networking/mullvad/openvpn.nix | 97 +- .../networking/netmaker/default.nix | 6 +- .../networking/newsreaders/pan/default.nix | 25 +- .../newsreaders/pan/move-out-of-extern-c.diff | 1113 - .../networking/nextcloud-client/default.nix | 5 +- .../applications/networking/nload/default.nix | 1 + .../networking/onionshare/default.nix | 8 + .../onionshare/fix-qrcode-gui.patch | 14 + .../libre-graph-api-cpp-qt-client.nix | 2 +- .../networking/p2p/flood/default.nix | 26 + .../networking/p2p/gnunet/default.nix | 4 +- .../networking/p2p/gnunet/gtk.nix | 4 +- ...void-stack-overflow-for-lockfile-buf.patch | 30 + .../networking/p2p/jesec-rtorrent/default.nix | 4 + .../networking/p2p/pyrosimple/default.nix | 4 +- .../p2p/rakshasa-rtorrent/default.nix | 6 +- .../p2p/zeronet-conservancy/default.nix | 10 +- .../applications/networking/pjsip/default.nix | 17 +- .../networking/protonmail-bridge/default.nix | 8 +- .../networking/pyload-ng/default.nix | 54 + .../networking/remote/dayon/default.nix | 67 + .../remote/vmware-horizon-client/default.nix | 17 +- .../networking/seaweedfs/default.nix | 6 +- .../networking/shellhub-agent/default.nix | 13 +- .../networking/sync/backintime/common.nix | 2 +- .../networking/sync/rclone/default.nix | 17 +- .../applications/networking/taler/default.nix | 26 +- .../networking/twingate/default.nix | 22 +- .../networking/weather/meteo/default.nix | 4 +- .../pkgs/applications/office/fava/default.nix | 6 +- .../applications/office/gnote/default.nix | 4 +- .../applications/office/iotas/default.nix | 6 +- .../applications/office/jabref/default.nix | 12 +- .../0001-Strip-away-BUILDCONFIG.patch | 32 + .../office/libreoffice/default.nix | 19 +- .../applications/office/morgen/default.nix | 4 +- .../applications/office/notes/default.nix | 54 + .../office/paperwork/openpaperwork-core.nix | 2 +- .../office/paperwork/openpaperwork-gtk.nix | 2 +- .../office/paperwork/paperwork-backend.nix | 2 +- .../office/paperwork/paperwork-gtk.nix | 2 +- .../office/paperwork/paperwork-shell.nix | 2 +- .../applications/office/portfolio/default.nix | 4 +- .../applications/office/qownnotes/default.nix | 4 +- .../office/treesheets/default.nix | 6 +- .../applications/office/trilium/desktop.nix | 1 + .../applications/office/vnote/default.nix | 6 +- .../radio/abracadabra/default.nix | 4 +- .../applications/radio/ax25-apps/default.nix | 1 + .../applications/radio/ax25-tools/default.nix | 5 +- .../applications/radio/cloudlog/default.nix | 4 +- .../pkgs/applications/radio/flrig/default.nix | 4 +- .../applications/radio/freedv/default.nix | 4 +- .../applications/radio/limesuite/default.nix | 2 +- .../pkgs/applications/radio/pat/default.nix | 24 + .../applications/radio/sdrangel/default.nix | 4 +- .../applications/radio/ubertooth/default.nix | 2 +- .../pkgs/applications/radio/urh/default.nix | 2 +- .../science/astronomy/stellarium/default.nix | 9 + .../science/biology/bcftools/default.nix | 4 +- .../science/biology/dssp/default.nix | 4 +- .../science/biology/last/default.nix | 4 +- .../science/biology/muscle/default.nix | 2 +- .../science/biology/octopus/default.nix | 4 +- .../science/biology/paml/default.nix | 35 +- .../science/biology/picard-tools/default.nix | 4 +- .../science/biology/seqkit/default.nix | 6 +- .../science/biology/star/default.nix | 2 +- .../biology/tandem-aligner/default.nix | 2 +- .../science/biology/veryfasttree/default.nix | 35 +- .../autodock-vina/python-bindings.nix | 2 +- .../science/chemistry/cp2k/default.nix | 4 +- .../science/chemistry/openmolcas/default.nix | 74 +- .../chemistry/openmolcas/qcmaquis.patch | 46 + .../science/electronics/digital/default.nix | 4 +- .../science/electronics/geda/default.nix | 28 +- .../hal-hardware-analyzer/default.nix | 2 +- .../science/electronics/kingstvis/default.nix | 59 + .../science/electronics/nvc/default.nix | 4 +- .../science/electronics/sv-lang/default.nix | 75 + .../science/electronics/systemc/default.nix | 20 +- .../science/electronics/verilator/default.nix | 26 +- .../science/logic/abc/default.nix | 6 +- .../science/logic/beluga/default.nix | 35 +- .../science/logic/cbmc/default.nix | 4 +- .../science/logic/dafny/default.nix | 6 +- .../applications/science/logic/dafny/deps.nix | 25 +- .../science/logic/egglog/Cargo.lock | 80 + .../science/logic/egglog/default.nix | 7 +- .../science/logic/elan/default.nix | 6 +- .../science/logic/hol_light/default.nix | 19 +- .../science/logic/opensmt/default.nix | 4 +- .../applications/science/logic/z3/tptp.nix | 2 +- .../science/math/caffe/default.nix | 2 +- .../science/math/cntk/default.nix | 3 +- .../science/math/fricas/default.nix | 4 +- .../science/math/geogebra/default.nix | 2 +- .../science/math/labplot/default.nix | 4 +- .../science/math/mathematica/default.nix | 2 +- .../science/math/mathematica/generic.nix | 5 +- .../science/math/mxnet/default.nix | 3 +- .../science/math/primecount/default.nix | 4 +- .../science/math/sage/default.nix | 6 +- .../science/math/sage/sage-tests.nix | 2 +- .../science/misc/boinc/default.nix | 10 +- .../science/misc/colmap/default.nix | 3 +- .../science/misc/gephi/default.nix | 3 +- .../molecular-dynamics/gromacs/default.nix | 7 +- .../molecular-dynamics/lammps/default.nix | 12 +- .../science/networking/sumo/default.nix | 4 +- .../robotics/qgroundcontrol/default.nix | 4 +- .../applications/system/booster/default.nix | 6 +- .../pkgs/applications/system/mgmt/default.nix | 2 +- .../applications/system/psitop/default.nix | 27 + .../blackbox-terminal/default.nix | 16 +- .../blackbox-terminal/marble.nix | 8 +- .../cool-retro-term/default.nix | 29 +- .../terminal-emulators/foot/default.nix | 9 +- .../terminal-emulators/kitty/default.nix | 17 +- .../terminal-emulators/rio/default.nix | 32 +- .../terminal-emulators/wayst/default.nix | 12 +- .../terminal-emulators/wayst/utf8proc.patch | 24 - .../codeberg-cli/default.nix | 42 + .../version-management/dvc/default.nix | 5 +- .../version-management/forgejo/default.nix | 17 +- .../version-management/gex/default.nix | 6 +- .../version-management/gh/default.nix | 6 +- .../version-management/ghorg/default.nix | 4 +- .../git-backdate/default.nix | 31 + .../git-cinnabar/default.nix | 55 +- .../git-codereview/default.nix | 4 +- .../git-credential-manager/default.nix | 33 +- .../git-credential-manager/deps.nix | 34 +- .../version-management/git-crypt/default.nix | 2 +- .../version-management/git-hound/default.nix | 2 +- .../git-interactive-rebase-tool/Cargo.lock | 1366 + .../git-interactive-rebase-tool/default.nix | 38 +- .../version-management/git-lfs/default.nix | 10 +- .../git-machete/default.nix | 4 +- .../version-management/gitea/default.nix | 5 +- .../gitlab-triage/default.nix | 2 +- .../version-management/gitlab/data.json | 14 +- .../gitlab/gitaly/default.nix | 4 +- .../gitlab-container-registry/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlint/default.nix | 2 +- .../version-management/gitolite/default.nix | 4 +- .../version-management/gitqlient/default.nix | 80 +- .../version-management/glab/default.nix | 4 +- .../version-management/got/default.nix | 4 +- .../version-management/gql/default.nix | 11 +- .../version-management/jujutsu/default.nix | 78 +- .../version-management/lab/default.nix | 2 +- .../version-management/lefthook/default.nix | 6 +- .../version-management/mercurial/default.nix | 6 +- .../rs-git-fsmonitor/default.nix | 2 +- .../version-management/sapling/default.nix | 4 +- .../version-management/sourcehut/builds.nix | 2 +- .../sourcehut/fix-gqlgen-trimpath.nix | 2 +- .../applications/video/aegisub/default.nix | 4 +- .../applications/video/asciicam/default.nix | 27 + .../video/davinci-resolve/default.nix | 2 +- .../applications/video/epgstation/default.nix | 2 +- .../applications/video/frigate/default.nix | 4 +- .../pkgs/applications/video/frigate/web.nix | 2 +- .../pkgs/applications/video/iina/default.nix | 5 +- .../pkgs/applications/video/mpv/default.nix | 18 +- .../video/multiviewer-for-f1/default.nix | 103 + ...-plugin-destination-as-relative-path.patch | 26 - .../applications/video/obs-studio/default.nix | 25 +- .../obs-studio/fix-nix-plugin-path.patch | 13 + .../obs-studio/plugins/obs-source-record.nix | 18 +- .../plugins/obs-vertical-canvas.nix | 4 +- .../pkgs/applications/video/pyca/default.nix | 4 + .../applications/video/qmplay2/default.nix | 10 +- .../applications/video/streamlink/default.nix | 12 +- .../applications/video/vdr/markad/default.nix | 59 + .../video/vdr/nopacity/default.nix | 24 + .../pkgs/applications/video/vdr/plugins.nix | 54 +- .../video/vdr/softhddevice/default.nix | 4 +- .../video/vokoscreen-ng/default.nix | 4 +- .../pkgs/applications/video/xine/lib.nix | 92 + .../{xine-ui/default.nix => xine/ui.nix} | 58 +- .../video/youtube-tui/default.nix | 6 +- .../virtualization/OVMF/default.nix | 8 +- .../cloud-hypervisor/Cargo.lock | 1084 +- .../cloud-hypervisor/default.nix | 17 +- .../virtualization/containerd/default.nix | 4 +- .../virtualization/cri-o/default.nix | 4 +- .../virtualization/crun/default.nix | 5 +- .../virtualization/docker-slim/default.nix | 8 +- .../virtualization/docker/buildx.nix | 4 +- .../virtualization/docker/compose.nix | 8 +- .../virtualization/docker/default.nix | 63 +- .../virtualization/ecs-agent/default.nix | 4 +- .../virtualization/firecracker/default.nix | 6 +- .../virtualization/kvmtool/default.nix | 1 + .../virtualization/nixpacks/default.nix | 6 +- .../virtualization/podman/default.nix | 6 +- .../podman/rm-podman-mac-helper-msg.patch | 10 +- .../virtualization/qemu/default.nix | 4 +- .../virtualization/runc/default.nix | 4 +- .../virtualization/singularity/generic.nix | 2 +- .../virtualization/singularity/packages.nix | 4 +- .../virtualization/virtualbox/default.nix | 6 +- .../virtualization/virtualbox/extpack.nix | 2 +- .../virtualbox/guest-additions/default.nix | 2 +- .../window-managers/cage/default.nix | 13 +- .../window-managers/dwl/default.nix | 2 +- .../window-managers/e16/default.nix | 4 +- .../window-managers/gamescope/default.nix | 4 +- .../window-managers/i3/status-rust.nix | 6 +- .../applications/window-managers/sway/osd.nix | 41 +- .../sway/swayosd_systemd_paths.patch | 24 + .../window-managers/sway/wrapper.nix | 2 +- .../window-managers/tinywl/default.nix | 2 +- .../window-managers/wayfire/applications.nix | 20 - .../window-managers/wayfire/default.nix | 20 +- .../window-managers/wayfire/plugins.nix | 19 +- .../wayfire/wayfire-plugins-extra.nix | 56 + .../window-managers/wayfire/wcm.nix | 19 +- .../window-managers/wayfire/wf-config.nix | 18 +- .../window-managers/wayfire/wf-shell.nix | 18 +- .../window-managers/wayfire/wrapper.nix | 59 +- .../window-managers/wmderlandc/default.nix | 6 +- .../bintools-wrapper/default.nix | 16 +- .../pkgs/build-support/buildenv/builder.pl | 2 +- .../pkgs/build-support/cc-wrapper/default.nix | 14 +- .../pkgs/build-support/docker/default.nix | 2 +- .../build-support/fetch9front/default.nix | 36 + .../pkgs/build-support/fetchdarcs/default.nix | 4 - .../fetchfirefoxaddon/default.nix | 3 +- .../pkgs/build-support/fetchgit/default.nix | 6 +- .../build-support/fetchgit/nix-prefetch-git | 1 + .../build-support/fetchgithub/default.nix | 2 +- .../pkgs/build-support/fetchhg/default.nix | 5 +- .../pkgs/build-support/fetchpijul/default.nix | 56 + .../pkgs/build-support/fetchsvn/default.nix | 15 +- .../build-support/fetchsvnssh/default.nix | 5 +- .../pkgs/build-support/fetchurl/default.nix | 2 - .../nixpkgs/pkgs/build-support/go/module.nix | 10 +- .../build-support/kernel/make-initrd-ng.nix | 2 +- .../build-support/nix-gitignore/default.nix | 2 +- .../node/build-npm-package/default.nix | 2 - .../node/fetch-yarn-deps/default.nix | 6 +- .../node/fetch-yarn-deps/index.js | 21 +- .../node/fetch-yarn-deps/tests/default.nix | 10 +- .../node/fetch-yarn-deps/tests/giturl.lock | 11 + .../pkgs/build-support/release/default.nix | 2 +- .../pkgs/build-support/release/nix-build.nix | 6 +- .../build-support/release/source-tarball.nix | 6 +- .../rust/build-rust-crate/configure-crate.nix | 2 +- .../trivial-builders/default.nix | 9 +- .../trivial-builders/test/default.nix | 33 + .../trivial-builders/test/write-text-file.nix | 91 +- .../trivial-builders/test/writeCBin.nix | 43 + .../trivial-builders/test/writeScriptBin.nix | 39 + .../test/writeShellScriptBin.nix | 39 + .../nixpkgs/pkgs/build-support/vm/default.nix | 2 +- .../pkgs/build-support/writers/data.nix | 80 + .../pkgs/build-support/writers/default.nix | 365 +- .../pkgs/build-support/writers/scripts.nix | 384 + .../pkgs/build-support/writers/test.nix | 194 +- .../pkgs/common-updater/unstable-updater.nix | 15 +- .../pkgs/data/fonts/commit-mono/default.nix | 34 + .../pkgs/data/fonts/cozette/default.nix | 9 +- .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 2 +- .../pkgs/data/fonts/iosevka/default.nix | 6 +- .../pkgs/data/fonts/iosevka/variants.nix | 184 +- .../pkgs/data/fonts/maple-font/default.nix | 22 +- .../pkgs/data/fonts/nerdfonts/shas.nix | 2 + .../pkgs/data/fonts/ruwudu/default.nix | 4 +- .../pkgs/data/fonts/scheherazade/default.nix | 3 +- .../fonts/sketchybar-app-font/default.nix | 34 + .../pkgs/data/icons/banana-cursor/default.nix | 31 + .../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/misc/clash-geoip/default.nix | 4 +- .../data/misc/dbip-country-lite/default.nix | 13 +- .../v2ray-domain-list-community/default.nix | 4 +- .../stylesheets/xslt/docbook-xsl/default.nix | 2 +- .../themes/catppuccin-plymouth/default.nix | 2 +- .../catppuccin-sddm-corners/default.nix | 36 + .../themes/graphite-gtk-theme/default.nix | 4 +- .../data/themes/gruvbox-gtk-theme/default.nix | 8 +- .../pkgs/data/themes/mojave/default.nix | 43 +- .../budgie/budgie-control-center/default.nix | 4 +- .../deepin/apps/deepin-clone/default.nix | 6 +- .../deepin/apps/deepin-terminal/default.nix | 3 + .../deepin/core/dde-calendar/default.nix | 59 +- .../fix-wrapped-name-not-in-whitelist.diff | 13 + .../nixpkgs/pkgs/desktops/expidus/default.nix | 4 + .../desktops/expidus/file-manager/default.nix | 41 + .../desktops/expidus/file-manager/deps.json | 1023 + .../desktops/gnome/apps/cheese/default.nix | 4 +- .../gnome/apps/file-roller/default.nix | 1 + .../desktops/gnome/core/epiphany/default.nix | 4 +- .../gnome/core/gnome-software/default.nix | 4 +- .../desktops/gnome/core/rygel/default.nix | 4 +- .../desktops/gnome/misc/gpaste/default.nix | 4 +- .../pkgs/desktops/gnustep/base/default.nix | 5 + .../nixpkgs/pkgs/desktops/lomiri/default.nix | 2 + .../lomiri/development/geonames/default.nix | 122 + .../development/libusermetrics/default.nix | 129 + .../lumina/lumina-calculator/default.nix | 2 +- .../desktops/lumina/lumina-pdf/default.nix | 2 +- .../apps/elementary-calendar/default.nix | 16 +- .../pantheon/apps/elementary-code/default.nix | 21 +- .../pantheon/apps/elementary-mail/default.nix | 18 +- .../apps/elementary-tasks/default.nix | 16 +- .../switchboard-plugs/keyboard/default.nix | 4 +- .../pantheon-shell/default.nix | 4 +- .../security-privacy/default.nix | 11 +- .../apps/switchboard-plugs/sound/default.nix | 6 +- .../desktop/elementary-greeter/default.nix | 4 +- .../wingpanel-indicators/a11y/default.nix | 4 +- .../elementary-notifications/default.nix | 10 + .../elementary-settings-daemon/default.nix | 6 +- .../plasma-5/3rdparty/kwin/scripts/kzones.nix | 4 +- .../nixpkgs/pkgs/desktops/plasma-5/fetch.sh | 2 +- .../pkgs/desktops/plasma-5/plasma-sdk.nix | 11 + .../nixpkgs/pkgs/desktops/plasma-5/srcs.nix | 472 +- .../xfce/applications/mousepad/default.nix | 4 +- .../xfce4-volumed-pulse/default.nix | 10 +- .../xfce/core/xfce4-power-manager/default.nix | 8 + .../xfce4-clipman-plugin/default.nix | 4 +- .../xfce4-cpugraph-plugin/default.nix | 6 +- .../xfce4-pulseaudio-plugin/default.nix | 2 + .../compilers/assemblyscript/default.nix | 4 +- .../compilers/blueprint/default.nix | 21 +- .../compilers/chicken/5/chicken.nix | 47 +- .../development/compilers/chicken/5/deps.toml | 76 +- .../compilers/chicken/5/eggDerivation.nix | 8 +- .../development/compilers/chicken/5/update.sh | 2 +- .../development/compilers/ciao/default.nix | 4 +- .../development/compilers/circt/default.nix | 7 +- .../development/compilers/crystal/default.nix | 4 +- .../compilers/cudatoolkit/common.nix | 26 +- .../compilers/cudatoolkit/extension.nix | 31 +- .../hooks/mark-for-cudatoolkit-root-hook.sh | 8 + .../cudatoolkit/hooks/nvcc-setup-hook.sh | 5 + .../cudatoolkit/hooks/setup-cuda-hook.sh | 68 + .../redist/build-cuda-redist-package.nix | 2 + .../cudatoolkit/redist/overrides.nix | 46 +- .../cudatoolkit/saxpy/CMakeLists.txt | 12 + .../compilers/cudatoolkit/saxpy/default.nix | 50 + .../compilers/cudatoolkit/saxpy/saxpy.cu | 68 + .../development/compilers/dart/sources.nix | 12 +- .../development/compilers/dotnet/update.sh | 15 +- .../compilers/dotnet/versions/6.0.nix | 268 +- .../compilers/dotnet/versions/7.0.nix | 282 +- .../development/compilers/erg/default.nix | 6 +- .../development/compilers/flix/default.nix | 4 +- .../compilers/gambit/bootstrap.nix | 6 +- .../development/compilers/gambit/build.nix | 27 +- .../development/compilers/gambit/default.nix | 6 +- .../compilers/gambit/gambit-support.nix | 37 +- .../development/compilers/gambit/unstable.nix | 12 +- .../development/compilers/gcc/10/default.nix | 5 +- .../development/compilers/gcc/11/default.nix | 5 +- .../development/compilers/gcc/12/default.nix | 5 +- .../development/compilers/gcc/13/default.nix | 5 +- .../development/compilers/gcc/4.8/default.nix | 5 +- .../development/compilers/gcc/4.9/default.nix | 5 +- .../development/compilers/gcc/6/default.nix | 5 +- .../development/compilers/gcc/7/default.nix | 5 +- .../development/compilers/gcc/8/default.nix | 5 +- .../development/compilers/gcc/9/default.nix | 5 +- .../pkgs/development/compilers/gcc/builder.sh | 9 +- .../compilers/gcc/common/libgcc.nix | 13 +- .../compilers/gcc/common/pre-configure.nix | 33 +- .../development/compilers/gleam/default.nix | 20 +- .../pkgs/development/compilers/go/1.19.nix | 4 +- .../pkgs/development/compilers/go/1.20.nix | 4 +- .../development/compilers/inform6/default.nix | 4 +- .../development/compilers/ispc/default.nix | 4 +- .../development/compilers/jsonnet/default.nix | 1 + .../development/compilers/koka/default.nix | 5 +- .../koka/kklib-mimalloc-macos-fix.diff | 10 - .../compilers/llvm/13/clang/default.nix | 2 +- .../compilers/llvm/13/compiler-rt/default.nix | 2 +- .../compilers/llvm/13/libcxx/default.nix | 2 +- .../compilers/llvm/13/libcxxabi/default.nix | 2 +- .../compilers/llvm/13/libunwind/default.nix | 2 +- .../compilers/llvm/13/lld/default.nix | 2 +- .../compilers/llvm/13/llvm/default.nix | 2 +- .../compilers/llvm/13/openmp/default.nix | 2 +- .../compilers/minimacy/default.nix | 4 +- .../development/compilers/nim/default.nix | 3 - .../compilers/opensycl/default.nix | 67 + .../compilers/otus-lisp/default.nix | 25 + .../development/compilers/p4c/default.nix | 20 +- .../purescript/purescript/default.nix | 15 +- .../pkgs/development/compilers/rust/1_70.nix | 5 +- .../development/compilers/rust/default.nix | 7 - .../pkgs/development/compilers/sbcl/2.x.nix | 8 +- .../development/compilers/unison/default.nix | 29 +- .../development/compilers/vala/default.nix | 14 +- .../vala/disable-graphviz-0.46.1.patch | 19 + .../vala/disable-graphviz-0.56.8.patch | 173 + .../compilers/vala/gvc-compat.patch | 19 - .../development/compilers/yosys/default.nix | 4 +- .../pkgs/development/compilers/zig/hook.nix | 17 + .../development/compilers/zig/setup-hook.sh | 90 + .../coq-modules/bignums/default.nix | 14 +- .../development/coq-modules/ceres/default.nix | 8 +- .../coq-modules/compcert/default.nix | 12 +- .../coq-modules/coq-ext-lib/default.nix | 3 +- .../coq-modules/coq-lsp/default.nix | 8 +- .../coq-modules/coquelicot/default.nix | 3 +- .../coq-modules/interval/default.nix | 3 +- .../development/coq-modules/iris/default.nix | 2 +- .../coq-modules/metalib/default.nix | 8 +- .../development/coq-modules/paco/default.nix | 2 + .../coq-modules/parsec/default.nix | 2 + .../development/coq-modules/trakt/default.nix | 10 +- .../development/embedded/avrdude/default.nix | 4 +- .../development/embedded/blisp/default.nix | 42 + .../embedded/fpga/tinyprog/default.nix | 2 +- .../guile-modules/guile-cairo/default.nix | 2 +- .../guile-commonmark/default.nix | 12 +- .../guile-modules/guile-fibers/default.nix | 4 +- .../guile-modules/guile-gcrypt/default.nix | 2 +- .../guile-modules/guile-git/default.nix | 4 +- .../guile-modules/guile-gnutls/default.nix | 2 +- .../guile-modules/guile-lib/default.nix | 8 +- .../guile-modules/guile-ncurses/default.nix | 28 +- .../guile-modules/guile-reader/default.nix | 3 +- .../guile-modules/guile-ssh/default.nix | 2 +- .../guile-modules/guile-xcb/default.nix | 14 +- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 2 - .../configuration-tensorflow.nix | 2 +- .../haskell-modules/non-hackage-packages.nix | 2 - .../acl2/libipasirglucose4/default.nix | 2 +- .../development/interpreters/bats/default.nix | 5 +- .../development/interpreters/elixir/1.15.nix | 4 +- .../interpreters/elixir/generic-builder.nix | 4 +- .../development/interpreters/erlang/25.nix | 4 +- .../interpreters/evcxr/default.nix | 6 +- .../interpreters/janet/default.nix | 4 +- .../interpreters/joker/default.nix | 6 +- .../development/interpreters/kerf/default.nix | 2 +- .../development/interpreters/luau/default.nix | 4 +- .../interpreters/nickel/default.nix | 6 +- .../interpreters/perl/intepreter.nix | 7 +- .../pkgs/development/interpreters/php/8.1.nix | 4 +- .../pkgs/development/interpreters/php/8.3.nix | 6 +- .../interpreters/python/cpython/default.nix | 1 + .../interpreters/python/default.nix | 4 +- .../python/mk-python-derivation.nix | 2 +- .../interpreters/python/wrapper.nix | 2 +- .../development/interpreters/ruby/default.nix | 7 + .../interpreters/ruby/rubygems/default.nix | 4 +- .../interpreters/trealla/default.nix | 4 +- .../development/interpreters/wamr/default.nix | 2 +- .../interpreters/wasmtime/default.nix | 6 +- .../interpreters/wazero/default.nix | 4 +- .../development/java-modules/jogl/default.nix | 92 +- .../libraries/SDL_audiolib/default.nix | 2 +- .../libraries/apache-activemq/default.nix | 4 +- .../development/libraries/aravis/default.nix | 4 +- .../libraries/armadillo/default.nix | 4 +- .../libraries/arrayfire/default.nix | 3 +- .../libraries/at-spi2-core/default.nix | 9 + .../development/libraries/avro-c/default.nix | 4 +- .../pkgs/development/libraries/botan/2.0.nix | 3 - .../pkgs/development/libraries/botan/3.0.nix | 9 + .../development/libraries/botan/generic.nix | 13 +- .../development/libraries/cctag/default.nix | 4 +- .../development/libraries/cdo/default.nix | 12 +- .../development/libraries/cegui/default.nix | 54 +- .../development/libraries/cereal/1.3.0.nix | 39 + .../development/libraries/cereal/1.3.2.nix | 31 + .../development/libraries/cereal/default.nix | 35 - .../development/libraries/cjose/default.nix | 4 +- .../development/libraries/clfft/default.nix | 2 +- .../libraries/clipper2/default.nix | 2 +- .../libraries/cmark-gfm/default.nix | 4 +- .../libraries/cpp-utilities/default.nix | 3 + .../libraries/ctranslate2/default.nix | 4 +- .../development/libraries/cxxtest/default.nix | 2 +- .../development/libraries/dab_lib/default.nix | 6 +- .../pkgs/development/libraries/db/db-4.8.nix | 7 +- .../pkgs/development/libraries/db/db-5.3.nix | 7 +- .../pkgs/development/libraries/db/db-6.0.nix | 7 +- .../pkgs/development/libraries/db/db-6.2.nix | 7 +- .../pkgs/development/libraries/db/generic.nix | 11 +- .../development/libraries/doctest/default.nix | 11 +- .../libraries/easyloggingpp/default.nix | 4 +- .../development/libraries/elpa/default.nix | 3 +- .../development/libraries/fcft/default.nix | 4 +- .../development/libraries/ffmpeg/generic.nix | 8 +- .../development/libraries/fmt/default.nix | 9 +- .../libraries/freetype/default.nix | 8 +- .../development/libraries/frei0r/default.nix | 2 +- .../libraries/fuzzylite/default.nix | 2 +- .../development/libraries/gdal/default.nix | 20 +- .../pkgs/development/libraries/gdal/tests.nix | 46 + .../development/libraries/gexiv2/default.nix | 9 +- .../development/libraries/gjs/default.nix | 4 +- .../libraries/glib-networking/default.nix | 4 +- .../development/libraries/glib/default.nix | 4 +- .../libraries/gr-framework/default.nix | 65 + .../development/libraries/gspell/default.nix | 4 +- .../libraries/gstreamer/bad/default.nix | 5 +- .../libraries/gstreamer/good/default.nix | 10 +- .../gstreamer/icamerasrc/default.nix | 1 + .../libraries/gstreamer/rs/Cargo.lock | 948 +- .../libraries/gstreamer/rs/default.nix | 8 +- .../libraries/gtk-layer-shell/default.nix | 29 +- .../libraries/gupnp-av/default.nix | 4 + .../pkgs/development/libraries/gupnp/1.6.nix | 14 +- .../development/libraries/gupnp/default.nix | 8 + .../development/libraries/herqq/default.nix | 2 +- .../libraries/hfst-ospell/default.nix | 46 + .../development/libraries/hfst/default.nix | 53 + .../development/libraries/hipfort/default.nix | 4 +- .../development/libraries/hnswlib/default.nix | 66 + .../development/libraries/hwloc/default.nix | 3 +- .../development/libraries/igraph/default.nix | 4 +- .../libraries/intel-media-driver/default.nix | 4 +- .../libraries/ipu6-camera-hal/default.nix | 1 + .../libraries/iso-codes/default.nix | 4 +- .../libraries/jellyfin-ffmpeg/default.nix | 12 +- .../development/libraries/jsoncpp/default.nix | 10 +- .../libraries/kronosnet/default.nix | 4 +- .../development/libraries/ldb/default.nix | 4 +- .../libraries/level-zero/default.nix | 4 +- .../development/libraries/libargs/default.nix | 2 +- .../libraries/libassuan/default.nix | 4 +- .../libraries/libblockdev/default.nix | 85 +- .../development/libraries/libcef/default.nix | 10 +- .../development/libraries/libclc/default.nix | 2 +- .../libraries/libdatrie/default.nix | 2 +- .../libraries/libdc1394/default.nix | 4 +- .../libraries/libde265/default.nix | 22 +- .../libraries/libdmapsharing/default.nix | 4 +- .../libraries/libevent/default.nix | 2 + .../libraries/libgeotiff/default.nix | 2 +- .../libraries/libglibutil/default.nix | 4 +- ...LOC-and-_REALLOC-and-check-for-them-.patch | 31 - .../libraries/libgpiod/default.nix | 10 +- .../libraries/libgudev/default.nix | 47 +- .../development/libraries/libhsts/default.nix | 2 +- .../development/libraries/libjwt/default.nix | 4 +- .../development/libraries/liblcf/default.nix | 30 +- .../libraries/libmatheval/default.nix | 39 +- .../libraries/libnftnl/default.nix | 4 +- .../development/libraries/libopus/default.nix | 2 + .../libraries/libopus/test-timeout.patch | 16 + .../development/libraries/libqb/default.nix | 4 +- .../development/libraries/libqmi/default.nix | 14 +- .../libraries/librclone/default.nix | 4 +- .../development/libraries/librdf/raptor2.nix | 7 + .../libraries/librealsense/default.nix | 2 +- .../development/libraries/librsvg/default.nix | 33 +- .../libraries/libshumate/default.nix | 4 +- .../libraries/libspelling/default.nix | 59 + .../development/libraries/libsvm/default.nix | 4 +- .../development/libraries/libthai/default.nix | 2 +- .../libraries/libtickit/default.nix | 40 + .../development/libraries/libva/default.nix | 4 +- .../development/libraries/libvmaf/default.nix | 2 +- .../libraries/libvoikko/default.nix | 40 + .../libraries/libxcrypt/default.nix | 4 +- .../development/libraries/libxml2/default.nix | 19 +- .../libxml2/utf8-xmlErrorFuncHandler.patch | 30 - .../development/libraries/libxslt/default.nix | 4 +- .../development/libraries/libzim/default.nix | 4 +- .../development/libraries/libzip/default.nix | 4 +- .../libraries/lightgbm/default.nix | 2 +- .../libraries/loudmouth/default.nix | 10 +- .../development/libraries/mlt/default.nix | 20 +- .../libraries/mongocxx/default.nix | 53 + .../development/libraries/movit/default.nix | 4 +- .../libraries/mqtt_cpp/default.nix | 30 + .../libraries/msgpack-c/default.nix | 10 +- .../libraries/msgpack-cxx/default.nix | 10 +- .../development/libraries/mutest/default.nix | 16 +- .../development/libraries/ncurses/default.nix | 7 + .../development/libraries/ndn-cxx/default.nix | 8 +- .../development/libraries/nghttp3/default.nix | 4 +- .../pkgs/development/libraries/nss/latest.nix | 4 +- .../libraries/nv-codec-headers/12_x.nix | 27 + .../libraries/nvidia-thrust/default.nix | 2 +- .../development/libraries/octomap/default.nix | 2 +- .../development/libraries/ogre/1.10.x.nix | 110 - .../development/libraries/ogre/default.nix | 129 +- .../development/libraries/omorfi/default.nix | 81 + .../libraries/onnxruntime/default.nix | 150 +- .../libraries/opencl-clang/default.nix | 2 +- .../pkgs/development/libraries/opencv/3.x.nix | 2 +- .../pkgs/development/libraries/opencv/4.x.nix | 2 +- .../development/libraries/opencv/tests.nix | 2 +- .../development/libraries/openexr/default.nix | 4 +- .../libraries/openldap/default.nix | 7 +- .../development/libraries/openmpi/default.nix | 4 +- .../libraries/openssl/3.0/CVE-2023-2975.patch | 54 + .../development/libraries/openssl/default.nix | 21 +- .../libraries/opensubdiv/default.nix | 2 +- .../libraries/orocos-kdl/default.nix | 2 +- .../development/libraries/p11-kit/default.nix | 4 +- .../libraries/pdfhummus/default.nix | 4 +- .../libraries/phonon/backends/gstreamer.nix | 37 +- .../libraries/physics/pythia/default.nix | 4 +- .../libraries/pico-sdk/default.nix | 2 +- .../libraries/piper-phonemize/default.nix | 60 + .../piper-phonemize/espeak-mbrola.patch | 26 + .../libraries/proj-datumgrid/default.nix | 2 +- .../libraries/qmltermwidget/default.nix | 35 +- .../do-not-copy-artifacts-twice.patch | 10 + .../libraries/qrcodegen/default.nix | 32 +- .../libraries/qt-4.x/4.8/default.nix | 6 +- .../pkgs/development/libraries/qt-6/fetch.sh | 2 +- .../libraries/qt-6/modules/qtmqtt.nix | 4 +- .../pkgs/development/libraries/qt-6/srcs.nix | 314 +- .../qtstyleplugin-kvantum-qt4/default.nix | 2 +- .../qtstyleplugin-kvantum/default.nix | 2 +- .../libraries/qtutilities/default.nix | 2 + .../development/libraries/raylib/default.nix | 15 + .../development/libraries/rocfft/default.nix | 6 +- .../science/astronomy/cfitsio/default.nix | 28 +- .../science/astronomy/indilib/default.nix | 17 +- .../astronomy/indilib/indi-3rdparty.nix | 18 +- .../astronomy/indilib/indi-firmware.nix | 5 +- .../science/astronomy/indilib/indi-full.nix | 19 +- .../science/chemistry/openmm/default.nix | 3 +- .../chemistry/simple-dftd3/default.nix | 4 +- .../libraries/science/math/cudnn/generic.nix | 1 + .../libraries/science/math/faiss/default.nix | 2 +- .../libraries/science/math/magma/generic.nix | 37 +- .../science/math/suitesparse/4.4.nix | 3 +- .../science/math/suitesparse/default.nix | 3 +- .../science/math/tensorflow-lite/default.nix | 245 +- .../libraries/simdjson/default.nix | 4 +- .../development/libraries/simgear/default.nix | 4 +- .../development/libraries/smpeg/default.nix | 2 +- .../libraries/sofia-sip/default.nix | 4 +- .../development/libraries/spdlog/default.nix | 12 +- .../development/libraries/stb/default.nix | 6 +- .../libraries/sundials/default.nix | 4 +- .../libraries/tclap/{default.nix => 1.2.nix} | 0 .../pkgs/development/libraries/tclap/1.4.nix | 48 + .../development/libraries/thrift/default.nix | 7 +- .../development/libraries/tracker/default.nix | 7 +- .../development/libraries/ucc/default.nix | 3 +- .../development/libraries/ucx/default.nix | 3 +- .../libraries/umockdev/default.nix | 26 +- .../libraries/wayland/protocols.nix | 4 +- .../libraries/webkitgtk/default.nix | 4 +- .../libraries/wildmidi/default.nix | 34 +- .../development/libraries/wlroots/default.nix | 11 +- .../pkgs/development/libraries/wt/default.nix | 2 +- .../libraries/xdg-dbus-proxy/default.nix | 1 + .../xdg-desktop-portal-gnome/default.nix | 4 +- .../development/libraries/xercesc/default.nix | 18 +- .../libraries/xeus-zmq/default.nix | 45 + .../development/libraries/xgboost/default.nix | 2 +- .../libraries/xine-lib/default.nix | 92 - .../development/libraries/zziplib/default.nix | 5 + .../development/lisp-modules/packages.nix | 36 +- .../patches/nyxt-remove-build-operation.patch | 12 + .../lua-modules/generated-packages.nix | 31 + .../pkgs/development/lua-modules/lib.nix | 8 +- .../pkgs/development/lua-modules/magick.patch | 53 + .../development/lua-modules/overrides.nix | 20 + .../development/mobile/maestro/default.nix | 4 +- .../mobile/titaniumenv/build-app.nix | 3 +- .../development/nim-packages/cbor/default.nix | 4 +- .../development/nim-packages/eris/default.nix | 32 +- .../nim-packages/hashlib/default.nix | 17 + .../nim-packages/illwill/default.nix | 4 +- .../nim-packages/noise/default.nix | 24 +- .../nim-packages/preserves/default.nix | 7 +- .../nim-packages/regex/default.nix | 26 +- .../nim-packages/segmentation/default.nix | 25 +- .../nim-packages/syndicate/default.nix | 8 +- .../development/nim-packages/taps/default.nix | 4 +- .../nim-packages/unicodedb/default.nix | 24 +- .../nim-packages/unicodeplus/default.nix | 25 +- .../development/nim-packages/ws/default.nix | 21 + .../development/node-packages/aliases.nix | 7 + .../node-packages/main-programs.nix | 6 +- .../node-packages/node-packages.json | 7 +- .../node-packages/node-packages.nix | 13470 ++++------ .../development/node-packages/overrides.nix | 40 +- .../development/node-packages/remove-attr.py | 2 +- .../ocaml-modules/bisect_ppx/default.nix | 15 +- .../ocaml-modules/cmdliner/1_1.nix | 4 +- .../ocaml-modules/cohttp/default.nix | 6 +- .../ocaml-modules/dolog/default.nix | 22 +- .../ocaml-modules/dtools/default.nix | 4 +- .../ocaml-modules/dypgen/default.nix | 35 +- .../development/ocaml-modules/gsl/default.nix | 7 +- .../http-mirage-client/default.nix | 5 +- .../development/ocaml-modules/iri/default.nix | 7 +- .../development/ocaml-modules/mm/default.nix | 4 +- .../ocaml-modules/ocamlformat/generic.nix | 1 + .../ocamlformat/ocamlformat-rpc-lib.nix | 4 +- .../ocaml-modules/ocamlformat/ocamlformat.nix | 2 +- .../development/ocaml-modules/ogg/default.nix | 4 +- .../ppx_deriving_yaml/default.nix | 8 +- .../ocaml-modules/printbox/text.nix | 5 +- .../ocaml-modules/ptime/default.nix | 37 +- .../ocaml-modules/rfc7748/default.nix | 7 + .../ocaml-modules/sosa/default.nix | 12 +- .../ocaml-modules/trace/default.nix | 21 + .../development/ocaml-modules/trace/tef.nix | 15 + .../ocaml-modules/unix-errno/default.nix | 4 +- .../ocaml-modules/wasm/default.nix | 5 +- .../ocaml-modules/x509/default.nix | 4 +- .../ocaml-modules/xenstore-tool/default.nix | 8 +- .../Data-UUID-CVE-2013-4184.patch | 214 + .../pkgs/development/pharo/default.nix | 99 + .../development/pharo/launcher/default.nix | 83 - .../development/pharo/vm/build-vm-legacy.nix | 104 - .../pkgs/development/pharo/vm/build-vm.nix | 179 - .../pkgs/development/pharo/vm/default.nix | 13 - .../pkgs/development/pharo/vm/share.nix | 58 - .../nixpkgs/pkgs/development/pharo/vm/vms.nix | 67 - .../development/pharo/wrapper/default.nix | 60 - .../pkgs/development/pharo/wrapper/magic | 37 - .../development/pharo/wrapper/pharo-vm.sh | 57 - .../php-packages/phpstan/default.nix | 4 +- .../php-packages/snuffleupagus/default.nix | 2 +- .../php-packages/xdebug/default.nix | 10 +- .../python-modules/Cython/default.nix | 4 +- .../python-modules/aardwolf/default.nix | 2 +- .../python-modules/accelerate/default.nix | 35 +- .../python-modules/accupy/default.nix | 2 +- .../python-modules/acme/default.nix | 2 +- .../python-modules/actdiag/default.nix | 2 +- .../adafruit-platformdetect/default.nix | 4 +- .../add-trailing-comma/default.nix | 4 +- .../python-modules/aggdraw/default.nix | 15 + .../python-modules/ailment/default.nix | 4 +- .../aioairzone-cloud/default.nix | 4 +- .../python-modules/aioamqp/default.nix | 2 +- .../python-modules/aioconsole/default.nix | 4 +- .../python-modules/aiocontextvars/default.nix | 2 +- .../python-modules/aioesphomeapi/default.nix | 4 +- .../python-modules/aioftp/default.nix | 2 +- .../python-modules/aiogram/default.nix | 65 + .../python-modules/aiohomekit/default.nix | 6 +- .../python-modules/aiohttp/default.nix | 6 + .../python-modules/aiokafka/default.nix | 2 +- .../python-modules/aiomisc/default.nix | 4 +- .../python-modules/aiomqtt/default.nix | 67 + .../python-modules/aiomysensors/default.nix | 12 +- .../python-modules/aiomysql/default.nix | 2 +- .../python-modules/aiooss2/default.nix | 4 +- .../python-modules/aiopvpc/default.nix | 4 +- .../python-modules/aiorun/default.nix | 2 +- .../python-modules/aioslimproto/default.nix | 4 +- .../python-modules/aiosomecomfort/default.nix | 4 +- .../python-modules/aiosqlite/default.nix | 2 +- .../python-modules/aiounifi/default.nix | 8 +- .../python-modules/aiounittest/default.nix | 2 +- .../python-modules/albumentations/default.nix | 62 + .../aliyun-python-sdk-iot/default.nix | 4 +- .../python-modules/allpairspy/default.nix | 17 +- .../python-modules/altair/default.nix | 76 +- .../python-modules/altgraph/default.nix | 32 + .../python-modules/androidtv/default.nix | 4 +- .../androidtvremote2/default.nix | 4 +- .../python-modules/angr/default.nix | 4 +- .../python-modules/ansible-compat/default.nix | 4 +- .../python-modules/ansible-kernel/default.nix | 2 +- .../python-modules/ansible-runner/default.nix | 2 +- .../ansible-vault-rw/default.nix | 27 + .../python-modules/ansible/core.nix | 4 +- .../python-modules/ansiwrap/default.nix | 2 +- .../python-modules/anthropic/default.nix | 47 +- .../antlr4-python3-runtime/default.nix | 2 +- .../python-modules/apache-beam/default.nix | 2 +- .../python-modules/apispec/default.nix | 2 +- .../python-modules/archinfo/default.nix | 4 +- .../python-modules/argilla/default.nix | 6 +- .../python-modules/arpeggio/default.nix | 11 +- .../python-modules/asciitree/default.nix | 2 +- .../python-modules/asdf/default.nix | 2 +- .../python-modules/ase/default.nix | 2 +- .../python-modules/asgiref/default.nix | 2 +- .../python-modules/asn1tools/default.nix | 2 +- .../python-modules/aspell-python/default.nix | 2 +- .../python-modules/asteval/default.nix | 4 +- .../python-modules/astroid/default.nix | 2 +- .../async-interrupt/default.nix | 49 + .../python-modules/async-lru/default.nix | 4 +- .../async-upnp-client/default.nix | 4 +- .../python-modules/asyncinotify/default.nix | 4 +- .../python-modules/asyncua/default.nix | 12 + .../python-modules/atomman/default.nix | 2 +- .../atsim_potentials/default.nix | 2 +- .../python-modules/auth0-python/default.nix | 6 +- .../python-modules/autobahn/default.nix | 2 +- .../python-modules/autocommand/default.nix | 2 +- .../python-modules/automat/default.nix | 2 +- .../python-modules/awesomeversion/default.nix | 4 +- .../python-modules/azure-common/default.nix | 2 +- .../azure-mgmt-authorization/default.nix | 4 +- .../azure-mgmt-cognitiveservices/default.nix | 4 +- .../azure-mgmt-common/default.nix | 2 +- .../azure-mgmt-compute/default.nix | 4 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-kusto/default.nix | 4 +- .../azure-mgmt-netapp/default.nix | 4 +- .../azure-mgmt-network/default.nix | 4 +- .../python-modules/babel/default.nix | 2 +- .../default.nix | 2 +- .../default.nix | 2 +- .../python-modules/backports_csv/default.nix | 20 - .../backports_functools_lru_cache/default.nix | 32 - .../backports_tempfile/default.nix | 34 - .../backports_unittest-mock/default.nix | 26 - .../backports_weakref/default.nix | 32 - .../python-modules/bandcamp-api/default.nix | 9 +- .../python-modules/basemap-data/default.nix | 2 +- .../python-modules/basemap/default.nix | 2 +- .../python-modules/batchspawner/default.nix | 2 +- .../bc-detect-secrets/default.nix | 4 +- .../python-modules/bcf/default.nix | 54 + .../python-modules/bcg/default.nix | 49 + .../python-modules/bch/default.nix | 42 + .../python-modules/bentoml/default.nix | 198 + .../python-modules/bitarray/default.nix | 4 +- .../python-modules/bitbox02/default.nix | 2 +- .../bleak-retry-connector/default.nix | 4 +- .../python-modules/blinker/default.nix | 2 +- .../python-modules/blockdiag/default.nix | 2 +- .../bluetooth-adapters/default.nix | 4 +- .../bluetooth-auto-recovery/default.nix | 6 +- .../bluetooth-data-tools/default.nix | 4 +- .../python-modules/boltztrap2/default.nix | 2 +- .../python-modules/boto/default.nix | 2 +- .../python-modules/bracex/default.nix | 2 +- .../python-modules/bravado-core/default.nix | 5 +- .../python-modules/brotli/default.nix | 2 +- .../python-modules/bsddb3/default.nix | 2 +- .../python-modules/bthome-ble/default.nix | 10 +- .../python-modules/bugz/default.nix | 2 +- .../python-modules/cachecontrol/default.nix | 2 +- .../python-modules/cadquery/default.nix | 2 +- .../python-modules/cairocffi/default.nix | 2 +- .../python-modules/cairosvg/default.nix | 2 +- .../python-modules/capstone/default.nix | 2 +- .../python-modules/casbin/default.nix | 6 +- .../certbot-dns-cloudflare/default.nix | 2 +- .../certbot-dns-google/default.nix | 2 +- .../certbot-dns-rfc2136/default.nix | 2 +- .../certbot-dns-route53/default.nix | 2 +- .../python-modules/certbot/default.nix | 6 +- .../python-modules/certifi/default.nix | 6 +- .../python-modules/certipy-ad/default.nix | 4 +- .../python-modules/cgen/default.nix | 2 +- .../python-modules/chainer/default.nix | 2 +- .../python-modules/chalice/default.nix | 2 +- .../python-modules/chart-studio/default.nix | 2 +- .../python-modules/cheroot/default.nix | 8 +- .../python-modules/cherrypy/default.nix | 4 +- .../python-modules/chess/default.nix | 4 +- .../python-modules/chiavdf/default.nix | 4 +- .../python-modules/chirpstack-api/default.nix | 2 +- .../python-modules/circus/default.nix | 77 + .../python-modules/cirq-aqt/default.nix | 2 +- .../python-modules/cirq-core/default.nix | 2 +- .../python-modules/cirq-google/default.nix | 2 +- .../python-modules/cirq-ionq/default.nix | 2 +- .../python-modules/cirq-pasqal/default.nix | 2 +- .../python-modules/cirq-rigetti/default.nix | 2 +- .../python-modules/cirq-web/default.nix | 2 +- .../python-modules/claripy/default.nix | 4 +- .../python-modules/cle/default.nix | 4 +- .../python-modules/cli-helpers/default.nix | 1 - .../python-modules/cliche/default.nix | 2 +- .../python-modules/click/default.nix | 4 +- .../python-modules/clifford/default.nix | 2 +- .../python-modules/clintermission/default.nix | 2 +- .../python-modules/cloudflare/default.nix | 2 +- .../python-modules/cma/default.nix | 2 +- .../python-modules/coincurve/default.nix | 2 +- .../python-modules/colorcet/default.nix | 2 +- .../python-modules/commandparse/default.nix | 13 +- .../python-modules/commentjson/default.nix | 2 +- .../python-modules/compreffor/default.nix | 4 +- .../python-modules/confection/default.nix | 4 +- .../python-modules/constantly/default.nix | 52 +- .../python-modules/coredis/default.nix | 59 + .../python-modules/cornice/default.nix | 2 +- .../python-modules/cpyparsing/default.nix | 4 +- .../python-modules/croniter/default.nix | 2 +- .../python-modules/crytic-compile/default.nix | 11 +- .../python-modules/ctranslate2/default.nix | 2 +- .../python-modules/dask-awkward/default.nix | 4 +- .../dask-gateway-server/default.nix | 2 +- .../python-modules/dask-gateway/default.nix | 4 +- .../python-modules/dask-glm/default.nix | 2 +- .../python-modules/dask-image/default.nix | 2 +- .../python-modules/dask-jobqueue/default.nix | 2 +- .../python-modules/dask-ml/default.nix | 2 +- .../python-modules/dask-mpi/default.nix | 2 +- .../python-modules/databases/default.nix | 2 +- .../python-modules/datadog/default.nix | 4 +- .../python-modules/datamodeldict/default.nix | 2 +- .../python-modules/datasette/default.nix | 2 +- .../python-modules/datashader/default.nix | 2 +- .../python-modules/dateutils/default.nix | 2 +- .../python-modules/db-dtypes/default.nix | 2 +- .../python-modules/dbt-bigquery/default.nix | 60 + .../python-modules/dbt-core/default.nix | 113 + .../python-modules/dbt-core/with-adapters.nix | 18 + .../python-modules/dbt-extractor/Cargo.lock | 531 + .../python-modules/dbt-extractor/default.nix | 49 + .../python-modules/dbt-postgres/default.nix | 37 + .../python-modules/dbt-redshift/default.nix | 61 + .../python-modules/dbt-snowflake/default.nix | 45 + .../python-modules/dbus-fast/default.nix | 4 +- .../python-modules/dbutils/default.nix | 2 +- .../python-modules/debian/default.nix | 2 +- .../python-modules/decorator/default.nix | 2 +- .../python-modules/detectron2/default.nix | 98 +- .../python-modules/discogs-client/default.nix | 4 +- .../python-modules/discordpy/default.nix | 3 +- .../python-modules/diskcache/default.nix | 2 +- .../dissect-cobaltstrike/default.nix | 2 + .../python-modules/distributed/default.nix | 2 +- .../python-modules/dj-email-url/default.nix | 2 +- .../python-modules/dj-rest-auth/default.nix | 2 +- .../python-modules/dj-search-url/default.nix | 2 +- .../django-autocomplete-light/default.nix | 4 +- .../django-cache-url/default.nix | 2 +- .../django-cacheops/default.nix | 7 +- .../django-celery-results/default.nix | 5 +- .../default.nix | 0 .../default.nix | 0 .../django-configurations/default.nix | 2 +- .../default.nix | 0 .../default.nix | 0 .../django-guardian/default.nix | 2 +- .../python-modules/django-hijack/default.nix | 4 +- .../django-model-utils/default.nix | 2 +- .../default.nix | 0 .../{django_nose => django-nose}/default.nix | 0 .../python-modules/django-otp/default.nix | 2 +- .../django-polymorphic/default.nix | 2 +- .../python-modules/django-raster/default.nix | 4 +- .../django-rest-auth/default.nix | 2 +- .../django-rest-polymorphic/default.nix | 2 +- .../python-modules/django-sekizai/default.nix | 4 +- .../{django_silk => django-silk}/default.nix | 0 .../python-modules/django-stubs/default.nix | 4 +- .../python-modules/django-tables2/default.nix | 4 +- .../default.nix | 0 .../default.nix | 0 .../development/python-modules/django/4.nix | 4 +- .../default.nix | 2 +- .../default.nix | 2 +- .../djangorestframework-guardian/default.nix | 2 +- .../djangorestframework-recursive/default.nix | 2 +- .../djangorestframework/default.nix | 2 +- .../dockerfile-parse/default.nix | 4 +- .../python-modules/dockerspawner/default.nix | 2 +- .../python-modules/docrep/default.nix | 2 +- .../python-modules/dokuwiki/default.nix | 26 + .../drf-spectacular-sidecar/default.nix | 2 +- .../drf-spectacular/default.nix | 2 +- .../python-modules/drms/default.nix | 2 +- .../python-modules/dsmr-parser/default.nix | 4 +- .../python-modules/dtlssocket/default.nix | 4 +- .../python-modules/duckdb/default.nix | 2 +- .../python-modules/duct-py/default.nix | 38 + .../python-modules/duo-client/default.nix | 2 +- .../python-modules/dvc-data/default.nix | 4 +- .../python-modules/dvc-objects/default.nix | 4 +- .../python-modules/dvclive/default.nix | 4 +- .../python-modules/editorconfig/default.nix | 2 +- .../edk2-pytool-library/default.nix | 4 +- .../python-modules/edlib/default.nix | 2 +- .../python-modules/elastic-apm/default.nix | 4 +- .../python-modules/elementpath/default.nix | 4 +- .../enochecker-core/default.nix | 35 + .../python-modules/enrich/default.nix | 2 +- .../python-modules/env-canada/default.nix | 4 +- .../python-modules/eth-abi/default.nix | 2 +- .../python-modules/eth-account/default.nix | 2 +- .../python-modules/eth-hash/default.nix | 2 +- .../python-modules/eth-keyfile/default.nix | 2 +- .../python-modules/eth-keys/default.nix | 2 +- .../python-modules/eth-rlp/default.nix | 2 +- .../python-modules/eth-typing/default.nix | 2 +- .../python-modules/eth-utils/default.nix | 2 +- .../python-modules/exceptiongroup/default.nix | 10 +- .../python-modules/exdown/default.nix | 2 +- .../python-modules/extractcode/7z.nix | 2 +- .../python-modules/extractcode/libarchive.nix | 2 +- .../python-modules/fabric/default.nix | 2 +- .../python-modules/facebook-sdk/default.nix | 2 +- .../python-modules/fairscale/default.nix | 17 +- .../python-modules/fakeredis/default.nix | 4 +- .../default.nix | 4 +- .../python-modules/fastavro/default.nix | 4 +- .../python-modules/fastdiff/default.nix | 2 +- .../python-modules/faster-whisper/default.nix | 4 +- .../python-modules/filterpy/default.nix | 2 +- .../python-modules/findpython/default.nix | 4 +- .../python-modules/fiona/default.nix | 31 +- .../python-modules/fipy/default.nix | 2 +- .../python-modules/flake8/default.nix | 1 + .../python-modules/flask-admin/default.nix | 2 +- .../flask-appbuilder/default.nix | 2 +- .../python-modules/flask-babelex/default.nix | 2 +- .../python-modules/flask-bcrypt/default.nix | 2 +- .../flask-mongoengine/default.nix | 2 +- .../python-modules/flask-openid/default.nix | 2 +- .../python-modules/flask-themes2/default.nix | 25 + .../python-modules/flask/default.nix | 2 +- .../python-modules/flatbuffers/default.nix | 2 +- .../python-modules/flit-core/default.nix | 2 +- .../python-modules/flit/default.nix | 2 +- .../python-modules/flux-led/default.nix | 4 +- .../python-modules/fnv-hash-fast/default.nix | 4 +- .../fontawesomefree/default.nix | 29 + .../fritzconnection/default.nix | 4 +- .../python-modules/fsspec/default.nix | 2 +- .../python-modules/func-timeout/default.nix | 2 +- .../python-modules/galois/default.nix | 5 +- .../python-modules/gatt/default.nix | 2 +- .../python-modules/gb-io/default.nix | 2 +- .../python-modules/gehomesdk/default.nix | 4 +- .../python-modules/genpy/default.nix | 2 +- .../python-modules/gidgethub/default.nix | 2 +- .../gitignore-parser/default.nix | 4 +- .../python-modules/glob2/default.nix | 2 +- .../python-modules/glymur/default.nix | 2 +- .../python-modules/glyphslib/default.nix | 4 +- .../python-modules/gocardless-pro/default.nix | 44 + .../google-api-core/default.nix | 2 +- .../google-auth-httplib2/default.nix | 2 +- .../google-auth-oauthlib/default.nix | 2 +- .../python-modules/google-auth/default.nix | 2 +- .../default.nix | 2 +- .../default.nix | 41 + .../google-cloud-asset/default.nix | 2 +- .../google-cloud-audit-log/default.nix | 2 +- .../google-cloud-automl/default.nix | 2 +- .../default.nix | 2 +- .../google-cloud-bigquery-storage/default.nix | 2 +- .../google-cloud-bigquery/default.nix | 6 +- .../google-cloud-bigtable/default.nix | 6 +- .../google-cloud-container/default.nix | 6 +- .../google-cloud-core/default.nix | 2 +- .../google-cloud-datacatalog/default.nix | 2 +- .../google-cloud-dataproc/default.nix | 2 +- .../google-cloud-datastore/default.nix | 2 +- .../google-cloud-dlp/default.nix | 2 +- .../google-cloud-dns/default.nix | 2 +- .../google-cloud-error-reporting/default.nix | 2 +- .../google-cloud-firestore/default.nix | 2 +- .../google-cloud-iam/default.nix | 2 +- .../google-cloud-iot/default.nix | 2 +- .../google-cloud-kms/default.nix | 2 +- .../google-cloud-language/default.nix | 2 +- .../google-cloud-logging/default.nix | 2 +- .../google-cloud-monitoring/default.nix | 2 +- .../google-cloud-org-policy/default.nix | 2 +- .../google-cloud-os-config/default.nix | 2 +- .../google-cloud-pubsub/default.nix | 2 +- .../google-cloud-redis/default.nix | 2 +- .../google-cloud-resource-manager/default.nix | 2 +- .../google-cloud-runtimeconfig/default.nix | 2 +- .../google-cloud-secret-manager/default.nix | 2 +- .../google-cloud-securitycenter/default.nix | 6 +- .../google-cloud-spanner/default.nix | 6 +- .../google-cloud-speech/default.nix | 2 +- .../google-cloud-storage/default.nix | 2 +- .../google-cloud-tasks/default.nix | 2 +- .../google-cloud-testutils/default.nix | 2 +- .../google-cloud-texttospeech/default.nix | 2 +- .../google-cloud-trace/default.nix | 2 +- .../google-cloud-translate/default.nix | 6 +- .../default.nix | 2 +- .../google-cloud-vision/default.nix | 2 +- .../default.nix | 2 +- .../python-modules/google-crc32c/default.nix | 2 +- .../google-i18n-address/default.nix | 2 +- .../google-resumable-media/default.nix | 2 +- .../googleapis-common-protos/default.nix | 2 +- .../python-modules/gptcache/default.nix | 42 + .../python-modules/grad-cam/default.nix | 4 +- .../python-modules/graphene/default.nix | 6 +- .../python-modules/graphite-web/default.nix | 4 +- .../python-modules/graphql-relay/default.nix | 2 +- .../python-modules/gremlinpython/default.nix | 2 +- .../python-modules/griffe/default.nix | 4 +- .../grpc-google-iam-v1/default.nix | 2 +- .../grpcio-channelz/default.nix | 42 + .../python-modules/grpcio-gcp/default.nix | 2 +- .../grpcio-health-checking/default.nix | 42 + .../grpcio-reflection/default.nix | 42 + .../python-modules/grpcio/default.nix | 2 +- .../python-modules/gsd/default.nix | 2 +- .../python-modules/gssapi/default.nix | 4 + .../python-modules/guidance/default.nix | 80 + .../python-modules/gunicorn/default.nix | 2 +- .../python-modules/gymnasium/default.nix | 6 +- .../python-modules/h11/default.nix | 2 +- .../development/python-modules/h2/default.nix | 2 +- .../python-modules/hap-python/default.nix | 6 +- .../python-modules/hassil/default.nix | 4 +- .../python-modules/hcloud/default.nix | 4 +- .../python-modules/hdmedians/default.nix | 2 +- .../python-modules/hexbytes/default.nix | 2 +- .../python-modules/hexdump/default.nix | 3 +- .../python-modules/hfst/default.nix | 45 + .../python-modules/hid-parser/default.nix | 36 + .../python-modules/hist/default.nix | 10 +- .../python-modules/hnswlib/default.nix | 32 + .../python-modules/holidays/default.nix | 4 +- .../python-modules/hologram/default.nix | 45 + .../python-modules/holoviews/default.nix | 2 +- .../home-assistant-bluetooth/default.nix | 4 +- .../python-modules/hoomd-blue/default.nix | 2 +- .../python-modules/hopcroftkarp/default.nix | 2 +- .../python-modules/howdoi/default.nix | 2 +- .../python-modules/hpack/default.nix | 2 +- .../python-modules/hstspreload/default.nix | 2 +- .../python-modules/httptools/default.nix | 2 +- .../python-modules/httpx/default.nix | 2 +- .../python-modules/humanize/default.nix | 11 +- .../python-modules/hvplot/default.nix | 2 +- .../python-modules/hydra-core/default.nix | 7 + .../python-modules/hyperframe/default.nix | 2 +- .../python-modules/hypothesis/default.nix | 2 +- .../python-modules/hypothesmith/default.nix | 2 +- .../python-modules/ibis-framework/default.nix | 2 +- .../python-modules/ibis/default.nix | 2 +- .../python-modules/ical/default.nix | 8 +- .../python-modules/identify/default.nix | 8 +- .../python-modules/ifaddr/default.nix | 2 +- .../python-modules/igraph/default.nix | 4 +- .../python-modules/ijson/default.nix | 4 +- .../python-modules/imap-tools/default.nix | 8 +- .../python-modules/immutabledict/default.nix | 6 +- .../python-modules/impacket/default.nix | 2 +- .../importlib-metadata/default.nix | 6 +- .../python-modules/imutils/default.nix | 2 +- .../python-modules/incremental/default.nix | 2 +- .../python-modules/inscriptis/default.nix | 2 +- .../python-modules/insightface/default.nix | 77 + .../python-modules/intake/default.nix | 2 +- .../python-modules/iocextract/default.nix | 11 +- .../python-modules/ipdb/default.nix | 2 +- .../python-modules/ipdbplugin/default.nix | 2 +- .../python-modules/ipyniivue/default.nix | 4 +- .../python-modules/irc/default.nix | 26 +- .../python-modules/islpy/default.nix | 6 +- .../python-modules/isounidecode/default.nix | 2 +- .../python-modules/jaraco-abode/default.nix | 12 +- .../default.nix | 2 +- .../default.nix | 13 +- .../python-modules/jaraco-email/default.nix | 8 +- .../default.nix | 5 +- .../default.nix | 5 +- .../default.nix | 0 .../python-modules/jaraco-net/default.nix | 16 +- .../default.nix | 5 +- .../python-modules/jaraco-test/default.nix | 8 +- .../{jaraco_text => jaraco-text}/default.nix | 9 +- .../development/python-modules/jaxlib/bin.nix | 2 +- .../python-modules/jaxlib/default.nix | 3 +- .../development/python-modules/jc/default.nix | 4 +- .../python-modules/joblib/default.nix | 2 +- .../python-modules/jsbeautifier/default.nix | 4 +- .../json-merge-patch/default.nix | 2 +- .../python-modules/jsonable/default.nix | 32 + .../python-modules/jsonmerge/default.nix | 11 +- .../jupyter-c-kernel/default.nix | 2 +- .../jupyter-contrib-core/default.nix | 32 + .../jupyter-contrib-nbextensions/default.nix | 36 + .../default.nix | 25 + .../default.nix | 28 + .../jupyter-repo2docker/default.nix | 2 +- .../python-modules/jupyter-server/default.nix | 4 - .../jupyterhub-systemdspawner/default.nix | 2 +- .../jupyterlab-widgets/default.nix | 2 +- .../python-modules/jupyterlab/default.nix | 2 +- .../jupyterlab_server/default.nix | 2 +- .../python-modules/jwcrypto/default.nix | 2 +- .../python-modules/karton-core/default.nix | 6 +- .../karton-yaramatcher/default.nix | 4 +- .../python-modules/kasa-crypt/default.nix | 6 +- .../python-modules/keyring/default.nix | 4 +- .../python-modules/kmapper/default.nix | 2 +- .../python-modules/kubernetes/default.nix | 2 +- .../python-modules/langchain/default.nix | 10 +- .../python-modules/langsmith/default.nix | 54 + .../python-modules/ldapdomaindump/default.nix | 2 +- .../python-modules/ldaptor/default.nix | 2 +- .../python-modules/lektor/default.nix | 49 +- .../python-modules/libcst/default.nix | 22 +- .../python-modules/libgpuarray/default.nix | 4 +- .../python-modules/librespot/default.nix | 61 + .../python-modules/libsass/default.nix | 2 +- .../python-modules/life360/default.nix | 4 +- .../python-modules/lightgbm/default.nix | 2 +- .../python-modules/lmfit/default.nix | 4 +- .../python-modules/loopy/default.nix | 2 +- .../python-modules/looseversion/default.nix | 4 +- .../python-modules/losant-rest/default.nix | 4 +- .../python-modules/lz4/default.nix | 2 +- .../python-modules/m2r/default.nix | 2 +- .../python-modules/macaddress/default.nix | 41 + .../python-modules/macropy/default.nix | 2 +- .../python-modules/maestral/default.nix | 6 +- .../python-modules/magic-filter/default.nix | 40 + .../magic-wormhole-mailbox-server/default.nix | 2 +- .../magic-wormhole-transit-relay/default.nix | 2 +- .../python-modules/magic-wormhole/default.nix | 2 +- .../marshmallow-enum/default.nix | 2 +- .../python-modules/matchpy/default.nix | 2 +- .../python-modules/mautrix/default.nix | 15 +- .../python-modules/maxminddb/default.nix | 4 + .../python-modules/mcstatus/default.nix | 22 +- .../python-modules/meilisearch/default.nix | 4 +- .../python-modules/meshtastic/default.nix | 4 +- .../python-modules/mesonpep517/default.nix | 17 +- .../python-modules/mezzanine/default.nix | 4 +- .../minimal-snowplow-tracker/default.nix | 36 + .../mkdocs-git-authors-plugin/default.nix | 31 + .../mkdocs-linkcheck/default.nix | 38 + .../mkdocs-redirects/default.nix | 4 +- .../mkdocstrings-python/default.nix | 11 +- .../python-modules/modeled/default.nix | 2 +- .../moderngl_window/default.nix | 16 +- .../python-modules/mongoengine/default.nix | 2 +- .../python-modules/mqtt2influxdb/default.nix | 42 + .../python-modules/msgpack/default.nix | 2 +- .../msoffcrypto-tool/default.nix | 6 +- .../python-modules/multiset/default.nix | 2 +- .../python-modules/music-tag/default.nix | 41 + .../python-modules/mwcli/default.nix | 41 + .../python-modules/mwdblib/default.nix | 4 +- .../python-modules/mwtypes/default.nix | 38 + .../python-modules/mwxml/default.nix | 43 + .../python-modules/mxnet/default.nix | 3 + .../mypy-boto3-builder/default.nix | 4 +- .../python-modules/mypy-boto3-ebs/default.nix | 4 +- .../python-modules/mypy-boto3-s3/default.nix | 6 +- .../python-modules/mypy/default.nix | 2 +- .../python-modules/mypy/extensions.nix | 2 +- .../python-modules/myst-nb/default.nix | 27 +- .../python-modules/nbconflux/default.nix | 9 +- .../python-modules/nbconflux/setup-py.patch | 16 + .../python-modules/nbsmoke/default.nix | 2 +- .../python-modules/nbsphinx/default.nix | 2 +- .../python-modules/nbval/default.nix | 2 +- .../python-modules/nclib/default.nix | 4 +- .../python-modules/neo4j/default.nix | 4 +- .../python-modules/nest-asyncio/default.nix | 2 +- .../python-modules/nexia/default.nix | 6 +- .../python-modules/ninja/default.nix | 72 + .../python-modules/ninja/no-download.patch | 10 + .../python-modules/nix-kernel/default.nix | 2 +- .../nix-prefetch-github/default.nix | 4 +- .../nixpkgs-pytools/default.nix | 2 +- .../python-modules/noiseprotocol/default.nix | 2 +- .../python-modules/nose-randomly/default.nix | 2 +- .../notifications-python-client/default.nix | 6 +- .../python-modules/notmuch2/default.nix | 8 +- .../python-modules/numba/default.nix | 4 +- .../python-modules/numcodecs/default.nix | 2 +- .../python-modules/numericalunits/default.nix | 2 +- .../python-modules/numpy/default.nix | 45 +- ...e-failing-long-double-test-Rosetta-2.patch | 23 + .../python-modules/nvidia-ml-py/default.nix | 4 +- .../python-modules/oci/default.nix | 4 +- .../python-modules/ome-zarr/default.nix | 19 +- .../python-modules/omorfi/default.nix | 32 + .../python-modules/omorfi/importfix.patch | 76 + .../python-modules/onnxmltools/default.nix | 59 + .../python-modules/onnxruntime/default.nix | 6 +- .../python-modules/openrazer/pylib.nix | 2 +- .../python-modules/openshift/default.nix | 6 +- .../opentelemetry-api/default.nix | 19 +- .../default.nix | 18 +- .../default.nix | 18 +- .../default.nix | 18 +- .../opentelemetry-exporter-otlp/default.nix | 18 +- .../default.nix | 17 +- .../default.nix | 52 + .../default.nix | 17 +- .../default.nix | 17 +- .../default.nix | 52 + .../default.nix | 17 +- .../opentelemetry-instrumentation/default.nix | 11 +- .../opentelemetry-proto/default.nix | 18 +- .../opentelemetry-sdk/default.nix | 19 +- .../default.nix | 18 +- .../opentelemetry-test-utils/default.nix | 17 +- .../opentelemetry-util-http/default.nix | 17 +- .../python-modules/opower/default.nix | 4 +- .../python-modules/optax/default.nix | 4 +- .../python-modules/optuna/default.nix | 2 +- .../python-modules/orjson/default.nix | 6 +- .../python-modules/orm/default.nix | 2 +- .../python-modules/packaging/default.nix | 2 +- .../python-modules/paddle-bfloat/default.nix | 46 + .../paddle_bfloat/binary-hashes.nix | 11 - .../python-modules/paddle_bfloat/default.nix | 37 - .../python-modules/panel/default.nix | 2 +- .../python-modules/papermill/default.nix | 2 +- .../python-modules/para/default.nix | 30 + .../python-modules/param/default.nix | 2 +- .../python-modules/paramiko/default.nix | 2 +- .../python-modules/parfive/default.nix | 2 +- .../python-modules/parver/default.nix | 2 +- .../python-modules/patator/default.nix | 2 +- .../python-modules/pathlib/default.nix | 2 +- .../python-modules/pathlib2/default.nix | 2 +- .../python-modules/peaqevcore/default.nix | 4 +- .../python-modules/pecan/default.nix | 22 +- .../python-modules/peft/default.nix | 9 +- .../python-modules/perfplot/default.nix | 2 +- .../python-modules/persim/default.nix | 2 +- .../python-modules/pgvector/default.nix | 6 +- .../phx-class-registry/default.nix | 2 +- .../python-modules/piccolo-theme/default.nix | 6 +- .../python-modules/picosvg/default.nix | 57 + .../python-modules/pillow-simd/default.nix | 2 +- .../python-modules/pillow/default.nix | 15 +- .../python-modules/pims/default.nix | 2 +- .../pinecone-client/default.nix | 4 +- .../python-modules/pint/default.nix | 2 +- .../python-modules/pipdate/default.nix | 2 +- .../python-modules/pipdeptree/default.nix | 11 +- .../piper-phonemize/default.nix | 34 + .../python-modules/pkgconfig/default.nix | 2 +- .../python-modules/plaid-python/default.nix | 4 +- .../python-modules/playwright/default.nix | 6 +- .../python-modules/plugwise/default.nix | 4 +- .../python-modules/policyuniverse/default.nix | 4 +- .../python-modules/pontos/default.nix | 4 +- .../python-modules/posthog/default.nix | 18 +- .../python-modules/potentials/default.nix | 4 +- .../python-modules/ppft/default.nix | 4 +- .../development/python-modules/pq/default.nix | 2 +- .../python-modules/prance/default.nix | 2 +- .../python-modules/prison/default.nix | 2 +- .../python-modules/progress/default.nix | 2 +- .../python-modules/proto-plus/default.nix | 2 +- .../python-modules/protobuf/default.nix | 28 +- .../python-modules/publicsuffix2/default.nix | 2 +- .../publicsuffixlist/default.nix | 4 +- .../python-modules/pulumi-aws/default.nix | 2 +- .../python-modules/py-cpuinfo/default.nix | 2 +- .../python-modules/py-ecc/default.nix | 2 +- .../py-eth-sig-utils/default.nix | 2 +- .../py-expression-eval/default.nix | 24 + .../python-modules/py-lru-cache/default.nix | 2 +- .../py-partiql-parser/default.nix | 4 +- .../python-modules/py-radix-sr/default.nix | 34 + .../python-modules/py65/default.nix | 39 + .../python-modules/pyamg/default.nix | 2 +- .../python-modules/pyannotate/default.nix | 2 +- .../python-modules/pyasn1/default.nix | 2 +- .../python-modules/pyatv/default.nix | 10 +- .../python-modules/pyaxmlparser/default.nix | 2 +- .../python-modules/pyct/default.nix | 2 +- .../python-modules/pycurl/default.nix | 2 +- .../pydata-google-auth/default.nix | 4 +- .../python-modules/pydeps/default.nix | 4 +- .../python-modules/pydy/default.nix | 2 +- .../python-modules/pyemd/default.nix | 34 +- .../python-modules/pyfibaro/default.nix | 4 +- .../python-modules/pyfma/default.nix | 2 +- .../python-modules/pyftpdlib/default.nix | 2 +- .../python-modules/pyfuse3/default.nix | 4 +- .../python-modules/pyglm/default.nix | 23 + .../python-modules/pygments/default.nix | 2 +- .../python-modules/pygmo/default.nix | 2 +- .../python-modules/pygnmi/default.nix | 2 +- .../python-modules/pykdl/default.nix | 2 +- .../python-modules/pylint/default.nix | 2 +- .../python-modules/pylitterbot/default.nix | 4 +- .../python-modules/pyls-spyder/default.nix | 2 +- .../python-modules/pylyrics/default.nix | 2 +- .../pymatting/01-kdtree-signature.patch | 13 + .../python-modules/pymatting/default.nix | 55 + .../python-modules/pymazda/default.nix | 4 +- .../python-modules/pymbolic/default.nix | 2 +- .../python-modules/pymilvus/default.nix | 4 +- .../python-modules/pynina/default.nix | 5 +- .../python-modules/pynisher/default.nix | 4 +- .../python-modules/pyomo/default.nix | 2 +- .../python-modules/pyopenssl/default.nix | 2 +- .../python-modules/pyperf/default.nix | 2 +- .../python-modules/pypiserver/default.nix | 2 +- .../python-modules/pypitoken/default.nix | 6 +- .../development/python-modules/pyqt/6.x.nix | 4 +- .../python-modules/pyrabbit2/default.nix | 2 +- .../python-modules/pyrainbird/default.nix | 4 +- .../python-modules/pyramid/default.nix | 4 +- .../pyramid_chameleon/default.nix | 1 - .../python-modules/pyschedule/default.nix | 2 +- .../python-modules/pyschlage/default.nix | 4 +- .../python-modules/pyscreenshot/default.nix | 2 +- .../python-modules/pysensibo/default.nix | 4 +- .../python-modules/pyslurm/default.nix | 4 +- .../python-modules/pysnooper/default.nix | 4 +- .../python-modules/pyspcwebgw/default.nix | 14 +- .../python-modules/pysqlcipher3/default.nix | 2 +- .../python-modules/pysrim/default.nix | 2 +- .../pytest-annotate/default.nix | 2 +- .../python-modules/pytest-ansible/default.nix | 16 +- .../pytest-arraydiff/default.nix | 2 +- .../pytest-astropy-header/default.nix | 2 +- .../python-modules/pytest-astropy/default.nix | 2 +- .../python-modules/pytest-click/default.nix | 2 +- .../pytest-doctestplus/default.nix | 2 +- .../pytest-md-report/default.nix | 4 +- .../python-modules/pytest-mpl/default.nix | 2 +- .../python-modules/pytest-mypy/default.nix | 2 +- .../pytest-openfiles/default.nix | 2 +- .../python-modules/pytest-pylint/default.nix | 2 +- .../python-modules/pytest-qt/default.nix | 2 +- .../python-modules/pytest-relaxed/default.nix | 2 +- .../pytest-remotedata/default.nix | 2 +- .../python-modules/pytest-repeat/default.nix | 2 +- .../pytest-snapshot/default.nix | 2 +- .../python-modules/pytest-socket/default.nix | 2 +- .../python-modules/pytest-sugar/default.nix | 2 +- .../pytest-testinfra/default.nix | 4 + .../python-modules/pytest-timeout/default.nix | 4 +- .../python-modules/pytest-xvfb/default.nix | 2 +- .../python-modules/python-arango/default.nix | 2 + .../python-benedict/default.nix | 4 +- .../python-modules/python-csxcad/default.nix | 2 +- .../python-modules/python-gnupg/default.nix | 5 +- .../python-homewizard-energy/default.nix | 4 +- .../python-modules/python-kasa/default.nix | 6 +- .../python-keycloak/default.nix | 2 +- .../python-modules/python-magic/default.nix | 2 +- .../python-matter-server/default.nix | 4 +- .../python-multipart/default.nix | 2 +- .../python-modules/python-olm/default.nix | 2 +- .../python-modules/python-openems/default.nix | 2 +- .../python-otbr-api/default.nix | 4 +- .../python-rapidjson/default.nix | 2 +- .../python-roborock/default.nix | 4 +- .../python-modules/python-snappy/default.nix | 2 +- .../python-modules/python-youtube/default.nix | 56 + .../python-modules/pytomorrowio/default.nix | 4 +- .../pytorch-lightning/default.nix | 4 +- .../python-modules/pyturbojpeg/default.nix | 4 +- .../python-modules/pyudev/default.nix | 4 +- .../python-modules/pyunifiprotect/default.nix | 4 +- .../python-modules/pyutilib/default.nix | 2 +- .../python-modules/pyvesync/default.nix | 4 +- .../python-modules/pyvex/default.nix | 4 +- .../python-modules/pyvista/default.nix | 4 +- .../python-modules/pyviz-comms/default.nix | 2 +- .../python-modules/pyvoro/default.nix | 2 +- .../python-modules/pywayland/default.nix | 4 +- .../python-modules/pywemo/default.nix | 4 +- .../python-modules/pyxbe/default.nix | 4 +- .../python-modules/pyxl3/default.nix | 2 +- .../python-modules/pyxnat/default.nix | 46 +- .../python-modules/qcs-api-client/default.nix | 4 +- .../python-modules/qudida/default.nix | 50 + .../python-modules/rauth/default.nix | 54 + .../python-modules/readme/default.nix | 2 +- .../python-modules/recline/default.nix | 2 +- .../python-modules/referencing/default.nix | 4 +- .../python-modules/regional/default.nix | 2 +- .../python-modules/reolink-aio/default.nix | 33 +- .../python-modules/repeated-test/default.nix | 10 +- .../python-modules/reprshed/default.nix | 28 + .../python-modules/requests-mock/default.nix | 29 +- .../python-modules/rfc3986/default.nix | 2 +- .../python-modules/ripser/default.nix | 2 +- .../python-modules/riscv-isac/default.nix | 4 +- .../python-modules/rlp/default.nix | 2 +- .../robotframework-pythonlibcore/default.nix | 6 +- .../robotframework-tools/default.nix | 2 +- .../python-modules/rpds-py/default.nix | 14 +- .../python-modules/rst2pdf/default.nix | 5 +- .../python-modules/ruamel-base/default.nix | 2 +- .../ruamel-yaml-clib/default.nix | 2 +- .../python-modules/ruamel-yaml/default.nix | 2 +- .../python-modules/safetensors/default.nix | 4 +- .../python-modules/sagemaker/default.nix | 63 +- .../python-modules/sanic/default.nix | 2 +- .../scancode-toolkit/default.nix | 4 +- .../python-modules/scikit-bio/default.nix | 2 +- .../python-modules/scikit-fmm/default.nix | 2 +- .../scikit-optimize/default.nix | 2 +- .../python-modules/scikit-tda/default.nix | 2 +- .../python-modules/scmrepo/default.nix | 4 +- .../python-modules/selectors2/default.nix | 2 +- .../python-modules/selenium/default.nix | 2 +- .../sensor-state-data/default.nix | 4 +- .../python-modules/sentencepiece/default.nix | 2 +- .../python-modules/sentry-sdk/default.nix | 4 +- .../setuptools-rust/default.nix | 2 +- .../python-modules/setuptools-scm/default.nix | 2 +- .../development/python-modules/sh/default.nix | 7 +- .../python-modules/shap/default.nix | 15 +- .../python-modules/showit/default.nix | 2 +- .../python-modules/shtab/default.nix | 4 +- .../simple-salesforce/default.nix | 2 +- .../python-modules/simpleitk/default.nix | 2 +- .../python-modules/slack-bolt/default.nix | 88 + .../python-modules/slack-sdk/default.nix | 7 +- .../python-modules/slicedimage/default.nix | 2 +- .../python-modules/slicerator/default.nix | 2 +- .../slither-analyzer/default.nix | 8 +- .../python-modules/sly/default.nix | 2 +- .../smart-meter-texas/default.nix | 6 +- .../python-modules/snakebite/default.nix | 2 +- .../python-modules/snapshottest/default.nix | 2 +- .../snowflake-connector-python/default.nix | 5 + .../socid-extractor/default.nix | 4 +- .../python-modules/sopel/default.nix | 7 + .../sopel/python311-support.patch | 96 + .../sortedcontainers/default.nix | 2 +- .../python-modules/soupsieve/default.nix | 1 - .../python-modules/spacy/lookups-data.nix | 33 + .../python-modules/sparse/default.nix | 2 +- .../sphinx-basic-ng/default.nix | 4 +- .../python-modules/sphinx-design/default.nix | 7 +- .../sphinxcontrib-bibtex/default.nix | 2 +- .../sphinxcontrib-programoutput/default.nix | 2 +- .../sphinxcontrib-tikz/default.nix | 2 +- .../sqlalchemy-citext/default.nix | 2 +- .../sqlalchemy-continuum/default.nix | 18 +- .../sqlalchemy-mixins/default.nix | 4 +- .../python-modules/sqlalchemy/default.nix | 6 +- .../python-modules/sqlite-utils/default.nix | 12 +- .../python-modules/sseclient/default.nix | 2 - .../python-modules/sshfs/default.nix | 4 +- .../python-modules/statistics/default.nix | 2 +- .../python-modules/steamship/default.nix | 4 +- .../python-modules/stravalib/default.nix | 2 +- .../python-modules/streamz/default.nix | 2 +- .../python-modules/striprtf/default.nix | 4 +- .../python-modules/stumpy/default.nix | 2 +- .../python-modules/subarulink/default.nix | 4 +- .../python-modules/sunpy/default.nix | 2 +- .../python-modules/sure/default.nix | 18 +- .../python-modules/survey/default.nix | 13 +- .../python-modules/symengine/default.nix | 2 +- .../python-modules/systemd/default.nix | 2 +- .../tableaudocumentapi/default.nix | 2 +- .../python-modules/tadasets/default.nix | 2 +- .../python-modules/tbm-utils/default.nix | 69 +- .../python-modules/tempora/default.nix | 4 +- .../tensorflow-datasets/default.nix | 9 +- .../python-modules/tensorflow/bin.nix | 9 +- .../python-modules/tensorflow/default.nix | 5 +- .../python-modules/teslajsonpy/default.nix | 4 +- .../python-modules/tess/default.nix | 2 +- .../python-modules/tesserocr/default.nix | 4 +- .../python-modules/testfixtures/default.nix | 4 +- .../python-modules/textwrap3/default.nix | 2 +- .../python-modules/tf2onnx/default.nix | 86 + .../python-modules/theano/default.nix | 5 +- .../python-modules/three-merge/default.nix | 2 +- .../python-modules/tidalapi/default.nix | 11 +- .../python-modules/tinycss/default.nix | 2 +- .../python-modules/tokenizers/default.nix | 2 +- .../python-modules/tomli/default.nix | 2 +- .../python-modules/torch/default.nix | 2 +- .../python-modules/torchvision/bin.nix | 9 +- .../python-modules/tornado/default.nix | 2 +- .../python-modules/tpm2-pytss/default.nix | 37 +- .../tpm2-pytss/fapi-config.patch | 12 + .../python-modules/trackpy/default.nix | 2 +- .../python-modules/trainer/default.nix | 4 +- .../python-modules/transformers/default.nix | 16 +- .../python-modules/treq/default.nix | 2 +- .../python-modules/trimesh/default.nix | 8 +- .../python-modules/trio-websocket/default.nix | 2 +- .../python-modules/ttstokenizer/default.nix | 38 + .../python-modules/tubeup/default.nix | 5 +- .../python-modules/turnt/default.nix | 4 +- .../python-modules/twisted/default.nix | 2 +- .../python-modules/typecode/libmagic.nix | 2 +- .../python-modules/typed-ast/default.nix | 2 +- .../python-modules/types-colorama/default.nix | 4 +- .../types-decorator/default.nix | 4 +- .../types-deprecated/default.nix | 4 +- .../python-modules/types-pillow/default.nix | 4 +- .../python-modules/types-protobuf/default.nix | 4 +- .../types-pyopenssl/default.nix | 4 +- .../types-python-dateutil/default.nix | 4 +- .../python-modules/types-redis/default.nix | 4 +- .../python-modules/types-requests/default.nix | 4 +- .../python-modules/types-retry/default.nix | 4 +- .../python-modules/types-tabulate/default.nix | 4 +- .../types-typed-ast/default.nix | 2 +- .../python-modules/types-urllib3/default.nix | 4 +- .../python-modules/typesystem/default.nix | 2 +- .../python-modules/tzdata/default.nix | 2 +- .../python-modules/uarray/default.nix | 2 +- .../python-modules/ucsmsdk/default.nix | 36 + .../python-modules/ujson/default.nix | 2 +- .../python-modules/ulid-transform/default.nix | 4 +- .../python-modules/umap-learn/default.nix | 2 +- .../python-modules/unearth/default.nix | 4 +- .../python-modules/unicorn/default.nix | 2 +- .../python-modules/units/default.nix | 2 +- .../unittest-xml-reporting/default.nix | 2 +- .../universal-pathlib/default.nix | 21 +- .../unstructured-api-tools/default.nix | 93 + .../unstructured-inference/default.nix | 99 + .../python-modules/unstructured/default.nix | 143 + .../python-modules/urwid/default.nix | 2 +- .../python-modules/userpath/default.nix | 4 +- .../python-modules/uvloop/default.nix | 2 +- .../python-modules/validators/default.nix | 2 +- .../python-modules/vcard/default.nix | 34 + .../python-modules/vidstab/default.nix | 2 +- .../python-modules/vsure/default.nix | 4 +- .../python-modules/wagtail/default.nix | 4 +- .../python-modules/wandb/default.nix | 34 +- .../python-modules/wasmer/default.nix | 2 +- .../wcag-contrast-ratio/default.nix | 2 +- .../python-modules/wcmatch/default.nix | 2 +- .../python-modules/wcwidth/default.nix | 6 +- .../python-modules/web/default.nix | 2 +- .../python-modules/webargs/default.nix | 4 +- .../python-modules/webauthn/default.nix | 2 +- .../python-modules/weconnect-mqtt/default.nix | 4 +- .../python-modules/weconnect/default.nix | 4 +- .../python-modules/werkzeug/default.nix | 2 +- .../whirlpool-sixth-sense/default.nix | 4 +- .../python-modules/wsgi-intercept/default.nix | 2 +- .../python-modules/wsproto/default.nix | 2 +- .../python-modules/wtf-peewee/default.nix | 2 +- .../python-modules/wyoming/default.nix | 4 +- .../python-modules/xiaomi-ble/default.nix | 19 +- .../python-modules/xknx/default.nix | 4 +- .../python-modules/xmltodict/default.nix | 2 +- .../python-modules/yabadaba/default.nix | 4 +- .../python-modules/yalexs-ble/default.nix | 6 +- .../python-modules/yapf/default.nix | 19 +- .../python-modules/yarl/default.nix | 8 +- .../python-modules/yeelight/default.nix | 7 +- .../python-modules/yolink-api/default.nix | 8 +- .../python-modules/yowsup/default.nix | 2 +- .../python-modules/ypy-websocket/default.nix | 6 +- .../python-modules/zarr/default.nix | 2 +- .../python-modules/zeep/default.nix | 38 +- .../python-modules/zeroconf/default.nix | 4 +- .../python-modules/zha-quirks/default.nix | 4 +- .../python-modules/zigpy-znp/default.nix | 4 +- .../python-modules/zigpy/default.nix | 4 +- .../python-modules/zipp/default.nix | 6 +- .../default.nix | 28 +- .../python-modules/zope_broken/default.nix | 26 - .../zope_lifecycleevent/default.nix | 4 +- .../python-modules/zxing_cpp/default.nix | 2 +- .../setuptools-scm/default.nix | 2 +- .../ruby-modules/bundled-common/default.nix | 11 +- .../ruby-modules/bundler/default.nix | 4 +- .../development/ruby-modules/gem/default.nix | 2 +- .../ruby-modules/with-packages/Gemfile | 1 + .../pkgs/development/tools/aapt/default.nix | 48 + .../pkgs/development/tools/allure/default.nix | 4 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/flow/default.nix | 4 +- .../tools/analysis/frama-c/default.nix | 27 +- .../tools/analysis/ikos/default.nix | 11 +- .../tools/analysis/spin/default.nix | 2 +- .../development/tools/api-linter/default.nix | 41 + .../pkgs/development/tools/apkid/default.nix | 4 +- .../development/tools/apktool/default.nix | 27 +- .../pkgs/development/tools/argc/default.nix | 6 +- .../pkgs/development/tools/azcopy/default.nix | 6 +- .../pkgs/development/tools/bacon/default.nix | 6 +- .../pkgs/development/tools/bearer/default.nix | 6 +- .../pkgs/development/tools/buf/default.nix | 6 +- .../tools/build-managers/alire/default.nix | 50 + .../apache-maven/build-package.nix | 15 +- .../build-managers/apache-maven/default.nix | 4 +- .../build-managers/bazel/bazel_6/default.nix | 2 +- .../bazel/buildtools/default.nix | 7 +- .../tools/build-managers/bmake/default.nix | 73 +- .../bmake/dont-test-while-installing.diff | 21 + .../bmake/fix-localtime-test.patch | 23 - .../tools/build-managers/bmake/setup-hook.sh | 50 +- .../tools/build-managers/buck2/default.nix | 25 +- .../tools/build-managers/buck2/hashes.json | 9 +- .../tools/build-managers/buck2/update.sh | 20 +- .../tools/build-managers/build2/bpkg.nix | 10 + .../tools/build-managers/gradle/default.nix | 8 +- .../tools/build-managers/knit/default.nix | 36 + .../tools/build-managers/moon/default.nix | 6 +- .../build-managers/sbt-extras/default.nix | 6 +- .../tools/build-managers/sbt/default.nix | 4 +- .../build-managers/scala-cli/sources.json | 10 +- .../development/tools/buildkit/default.nix | 4 +- .../tools/capnproto-rust/default.nix | 13 +- .../development/tools/clj-kondo/default.nix | 4 +- .../tools/codespelunker/default.nix | 4 +- .../buildbot/default.nix | 4 + .../cirrus-cli/default.nix | 4 +- .../continuous-integration/dagger/default.nix | 6 +- .../drone-runner-docker/default.nix | 1 + .../drone-runner-exec/default.nix | 1 + .../drone-runner-ssh/default.nix | 1 + .../forgejo-actions-runner/default.nix | 43 + .../gitea-actions-runner/default.nix | 15 +- .../github-runner/default.nix | 4 +- .../gitlab-runner/default.nix | 6 +- .../jenkins/default.nix | 4 +- .../woodpecker-plugin-git/default.nix | 42 + .../woodpecker/agent.nix | 6 +- .../continuous-integration/woodpecker/cli.nix | 6 +- .../woodpecker/common.nix | 15 +- .../woodpecker/frontend.nix | 25 +- .../woodpecker/server.nix | 6 +- .../woodpecker/update.sh | 21 +- .../woodpecker/woodpecker-package.json | 92 +- .../woodpecker/yarn.lock | 3219 +++ .../pkgs/development/tools/convco/default.nix | 6 +- .../development/tools/cpm-cmake/default.nix | 4 +- .../database/clickhouse-backup/default.nix | 4 +- .../tools/database/litefs/default.nix | 6 +- .../tools/database/mermerd/default.nix | 4 +- .../tools/database/prisma-engines/Cargo.lock | 326 +- .../tools/database/prisma-engines/default.nix | 10 +- .../tools/database/schemaspy/default.nix | 1 - .../tools/database/sqlboiler-crdb/default.nix | 24 + .../tools/database/sqlc/default.nix | 6 +- .../tools/database/sqlcl/default.nix | 13 +- .../tools/database/sqlcmd/default.nix | 4 +- .../tools/database/sqlfluff/default.nix | 4 +- .../database/surrealdb-migrations/Cargo.lock | 2 +- .../database/surrealdb-migrations/default.nix | 4 +- .../tools/database/trino-cli/default.nix | 4 +- .../pkgs/development/tools/datree/default.nix | 4 +- .../pkgs/development/tools/delve/default.nix | 2 +- .../tools/devpi-server/default.nix | 2 +- .../tools/diesel-cli-ext/default.nix | 24 + .../pkgs/development/tools/doc2go/default.nix | 49 + .../pkgs/development/tools/doctl/default.nix | 4 +- .../pkgs/development/tools/dprint/default.nix | 6 +- .../tools/efm-langserver/default.nix | 6 +- .../tools/electron/binary/default.nix | 56 +- .../development/tools/elkhound/default.nix | 2 +- .../tools/enochecker-test/default.nix | 69 + .../development/tools/esbuild/default.nix | 5 +- .../development/tools/esbuild/netlify.nix | 1 + .../pkgs/development/tools/espup/default.nix | 82 + .../pkgs/development/tools/fatcat/default.nix | 33 + .../development/tools/flip-link/default.nix | 6 +- .../pkgs/development/tools/flyway/default.nix | 4 +- .../tools/fsautocomplete/default.nix | 4 +- .../pkgs/development/tools/gauge/default.nix | 6 +- .../development/tools/geckodriver/default.nix | 1 + .../development/tools/gen-license/default.nix | 27 + .../development/tools/gi-crystal/default.nix | 42 + .../development/tools/gi-crystal/src.patch | 57 + .../store-friendly-library-name.patch | 10 + .../tools/global-platform-pro/default.nix | 7 +- .../development/tools/go-mockery/default.nix | 10 +- .../development/tools/go-outline/default.nix | 2 +- .../development/tools/go-task/default.nix | 6 +- .../development/tools/go-toml/default.nix | 6 +- .../pkgs/development/tools/goa/default.nix | 6 +- .../development/tools/godot/4/default.nix | 62 +- .../tools/goimports-reviser/default.nix | 45 + .../golangci-lint-langserver/default.nix | 2 +- .../pkgs/development/tools/gotest/default.nix | 2 +- .../pkgs/development/tools/gron/default.nix | 2 + .../tools/grpc-gateway/default.nix | 6 +- .../tools/guile/g-wrap/default.nix | 2 + .../development/tools/ilspycmd/default.nix | 48 + .../pkgs/development/tools/ilspycmd/deps.nix | 78 + .../pkgs/development/tools/jaq/Cargo.lock | 562 - .../pkgs/development/tools/jaq/default.nix | 25 +- .../java/java-language-server/default.nix | 5 +- .../pkgs/development/tools/jbang/default.nix | 4 +- .../pkgs/development/tools/jless/default.nix | 9 +- .../pkgs/development/tools/jq/default.nix | 1 + .../pkgs/development/tools/jql/default.nix | 6 +- .../pkgs/development/tools/kcli/default.nix | 2 +- .../pkgs/development/tools/krew/default.nix | 6 +- .../development/tools/kubepug/default.nix | 6 +- .../kubernetes-controller-tools/default.nix | 4 +- .../pkgs/development/tools/kustomize/3.nix | 2 +- .../ansible-language-server/default.nix | 6 +- .../language-servers/crystalline/default.nix | 4 +- .../tools/language-servers/gopls/default.nix | 6 +- .../jdt-language-server/default.nix | 7 +- .../lua-language-server/default.nix | 7 +- .../tools/language-servers/millet/Cargo.lock | 320 +- .../tools/language-servers/millet/default.nix | 8 +- .../language-servers/neocmakelsp/default.nix | 7 +- .../tools/language-servers/nil/default.nix | 1 + .../tools/language-servers/nls/default.nix | 4 + .../language-servers/pylyzer/default.nix | 9 +- .../language-servers/typst-lsp/Cargo.lock | 1010 +- .../language-servers/typst-lsp/default.nix | 8 +- .../typst-lsp/move-typst-assets.patch | 14 +- .../development/tools/lazygit/default.nix | 6 +- .../tools/ldid-procursus/default.nix | 29 + .../literate-programming/noweb/default.nix | 2 +- .../development/tools/loganalyzer/default.nix | 2 +- .../tools/luaformatter/default.nix | 2 +- .../development/tools/lv_img_conv/default.nix | 4 +- .../pkgs/development/tools/memray/default.nix | 4 +- .../development/tools/micronaut/default.nix | 4 +- .../pkgs/development/tools/minizinc/ide.nix | 2 +- .../development/tools/misc/act/default.nix | 2 +- .../tools/misc/ast-grep/default.nix | 13 +- .../tools/misc/autogen/default.nix | 4 +- .../tools/misc/binutils/default.nix | 8 +- .../tools/misc/blackfire/default.nix | 12 +- .../tools/misc/catppuccin-catwalk/default.nix | 36 + .../development/tools/misc/ccache/default.nix | 6 +- ...on-darwin.patch => fix-objdump-path.patch} | 0 .../tools/misc/circleci-cli/default.nix | 6 +- .../tools/misc/complgen/default.nix | 8 +- .../tools/misc/dart-sass/default.nix | 6 +- .../development/tools/misc/distcc/default.nix | 2 +- .../development/tools/misc/gdb/default.nix | 5 +- .../development/tools/misc/grcov/default.nix | 6 +- .../tools/misc/grpc-tools/default.nix | 2 +- .../development/tools/misc/hydra/unstable.nix | 6 +- .../tools/misc/itstool/default.nix | 26 +- .../tools/misc/libtool/default.nix | 2 + .../tools/misc/libtool/libtool2.nix | 1 + .../tools/misc/licenseclassifier/default.nix | 2 +- .../tools/misc/micronucleus/default.nix | 2 +- .../tools/misc/opengrok/default.nix | 4 +- .../tools/misc/patchelf/unstable.nix | 6 +- .../tools/misc/phpunit/default.nix | 4 +- .../tools/misc/rsonpath/default.nix | 6 +- .../development/tools/misc/runme/default.nix | 11 +- .../tools/misc/rustywind/default.nix | 6 +- .../development/tools/misc/samply/default.nix | 55 + .../development/tools/misc/seer/default.nix | 7 +- .../tools/misc/strace-analyzer/default.nix | 2 +- .../tools/misc/terramate/default.nix | 31 + .../development/tools/misc/texlab/default.nix | 6 +- .../development/tools/misc/tokei/default.nix | 1 + .../tools/misc/unixbench/default.nix | 2 +- .../development/tools/misc/xxdiff/default.nix | 2 +- .../pkgs/development/tools/mold/default.nix | 12 +- .../development/tools/mysql-shell/default.nix | 6 +- .../pkgs/development/tools/nc4nix/default.nix | 11 +- .../development/tools/norminette/default.nix | 4 +- .../pkgs/development/tools/ocaml/dune/3.nix | 4 +- .../tools/ocaml/js_of_ocaml/compiler.nix | 4 +- .../development/tools/ocaml/utop/default.nix | 4 +- .../development/tools/oh-my-posh/default.nix | 8 +- .../pkgs/development/tools/okteto/default.nix | 6 +- .../tools/omnisharp-roslyn/default.nix | 4 +- .../tools/omnisharp-roslyn/deps.nix | 52 +- .../tools/open-policy-agent/default.nix | 4 +- .../pkgs/development/tools/packer/default.nix | 8 +- .../development/tools/parsing/antlr/4.nix | 2 +- .../tools/parsing/ragel/default.nix | 2 + .../tools/parsing/re-flex/default.nix | 4 +- .../development/tools/pip-audit/default.nix | 4 +- .../poetry2nix/overrides/default.nix | 4 +- .../development/tools/prettierd/default.nix | 1 + .../tools/profiling/heaptrack/default.nix | 4 +- .../tools/profiling/pprof/default.nix | 8 +- .../tools/protoc-gen-dart/default.nix | 2 +- .../tools/protoc-gen-grpc-web/default.nix | 2 +- .../protoc-gen-twirp_typescript/default.nix | 9 +- .../pkgs/development/tools/pscale/default.nix | 6 +- .../pkgs/development/tools/pup/default.nix | 2 +- .../pkgs/development/tools/pyenv/default.nix | 5 +- .../0001-Fix-clang-libcpp-regexp.patch | 15 - .../0002-Dont-remove-clang-header-paths.patch | 12 - .../development/tools/qtcreator/default.nix | 152 +- .../pkgs/development/tools/qtcreator/qt6.nix | 102 - .../tools/quick-lint-js/default.nix | 4 +- .../development/tools/railway/default.nix | 6 +- .../0001-cargo-lock-update-version.patch | 25 + .../0002-remove-dependency-on-git.patch | 62 + .../development/tools/rubyfmt/default.nix | 78 + .../pkgs/development/tools/ruff/Cargo.lock | 640 +- .../pkgs/development/tools/ruff/default.nix | 10 +- .../tools/rust/cargo-all-features/default.nix | 6 +- .../tools/rust/cargo-binstall/default.nix | 6 +- .../tools/rust/cargo-component/Cargo.lock | 2026 +- .../tools/rust/cargo-component/default.nix | 17 +- .../tools/rust/cargo-cyclonedx/default.nix | 6 +- .../tools/rust/cargo-deny/default.nix | 30 +- .../tools/rust/cargo-diet/default.nix | 8 +- .../tools/rust/cargo-espflash/default.nix | 6 +- .../tools/rust/cargo-expand/default.nix | 6 +- .../tools/rust/cargo-guppy/default.nix | 8 +- .../tools/rust/cargo-hakari/default.nix | 6 +- .../tools/rust/cargo-info/default.nix | 6 +- .../tools/rust/cargo-insta/default.nix | 2 +- .../tools/rust/cargo-leptos/Cargo.lock | 3294 +++ .../tools/rust/cargo-leptos/default.nix | 16 +- .../tools/rust/cargo-llvm-cov/default.nix | 6 +- .../tools/rust/cargo-llvm-lines/default.nix | 6 +- .../rust/cargo-local-registry/default.nix | 8 +- .../tools/rust/cargo-make/default.nix | 6 +- .../tools/rust/cargo-nextest/default.nix | 6 +- .../tools/rust/cargo-raze/default.nix | 2 +- .../tools/rust/cargo-show-asm/default.nix | 7 +- .../tools/rust/cargo-shuttle/Cargo.lock | 596 +- .../tools/rust/cargo-shuttle/default.nix | 4 +- .../tools/rust/cargo-tauri/default.nix | 2 +- .../tools/rust/cargo-zigbuild/default.nix | 6 +- .../tools/rust/crate2nix/default.nix | 2 +- .../tools/rust/dioxus-cli/default.nix | 17 +- .../tools/rust/measureme/Cargo.lock | 993 + .../tools/rust/measureme/default.nix | 31 + .../tools/rust/probe-rs/default.nix | 6 +- .../tools/rust/probe-run/default.nix | 6 +- .../tools/rust/ra-multiplex/default.nix | 34 + .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-script/default.nix | 6 +- .../tools/rust/rustycli/default.nix | 33 + .../tools/rust/specr-transpile/default.nix | 23 + .../tools/rust/sqlx-cli/default.nix | 39 +- .../tools/rust/tauri-mobile/default.nix | 2 +- .../pkgs/development/tools/rye/Cargo.lock | 274 +- .../pkgs/development/tools/rye/default.nix | 25 +- .../tools/selenium/chromedriver/default.nix | 11 +- .../development/tools/skaffold/default.nix | 4 +- .../pkgs/development/tools/skopeo/default.nix | 4 +- .../tools/supabase-cli/default.nix | 6 +- .../development/tools/symfony-cli/default.nix | 12 +- .../development/tools/tailwindcss/default.nix | 12 +- .../pkgs/development/tools/trunk/default.nix | 6 +- .../development/tools/twitch-cli/default.nix | 4 +- .../pkgs/development/tools/typos/default.nix | 6 +- .../development/tools/viceroy/default.nix | 6 +- .../pkgs/development/tools/volta/default.nix | 3 + .../tools/wasm-bindgen-cli/default.nix | 15 +- .../development/tools/wasmedge/default.nix | 4 +- .../development/tools/wasmserve/default.nix | 25 + .../development/tools/yarn-berry/default.nix | 43 + .../pkgs/development/tools/yq-go/default.nix | 6 +- .../pkgs/development/web/bun/default.nix | 15 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/development/web/deno/default.nix | 6 +- .../development/web/edge-runtime/default.nix | 6 +- .../pkgs/development/web/flyctl/default.nix | 8 +- .../web/flyctl/disable-auto-update.patch | 25 + .../web/function-runner/default.nix | 6 +- .../pkgs/development/web/ihp-new/default.nix | 2 +- .../pkgs/development/web/insomnia/default.nix | 4 +- .../development/web/mailcatcher/Gemfile.lock | 144 +- .../development/web/mailcatcher/default.nix | 3 +- .../development/web/mailcatcher/gemset.nix | 593 +- .../pkgs/development/web/minify/default.nix | 38 +- .../development/web/netlify-cli/default.nix | 2 +- .../development/web/netlify-cli/generate.sh | 2 +- .../web/netlify-cli/netlify-cli.json | 5 +- .../pkgs/development/web/nodejs/v20.nix | 4 +- .../web/pnpm-lock-export/default.nix | 10 +- .../web/pnpm-lock-export/package-lock.json | 3424 ++- .../web/pnpm-lock-export/update.sh | 16 +- .../web/twitter-bootstrap/default.nix | 21 +- .../nixpkgs/pkgs/games/aaaaxy/default.nix | 6 +- .../pkgs/games/chiaki4deck/default.nix | 63 + .../nixpkgs/pkgs/games/ckan/default.nix | 4 +- .../games/doom-ports/doomrunner/default.nix | 4 +- .../games/doom-ports/prboom-plus/default.nix | 2 +- .../pkgs/games/easyrpg-player/default.nix | 112 +- .../games/endgame-singularity/default.nix | 34 +- .../nixpkgs/pkgs/games/ezquake/default.nix | 16 +- .../nixpkgs/pkgs/games/factorio/versions.json | 48 +- .../nixpkgs/pkgs/games/ferium/default.nix | 2 +- .../nixpkgs/pkgs/games/fheroes2/default.nix | 4 +- .../nixpkgs/pkgs/games/forge-mtg/default.nix | 3 +- .../nixpkgs/pkgs/games/freeciv/default.nix | 7 +- .../nixpkgs/pkgs/games/fteqw/default.nix | 90 + .../nixpkgs/pkgs/games/fteqw/generic.nix | 60 + .../nixpkgs/pkgs/games/gambit/default.nix | 54 + .../nixpkgs/pkgs/games/gnubg/default.nix | 23 +- .../nixpkgs/pkgs/games/hheretic/default.nix | 57 + .../nixpkgs/pkgs/games/hhexen/default.nix | 54 +- .../nixpkgs/pkgs/games/hmcl/default.nix | 97 + .../nixpkgs/pkgs/games/iortcw/default.nix | 4 +- third_party/nixpkgs/pkgs/games/iortcw/sp.nix | 2 +- third_party/nixpkgs/pkgs/games/jazz2/game.nix | 4 +- .../nixpkgs/pkgs/games/jfsw/default.nix | 57 + .../nixpkgs/pkgs/games/katago/default.nix | 3 +- .../nixpkgs/pkgs/games/keeperrl/default.nix | 2 +- .../nixpkgs/pkgs/games/koboredux/default.nix | 53 +- .../pkgs/games/lgames/barrage/default.nix | 5 +- .../pkgs/games/lgames/ltris/default.nix | 1 + .../pkgs/games/minesweep-rs/default.nix | 6 +- .../pkgs/games/opendungeons/default.nix | 54 +- .../nixpkgs/pkgs/games/osu-lazer/bin.nix | 8 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 33 +- .../nixpkgs/pkgs/games/papermc/default.nix | 4 +- .../nixpkgs/pkgs/games/portmod/default.nix | 6 - .../nixpkgs/pkgs/games/powermanga/default.nix | 1 + .../pkgs/games/prismlauncher/default.nix | 72 +- .../pkgs/games/prismlauncher/wrapper.nix | 8 +- .../nixpkgs/pkgs/games/quakespasm/vulkan.nix | 2 +- .../pkgs/games/sauerbraten/default.nix | 2 +- .../nixpkgs/pkgs/games/scummvm/default.nix | 4 +- .../games/shattered-pixel-dungeon/default.nix | 4 +- .../nixpkgs/pkgs/games/sil-q/default.nix | 2 +- .../nixpkgs/pkgs/games/sil/default.nix | 2 +- .../nixpkgs/pkgs/games/srb2kart/default.nix | 19 +- .../nixpkgs/pkgs/games/steam/fhsenv.nix | 2 +- .../nixpkgs/pkgs/games/steam/steam.nix | 6 + .../pkgs/games/stone-kingdoms/default.nix | 63 + .../nixpkgs/pkgs/games/stuntrally/default.nix | 6 +- .../nixpkgs/pkgs/games/tecnoballz/default.nix | 1 + .../nixpkgs/pkgs/games/unciv/default.nix | 4 +- .../pkgs/games/vintagestory/default.nix | 49 +- .../nixpkgs/pkgs/games/vvvvvv/default.nix | 2 +- .../pkgs/misc/brightnessctl/default.nix | 1 + .../misc/cups/drivers/foomatic-db/default.nix | 6 +- .../nixpkgs/pkgs/misc/fastly/default.nix | 6 +- .../nixpkgs/pkgs/misc/lilypond/default.nix | 4 +- .../nixpkgs/pkgs/misc/moonfire-nvr/Cargo.lock | 2731 ++ .../pkgs/misc/moonfire-nvr/default.nix | 81 + .../pkgs/misc/opcua-client-gui/default.nix | 20 +- .../nixpkgs/pkgs/misc/opensbi/default.nix | 4 +- .../screensavers/electricsheep/default.nix | 4 +- .../misc/screensavers/xlockmore/default.nix | 4 +- .../pkgs/misc/tmux-plugins/default.nix | 6 +- ...ies-from-firmware-dtb-to-the-loaded-.patch | 92 - .../nixpkgs/pkgs/misc/uboot/default.nix | 14 +- .../nixpkgs/pkgs/misc/urbit/default.nix | 10 +- .../nixpkgs/pkgs/misc/wiki-tui/default.nix | 6 +- .../bsd/freebsd/evdev-proto/default.nix | 2 +- .../pkgs/os-specific/bsd/netbsd/default.nix | 2 +- .../os-specific/darwin/airbuddy/default.nix | 4 +- .../apple-sdk-11.0/private-frameworks.nix | 7 +- .../darwin/grandperspective/default.nix | 19 +- .../os-specific/darwin/hexfiend/default.nix | 3 +- .../os-specific/darwin/libtapi/default.nix | 6 +- .../os-specific/darwin/moltenvk/default.nix | 10 +- .../os-specific/darwin/raycast/default.nix | 4 +- .../darwin/rewrite-tbd/default.nix | 8 +- .../os-specific/darwin/sketchybar/default.nix | 43 +- .../pkgs/os-specific/darwin/skhd/default.nix | 36 +- .../pkgs/os-specific/linux/9ptls/default.nix | 28 + .../pkgs/os-specific/linux/akvcam/default.nix | 2 +- .../os-specific/linux/apparmor/default.nix | 31 +- .../os-specific/linux/aseq2json/default.nix | 6 +- .../pkgs/os-specific/linux/bcc/default.nix | 45 +- .../pkgs/os-specific/linux/below/default.nix | 1 + .../os-specific/linux/bpftune/default.nix | 73 + .../pkgs/os-specific/linux/dcgm/default.nix | 147 + .../pkgs/os-specific/linux/fanout/default.nix | 37 + .../linux/fanout/remove_auto_mknod.patch | 13 + .../firmware/ipu6-camera-bins/default.nix | 6 +- .../linux/firmware/linux-firmware/default.nix | 2 +- .../linux/firmware/linux-firmware/source.nix | 7 +- .../linux/firmware/linux-firmware/update.sh | 16 +- .../linux/firmware/sof-firmware/default.nix | 4 +- .../pkgs/os-specific/linux/fwts/module.nix | 2 +- .../pkgs/os-specific/linux/gasket/default.nix | 2 +- .../pkgs/os-specific/linux/gt/default.nix | 6 +- .../pkgs/os-specific/linux/hwdata/default.nix | 4 +- .../linux/iio-sensor-proxy/default.nix | 59 +- .../linux/intel-compute-runtime/default.nix | 4 +- .../linux/kernel/common-config.nix | 39 +- .../linux/kernel/hardened/patches.json | 70 +- .../os-specific/linux/kernel/htmldocs.nix | 2 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-5.10.nix | 4 +- .../os-specific/linux/kernel/linux-5.15.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-6.1.nix | 4 +- .../os-specific/linux/kernel/linux-6.3.nix | 18 - .../os-specific/linux/kernel/linux-6.4.nix | 4 +- .../linux/kernel/linux-testing.nix | 4 +- .../linux/kernel/manual-config.nix | 19 +- .../pkgs/os-specific/linux/kernel/patches.nix | 9 - .../linux/kernel/xanmod-kernels.nix | 8 +- .../os-specific/linux/kernel/zen-kernels.nix | 8 +- .../os-specific/linux/ksmbd-tools/default.nix | 4 +- .../pkgs/os-specific/linux/kvmfr/default.nix | 2 +- .../os-specific/linux/lenovo-legion/app.nix | 2 +- .../linux/lenovo-legion/default.nix | 2 +- .../pkgs/os-specific/linux/libbpf/default.nix | 4 +- .../linux/lttng-modules/default.nix | 4 +- .../os-specific/linux/mba6x_bl/default.nix | 6 +- .../linux/minimal-bootstrap/bash/default.nix | 98 + .../linux/minimal-bootstrap/default.nix | 26 + .../minimal-bootstrap/diffutils/default.nix | 72 + .../linux/minimal-bootstrap/gcc/2.nix | 2 +- .../minimal-bootstrap/gnused/default.nix | 42 +- .../pkgs/os-specific/linux/musl/default.nix | 4 +- .../os-specific/linux/nftables/default.nix | 19 +- .../os-specific/linux/nvidia-x11/default.nix | 41 +- .../pkgs/os-specific/linux/oddjob/default.nix | 60 + .../os-specific/linux/open-iscsi/default.nix | 6 +- .../os-specific/linux/pam_dp9ik/default.nix | 7 +- .../pkgs/os-specific/linux/pcm/default.nix | 4 +- .../os-specific/linux/rdma-core/default.nix | 52 +- .../os-specific/linux/rtl8812au/default.nix | 8 +- .../os-specific/linux/rtl8821au/default.nix | 8 +- .../os-specific/linux/rtl88x2bu/default.nix | 10 +- .../os-specific/linux/smemstat/default.nix | 4 +- .../os-specific/linux/systemd/default.nix | 38 +- .../os-specific/linux/tp_smapi/default.nix | 27 +- .../os-specific/linux/udisks/2-default.nix | 5 +- .../os-specific/linux/uhk-agent/default.nix | 4 +- .../pkgs/os-specific/linux/ulogd/default.nix | 4 + .../linux/ultrablue-server/default.nix | 4 +- .../os-specific/linux/unstick/default.nix | 2 +- .../pkgs/os-specific/linux/upower/default.nix | 93 +- .../linux/upower/installed-tests-path.patch | 56 + .../os-specific/linux/util-linux/default.nix | 7 +- .../os-specific/linux/wiringpi/default.nix | 2 +- .../linux/wooting-udev-rules/default.nix | 6 +- .../linux/wooting-udev-rules/wooting.rules | 14 +- .../pkgs/os-specific/linux/zfs/stable.nix | 5 +- .../pkgs/os-specific/linux/zfs/unstable.nix | 8 +- .../nixpkgs/pkgs/servers/adguardhome/bins.nix | 28 +- .../pkgs/servers/adguardhome/default.nix | 4 +- .../pkgs/servers/apache-airflow/default.nix | 4 + .../pkgs/servers/audiobookshelf/default.nix | 11 +- .../nixpkgs/pkgs/servers/authelia/update.sh | 2 +- .../nixpkgs/pkgs/servers/authelia/web.nix | 2 +- .../nixpkgs/pkgs/servers/baserow/default.nix | 4 +- .../nixpkgs/pkgs/servers/bazarr/default.nix | 4 +- .../pkgs/servers/calibre-web/default.nix | 4 + .../pkgs/servers/code-server/default.nix | 15 +- .../nixpkgs/pkgs/servers/consul/default.nix | 1 + .../pkgs/servers/dns/acme-dns/default.nix | 1 + .../nixpkgs/pkgs/servers/dns/bind/default.nix | 4 +- .../pkgs/servers/dns/knot-dns/default.nix | 4 +- .../pkgs/servers/dns/ncdns/default.nix | 2 +- .../nixpkgs/pkgs/servers/ebusd/default.nix | 50 + .../servers/ebusd/patches/ebusd-cmake.patch | 21 + .../geospatial/pg_tileserv/default.nix | 20 +- .../pkgs/servers/gobetween/default.nix | 2 +- .../pkgs/servers/gotosocial/default.nix | 6 +- .../pkgs/servers/heisenbridge/default.nix | 27 +- .../home-assistant/component-packages.nix | 145 +- .../pkgs/servers/home-assistant/default.nix | 39 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../pkgs/servers/home-assistant/intents.nix | 23 +- .../home-assistant/parse-requirements.py | 1 - .../pkgs/servers/home-assistant/stubs.nix | 4 +- .../pkgs/servers/home-assistant/tests.nix | 10 + .../servers/home-automation/evcc/default.nix | 4 +- .../servers/homepage-dashboard/default.nix | 25 +- .../pkgs/servers/http/envoy/default.nix | 10 +- .../pkgs/servers/http/nginx/generic.nix | 4 +- .../pkgs/servers/http/tengine/default.nix | 4 +- .../servers/http/trafficserver/default.nix | 14 +- .../nixpkgs/pkgs/servers/imgproxy/default.nix | 4 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 4 +- .../pkgs/servers/jellyseerr/default.nix | 2 +- .../nixpkgs/pkgs/servers/jellyseerr/pin.json | 2 +- .../nixpkgs/pkgs/servers/jellyseerr/update.sh | 4 +- .../nixpkgs/pkgs/servers/kanidm/default.nix | 33 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 4 +- .../keycloak/keycloak-metrics-spi/default.nix | 23 +- .../keycloak/scim-for-keycloak/default.nix | 4 - .../default.nix | 12 +- .../nixpkgs/pkgs/servers/klipper/default.nix | 2 +- .../nixpkgs/pkgs/servers/komga/default.nix | 10 +- .../nixpkgs/pkgs/servers/ldap/389/default.nix | 8 +- .../pkgs/servers/ldap/lldap/default.nix | 9 +- .../pkgs/servers/mail/mailman/package.nix | 2 +- .../nixpkgs/pkgs/servers/mail/mox/default.nix | 34 + .../pkgs/servers/mail/mox/version.patch | 45 + .../{kanidm => mail/stalwart}/Cargo.lock | 5819 +++-- .../pkgs/servers/mail/stalwart/default.nix | 77 + .../nixpkgs/pkgs/servers/mastodon/default.nix | 3 +- .../nixpkgs/pkgs/servers/mastodon/source.nix | 4 +- .../nixpkgs/pkgs/servers/mastodon/update.nix | 29 - .../nixpkgs/pkgs/servers/mastodon/update.sh | 29 +- .../nixpkgs/pkgs/servers/mastodon/version.nix | 2 +- .../matrix-appservice-discord/default.nix | 2 +- .../matrix-appservice-discord/pin.json | 2 +- .../matrix-appservice-discord/update.sh | 4 +- .../pkgs/servers/matrix-synapse/default.nix | 6 +- .../matrix-appservice-irc/default.nix | 72 +- .../matrix-appservice-slack/default.nix | 2 +- .../matrix-appservice-slack/package.json | 7 +- .../matrix-appservice-slack/pin.json | 6 +- .../matrix-appservice-slack/update.sh | 2 +- .../matrix-hookshot/default.nix | 4 +- .../matrix-hookshot/package.json | 4 +- .../matrix-synapse/matrix-hookshot/pin.json | 8 +- .../matrix-synapse/matrix-hookshot/update.sh | 4 +- .../matrix-synapse/plugins/default.nix | 1 + .../plugins/s3-storage-provider.nix | 33 + .../matrix-synapse/sliding-sync/default.nix | 6 +- .../pkgs/servers/mattermost/default.nix | 19 +- .../pkgs/servers/mautrix-facebook/default.nix | 7 +- .../servers/mautrix-googlechat/default.nix | 8 +- .../pkgs/servers/mautrix-signal/default.nix | 5 +- .../pkgs/servers/mautrix-telegram/default.nix | 8 - .../nixpkgs/pkgs/servers/mediamtx/default.nix | 6 +- .../nixpkgs/pkgs/servers/memos/default.nix | 6 +- .../nixpkgs/pkgs/servers/memos/update.sh | 8 +- .../nixpkgs/pkgs/servers/metabase/default.nix | 4 +- .../nixpkgs/pkgs/servers/miniflux/default.nix | 6 +- .../pkgs/servers/misc/irrd/default.nix | 159 + .../servers/misc/irrd/irrd-asgiref-3.8.0.diff | 51 + .../pkgs/servers/misc/navidrome/default.nix | 2 +- .../misc/oven-media-engine/default.nix | 6 +- .../monitoring/alertmanager-bot/default.nix | 2 +- .../servers/monitoring/cadvisor/default.nix | 12 +- .../monitoring/grafana-agent/default.nix | 7 +- .../servers/monitoring/grafana/default.nix | 8 +- .../pkgs/servers/monitoring/grafana/update.sh | 2 +- .../servers/monitoring/icinga2/default.nix | 4 +- .../pkgs/servers/monitoring/karma/default.nix | 63 +- .../monitoring/karma/generate-dependencies.sh | 30 - .../monitoring/karma/node-composition.nix | 17 - .../servers/monitoring/karma/node-env.nix | 686 - .../monitoring/karma/node-packages.nix | 21059 ---------------- .../servers/monitoring/karma/package.json | 138 - .../servers/monitoring/laurel/default.nix | 6 +- .../pkgs/servers/monitoring/loki/default.nix | 4 +- .../monitoring/mackerel-agent/default.nix | 6 +- .../prometheus/dcgm-exporter/default.nix | 66 + .../servers/monitoring/prometheus/default.nix | 8 +- .../prometheus/nginxlog-exporter.nix | 6 +- .../monitoring/prometheus/node-exporter.nix | 5 +- .../monitoring/prometheus/pihole-exporter.nix | 2 +- .../servers/monitoring/prometheus/sachet.nix | 6 +- .../prometheus/smokeping-prober.nix | 6 +- .../prometheus/unbound-exporter.nix | 2 +- .../prometheus/varnish-exporter.nix | 2 +- .../servers/monitoring/unpoller/default.nix | 6 +- .../pkgs/servers/mqtt/mosquitto/default.nix | 9 +- .../pkgs/servers/nats-server/default.nix | 6 +- .../pkgs/servers/nextcloud/default.nix | 12 +- .../pkgs/servers/nextcloud/packages/25.json | 96 +- .../pkgs/servers/nextcloud/packages/26.json | 96 +- .../pkgs/servers/nextcloud/packages/27.json | 128 +- .../nextcloud/packages/nextcloud-apps.json | 1 + .../nixpkgs/pkgs/servers/nfd/default.nix | 6 +- .../pkgs/servers/nfs-ganesha/default.nix | 4 +- .../pkgs/servers/nginx-sso/default.nix | 1 + .../nixpkgs/pkgs/servers/nitter/default.nix | 14 +- .../pkgs/servers/nosql/apache-jena/binary.nix | 4 +- .../nosql/apache-jena/fuseki-binary.nix | 22 +- .../servers/nosql/apache-jena/fuseki-test.nix | 18 + .../pkgs/servers/nosql/ferretdb/default.nix | 6 +- .../pkgs/servers/nosql/influxdb/default.nix | 4 +- .../pkgs/servers/nosql/influxdb2/default.nix | 2 +- .../pkgs/servers/nosql/mongodb/mongodb.nix | 3 + .../pkgs/servers/nosql/questdb/default.nix | 4 +- .../servers/nosql/victoriametrics/default.nix | 21 +- .../servers/openvscode-server/default.nix | 1 + .../pkgs/servers/osrm-backend/default.nix | 4 +- .../nixpkgs/pkgs/servers/owncast/default.nix | 44 +- .../pkgs/servers/photofield/default.nix | 2 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 6 +- .../pkgs/servers/pocketbase/default.nix | 4 +- .../nixpkgs/pkgs/servers/polaris/Cargo.lock | 2497 ++ .../nixpkgs/pkgs/servers/polaris/default.nix | 30 +- .../pkgs/servers/polaris/node-composition.nix | 17 - .../pkgs/servers/polaris/node-packages.nix | 4301 ---- .../pkgs/servers/polaris/update-web.sh | 31 - .../nixpkgs/pkgs/servers/polaris/update.sh | 18 - .../nixpkgs/pkgs/servers/polaris/web.nix | 60 +- .../nixpkgs/pkgs/servers/prowlarr/default.nix | 10 +- .../pkgs/servers/psitransfer/default.nix | 77 +- .../pkgs/servers/psitransfer/generate.sh | 11 - .../servers/psitransfer/node-composition.nix | 17 - .../servers/psitransfer/node-packages.json | 3 - .../servers/psitransfer/node-packages.nix | 1781 -- .../pkgs/servers/pufferpanel/default.nix | 122 +- .../nixpkgs/pkgs/servers/readarr/default.nix | 8 +- .../nixpkgs/pkgs/servers/redpanda/default.nix | 4 +- .../pkgs/servers/rustdesk-server/Cargo.lock | 2885 +++ .../pkgs/servers/rustdesk-server/default.nix | 62 + .../nixpkgs/pkgs/servers/samba/4.x.nix | 4 +- ...uilt-heimdal-build-tools-in-case-of-.patch | 40 +- .../search/manticoresearch/default.nix | 47 +- .../pkgs/servers/search/qdrant/Cargo.lock | 204 +- .../pkgs/servers/search/qdrant/default.nix | 8 +- .../pkgs/servers/search/quickwit/Cargo.lock | 268 +- .../pkgs/servers/search/quickwit/default.nix | 11 +- .../pkgs/servers/search/typesense/default.nix | 64 + .../servers/search/typesense/sources.json | 17 + .../pkgs/servers/search/typesense/update.sh | 42 + .../pkgs/servers/search/weaviate/default.nix | 33 + .../servers/search/zincsearch/default.nix | 2 +- .../nixpkgs/pkgs/servers/sftpgo/default.nix | 6 +- .../pkgs/servers/snappymail/default.nix | 4 +- .../nixpkgs/pkgs/servers/sozu/default.nix | 6 +- .../nixpkgs/pkgs/servers/spicedb/zed.nix | 6 +- .../sql/cockroachdb/cockroachdb-bin.nix | 42 + .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 6 +- .../nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix | 4 +- .../pkgs/servers/sql/pgbouncer/default.nix | 6 +- .../pkgs/servers/sql/pgcat/default.nix | 50 + .../sql/postgresql/ext/plv8/default.nix | 2 +- .../servers/sql/postgresql/ext/postgis.nix | 7 +- .../pkgs/servers/sql/proxysql/default.nix | 24 +- .../servers/static-web-server/default.nix | 6 +- .../nixpkgs/pkgs/servers/sunshine/default.nix | 3 +- .../pkgs/servers/tailscale/default.nix | 6 +- .../nixpkgs/pkgs/servers/tautulli/default.nix | 4 +- .../pkgs/servers/unpackerr/default.nix | 6 +- .../nixpkgs/pkgs/servers/unpfs/default.nix | 2 +- .../nixpkgs/pkgs/servers/uwsgi/default.nix | 178 +- .../nixpkgs/pkgs/servers/uxplay/default.nix | 20 +- .../servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/changedetection-io/default.nix | 2 +- .../servers/web-apps/freshrss/default.nix | 2 +- .../servers/web-apps/healthchecks/default.nix | 4 +- .../servers/web-apps/hedgedoc/default.nix | 120 +- .../servers/web-apps/hedgedoc/package.json | 213 - .../pkgs/servers/web-apps/hedgedoc/update.sh | 31 - .../pkgs/servers/web-apps/kavita/default.nix | 3 +- .../pkgs/servers/web-apps/lemmy/package.json | 5 +- .../pkgs/servers/web-apps/lemmy/pin.json | 12 +- .../pkgs/servers/web-apps/lemmy/server.nix | 4 +- .../pkgs/servers/web-apps/lemmy/ui.nix | 4 +- .../pkgs/servers/web-apps/lemmy/update.py | 44 +- .../servers/web-apps/livebook/default.nix | 6 +- .../pkgs/servers/web-apps/netbox/default.nix | 4 +- .../pkgs/servers/web-apps/pict-rs/default.nix | 4 +- .../servers/web-apps/plausible/default.nix | 2 +- .../pkgs/servers/web-apps/plausible/update.sh | 12 +- .../pkgs/servers/web-apps/searxng/default.nix | 25 +- .../pkgs/servers/web-apps/shiori/default.nix | 6 +- .../nixpkgs/pkgs/servers/windmill/default.nix | 2 +- .../nixpkgs/pkgs/servers/wishlist/default.nix | 8 +- .../pkgs/servers/x11/xorg/overrides.nix | 32 +- .../pkgs/shells/any-nix-shell/default.nix | 1 + .../nixpkgs/pkgs/shells/carapace/default.nix | 6 +- .../pkgs/shells/fish/plugins/fzf-fish.nix | 4 +- .../nixpkgs/pkgs/shells/murex/default.nix | 4 +- .../pkgs/shells/nix-your-shell/default.nix | 6 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 6 +- .../shells/nushell/nu_scripts/default.nix | 9 +- .../pkgs/shells/nushell/plugins/gstat.nix | 4 +- .../pkgs/shells/nushell/plugins/query.nix | 4 +- .../nixpkgs/pkgs/shells/rc-9front/default.nix | 14 +- .../nixpkgs/pkgs/shells/zsh/default.nix | 1 + .../shells/zsh/grml-zsh-config/default.nix | 4 +- .../pkgs/shells/zsh/zsh-abbr/default.nix | 30 + .../pkgs/shells/zsh/zsh-forgit/default.nix | 2 + .../zsh-history-substring-search/default.nix | 4 +- .../pkgs/shells/zsh/zsh-vi-mode/default.nix | 4 +- third_party/nixpkgs/pkgs/stdenv/adapters.nix | 5 +- .../nixpkgs/pkgs/stdenv/native/default.nix | 7 +- .../nixpkgs/pkgs/test/cross/default.nix | 3 +- third_party/nixpkgs/pkgs/test/default.nix | 10 +- .../nixpkgs/pkgs/test/haskell/default.nix | 1 - .../pkgs/test/haskell/writers/default.nix | 26 - .../nixpkgs/pkgs/test/texlive/default.nix | 50 + .../pkgs/tools/X11/kdocker/default.nix | 54 + .../tools/X11/opentabletdriver/default.nix | 4 +- .../nixpkgs/pkgs/tools/X11/pmenu/default.nix | 20 +- .../pkgs/tools/X11/sunpaper/default.nix | 3 +- .../nixpkgs/pkgs/tools/X11/sxhkd/default.nix | 12 +- .../pkgs/tools/X11/xbindkeys/default.nix | 6 +- .../pkgs/tools/X11/xdg-utils/default.nix | 1 + .../pkgs/tools/X11/xssstate/default.nix | 32 + .../pkgs/tools/admin/aliyun-cli/default.nix | 4 +- .../pkgs/tools/admin/aws-sso-cli/default.nix | 4 +- .../pkgs/tools/admin/awscli/default.nix | 4 +- .../pkgs/tools/admin/awscli2/default.nix | 4 +- .../pkgs/tools/admin/azure-cli/default.nix | 8 +- .../tools/admin/azure-cli/python-packages.nix | 35 +- .../pkgs/tools/admin/balena-cli/default.nix | 8 +- .../pkgs/tools/admin/chkcrontab/default.nix | 2 +- .../pkgs/tools/admin/copilot-cli/default.nix | 6 +- .../pkgs/tools/admin/credhub-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/cw/default.nix | 2 +- .../docker-credential-helpers/default.nix | 6 +- .../pkgs/tools/admin/drawterm/default.nix | 12 +- .../pkgs/tools/admin/ejson2env/default.nix | 4 +- .../pkgs/tools/admin/eksctl/default.nix | 6 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 4 +- .../tools/admin/fits-cloudctl/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/gam/default.nix | 2 +- .../tools/admin/gimme-aws-creds/default.nix | 4 +- .../nixpkgs/pkgs/tools/admin/gixy/default.nix | 4 +- .../admin/google-cloud-sdk/components.nix | 8 +- .../tools/admin/google-cloud-sdk/default.nix | 2 +- .../google-cloud-sdk/withExtraComponents.nix | 2 +- .../pkgs/tools/admin/hop-cli/default.nix | 49 + .../pkgs/tools/admin/ibmcloud-cli/default.nix | 57 + .../nixpkgs/pkgs/tools/admin/kics/default.nix | 9 +- .../nixpkgs/pkgs/tools/admin/lego/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/lxd/default.nix | 24 +- .../nixpkgs/pkgs/tools/admin/lxd/ui.nix | 3 +- .../pkgs/tools/admin/meshcentral/default.nix | 2 +- .../pkgs/tools/admin/okta-aws-cli/default.nix | 4 +- .../pkgs/tools/admin/ossutil/default.nix | 2 +- .../pkgs/tools/admin/oxidized/default.nix | 2 +- .../nixpkgs/pkgs/tools/admin/pbm/default.nix | 4 +- .../pkgs/tools/admin/pgadmin/default.nix | 12 +- .../pkgs/tools/admin/procs/default.nix | 3 +- .../pkgs/tools/admin/pulumi-bin/data.nix | 450 +- .../pkgs/tools/admin/qovery-cli/default.nix | 8 +- .../pkgs/tools/admin/scaleway-cli/default.nix | 6 +- .../pkgs/tools/admin/simplotask/default.nix | 4 +- .../nixpkgs/pkgs/tools/admin/syft/default.nix | 8 +- .../pkgs/tools/admin/tigervnc/default.nix | 1 - .../pkgs/tools/admin/tlsclient/default.nix | 26 +- .../pkgs/tools/admin/trivy/default.nix | 8 +- .../pkgs/tools/admin/wander/default.nix | 4 +- .../pkgs/tools/archivers/ctrtool/default.nix | 2 +- .../pkgs/tools/audio/botamusique/default.nix | 1 - .../pkgs/tools/audio/isrcsubmit/default.nix | 2 +- .../pkgs/tools/audio/kaldi/default.nix | 3 +- .../pkgs/tools/audio/linuxwave/default.nix | 4 +- .../pkgs/tools/audio/midimonster/default.nix | 6 +- .../tools/audio/mpd-notification/default.nix | 11 +- .../pkgs/tools/audio/picotts/default.nix | 8 +- .../pkgs/tools/audio/piper/default.nix | 39 +- ...x-compilation-with-newer-onnxruntime.patch | 18 + .../audio/piper/train.nix} | 46 +- .../nixpkgs/pkgs/tools/audio/tts/default.nix | 4 +- .../wyoming/faster-whisper-entrypoint.patch | 17 +- .../tools/audio/wyoming/faster-whisper.nix | 4 +- .../audio/wyoming/piper-entrypoint.patch | 20 +- .../pkgs/tools/audio/wyoming/piper.nix | 4 +- .../pkgs/tools/audio/yabridgectl/default.nix | 2 +- .../pkgs/tools/backup/borgmatic/default.nix | 4 +- .../pkgs/tools/backup/hpe-ltfs/default.nix | 2 +- .../pkgs/tools/backup/partclone/default.nix | 4 +- ...ting-restore-with-permission-failure.patch | 16 +- .../pkgs/tools/backup/restic/default.nix | 8 +- .../pkgs/tools/backup/sanoid/default.nix | 6 +- .../pkgs/tools/backup/tarsnap/default.nix | 1 + .../tools/backup/zfs-autobackup/default.nix | 30 +- .../tools/bluetooth/blueberry/default.nix | 1 - .../pkgs/tools/bluetooth/blueman/default.nix | 4 +- .../tools/bluetooth/bluetuith/default.nix | 2 +- .../tools/bluetooth/nrfconnect/default.nix | 1 - .../pkgs/tools/cd-dvd/cdrdao/default.nix | 57 +- .../tools/cd-dvd/srt-to-vtt-cl/default.nix | 11 +- .../srt-to-vtt-cl/simplify-macOS-builds.patch | 31 + .../pkgs/tools/cd-dvd/ventoy/default.nix | 5 +- .../pkgs/tools/compression/flips/default.nix | 6 +- .../flips/use-system-libdivsufsort.patch | 8 +- .../pkgs/tools/compression/keka/default.nix | 38 + .../pkgs/tools/compression/zfp/default.nix | 3 +- .../pkgs/tools/compression/zopfli/default.nix | 2 +- .../pkgs/tools/compression/zstd/default.nix | 1 - .../pkgs/tools/filesystems/bees/default.nix | 4 +- .../tools/filesystems/blobfuse/default.nix | 2 +- .../tools/filesystems/btrfs-progs/default.nix | 4 +- .../pkgs/tools/filesystems/ceph/default.nix | 13 +- .../pkgs/tools/filesystems/cpcfs/default.nix | 2 +- .../pkgs/tools/filesystems/cryfs/default.nix | 4 +- .../pkgs/tools/filesystems/davfs2/default.nix | 1 - .../pkgs/tools/filesystems/dduper/default.nix | 4 +- .../filesystems/disk-inventory-x/default.nix | 35 + .../tools/filesystems/dupe-krill/default.nix | 2 +- .../pkgs/tools/filesystems/dwarfs/default.nix | 30 +- .../filesystems/dwarfs/version_info.patch | 34 +- .../pkgs/tools/filesystems/dysk/default.nix | 16 +- .../pkgs/tools/filesystems/garage/default.nix | 2 +- .../tools/filesystems/gocryptfs/default.nix | 1 - .../pkgs/tools/filesystems/goofys/default.nix | 2 +- .../tools/filesystems/lizardfs/default.nix | 1 - .../tools/filesystems/mergerfs/default.nix | 4 +- .../tools/filesystems/mkspiffs/presets.nix | 4 +- .../tools/filesystems/mount-zip/default.nix | 32 + .../tools/filesystems/netatalk/default.nix | 3 - .../tools/filesystems/nilfs-utils/default.nix | 2 +- .../pkgs/tools/filesystems/s3fs/default.nix | 11 +- .../tools/filesystems/sdat2img/default.nix | 2 +- .../tools/filesystems/squashfs/default.nix | 1 - .../tools/filesystems/squashfuse/default.nix | 4 +- .../tools/filesystems/stratisd/Cargo.lock | 341 +- .../tools/filesystems/stratisd/default.nix | 8 +- .../tools/filesystems/tar2ext4/default.nix | 6 +- .../tools/filesystems/ubidump/default.nix | 2 +- .../filesystems/wipefreespace/default.nix | 1 - .../tools/filesystems/xfsprogs/default.nix | 4 +- .../zpool-auto-expand-partitions/default.nix | 5 +- .../pkgs/tools/games/dualsensectl/default.nix | 4 +- .../pkgs/tools/games/pokefinder/cstddef.patch | 12 - .../pkgs/tools/games/pokefinder/default.nix | 47 +- .../pokefinder/set-desktop-file-name.patch | 12 + .../tools/games/ps3-disc-dumper/default.nix | 1 - .../pkgs/tools/games/slipstream/default.nix | 48 + .../tools/games/steam-rom-manager/default.nix | 4 +- .../tools/games/steamtinkerlaunch/default.nix | 1 - .../pkgs/tools/graphics/asymptote/default.nix | 2 +- .../pkgs/tools/graphics/didder/default.nix | 2 +- .../pkgs/tools/graphics/dnglab/default.nix | 28 + .../pkgs/tools/graphics/glmark2/default.nix | 1 - .../pkgs/tools/graphics/graphviz/default.nix | 1 - .../graphics/ldgallery/compiler/default.nix | 42 - .../graphics/ldgallery/compiler/generate.sh | 19 - .../pkgs/tools/graphics/ldgallery/default.nix | 53 - .../graphics/ldgallery/viewer/default.nix | 49 - .../graphics/ldgallery/viewer/generate.sh | 29 - .../ldgallery/viewer/node-composition.nix | 17 - .../ldgallery/viewer/node-packages.nix | 9570 ------- .../tools/graphics/maskromtool/default.nix | 4 +- .../pkgs/tools/graphics/pdftoipe/default.nix | 2 +- .../realesrgan-ncnn-vulkan/default.nix | 3 +- .../pkgs/tools/graphics/smartcrop/default.nix | 27 + .../pkgs/tools/graphics/svg2pdf/default.nix | 3 +- .../pkgs/tools/graphics/timg/default.nix | 4 +- .../tools/graphics/ueberzugpp/default.nix | 15 +- .../pkgs/tools/graphics/vips/default.nix | 4 +- .../waifu2x-converter-cpp/default.nix | 3 +- .../graphics/wkhtmltopdf-bin/default.nix | 2 - .../tools/inputmethods/fcitx5/fcitx5-mozc.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-qt.nix | 2 + .../pkgs/tools/inputmethods/fcitx5/update.py | 2 +- .../ibus-engines/ibus-bamboo/default.nix | 1 - .../ibus-engines/ibus-libthai/default.nix | 4 +- .../ibus-table-others/default.nix | 10 +- .../inputmethods/input-remapper/default.nix | 1 - .../pkgs/tools/inputmethods/keyd/default.nix | 4 +- .../tools/inputmethods/m17n-lib/default.nix | 1 - .../inputmethods/skk/skk-dicts/default.nix | 2 +- .../unnaturalscrollwheels/default.nix | 37 + .../pkgs/tools/llm/gorilla-cli/default.nix | 38 + .../tools/{misc => llm}/shell_gpt/default.nix | 4 +- .../pkgs/tools/misc/a4term/default.nix | 34 + .../pkgs/tools/misc/alt-server/default.nix | 41 + .../pkgs/tools/misc/autorandr/default.nix | 5 +- .../pkgs/tools/misc/barman/default.nix | 4 +- .../pkgs/tools/misc/bat-extras/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/bat/default.nix | 3 +- .../pkgs/tools/misc/bdf2psf/default.nix | 4 +- .../pkgs/tools/misc/bitwise/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/broot/default.nix | 6 +- .../pkgs/tools/misc/charasay/default.nix | 6 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../pkgs/tools/misc/clipboard-jh/default.nix | 6 +- .../tools/misc/cloud-sql-proxy/default.nix | 23 +- .../nixpkgs/pkgs/tools/misc/cope/default.nix | 2 +- .../tools/misc/coreboot-utils/default.nix | 1 + .../tools/misc/cp210x-program/default.nix | 33 + .../pkgs/tools/misc/cyberchef/default.nix | 4 +- .../pkgs/tools/misc/czkawka/default.nix | 7 + .../tools/misc/debian-devscripts/default.nix | 2 +- .../pkgs/tools/misc/diffoscope/default.nix | 8 +- .../pkgs/tools/misc/direnv/default.nix | 1 + .../pkgs/tools/misc/diskonaut/default.nix | 2 +- .../pkgs/tools/misc/dotter/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/duf/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/dust/default.nix | 2 +- .../pkgs/tools/misc/engage/default.nix | 17 + .../pkgs/tools/misc/enjarify/default.nix | 2 +- .../pkgs/tools/misc/esphome/dashboard.nix | 4 +- .../pkgs/tools/misc/esphome/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/exa/default.nix | 1 + .../nixpkgs/pkgs/tools/misc/eza/default.nix | 61 + .../nixpkgs/pkgs/tools/misc/farge/default.nix | 57 + .../pkgs/tools/misc/fastfetch/default.nix | 123 + .../nixpkgs/pkgs/tools/misc/file/default.nix | 1 + .../pkgs/tools/misc/fluent-bit/default.nix | 32 +- .../nixpkgs/pkgs/tools/misc/fw/default.nix | 30 +- .../nixpkgs/pkgs/tools/misc/fwup/default.nix | 4 +- .../tools/misc/fx-cast-bridge/default.nix | 55 + .../pkgs/tools/misc/fx_cast/default.nix | 66 - .../pkgs/tools/misc/fx_cast/node-env.nix | 686 - .../pkgs/tools/misc/fx_cast/node-packages.nix | 2043 -- .../pkgs/tools/misc/fx_cast/package-lock.json | 3950 --- .../pkgs/tools/misc/fx_cast/package.json | 37 - .../pkgs/tools/misc/gh-dash/default.nix | 8 +- .../nixpkgs/pkgs/tools/misc/goose/default.nix | 6 +- .../pkgs/tools/misc/grass-sass/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/grex/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/hexyl/default.nix | 6 +- .../pkgs/tools/misc/hwatch/default.nix | 5 +- .../pkgs/tools/misc/ictree/default.nix | 23 + .../pkgs/tools/misc/infracost/default.nix | 6 +- .../pkgs/tools/misc/jfrog-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/kalker/Cargo.lock | 634 - .../pkgs/tools/misc/kalker/default.nix | 15 +- .../pkgs/tools/misc/keychain/default.nix | 2 +- .../pkgs/tools/misc/killport/default.nix | 6 +- .../pkgs/tools/misc/lazydocker/default.nix | 6 +- .../pkgs/tools/misc/license-cli/default.nix | 6 +- .../pkgs/tools/misc/mastotool/default.nix | 28 + .../nixpkgs/pkgs/tools/misc/mdr/default.nix | 2 +- .../pkgs/tools/misc/melody/default.nix | 6 +- .../pkgs/tools/misc/memtest86+/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/mmv/default.nix | 4 +- .../tools/misc/mongodb-compass/default.nix | 4 +- .../pkgs/tools/misc/nanoemoji/default.nix | 72 + .../pkgs/tools/misc/nanoemoji/fix-test.patch | 24 + .../misc/nanoemoji/test-pythonpath.patch | 14 + .../nixpkgs/pkgs/tools/misc/ncdu/1.nix | 2 +- .../nixpkgs/pkgs/tools/misc/ncdu/default.nix | 2 +- .../pkgs/tools/misc/ntfy-sh/default.nix | 43 +- .../misc/ntfy-sh/generate-dependencies.sh | 11 - .../tools/misc/ntfy-sh/node-composition.nix | 17 - .../pkgs/tools/misc/ntfy-sh/node-packages.nix | 15694 ------------ .../pkgs/tools/misc/ntfy-sh/package.json | 44 - .../nixpkgs/pkgs/tools/misc/ntfy-sh/update.sh | 30 +- .../nixpkgs/pkgs/tools/misc/ntfy/default.nix | 4 + .../nixpkgs/pkgs/tools/misc/ntfy/webpush.nix | 2 +- .../nixpkgs/pkgs/tools/misc/nurl/Cargo.lock | 456 +- .../nixpkgs/pkgs/tools/misc/nurl/default.nix | 7 +- .../pkgs/tools/misc/oggvideotools/default.nix | 2 +- .../pkgs/tools/misc/ollama/default.nix | 35 + .../pkgs/tools/misc/onefetch/default.nix | 2 +- .../misc/opentelemetry-collector/contrib.nix | 2 +- .../misc/opentelemetry-collector/default.nix | 2 +- .../pkgs/tools/misc/osm2pgsql/default.nix | 9 + .../pkgs/tools/misc/panicparse/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/pc/default.nix | 35 + .../pkgs/tools/misc/phrase-cli/default.nix | 6 +- .../tools/misc/plantuml-server/default.nix | 4 +- .../pkgs/tools/misc/plantuml/default.nix | 4 +- .../pkgs/tools/misc/procyon/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/qt5ct/default.nix | 5 +- .../pkgs/tools/misc/qt6gtk2/default.nix | 36 + .../nixpkgs/pkgs/tools/misc/rauc/default.nix | 1 - .../tools/misc/riemann-c-client/default.nix | 9 +- .../pkgs/tools/misc/ripdrag/default.nix | 10 +- .../nixpkgs/pkgs/tools/misc/rtx/default.nix | 13 +- .../nixpkgs/pkgs/tools/misc/rtz/Cargo.lock | 3474 +++ .../nixpkgs/pkgs/tools/misc/rtz/default.nix | 56 + .../pkgs/tools/misc/sagoin/default.nix | 6 +- .../pkgs/tools/misc/scanmem/default.nix | 37 +- .../tools/misc/shadowenv/Cargo.lock.patch | 13 + .../pkgs/tools/misc/shadowenv/default.nix | 8 +- .../pkgs/tools/misc/sharedown/default.nix | 4 +- .../pkgs/tools/misc/sharedown/yarn.lock | 1502 +- .../pkgs/tools/misc/sharedown/yarndeps.nix | 1424 +- .../nixpkgs/pkgs/tools/misc/smenu/default.nix | 2 +- .../pkgs/tools/misc/spigot/default.nix | 30 +- .../tools/misc/sqlite3-to-mysql/default.nix | 4 + .../pkgs/tools/misc/star-history/default.nix | 6 +- .../pkgs/tools/misc/starship/default.nix | 6 +- .../pkgs/tools/misc/steampipe/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/tbls/default.nix | 6 +- .../pkgs/tools/misc/thefuck/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tmux/default.nix | 2 +- .../pkgs/tools/misc/topgrade/default.nix | 6 +- .../pkgs/tools/misc/topicctl/default.nix | 4 +- .../pkgs/tools/misc/trdl-client/default.nix | 2 +- .../tools/misc/twspace-crawler/default.nix | 8 +- .../pkgs/tools/misc/twspace-dl/default.nix | 10 +- .../pkgs/tools/misc/urn-timer/default.nix | 10 +- .../pkgs/tools/misc/usbimager/default.nix | 2 +- .../tools/misc/uutils-coreutils/default.nix | 8 +- .../pkgs/tools/misc/valeronoi/default.nix | 52 + .../pkgs/tools/misc/vector/default.nix | 5 + .../vector/rust-1.71-unnecessary-mut.diff | 22 + .../nixpkgs/pkgs/tools/misc/vtm/default.nix | 4 +- .../pkgs/tools/misc/wakapi/default.nix | 6 +- .../pkgs/tools/misc/wasm-tools/Cargo.lock | 521 +- .../pkgs/tools/misc/wasm-tools/default.nix | 4 +- .../pkgs/tools/misc/wimboot/default.nix | 2 +- .../pkgs/tools/misc/wit-bindgen/default.nix | 6 +- .../pkgs/tools/misc/xvfb-run/default.nix | 1 + .../pkgs/tools/misc/yt-dlp/default.nix | 1 + .../pkgs/tools/misc/zoxide/default.nix | 6 +- .../tools/networking/airgeddon/default.nix | 2 - .../pkgs/tools/networking/amass/default.nix | 8 +- .../pkgs/tools/networking/aria2/default.nix | 4 +- .../pkgs/tools/networking/babeld/default.nix | 4 +- .../tools/networking/bandwhich/default.nix | 2 +- .../tools/networking/bitmask-vpn/default.nix | 2 +- .../tools/networking/boundary/default.nix | 10 +- .../pkgs/tools/networking/cdpr/default.nix | 2 +- .../pkgs/tools/networking/circus/default.nix | 40 - .../tools/networking/clash-meta/default.nix | 1 + .../pkgs/tools/networking/clash/default.nix | 1 + .../curl-impersonate-0.5.2-fix-shebangs.patch | 13 + .../networking/curl-impersonate/default.nix | 198 +- .../networking/curl-impersonate/deps.nix | 29 + .../networking/curl-impersonate/update.sh | 91 + .../pkgs/tools/networking/curl/default.nix | 4 +- .../pkgs/tools/networking/dae/default.nix | 27 +- .../networking/dd-agent/integrations-core.nix | 2 +- .../pkgs/tools/networking/ddns-go/default.nix | 32 + .../pkgs/tools/networking/dhcp/default.nix | 102 - .../tools/networking/dhcp/set-hostname.patch | 12 - .../pkgs/tools/networking/dnsmasq/default.nix | 2 +- .../tools/networking/dnsproxy/default.nix | 4 +- .../pkgs/tools/networking/dsniff/default.nix | 10 +- .../networking/ebpf-verifier/default.nix | 60 + .../remove-fetchcontent-usage.patch | 14 + .../pkgs/tools/networking/edgedb/Cargo.lock | 2729 +- .../pkgs/tools/networking/edgedb/default.nix | 16 +- .../pkgs/tools/networking/frp/default.nix | 6 +- .../tools/networking/gnirehtet/default.nix | 5 +- .../tools/networking/goimapnotify/default.nix | 1 + .../pkgs/tools/networking/gping/default.nix | 13 +- .../tools/networking/grpc_cli/default.nix | 4 +- .../tools/networking/gupnp-tools/default.nix | 8 +- .../pkgs/tools/networking/gvproxy/default.nix | 4 +- .../pkgs/tools/networking/haproxy/default.nix | 41 +- .../pkgs/tools/networking/i2p/default.nix | 20 +- .../pkgs/tools/networking/ifwifi/default.nix | 2 +- .../nixpkgs/pkgs/tools/networking/iperf/3.nix | 6 +- .../tools/networking/ipv6calc/default.nix | 4 +- .../pkgs/tools/networking/juicity/default.nix | 46 + .../pkgs/tools/networking/junkie/default.nix | 4 +- .../pkgs/tools/networking/kapp/default.nix | 4 +- .../pkgs/tools/networking/kea/default.nix | 2 + .../pkgs/tools/networking/lftp/default.nix | 5 +- .../tools/networking/mailutils/default.nix | 4 +- .../tools/networking/minio-client/default.nix | 6 +- .../pkgs/tools/networking/mosh/default.nix | 2 +- .../tools/networking/mozillavpn/default.nix | 6 +- .../networking/mqttmultimeter/default.nix | 2 +- .../tools/networking/mtr-exporter/default.nix | 4 +- .../pkgs/tools/networking/mtr/default.nix | 1 - .../pkgs/tools/networking/netbird/default.nix | 6 +- .../tools/networking/nethoscope/default.nix | 3 +- .../networking/networkmanager/default.nix | 11 +- .../networkmanager/libnma/default.nix | 1 - .../networkmanager/strongswan/default.nix | 1 - .../tools/networking/nss-mdns/default.nix | 2 +- .../pkgs/tools/networking/ntp/default.nix | 13 +- .../tools/networking/ntp/glibc-2.34-fix.patch | 28 - .../pkgs/tools/networking/nzbget/default.nix | 41 +- .../networking/ooniprobe-cli/default.nix | 6 +- .../tools/networking/openconnect/default.nix | 2 +- .../tools/networking/openresolv/default.nix | 4 +- .../pkgs/tools/networking/openssh/common.nix | 3 +- .../pkgs/tools/networking/openssh/default.nix | 10 +- .../pkgs/tools/networking/openvpn/default.nix | 1 - .../tools/networking/p2p/amule/default.nix | 1 - .../networking/p2p/gtk-gnutella/default.nix | 4 +- .../tools/networking/persepolis/default.nix | 2 +- .../pkgs/tools/networking/pgrok/default.nix | 41 + .../pkgs/tools/networking/ppp/default.nix | 1 - .../pkgs/tools/networking/proxify/default.nix | 6 +- .../pkgs/tools/networking/pykms/default.nix | 2 +- .../pkgs/tools/networking/q/default.nix | 4 +- .../pkgs/tools/networking/qrcp/default.nix | 2 +- .../pkgs/tools/networking/ratman/default.nix | 2 +- .../pkgs/tools/networking/rconc/default.nix | 2 +- .../networking/reaver-wps-t6x/default.nix | 2 +- .../pkgs/tools/networking/restish/default.nix | 56 + .../tools/networking/shorewall/default.nix | 1 - .../tools/networking/sing-box/default.nix | 6 +- .../tools/networking/sitespeed-io/default.nix | 1 + .../tools/networking/sleep-on-lan/default.nix | 2 +- .../stevenblack-blocklist/default.nix | 4 +- .../tools/networking/subfinder/default.nix | 6 +- .../tools/networking/swagger-cli/default.nix | 3 +- .../tools/networking/telepresence/default.nix | 2 +- .../pkgs/tools/networking/tgt/default.nix | 2 +- .../pkgs/tools/networking/tinc/pre.nix | 2 +- .../networking/transmission-rss/default.nix | 2 +- .../pkgs/tools/networking/trurl/default.nix | 2 +- .../pkgs/tools/networking/tunwg/default.nix | 6 +- .../tools/networking/userhosts/default.nix | 2 +- .../pkgs/tools/networking/v2raya/default.nix | 28 +- .../pkgs/tools/networking/v2raya/package.json | 31 +- .../pkgs/tools/networking/v2raya/yarn.lock | 9381 ------- .../pkgs/tools/networking/v2raya/yarn.nix | 10101 -------- .../pkgs/tools/networking/vegeta/default.nix | 6 +- .../pkgs/tools/networking/vpnc/default.nix | 4 +- .../pkgs/tools/networking/waitron/default.nix | 2 +- .../networking/wg-netmanager/default.nix | 2 +- .../tools/networking/wgautomesh/default.nix | 1 + .../networking/wireguard-tools/default.nix | 2 +- .../tools/networking/wsl-vpnkit/default.nix | 84 + .../pkgs/tools/networking/wtfis/default.nix | 3 +- .../pkgs/tools/networking/xrootd/fetchxrd.nix | 4 +- .../pkgs/tools/networking/zap/default.nix | 4 +- .../tools/networking/zerotierone/default.nix | 5 +- .../pkgs/tools/networking/zrok/default.nix | 10 +- .../pkgs/tools/nix/alejandra/default.nix | 1 + .../tools/nix/cached-nix-shell/default.nix | 2 +- .../pkgs/tools/nix/devour-flake/default.nix | 27 + .../nixpkgs/pkgs/tools/nix/manix/default.nix | 2 +- .../nixpkgs/pkgs/tools/nix/nixci/default.nix | 38 + .../nixpkgs/pkgs/tools/nix/nixdoc/default.nix | 12 +- .../tools/nix/nixos-install-tools/default.nix | 4 +- .../pkgs/tools/nix/nixpkgs-fmt/default.nix | 1 + .../nixpkgs/pkgs/tools/nix/npins/default.nix | 2 - .../nixpkgs/pkgs/tools/nix/web-devmode.nix | 117 + .../tools/package-management/apkg/default.nix | 25 +- .../appimagekit/default.nix | 4 +- .../tools/package-management/apt/default.nix | 5 +- .../package-management/comma/default.nix | 6 +- .../package-management/disnix/default.nix | 2 +- .../tools/package-management/dnf5/default.nix | 4 +- .../package-management/fusesoc/default.nix | 1 - .../package-management/harmonia/default.nix | 1 + .../package-management/holo-build/default.nix | 2 +- .../home-manager/default.nix | 4 +- .../package-management/nix-update/default.nix | 4 +- .../tools/package-management/nix/common.nix | 5 + .../tools/package-management/nix/default.nix | 11 +- .../nixpkgs-review/default.nix | 2 +- .../package-management/pacman/default.nix | 2 + .../tools/package-management/pdm/default.nix | 22 +- .../tools/package-management/pkg/default.nix | 4 +- .../package-management/reuse/default.nix | 11 +- .../tools/package-management/rpm/default.nix | 8 +- .../security/age-plugin-ledger/default.nix | 44 + .../tools/security/age-plugin-tpm/default.nix | 4 +- .../pkgs/tools/security/arti/default.nix | 6 +- .../pkgs/tools/security/authz0/default.nix | 6 +- .../aws-iam-authenticator/default.nix | 8 +- .../pkgs/tools/security/b2sum/default.nix | 2 +- .../pkgs/tools/security/bitwarden/cli.nix | 52 + .../pkgs/tools/security/bitwarden/default.nix | 2 +- .../pkgs/tools/security/cnspec/default.nix | 6 +- .../tools/security/cryptomator/default.nix | 1 - .../pkgs/tools/security/deepsea/default.nix | 2 +- .../pkgs/tools/security/dnsrecon/default.nix | 10 +- .../pkgs/tools/security/donkey/default.nix | 2 +- .../pkgs/tools/security/doppler/default.nix | 4 +- .../pkgs/tools/security/echidna/default.nix | 62 +- .../pkgs/tools/security/enc/default.nix | 9 +- .../pkgs/tools/security/exploitdb/default.nix | 4 +- .../security/firefox_decrypt/default.nix | 6 +- .../pkgs/tools/security/fulcio/default.nix | 6 +- .../pkgs/tools/security/ghidra/build.nix | 4 +- .../pkgs/tools/security/gopass/default.nix | 6 +- .../pkgs/tools/security/gotrue/supabase.nix | 4 +- .../pkgs/tools/security/grype/default.nix | 17 +- .../tools/security/hashcat-utils/default.nix | 2 +- .../pkgs/tools/security/hashcat/default.nix | 18 +- .../pkgs/tools/security/httpx/default.nix | 15 +- .../pkgs/tools/security/jadx/default.nix | 45 +- .../pkgs/tools/security/jd-cli/default.nix | 5 +- .../pkgs/tools/security/jwx/default.nix | 2 +- .../security/kubernetes-polaris/default.nix | 4 +- .../tools/security/lesspass-cli/default.nix | 2 +- .../tools/security/libmodsecurity/default.nix | 4 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 40 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 70 +- .../pkgs/tools/security/monsoon/default.nix | 16 +- .../pkgs/tools/security/nuclei/default.nix | 6 +- .../tools/security/osv-detector/default.nix | 22 +- .../tools/security/osv-scanner/default.nix | 6 +- .../pkgs/tools/security/pass/default.nix | 4 +- .../pkgs/tools/security/pass/rofi-pass.nix | 58 +- .../pkgs/tools/security/proxmark3/default.nix | 135 +- .../security/proxmark3/proxmark3-rrg.nix | 86 - .../pkgs/tools/security/psudohash/default.nix | 40 + .../tools/security/pynitrokey/default.nix | 4 +- .../tools/security/quark-engine/default.nix | 4 +- .../pkgs/tools/security/rage/default.nix | 1 + .../pkgs/tools/security/rbw/default.nix | 13 +- .../pkgs/tools/security/rekor/default.nix | 6 +- .../pkgs/tools/security/ronin/Gemfile.lock | 38 +- .../pkgs/tools/security/ronin/default.nix | 5 + .../pkgs/tools/security/ronin/gemset.nix | 52 +- .../pkgs/tools/security/saml2aws/default.nix | 6 +- .../pkgs/tools/security/semgrep/common.nix | 14 +- .../pkgs/tools/security/semgrep/default.nix | 4 + .../tools/security/semgrep/semgrep-core.nix | 2 +- .../pkgs/tools/security/semgrep/update.sh | 5 +- .../sequoia-chameleon-gnupg/default.nix | 8 +- .../tools/security/sequoia-sq/default.nix | 6 +- .../pkgs/tools/security/shhgit/default.nix | 2 +- .../pkgs/tools/security/solo2-cli/default.nix | 3 +- .../spectre-meltdown-checker/default.nix | 32 +- .../pkgs/tools/security/spire/default.nix | 6 +- .../pkgs/tools/security/ssb/default.nix | 2 +- .../pkgs/tools/security/sshuttle/default.nix | 2 +- .../pkgs/tools/security/stoken/default.nix | 42 +- .../pkgs/tools/security/sudo/default.nix | 14 +- .../pkgs/tools/security/terrascan/default.nix | 6 +- .../pkgs/tools/security/tor/default.nix | 4 +- .../tools/security/tpm2-tools/default.nix | 10 +- .../pkgs/tools/security/truecrack/default.nix | 3 +- .../tools/security/trufflehog/default.nix | 6 +- .../pkgs/tools/security/vals/default.nix | 4 +- .../pkgs/tools/security/vault/default.nix | 6 +- .../tools/security/vaultwarden/default.nix | 4 +- .../pkgs/tools/security/verifpal/default.nix | 1 - .../tools/security/zeekscript/default.nix | 5 + .../pkgs/tools/system/amdgpu_top/Cargo.lock | 242 +- .../pkgs/tools/system/amdgpu_top/default.nix | 9 +- .../tools/system/auto-cpufreq/default.nix | 1 + .../system/automatic-timezoned/default.nix | 6 +- .../pkgs/tools/system/collectd/plugins.nix | 2 - .../pkgs/tools/system/ctop/default.nix | 2 +- .../pkgs/tools/system/datefudge/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/fio/default.nix | 4 + .../pkgs/tools/system/gtop/default.nix | 27 + .../pkgs/tools/system/honcho/default.nix | 2 - .../pkgs/tools/system/htop/default.nix | 1 + .../pkgs/tools/system/hw-probe/default.nix | 3 +- .../pkgs/tools/system/hwinfo/default.nix | 4 +- .../pkgs/tools/system/kanata/default.nix | 12 +- .../pkgs/tools/system/logcheck/default.nix | 4 +- .../pkgs/tools/system/minijail/tools.nix | 2 +- .../pkgs/tools/system/netdata/default.nix | 9 +- .../netdata/no-files-in-etc-and-var.patch | 16 +- .../netdata/skip-CONFIGURE_COMMAND.patch | 18 +- .../pkgs/tools/system/nvitop/default.nix | 8 +- ...r-definition-of-AUDIT_FILTER_EXCLUDE.patch | 25 + .../system/osquery/Remove-git-reset.patch | 37 + .../Remove-system-controls-table.patch | 157 + ...-instead-of-removed-xlocale.h-header.patch | 29 + .../pkgs/tools/system/osquery/default.nix | 87 + .../pkgs/tools/system/pcstat/default.nix | 6 +- .../pkgs/tools/system/proot/default.nix | 1 - .../pkgs/tools/system/rsyslog/default.nix | 4 +- .../system/s0ix-selftest-tool/default.nix | 1 - .../pkgs/tools/system/stacer/default.nix | 49 + .../pkgs/tools/system/systeroid/default.nix | 2 +- .../pkgs/tools/system/testdisk/default.nix | 5 + .../pkgs/tools/system/tree/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/zx/default.nix | 25 + .../pkgs/tools/text/base16384/default.nix | 4 +- .../pkgs/tools/text/chroma/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/chroma/src.json | 8 +- .../pkgs/tools/text/csvkit/default.nix | 9 +- .../nixpkgs/pkgs/tools/text/d2/default.nix | 4 +- .../pkgs/tools/text/difftastic/Cargo.lock | 37 +- .../pkgs/tools/text/difftastic/default.nix | 4 +- .../pkgs/tools/text/fanficfare/default.nix | 4 +- .../pkgs/tools/text/frogmouth/default.nix | 5 +- .../nixpkgs/pkgs/tools/text/gawk/default.nix | 1 + .../nixpkgs/pkgs/tools/text/goawk/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/gtree/default.nix | 6 +- .../tools/text/languagetool-rust/default.nix | 35 +- .../pkgs/tools/text/languagetool/default.nix | 4 +- .../pkgs/tools/text/markdown-pp/default.nix | 26 - .../pkgs/tools/text/markscribe/default.nix | 28 + .../pkgs/tools/text/mdbook-katex/default.nix | 6 +- .../pkgs/tools/text/mdbook-toc/default.nix | 6 +- .../pkgs/tools/text/mdbook/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/ov/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/pru/default.nix | 10 +- .../nixpkgs/pkgs/tools/text/pyp/default.nix | 51 + .../pkgs/tools/text/repgrep/default.nix | 6 +- .../pkgs/tools/text/reveal-md/default.nix | 41 + .../pkgs/tools/text/ripgrep/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/tesh/default.nix | 26 + .../pkgs/tools/text/to-html/default.nix | 30 + .../nixpkgs/pkgs/tools/text/ugrep/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 7 +- .../nixpkgs/pkgs/tools/text/wrap/default.nix | 2 +- .../tools/typesetting/bibtex-tidy/default.nix | 35 + .../remove-google-font-loader.patch | 52 + .../tools/typesetting/lowdown/default.nix | 3 +- .../tools/typesetting/satysfi/default.nix | 6 +- .../tools/typesetting/skribilo/default.nix | 6 +- .../tools/typesetting/tex/mftrace/default.nix | 1 - .../typesetting/tex/pgf-tikz/pgf-umlsd.nix | 4 +- .../typesetting/tex/texlive/UPGRADING.md | 17 + .../tools/typesetting/tex/texlive/bin.nix | 9 + .../tools/typesetting/tex/texlive/combine.nix | 2 +- .../tools/typesetting/tex/texlive/default.nix | 28 +- .../tex/texlive/fix-implicit-int.patch | 22 + .../tools/typesetting/xmlroff/default.nix | 2 +- .../pkgs/tools/video/go2rtc/default.nix | 4 +- .../pkgs/tools/video/recyclarr/default.nix | 10 +- .../pkgs/tools/video/wtwitch/default.nix | 6 +- .../tools/virtualization/awsebcli/default.nix | 4 +- .../virtualization/cloud-init/default.nix | 4 +- .../virtualization/distrobuilder/default.nix | 2 +- .../google-compute-engine/default.nix | 1 - .../google-guest-agent/default.nix | 12 +- .../google-guest-configs/default.nix | 2 +- .../google-guest-oslogin/default.nix | 5 +- .../tools/virtualization/govc/default.nix | 6 +- .../tools/virtualization/kubevirt/default.nix | 4 +- .../nixos-container-completion.sh | 2 +- .../nixos-container/nixos-container.pl | 1 + .../virtualization/onmetal-image/default.nix | 2 +- .../tools/virtualization/ovftool/default.nix | 2 +- .../pkgs/tools/wayland/clapboard/default.nix | 26 + .../pkgs/tools/wayland/gtklock/default.nix | 2 +- .../hyprland-per-window-layout/default.nix | 23 + .../pkgs/tools/wayland/mpvpaper/default.nix | 1 - .../pkgs/tools/wayland/swww/default.nix | 47 +- .../pkgs/tools/wayland/waylogout/default.nix | 48 + .../pkgs/tools/wayland/waynergy/default.nix | 1 - .../pkgs/tools/wayland/wayout/default.nix | 3 +- .../tools/wayland/wl-clipboard/default.nix | 4 +- .../pkgs/tools/wayland/wlay/default.nix | 4 +- .../pkgs/tools/wayland/wlogout/default.nix | 1 + .../tools/wayland/wlr-which-key/default.nix | 42 + .../nixpkgs/pkgs/top-level/aliases.nix | 55 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 979 +- third_party/nixpkgs/pkgs/top-level/config.nix | 6 + .../nixpkgs/pkgs/top-level/coq-packages.nix | 17 +- .../nixpkgs/pkgs/top-level/java-packages.nix | 3 +- .../nixpkgs/pkgs/top-level/linux-kernels.nix | 15 +- .../nixpkgs/pkgs/top-level/lua-packages.nix | 8 +- .../nixpkgs/pkgs/top-level/nim-packages.nix | 4 + .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 10 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 13 +- .../nixpkgs/pkgs/top-level/python-aliases.nix | 25 +- .../pkgs/top-level/python-packages.nix | 231 +- .../nixpkgs/pkgs/top-level/qt6-packages.nix | 2 + .../nixpkgs/pkgs/top-level/release-small.nix | 1 - .../nixpkgs/pkgs/top-level/release.nix | 2 +- .../nixpkgs/pkgs/top-level/ruby-packages.nix | 206 +- 3799 files changed, 97519 insertions(+), 123476 deletions(-) create mode 100644 third_party/nixpkgs/doc/common.nix create mode 100644 third_party/nixpkgs/doc/hooks/zig.section.md create mode 100644 third_party/nixpkgs/doc/shell.nix create mode 100644 third_party/nixpkgs/lib/README.md create mode 100644 third_party/nixpkgs/lib/tests/modules/merge-typeless-option.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/module-argument-default.nix create mode 100644 third_party/nixpkgs/nixos/doc/manual/common.nix create mode 100644 third_party/nixpkgs/nixos/doc/manual/shell.nix create mode 100644 third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py create mode 100644 third_party/nixpkgs/nixos/lib/test-driver/nixos-test-driver-docstrings.nix delete mode 100644 third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix create mode 100644 third_party/nixpkgs/nixos/modules/config/fonts/packages.nix rename third_party/nixpkgs/nixos/modules/hardware/{usb-wwan.nix => usb-modeswitch.nix} (69%) create mode 100644 third_party/nixpkgs/nixos/modules/image/amend-repart-definitions.py create mode 100644 third_party/nixpkgs/nixos/modules/image/repart.md create mode 100644 third_party/nixpkgs/nixos/modules/image/repart.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/ns-usbloader.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/oddjobd.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/databases/pgbouncer.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/bcg.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/evdevremapkeys.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/osquery.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/search/typesense.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/system/bpftune.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix create mode 100644 third_party/nixpkgs/nixos/modules/system/boot/systemd/sysupdate.nix create mode 100644 third_party/nixpkgs/nixos/tests/appliance-repart-image.nix create mode 100644 third_party/nixpkgs/nixos/tests/bpftune.nix create mode 100644 third_party/nixpkgs/nixos/tests/common/gpg-keyring.nix create mode 100644 third_party/nixpkgs/nixos/tests/curl-impersonate.nix create mode 100644 third_party/nixpkgs/nixos/tests/freshrss-http-auth.nix create mode 100644 third_party/nixpkgs/nixos/tests/installed-tests/upower.nix create mode 100644 third_party/nixpkgs/nixos/tests/installer/flake.nix create mode 100644 third_party/nixpkgs/nixos/tests/nginx-status-page.nix create mode 100644 third_party/nixpkgs/nixos/tests/nixos-test-driver/busybox.nix create mode 100644 third_party/nixpkgs/nixos/tests/osquery.nix create mode 100644 third_party/nixpkgs/nixos/tests/pgbouncer.nix create mode 100644 third_party/nixpkgs/nixos/tests/syncthing-no-settings.nix create mode 100644 third_party/nixpkgs/nixos/tests/systemd-sysupdate.nix create mode 100644 third_party/nixpkgs/nixos/tests/typesense.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/pianoteq/pianoteq.svg create mode 100644 third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/gridcoin-research/default.nix mode change 100644 => 100755 third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch create mode 100644 third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/py65/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch create mode 100644 third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/glabels-qt/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/xpano/skip_prefix_check.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/acpic/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/blender/draco.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/collision/collision-shards.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/collision/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/collision/make.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/hyprdim/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ipatool/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/mya/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/no-launch4j.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/onthespot/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/plots/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/pop/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/make.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/typer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/cross-compile.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json create mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/wrapper.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/carbons/default.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/msn-pecan/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/otr/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/pidgin-indicator/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/pidgin-latex/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/pidgin-mra/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/pidgin-opensteamworks/default.nix (95%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/pidgin-osd/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/pidgin-skypeweb/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/pidgin-xmpp-receipts/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-discord/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-facebook/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-googlechat/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-hangouts/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-lurch/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-matrix/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-mm-sms/default.nix (93%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-plugin-pack/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-signald/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-slack/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-vk-plugin/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/purple-xmpp-http-upload/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/sipe/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/tdlib-purple/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/tox-prpl/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/networking/instant-messengers/{ => pidgin}/pidgin-plugins/window-merge/default.nix (100%) delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff create mode 100644 third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/avoid-stack-overflow-for-lockfile-buf.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch create mode 100644 third_party/nixpkgs/pkgs/applications/office/notes/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/radio/pat/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/kingstvis/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/system/psitop/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/utf8proc.patch create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/video/asciicam/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/obs-studio/Provide-runtime-plugin-destination-as-relative-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/xine/lib.nix rename third_party/nixpkgs/pkgs/applications/video/{xine-ui/default.nix => xine/ui.nix} (50%) create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/wayfire/applications.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/fetch9front/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/fetchpijul/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/giturl.lock create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeCBin.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeScriptBin.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeShellScriptBin.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/writers/data.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/writers/scripts.nix create mode 100644 third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/icons/banana-cursor/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/themes/catppuccin-sddm-corners/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff create mode 100644 third_party/nixpkgs/pkgs/desktops/expidus/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json create mode 100644 third_party/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/lomiri/development/libusermetrics/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff create mode 100644 third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/otus-lisp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.56.8.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zig/setup-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.0.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.2.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/cereal/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gdal/tests.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gr-framework/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/hfst/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/hnswlib/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libspelling/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libvoikko/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch rename third_party/nixpkgs/pkgs/development/libraries/tclap/{default.nix => 1.2.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/libraries/tclap/1.4.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch create mode 100644 third_party/nixpkgs/pkgs/development/lua-modules/magick.patch create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/hashlib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/ws/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix create mode 100644 third_party/nixpkgs/pkgs/development/perl-modules/Data-UUID-CVE-2013-4184.patch create mode 100644 third_party/nixpkgs/pkgs/development/pharo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/vm/build-vm-legacy.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/vm/build-vm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/vm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/vm/share.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/vm/vms.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/wrapper/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/wrapper/magic delete mode 100644 third_party/nixpkgs/pkgs/development/pharo/wrapper/pharo-vm.sh create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/altgraph/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ansible-vault-rw/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/async-interrupt/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bcf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bcg/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bch/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-core/with-adapters.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{django_classytags => django-classy-tags}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_colorful => django-colorful}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_contrib_comments => django-contrib-comments}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_environ => django-environ}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_modelcluster => django-modelcluster}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_nose => django-nose}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_silk => django-silk}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_tagging => django-tagging}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{django_treebeard => django-treebeard}/default.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dokuwiki/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/duct-py/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/enochecker-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/flask-themes2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hid-parser/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hnswlib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hologram/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{jaraco_classes => jaraco-classes}/default.nix (96%) rename third_party/nixpkgs/pkgs/development/python-modules/{jaraco_collections => jaraco-collections}/default.nix (85%) rename third_party/nixpkgs/pkgs/development/python-modules/{jaraco_functools => jaraco-functools}/default.nix (89%) rename third_party/nixpkgs/pkgs/development/python-modules/{jaraco_itertools => jaraco-itertools}/default.nix (90%) rename third_party/nixpkgs/pkgs/development/python-modules/{jaraco_logging => jaraco-logging}/default.nix (100%) rename third_party/nixpkgs/pkgs/development/python-modules/{jaraco_stream => jaraco-stream}/default.nix (81%) rename third_party/nixpkgs/pkgs/development/python-modules/{jaraco_text => jaraco-text}/default.nix (89%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jsonable/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/librespot/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/macaddress/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mkdocs-linkcheck/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mqtt2influxdb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/music-tag/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mwcli/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mwtypes/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mwxml/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/nbconflux/setup-py.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ninja/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ninja/no-download.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/numpy/disable-failing-long-double-test-Rosetta-2.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/omorfi/importfix.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/onnxmltools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/paddle-bfloat/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/binary-hashes.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/para/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/piper-phonemize/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/py-expression-eval/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pymatting/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qudida/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rauth/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/reprshed/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sopel/python311-support.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ttstokenizer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{zope_component => zope-component}/default.nix (54%) delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/aapt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/api-linter/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff delete mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/fix-localtime-test.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/knit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/database/sqlboiler-crdb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/doc2go/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/enochecker-test/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/espup/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/fatcat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gen-license/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gi-crystal/src.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ilspycmd/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ilspycmd/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/jaq/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix rename third_party/nixpkgs/pkgs/development/tools/misc/ccache/{force-objdump-on-darwin.patch => fix-objdump-path.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/development/tools/qtcreator/qt6.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/rubyfmt/0002-remove-dependency-on-git.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/measureme/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/measureme/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/ra-multiplex/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/wasmserve/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch create mode 100644 third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/fteqw/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/fteqw/generic.nix create mode 100644 third_party/nixpkgs/pkgs/games/gambit/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/hheretic/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/hmcl/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/jfsw/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/stone-kingdoms/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/moonfire-nvr/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/9ptls/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/bpftune/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/fanout/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/fanout/remove_auto_mknod.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.3.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/oddjob/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/upower/installed-tests-path.patch create mode 100644 third_party/nixpkgs/pkgs/servers/ebusd/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/ebusd/patches/ebusd-cmake.patch create mode 100644 third_party/nixpkgs/pkgs/servers/mail/mox/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mail/mox/version.patch rename third_party/nixpkgs/pkgs/servers/{kanidm => mail/stalwart}/Cargo.lock (61%) create mode 100644 third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/mastodon/update.nix create mode 100644 third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix create mode 100644 third_party/nixpkgs/pkgs/servers/misc/irrd/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff delete mode 100755 third_party/nixpkgs/pkgs/servers/monitoring/karma/generate-dependencies.sh delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/karma/node-composition.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/karma/node-env.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/karma/node-packages.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/karma/package.json create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-test.nix create mode 100644 third_party/nixpkgs/pkgs/servers/polaris/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/servers/polaris/node-composition.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix delete mode 100755 third_party/nixpkgs/pkgs/servers/polaris/update-web.sh delete mode 100755 third_party/nixpkgs/pkgs/servers/polaris/update.sh delete mode 100755 third_party/nixpkgs/pkgs/servers/psitransfer/generate.sh delete mode 100644 third_party/nixpkgs/pkgs/servers/psitransfer/node-composition.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.json delete mode 100644 third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.nix create mode 100644 third_party/nixpkgs/pkgs/servers/rustdesk-server/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/search/typesense/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/search/typesense/sources.json create mode 100755 third_party/nixpkgs/pkgs/servers/search/typesense/update.sh create mode 100644 third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix create mode 100644 third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json delete mode 100755 third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh create mode 100644 third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix delete mode 100644 third_party/nixpkgs/pkgs/test/haskell/writers/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/X11/kdocker/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/X11/xssstate/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/ibmcloud-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch rename third_party/nixpkgs/pkgs/{development/python-modules/piper-train/default.nix => tools/audio/piper/train.nix} (52%) create mode 100644 third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch create mode 100644 third_party/nixpkgs/pkgs/tools/compression/keka/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/disk-inventory-x/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/games/pokefinder/cstddef.patch create mode 100644 third_party/nixpkgs/pkgs/tools/games/pokefinder/set-desktop-file-name.patch create mode 100644 third_party/nixpkgs/pkgs/tools/games/slipstream/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix delete mode 100755 third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/generate.sh delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix delete mode 100755 third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/smartcrop/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/llm/gorilla-cli/default.nix rename third_party/nixpkgs/pkgs/tools/{misc => llm}/shell_gpt/default.nix (90%) create mode 100644 third_party/nixpkgs/pkgs/tools/misc/a4term/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/alt-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/eza/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/farge/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-packages.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/package-lock.json delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/fx_cast/package.json create mode 100644 third_party/nixpkgs/pkgs/tools/misc/ictree/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/kalker/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/tools/misc/mastotool/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/nanoemoji/fix-test.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/nanoemoji/test-pythonpath.patch delete mode 100755 third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-composition.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-packages.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/package.json create mode 100644 third_party/nixpkgs/pkgs/tools/misc/ollama/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/pc/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/shadowenv/Cargo.lock.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/valeronoi/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/circus/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.5.2-fix-shebangs.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/deps.nix create mode 100755 third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/update.sh create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ddns-go/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/dhcp/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/dhcp/set-hostname.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/remove-fetchcontent-usage.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/juicity/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/ntp/glibc-2.34-fix.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/pgrok/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/restish/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/wsl-vpnkit/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/nix/devour-flake/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/nix/web-devmode.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/bitwarden/cli.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/psudohash/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/gtop/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/osquery/Remove-circular-definition-of-AUDIT_FILTER_EXCLUDE.patch create mode 100644 third_party/nixpkgs/pkgs/tools/system/osquery/Remove-git-reset.patch create mode 100644 third_party/nixpkgs/pkgs/tools/system/osquery/Remove-system-controls-table.patch create mode 100644 third_party/nixpkgs/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch create mode 100644 third_party/nixpkgs/pkgs/tools/system/osquery/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/stacer/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/zx/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/text/markdown-pp/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/markscribe/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/pyp/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/tesh/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/to-html/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fix-implicit-int.patch create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/clapboard/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/hyprland-per-window-layout/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/waylogout/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 2ef607d0ff..98a7022088 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -196,6 +196,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/kea.nix @mweinelt /nixos/tests/knot.nix @mweinelt +# Web servers +/doc/builders/packages/nginx.section.md @raitobezarius +/pkgs/servers/http/nginx/ @raitobezarius +/nixos/modules/services/web-servers/nginx/ @raitobezarius + # Dhall /pkgs/development/dhall-modules @Gabriella439 @Profpatsch @ehmry /pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch @ehmry @@ -226,11 +231,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # VsCode Extensions /pkgs/applications/editors/vscode/extensions @jonringer -# Prometheus exporter modules and tests -/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz -/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz -/nixos/tests/prometheus-exporters.nix @WilliButz - # 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 @@ -308,3 +308,6 @@ nixos/lib/make-single-disk-zfs-image.nix @raitobezarius nixos/lib/make-multi-disk-zfs-image.nix @raitobezarius nixos/modules/tasks/filesystems/zfs.nix @raitobezarius nixos/tests/zfs.nix @raitobezarius + +# Linux Kernel +pkgs/os-specific/linux/kernel/manual-config.nix @amjoseph-nixpkgs diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index b2ec787313..4517080bb3 100644 --- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,11 @@ -###### Description of changes +## Description of changes -###### Things done +## Things done diff --git a/third_party/nixpkgs/.gitignore b/third_party/nixpkgs/.gitignore index b1018d44b8..b23460ec91 100644 --- a/third_party/nixpkgs/.gitignore +++ b/third_party/nixpkgs/.gitignore @@ -9,6 +9,7 @@ outputs/ result-* result +repl-result-* !pkgs/development/python-modules/result /doc/NEWS.html /doc/NEWS.txt diff --git a/third_party/nixpkgs/doc/builders/packages/ibus.section.md b/third_party/nixpkgs/doc/builders/packages/ibus.section.md index ec78cd0c9a..4eb74c0b69 100644 --- a/third_party/nixpkgs/doc/builders/packages/ibus.section.md +++ b/third_party/nixpkgs/doc/builders/packages/ibus.section.md @@ -34,5 +34,7 @@ The `ibus-engines.typing-booster` package contains a program named `emoji-picker On NixOS, it can be installed using the following expression: ```nix -{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; } +{ pkgs, ... }: { + fonts.packages = with pkgs; [ noto-fonts-emoji ]; +} ``` diff --git a/third_party/nixpkgs/doc/common.nix b/third_party/nixpkgs/doc/common.nix new file mode 100644 index 0000000000..56f723eb6b --- /dev/null +++ b/third_party/nixpkgs/doc/common.nix @@ -0,0 +1,4 @@ +{ + outputPath = "share/doc/nixpkgs"; + indexPath = "manual.html"; +} diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md index 03cd3dd458..eb9932d48b 100644 --- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md +++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md @@ -456,7 +456,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these owner = "NixOS"; repo = "nix"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - hash = "ha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ="; + hash = "sha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ="; } ``` diff --git a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md index a732eee4b9..557473555f 100644 --- a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md +++ b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md @@ -1,28 +1,24 @@ # Contributing to this documentation {#chap-contributing} -The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. The manual is still partially written in DocBook but it is progressively being converted to [Markdown](#sec-contributing-markup). +The sources of the Nixpkgs manual are in the [doc](https://github.com/NixOS/nixpkgs/tree/master/doc) subdirectory of the Nixpkgs repository. -You can quickly check your edits with `make`: +You can quickly check your edits with `nix-build`: ```ShellSession -$ cd /path/to/nixpkgs/doc -$ nix-shell -[nix-shell]$ make -``` - -If you experience problems, run `make debug` to help understand the docbook errors. - -After making modifications to the manual, it's important to build it before committing. You can do that as follows: - -```ShellSession -$ cd /path/to/nixpkgs/doc -$ nix-shell -[nix-shell]$ make clean -[nix-shell]$ nix-build . +$ cd /path/to/nixpkgs +$ nix-build doc ``` If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`. +## devmode {#sec-contributing-devmode} + +The shell in the manual source directory makes available a command, `devmode`. +It is a daemon, that: +1. watches the manual's source for changes and when they occur — rebuilds +2. HTTP serves the manual, injecting a script that triggers reload on changes +3. opens the manual in the default browser + ## Syntax {#sec-contributing-markup} As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. @@ -114,5 +110,3 @@ Additional syntax extensions are available, all of which can be used in NixOS op > > watermelon > : green fruit with red flesh - -For contributing to the legacy parts, please see [DocBook: The Definitive Guide](https://tdg.docbook.org/) or the [DocBook rocks! primer](https://web.archive.org/web/20200816233747/https://docbook.rocks/). diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix index 8efa406ec1..f4270ae856 100644 --- a/third_party/nixpkgs/doc/default.nix +++ b/third_party/nixpkgs/doc/default.nix @@ -3,6 +3,8 @@ let inherit (pkgs) lib; inherit (lib) hasPrefix removePrefix; + common = import ./common.nix; + lib-docs = import ./doc-support/lib-function-docs.nix { inherit pkgs nixpkgs; libsets = [ @@ -132,15 +134,15 @@ in pkgs.stdenv.mkDerivation { ''; installPhase = '' - dest="$out/share/doc/nixpkgs" + dest="$out/${common.outputPath}" mkdir -p "$(dirname "$dest")" mv out "$dest" - mv "$dest/index.html" "$dest/manual.html" + mv "$dest/index.html" "$dest/${common.indexPath}" cp ${epub} "$dest/nixpkgs-manual.epub" mkdir -p $out/nix-support/ - echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products + echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; } diff --git a/third_party/nixpkgs/doc/hooks/index.md b/third_party/nixpkgs/doc/hooks/index.md index c1e86a3033..602febaf9d 100644 --- a/third_party/nixpkgs/doc/hooks/index.md +++ b/third_party/nixpkgs/doc/hooks/index.md @@ -29,5 +29,6 @@ tetex-tex-live.section.md unzip.section.md validatePkgConfig.section.md waf.section.md +zig.section.md xcbuild.section.md ``` diff --git a/third_party/nixpkgs/doc/hooks/zig.section.md b/third_party/nixpkgs/doc/hooks/zig.section.md new file mode 100644 index 0000000000..78b8262f47 --- /dev/null +++ b/third_party/nixpkgs/doc/hooks/zig.section.md @@ -0,0 +1,59 @@ +# zigHook {#zighook} + +[Zig](https://ziglang.org/) is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software. + +In Nixpkgs, `zigHook` overrides the default build, check and install phases. + +## Example code snippet {#example-code-snippet} + +```nix +{ lib +, stdenv +, zigHook +}: + +stdenv.mkDerivation { + # . . . + + nativeBuildInputs = [ + zigHook + ]; + + zigBuildFlags = [ "-Dman-pages=true" ]; + + dontUseZigCheck = true; + + # . . . +} +``` + +## Variables controlling zigHook {#variables-controlling-zighook} + +### `dontUseZigBuild` {#dontUseZigBuild} + +Disables using `zigBuildPhase`. + +### `zigBuildFlags` {#zigBuildFlags} + +Controls the flags passed to the build phase. + +### `dontUseZigCheck` {#dontUseZigCheck} + +Disables using `zigCheckPhase`. + +### `zigCheckFlags` {#zigCheckFlags} + +Controls the flags passed to the check phase. + +### `dontUseZigInstall` {#dontUseZigInstall} + +Disables using `zigInstallPhase`. + +### `zigInstallFlags` {#zigInstallFlags} + +Controls the flags passed to the install phase. + +### Variables honored by zigHook {#variablesHonoredByZigHook} + +- `prefixKey` +- `dontAddPrefix` diff --git a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md index 6b19e02e74..b7f1f19546 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md @@ -12,8 +12,11 @@ compatible are available as well. For example, there can be a To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional ```nix -cudaSupport ? false -cudaPackages ? {} +{ config +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } +, ... +}: ``` When using `callPackage`, you can choose to pass in a different variant, e.g. diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md index cf18084142..7fd38a7d21 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md @@ -20,7 +20,7 @@ In the following is an example expression using `buildGoModule`, the following a To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. -- `modPostBuild`: Shell commands to run after the build of the go-modules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. +- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. ```nix pet = buildGoModule rec { @@ -115,7 +115,7 @@ done ## Attributes used by the builders {#ssec-go-common-attributes} -Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` go-modules fixed output derivation as well: +Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` goModules fixed output derivation as well: - [`sourceRoot`](#var-stdenv-sourceRoot) - [`prePatch`](#var-stdenv-prePatch) diff --git a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md index 3b5e2e14ee..7e287a097c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md @@ -4,6 +4,87 @@ Maven is a well-known build tool for the Java ecosystem however it has some chal The following provides a list of common patterns with how to package a Maven project (or any JVM language that can export to Maven) as a Nix package. +## Building a package using `maven.buildMavenPackage` {#maven-buildmavenpackage} + +Consider the following package: + +```nix +{ lib, fetchFromGitHub, jre, makeWrapper, maven }: + +maven.buildMavenPackage rec { + pname = "jd-cli"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "intoolswetrust"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; + }; + + mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo="; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/jd-cli + install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli + + makeWrapper ${jre}/bin/java $out/bin/jd-cli \ + --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + ''; + + meta = with lib; { + description = "Simple command line wrapper around JD Core Java Decompiler project"; + homepage = "https://github.com/intoolswetrust/jd-cli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ majiir ]; + }; +}: +``` + +This package calls `maven.buildMavenPackage` to do its work. The primary difference from `stdenv.mkDerivation` is the `mvnHash` variable, which is a hash of all of the Maven dependencies. + +::: {.tip} +After setting `maven.buildMavenPackage`, we then do standard Java `.jar` installation by saving the `.jar` to `$out/share/java` and then making a wrapper which allows executing that file; see [](#sec-language-java) for additional generic information about packaging Java applications. +::: + +### Stable Maven plugins {#stable-maven-plugins} + +Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. If your project does not override these versions, an upgrade of Maven will change the version of the used plugins, and therefore the derivation and hash. + +When `maven` is upgraded, `mvnHash` for the derivation must be updated as well: otherwise, the project will simply be built on the derivation of old plugins, and fail because the requested plugins are missing. + +This clearly prevents automatic upgrades of Maven: a manual effort must be made throughout nixpkgs by any maintainer wishing to push the upgrades. + +To make sure that your package does not add extra manual effort when upgrading Maven, explicitly define versions for all plugins. You can check if this is the case by adding the following plugin to your (parent) POM: + +```xml + + org.apache.maven.plugins + maven-enforcer-plugin + 3.3.0 + + + enforce-plugin-versions + + enforce + + + + + + + + + +``` + +## Manually using `mvn2nix` {#maven-mvn2nix} +::: {.warning} +This way is no longer recommended; see [](#maven-buildmavenpackage) for the simpler and preferred way. +::: + For the purposes of this example let's consider a very basic Maven project with the following `pom.xml` with a single dependency on [emoji-java](https://github.com/vdurmont/emoji-java). ```xml @@ -41,14 +122,11 @@ public class Main { } ``` -You find this demo project at https://github.com/fzakaria/nixos-maven-example +You find this demo project at [https://github.com/fzakaria/nixos-maven-example](https://github.com/fzakaria/nixos-maven-example). -## Solving for dependencies {#solving-for-dependencies} - -### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin} - -> ⚠️ Although `buildMaven` is the "blessed" way within nixpkgs, as of 2020, it hasn't seen much activity in quite a while. +### Solving for dependencies {#solving-for-dependencies} +#### buildMaven with NixOS/mvn2nix-maven-plugin {#buildmaven-with-nixosmvn2nix-maven-plugin} `buildMaven` is an alternative method that tries to follow similar patterns of other programming languages by generating a lock file. It relies on the maven plugin [mvn2nix-maven-plugin](https://github.com/NixOS/mvn2nix-maven-plugin). First you generate a `project-info.json` file using the maven plugin. @@ -105,9 +183,10 @@ The benefit over the _double invocation_ as we will see below, is that the _/nix │   ├── avalon-framework-4.1.3.jar -> /nix/store/iv5fp3955w3nq28ff9xfz86wvxbiw6n9-avalon-framework-4.1.3.jar ``` -### Double Invocation {#double-invocation} - -> ⚠️ This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing. +#### Double Invocation {#double-invocation} +::: {.note} +This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing. +::: The double invocation is a _simple_ way to get around the problem that `nix-build` may be sandboxed and have no Internet connectivity. @@ -115,7 +194,9 @@ It treats the entire Maven repository as a single source to be downloaded, relyi The first step will be to build the Maven project as a fixed-output derivation in order to collect the Maven repository -- below is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/double-invocation-repository.nix). -> Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory. +::: {.note} +Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory. +::: ```nix { lib, stdenv, maven }: @@ -147,7 +228,9 @@ stdenv.mkDerivation { The build will fail, and tell you the expected `outputHash` to place. When you've set the hash, the build will return with a `/nix/store` entry whose contents are the full Maven repository. -> Some additional files are deleted that would cause the output hash to change potentially on subsequent runs. +::: {.warning} +Some additional files are deleted that would cause the output hash to change potentially on subsequent runs. +::: ```bash ❯ tree $(nix-build --no-out-link double-invocation-repository.nix) | head @@ -165,40 +248,7 @@ The build will fail, and tell you the expected `outputHash` to place. When you'v If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a strong likelihood that over-time your output hash will change since the resolved dependencies may change. Hence this method is less recommended then using `buildMaven`. -#### Stable Maven plugins {#stable-maven-plugins} - -Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. -If your project does not override these versions, an upgrade of Maven will change the version of the used plugins. -This changes the output of the first invocation and the plugins required by the second invocation. -However, since a hash is given for the output of the first invocation, the second invocation will simply fail -because the requested plugins are missing. -This will prevent automatic upgrades of Maven: the manual fix for this is to change the hash of the first invocation. - -To make sure that your package does not add manual effort when upgrading Maven, explicitly define versions for all -plugins. You can check if this is the case by adding the following plugin to your (parent) POM: - -```xml - - org.apache.maven.plugins - maven-enforcer-plugin - 3.3.0 - - - enforce-plugin-versions - - enforce - - - - - - - - - -``` - -## Building a JAR {#building-a-jar} +### Building a JAR {#building-a-jar} Regardless of which strategy is chosen above, the step to build the derivation is the same. @@ -224,7 +274,9 @@ in stdenv.mkDerivation rec { } ``` -> We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment. +::: {.tip} +We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment. +::: ```bash ❯ tree $(nix-build --no-out-link build-jar.nix) @@ -236,7 +288,7 @@ in stdenv.mkDerivation rec { 2 directories, 1 file ``` -## Runnable JAR {#runnable-jar} +### Runnable JAR {#runnable-jar} The previous example builds a `jar` file but that's not a file one can run. @@ -248,9 +300,9 @@ We will use the same repository we built above (either _double invocation_ or _b The following two methods are more suited to Nix then building an [UberJar](https://imagej.net/Uber-JAR) which may be the more traditional approach. -### CLASSPATH {#classpath} +#### CLASSPATH {#classpath} -> This is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`. +This method is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`. We will read the Maven repository and flatten it to a single list. This list will then be concatenated with the _CLASSPATH_ separator to create the full classpath. @@ -288,9 +340,9 @@ in stdenv.mkDerivation rec { } ``` -### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin} +#### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin} -> This is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it. +This method is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it. Augment the `pom.xml` to create a JAR with the following manifest: @@ -366,8 +418,9 @@ in stdenv.mkDerivation rec { ''; } ``` - -> Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application. +::: {.note} +Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application. +::: This will give you an executable shell-script that launches your JAR with all the dependencies available. diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 23c8526787..947ce60286 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -1514,11 +1514,11 @@ Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is in ### Tools {#tools} -Packages inside nixpkgs are written by hand. However many tools exist in -community to help save time. No tool is preferred at the moment. +Packages inside nixpkgs must use the `buildPythonPackage` or `buildPythonApplication` function directly, +because we can only provide security support for non-vendored dependencies. -- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools) -- [poetry2nix](https://github.com/nix-community/poetry2nix) +We recommend [nix-init](https://github.com/nix-community/nix-init) for creating new python packages within nixpkgs, +as it already prefetches the source, parses dependencies for common formats and prefills most things in `meta`. ### Deterministic builds {#deterministic-builds} diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 7d46bdbd4d..0873802644 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; license = licenses.unlicense; - maintainers = [ maintainers.tailhook ]; + maintainers = []; }; } ``` @@ -558,7 +558,7 @@ buildPythonPackage rec { hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY="; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ cargo @@ -926,7 +926,7 @@ rustPlatform.buildRustPackage rec { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ mit unlicense ]; - maintainers = with maintainers; [ tailhook ]; + maintainers = with maintainers; []; }; } ``` diff --git a/third_party/nixpkgs/doc/shell.nix b/third_party/nixpkgs/doc/shell.nix new file mode 100644 index 0000000000..d71e3f3a70 --- /dev/null +++ b/third_party/nixpkgs/doc/shell.nix @@ -0,0 +1,20 @@ +let + pkgs = import ../. { + config = {}; + overlays = []; + }; + + common = import ./common.nix; + inherit (common) outputPath indexPath; + + web-devmode = import ../pkgs/tools/nix/web-devmode.nix { + inherit pkgs; + buildArgs = "./."; + open = "/${outputPath}/${indexPath}"; + }; +in + pkgs.mkShell { + packages = [ + web-devmode + ]; + } diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md index e626e79429..f6da0bb84b 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md @@ -70,7 +70,7 @@ A list of the maintainers of this Nix expression. Maintainers are defined in [`n ### `mainProgram` {#var-meta-mainProgram} -The name of the main binary for the package. This affects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"` +The name of the main binary for the package. This affects the binary `nix run` executes. Example: `"rg"` ### `priority` {#var-meta-priority} diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index a0f81b97f6..4e8559467f 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -614,14 +614,19 @@ The list of source files or directories to be unpacked or copied. One of these m ##### `sourceRoot` {#var-stdenv-sourceRoot} -After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory. Set `sourceRoot = ".";` if you use `srcs` and control the unpack phase yourself. +After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSourceRoot` are set, `unpackPhase` of the generic builder checks that the unpacking produced a single directory and moves the current working directory into it. -By default the `sourceRoot` is set to `"source"`. If you want to point to a sub-directory inside your project, you therefore need to set `sourceRoot = "source/my-sub-directory"`. +If `unpackPhase` produces multiple source directories, you should set `sourceRoot` to the name of the intended directory. +You can also set `sourceRoot = ".";` if you want to control it yourself in a later phase. + +For example, if your want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`. ##### `setSourceRoot` {#var-stdenv-setSourceRoot} Alternatively to setting `sourceRoot`, you can set `setSourceRoot` to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set `sourceRoot`. +For example, if you are using `fetchurl` on an archive file that gets unpacked into a single directory the name of which changes between package versions, and you want your build to start in its sub-directory, you need to set `setSourceRoot = "sourceRoot=$(echo */my-sub-directory)";`, or in the case of multiple sources, you could use something more specific, like `setSourceRoot = "sourceRoot=$(echo ${pname}-*/my-sub-directory)";`. + ##### `preUnpack` {#var-stdenv-preUnpack} Hook executed at the start of the unpack phase. diff --git a/third_party/nixpkgs/lib/README.md b/third_party/nixpkgs/lib/README.md new file mode 100644 index 0000000000..ac7cbd4330 --- /dev/null +++ b/third_party/nixpkgs/lib/README.md @@ -0,0 +1,73 @@ +# Nixpkgs lib + +This directory contains the implementation, documentation and tests for the Nixpkgs `lib` library. + +## Overview + +The evaluation entry point for `lib` is [`default.nix`](default.nix). +This file evaluates to an attribute set containing two separate kinds of attributes: +- Sub-libraries: + Attribute sets grouping together similar functionality. + Each sub-library is defined in a separate file usually matching its attribute name. + + Example: `lib.lists` is a sub-library containing list-related functionality such as `lib.lists.take` and `lib.lists.imap0`. + These are defined in the file [`lists.nix`](lists.nix). + +- Aliases: + Attributes that point to an attribute of the same name in some sub-library. + + Example: `lib.take` is an alias for `lib.lists.take`. + +Most files in this directory are definitions of sub-libraries, but there are a few others: +- [`minver.nix`](minver.nix): A string of the minimum version of Nix that is required to evaluate Nixpkgs. +- [`tests`](tests): Tests, see [Running tests](#running-tests) + - [`release.nix`](tests/release.nix): A derivation aggregating all tests + - [`misc.nix`](tests/misc.nix): Evaluation unit tests for most sub-libraries + - `*.sh`: Bash scripts that run tests for specific sub-libraries + - All other files in this directory exist to support the tests +- [`systems`](systems): The `lib.systems` sub-library, structured into a directory instead of a file due to its complexity +- [`path`](path): The `lib.path` sub-library, which includes tests as well as a document describing the design goals of `lib.path` +- All other files in this directory are sub-libraries + +### Module system + +The [module system](https://nixos.org/manual/nixpkgs/#module-system) spans multiple sub-libraries: +- [`modules.nix`](modules.nix): `lib.modules` for the core functions and anything not relating to option definitions +- [`options.nix`](options.nix): `lib.options` for anything relating to option definitions +- [`types.nix`](types.nix): `lib.types` for module system types + +## Reference documentation + +Reference documentation for library functions is written above each function as a multi-line comment. +These comments are processed using [nixdoc](https://github.com/nix-community/nixdoc) and [rendered in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#chap-functions). +The nixdoc README describes the [comment format](https://github.com/nix-community/nixdoc#comment-format). + +See the [chapter on contributing to the Nixpkgs manual](https://nixos.org/manual/nixpkgs/#chap-contributing) for how to build the manual. + +## Running tests + +All library tests can be run by building the derivation in [`tests/release.nix`](tests/release.nix): + +```bash +nix-build tests/release.nix +``` + +Some commands for quicker iteration over parts of the test suite are also available: + +```bash +# Run all evaluation unit tests in tests/misc.nix +# if the resulting list is empty, all tests passed +nix-instantiate --eval --strict tests/misc.nix + +# Run the module system tests +tests/modules.sh + +# Run the lib.sources tests +tests/sources.sh + +# Run the lib.filesystem tests +tests/filesystem.sh + +# Run the lib.path property tests +path/tests/prop.sh +``` diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index 0335146e2a..77e36d3271 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -738,6 +738,42 @@ rec { sets: zipAttrsWith (name: values: values) sets; + /* + Merge a list of attribute sets together using the `//` operator. + In case of duplicate attributes, values from later list elements take precedence over earlier ones. + The result is the same as `foldl mergeAttrs { }`, but the performance is better for large inputs. + For n list elements, each with an attribute set containing m unique attributes, the complexity of this operation is O(nm log n). + + Type: + mergeAttrsList :: [ Attrs ] -> Attrs + + Example: + mergeAttrsList [ { a = 0; b = 1; } { c = 2; d = 3; } ] + => { a = 0; b = 1; c = 2; d = 3; } + mergeAttrsList [ { a = 0; } { a = 1; } ] + => { a = 1; } + */ + mergeAttrsList = list: + let + # `binaryMerge start end` merges the elements at indices `index` of `list` such that `start <= index < end` + # Type: Int -> Int -> Attrs + binaryMerge = start: end: + # assert start < end; # Invariant + if end - start >= 2 then + # If there's at least 2 elements, split the range in two, recurse on each part and merge the result + # The invariant is satisfied because each half will have at least 1 element + binaryMerge start (start + (end - start) / 2) + // binaryMerge (start + (end - start) / 2) end + else + # Otherwise there will be exactly 1 element due to the invariant, in which case we just return it directly + elemAt list start; + in + if list == [ ] then + # Calling binaryMerge as below would not satisfy its invariant + { } + else + binaryMerge 0 (length list); + /* Does the same as the update operator '//' except that attributes are merged until the given predicate is verified. The predicate should diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix index a2dddedd2d..c37be1942d 100644 --- a/third_party/nixpkgs/lib/generators.nix +++ b/third_party/nixpkgs/lib/generators.nix @@ -81,9 +81,10 @@ rec { */ toKeyValue = { mkKeyValue ? mkKeyValueDefault {} "=", - listsAsDuplicateKeys ? false + listsAsDuplicateKeys ? false, + indent ? "" }: - let mkLine = k: v: mkKeyValue k v + "\n"; + let mkLine = k: v: indent + mkKeyValue k v + "\n"; mkLines = if listsAsDuplicateKeys then k: v: map (mkLine k) (if lib.isList v then v else [v]) else k: v: [ (mkLine k v) ]; diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index ee71488263..599e8ee53c 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -657,6 +657,13 @@ in mkLicense lset) ({ redistributable = true; }; + hl3 = { + fullName = "Hippocratic License v3.0"; + url = "https://firstdonoharm.dev/version/3/0/core.txt"; + free = false; + redistributable = true; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index 5d9af0cf71..3e058b3f1a 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -3,7 +3,7 @@ { lib }: let inherit (lib.strings) toInt; - inherit (lib.trivial) compare min; + inherit (lib.trivial) compare min id; inherit (lib.attrsets) mapAttrs; in rec { @@ -180,18 +180,18 @@ rec { else if len != 1 then multiple else head found; - /* Find the first element in the list matching the specified + /* Find the first index in the list matching the specified predicate or return `default` if no such element exists. - Type: findFirst :: (a -> bool) -> a -> [a] -> a + Type: findFirstIndex :: (a -> Bool) -> b -> [a] -> (Int | b) Example: - findFirst (x: x > 3) 7 [ 1 6 4 ] - => 6 - findFirst (x: x > 9) 7 [ 1 6 4 ] - => 7 + findFirstIndex (x: x > 3) null [ 0 6 4 ] + => 1 + findFirstIndex (x: x > 9) null [ 0 6 4 ] + => null */ - findFirst = + findFirstIndex = # Predicate pred: # Default value to return @@ -229,7 +229,33 @@ rec { if resultIndex < 0 then default else - elemAt list resultIndex; + resultIndex; + + /* Find the first element in the list matching the specified + predicate or return `default` if no such element exists. + + Type: findFirst :: (a -> bool) -> a -> [a] -> a + + Example: + findFirst (x: x > 3) 7 [ 1 6 4 ] + => 6 + findFirst (x: x > 9) 7 [ 1 6 4 ] + => 7 + */ + findFirst = + # Predicate + pred: + # Default value to return + default: + # Input list + list: + let + index = findFirstIndex pred null list; + in + if index == null then + default + else + elemAt list index; /* Return true if function `pred` returns true for at least one element of `list`. @@ -637,6 +663,32 @@ rec { else if start + count > len then len - start else count); + /* The common prefix of two lists. + + Type: commonPrefix :: [a] -> [a] -> [a] + + Example: + commonPrefix [ 1 2 3 4 5 6 ] [ 1 2 4 8 ] + => [ 1 2 ] + commonPrefix [ 1 2 3 ] [ 1 2 3 4 5 ] + => [ 1 2 3 ] + commonPrefix [ 1 2 3 ] [ 4 5 6 ] + => [ ] + */ + commonPrefix = + list1: + list2: + let + # Zip the lists together into a list of booleans whether each element matches + matchings = zipListsWith (fst: snd: fst != snd) list1 list2; + # Find the first index where the elements don't match, + # which will then also be the length of the common prefix. + # If all elements match, we fall back to the length of the zipped list, + # which is the same as the length of the smaller list. + commonPrefixLength = findFirstIndex id (length matchings) matchings; + in + take commonPrefixLength list1; + /* Return the last element of a list. This function throws an error if the list is empty. diff --git a/third_party/nixpkgs/lib/meta.nix b/third_party/nixpkgs/lib/meta.nix index 5fd55c4e90..21404b3a2b 100644 --- a/third_party/nixpkgs/lib/meta.nix +++ b/third_party/nixpkgs/lib/meta.nix @@ -132,10 +132,9 @@ rec { { shortName = licstr; } ); - /* Get the path to the main program of a derivation with either - meta.mainProgram or pname or name + /* Get the path to the main program of a package based on meta.mainProgram - Type: getExe :: derivation -> string + Type: getExe :: package -> string Example: getExe pkgs.hello @@ -144,5 +143,9 @@ rec { => "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache" */ getExe = x: - "${lib.getBin x}/bin/${x.meta.mainProgram or (lib.getName x)}"; + "${lib.getBin x}/bin/${x.meta.mainProgram or ( + # This could be turned into an error when 23.05 is at end of life + lib.warn "getExe: Package ${lib.strings.escapeNixIdentifier x.meta.name or x.pname or x.name} does not have the meta.mainProgram attribute. We'll assume that the main program has the same name for now, but this behavior is deprecated, because it leads to surprising errors when the assumption does not hold. If the package has a main program, please set `meta.mainProgram` in its definition to make this warning go away. Otherwise, if the package does not have a main program, or if you don't control its definition, specify the full path to the program, such as \"\${lib.getBin foo}/bin/bar\"." + lib.getName x + )}"; } diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index f16df20425..4966619f66 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -639,7 +639,7 @@ let unmatchedDefns = []; } else if optionDecls != [] then - if all (x: x.options.type.name == "submodule") optionDecls + if all (x: x.options.type.name or null == "submodule") optionDecls # Raw options can only be merged into submodules. Merging into # attrsets might be nice, but ambiguous. Suppose we have # attrset as a `attrsOf submodule`. User declares option diff --git a/third_party/nixpkgs/lib/path/README.md b/third_party/nixpkgs/lib/path/README.md index 87e552d120..89eec18b11 100644 --- a/third_party/nixpkgs/lib/path/README.md +++ b/third_party/nixpkgs/lib/path/README.md @@ -187,6 +187,27 @@ Decision: All functions remove trailing slashes in their results. +### Prefer returning subpaths over components +[subpath-preference]: #prefer-returning-subpaths-over-components + +Observing: Functions could return subpaths or lists of path component strings. + +Considering: Subpaths are used as inputs for some functions. Using them for outputs, too, makes the library more consistent and composable. + +Decision: Subpaths should be preferred over list of path component strings. + +
+Arguments + +- (+) It is consistent with functions accepting subpaths, making the library more composable +- (-) It is less efficient when the components are needed, because after creating the normalised subpath string, it will have to be parsed into components again + - (+) If necessary, we can still make it faster by adding builtins to Nix + - (+) Alternatively if necessary, versions of these functions that return components could later still be introduced. +- (+) It makes the path library simpler because there's only two types (paths and subpaths). Only `lib.path.subpath.components` can be used to get a list of components. + And once we have a list of component strings, `lib.lists` and `lib.strings` can be used to operate on them. + For completeness, `lib.path.subpath.join` allows converting the list of components back to a subpath. +
+ ## Other implementations and references - [Rust](https://doc.rust-lang.org/std/path/struct.Path.html) diff --git a/third_party/nixpkgs/lib/path/default.nix b/third_party/nixpkgs/lib/path/default.nix index 936e9b0302..5c6c5f6089 100644 --- a/third_party/nixpkgs/lib/path/default.nix +++ b/third_party/nixpkgs/lib/path/default.nix @@ -20,6 +20,7 @@ let concatMap foldl' take + drop ; inherit (lib.strings) @@ -217,9 +218,110 @@ in /* No rec! Add dependencies on this file at the top. */ { second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; take (length path1Deconstructed.components) path2Deconstructed.components == path1Deconstructed.components; + /* + Remove the first path as a component-wise prefix from the second path. + The result is a normalised subpath string, see `lib.path.subpath.normalise`. + + Laws: + + - Inverts `append` for normalised subpaths: + + removePrefix p (append p s) == subpath.normalise s + + Type: + removePrefix :: Path -> Path -> String + + Example: + removePrefix /foo /foo/bar/baz + => "./bar/baz" + removePrefix /foo /foo + => "./." + removePrefix /foo/bar /foo + => + removePrefix /. /foo + => "./foo" + */ + removePrefix = + path1: + assert assertMsg + (isPath path1) + "lib.path.removePrefix: First argument is of type ${typeOf path1}, but a path was expected."; + let + path1Deconstructed = deconstructPath path1; + path1Length = length path1Deconstructed.components; + in + path2: + assert assertMsg + (isPath path2) + "lib.path.removePrefix: Second argument is of type ${typeOf path2}, but a path was expected."; + let + path2Deconstructed = deconstructPath path2; + success = take path1Length path2Deconstructed.components == path1Deconstructed.components; + components = + if success then + drop path1Length path2Deconstructed.components + else + throw '' + lib.path.removePrefix: The first path argument "${toString path1}" is not a component-wise prefix of the second path argument "${toString path2}".''; + in + assert assertMsg + (path1Deconstructed.root == path2Deconstructed.root) '' + lib.path.removePrefix: Filesystem roots must be the same for both paths, but paths with different roots were given: + first argument: "${toString path1}" with root "${toString path1Deconstructed.root}" + second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; + joinRelPath components; + + /* + Split the filesystem root from a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path). + The result is an attribute set with these attributes: + - `root`: The filesystem root of the path, meaning that this directory has no parent directory. + - `subpath`: The [normalised subpath string](#function-library-lib.path.subpath.normalise) that when [appended](#function-library-lib.path.append) to `root` returns the original path. + + Laws: + - [Appending](#function-library-lib.path.append) the `root` and `subpath` gives the original path: + + p == + append + (splitRoot p).root + (splitRoot p).subpath + + - Trying to get the parent directory of `root` using [`readDir`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readDir) returns `root` itself: + + dirOf (splitRoot p).root == (splitRoot p).root + + Type: + splitRoot :: Path -> { root :: Path, subpath :: String } + + Example: + splitRoot /foo/bar + => { root = /.; subpath = "./foo/bar"; } + + splitRoot /. + => { root = /.; subpath = "./."; } + + # Nix neutralises `..` path components for all path values automatically + splitRoot /foo/../bar + => { root = /.; subpath = "./bar"; } + + splitRoot "/foo/bar" + => + */ + splitRoot = path: + assert assertMsg + (isPath path) + "lib.path.splitRoot: Argument is of type ${typeOf path}, but a path was expected"; + let + deconstructed = deconstructPath path; + in { + root = deconstructed.root; + subpath = joinRelPath deconstructed.components; + }; /* Whether a value is a valid subpath string. + A subpath string points to a specific file or directory within an absolute base directory. + It is a stricter form of a relative path that excludes `..` components, since those could escape the base directory. + - The value is a string - The string is not empty @@ -336,6 +438,37 @@ in /* No rec! Add dependencies on this file at the top. */ { ${subpathInvalidReason path}'' ) 0 subpaths; + /* + Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings. + Throw an error if the subpath isn't valid. + Note that the returned path components are also valid subpath strings, though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise). + + Laws: + + - Splitting a subpath into components and [joining](#function-library-lib.path.subpath.join) the components gives the same subpath but [normalised](#function-library-lib.path.subpath.normalise): + + subpath.join (subpath.components s) == subpath.normalise s + + Type: + subpath.components :: String -> [ String ] + + Example: + subpath.components "." + => [ ] + + subpath.components "./foo//bar/./baz/" + => [ "foo" "bar" "baz" ] + + subpath.components "/foo" + => + */ + subpath.components = + subpath: + assert assertMsg (isValid subpath) '' + lib.path.subpath.components: Argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + splitRelPath subpath; + /* Normalise a subpath. Throw an error if the subpath isn't valid, see `lib.path.subpath.isValid` diff --git a/third_party/nixpkgs/lib/path/tests/prop.sh b/third_party/nixpkgs/lib/path/tests/prop.sh index 9fea521577..f321fdf1cf 100755 --- a/third_party/nixpkgs/lib/path/tests/prop.sh +++ b/third_party/nixpkgs/lib/path/tests/prop.sh @@ -1,9 +1,12 @@ #!/usr/bin/env bash -# Property tests for the `lib.path` library -# +# Property tests for lib/path/default.nix # It generates random path-like strings and runs the functions on # them, checking that the expected laws of the functions hold +# Run: +# [nixpkgs]$ lib/path/tests/prop.sh +# or: +# [nixpkgs]$ nix-build lib/tests/release.nix set -euo pipefail shopt -s inherit_errexit diff --git a/third_party/nixpkgs/lib/path/tests/unit.nix b/third_party/nixpkgs/lib/path/tests/unit.nix index 9c5b752cf6..bad6560f13 100644 --- a/third_party/nixpkgs/lib/path/tests/unit.nix +++ b/third_party/nixpkgs/lib/path/tests/unit.nix @@ -3,7 +3,7 @@ { libpath }: let lib = import libpath; - inherit (lib.path) hasPrefix append subpath; + inherit (lib.path) hasPrefix removePrefix append splitRoot subpath; cases = lib.runTests { # Test examples from the lib.path.append documentation @@ -57,6 +57,40 @@ let expected = true; }; + testRemovePrefixExample1 = { + expr = removePrefix /foo /foo/bar/baz; + expected = "./bar/baz"; + }; + testRemovePrefixExample2 = { + expr = removePrefix /foo /foo; + expected = "./."; + }; + testRemovePrefixExample3 = { + expr = (builtins.tryEval (removePrefix /foo/bar /foo)).success; + expected = false; + }; + testRemovePrefixExample4 = { + expr = removePrefix /. /foo; + expected = "./foo"; + }; + + testSplitRootExample1 = { + expr = splitRoot /foo/bar; + expected = { root = /.; subpath = "./foo/bar"; }; + }; + testSplitRootExample2 = { + expr = splitRoot /.; + expected = { root = /.; subpath = "./."; }; + }; + testSplitRootExample3 = { + expr = splitRoot /foo/../bar; + expected = { root = /.; subpath = "./bar"; }; + }; + testSplitRootExample4 = { + expr = (builtins.tryEval (splitRoot "/foo/bar")).success; + expected = false; + }; + # Test examples from the lib.path.subpath.isValid documentation testSubpathIsValidExample1 = { expr = subpath.isValid null; @@ -204,6 +238,19 @@ let expr = (builtins.tryEval (subpath.normalise "..")).success; expected = false; }; + + testSubpathComponentsExample1 = { + expr = subpath.components "."; + expected = [ ]; + }; + testSubpathComponentsExample2 = { + expr = subpath.components "./foo//bar/./baz/"; + expected = [ "foo" "bar" "baz" ]; + }; + testSubpathComponentsExample3 = { + expr = (builtins.tryEval (subpath.components "/foo")).success; + expected = false; + }; }; in if cases == [] then "Unit tests successful" diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index a3462d2d42..40a2c88f32 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -85,17 +85,18 @@ rec { # is why we use the more obscure "bfd" and not "binutils" for this # choice. else "bfd"; - extensions = rec { - sharedLibrary = assert final.hasSharedLibraries; - /**/ if final.isDarwin then ".dylib" + extensions = lib.optionalAttrs final.hasSharedLibraries { + sharedLibrary = + if final.isDarwin then ".dylib" else if final.isWindows then ".dll" else ".so"; + } // { staticLibrary = /**/ if final.isWindows then ".lib" else ".a"; library = - /**/ if final.isStatic then staticLibrary - else sharedLibrary; + /**/ if final.isStatic then final.extensions.staticLibrary + else final.extensions.sharedLibrary; executable = /**/ if final.isWindows then ".exe" else ""; diff --git a/third_party/nixpkgs/lib/systems/platforms.nix b/third_party/nixpkgs/lib/systems/platforms.nix index 0b6a9f3891..d2e8f77bec 100644 --- a/third_party/nixpkgs/lib/systems/platforms.nix +++ b/third_party/nixpkgs/lib/systems/platforms.nix @@ -213,7 +213,6 @@ rec { bluefield2 = { gcc = { arch = "armv8-a+fp+simd+crc+crypto"; - cpu = "cortex-a72"; }; }; diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index ce980436c1..887ea39a08 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -1,6 +1,18 @@ -# to run these tests: -# nix-instantiate --eval --strict nixpkgs/lib/tests/misc.nix -# if the resulting list is empty, all tests passed +/* +Nix evaluation tests for various lib functions. + +Since these tests are implemented with Nix evaluation, error checking is limited to what `builtins.tryEval` can detect, which is `throw`'s and `abort`'s, without error messages. +If you need to test error messages or more complex evaluations, see ./modules.sh, ./sources.sh or ./filesystem.sh as examples. + +To run these tests: + + [nixpkgs]$ nix-instantiate --eval --strict lib/tests/misc.nix + +If the resulting list is empty, all tests passed. +Alternatively, to run all `lib` tests: + + [nixpkgs]$ nix-build lib/tests/release.nix +*/ with import ../default.nix; let @@ -488,6 +500,39 @@ runTests { expected = { a = [ 2 3 ]; b = [7]; c = [8];}; }; + testListCommonPrefixExample1 = { + expr = lists.commonPrefix [ 1 2 3 4 5 6 ] [ 1 2 4 8 ]; + expected = [ 1 2 ]; + }; + testListCommonPrefixExample2 = { + expr = lists.commonPrefix [ 1 2 3 ] [ 1 2 3 4 5 ]; + expected = [ 1 2 3 ]; + }; + testListCommonPrefixExample3 = { + expr = lists.commonPrefix [ 1 2 3 ] [ 4 5 6 ]; + expected = [ ]; + }; + testListCommonPrefixEmpty = { + expr = lists.commonPrefix [ ] [ 1 2 3 ]; + expected = [ ]; + }; + testListCommonPrefixSame = { + expr = lists.commonPrefix [ 1 2 3 ] [ 1 2 3 ]; + expected = [ 1 2 3 ]; + }; + testListCommonPrefixLazy = { + expr = lists.commonPrefix [ 1 ] [ 1 (abort "lib.lists.commonPrefix shouldn't evaluate this")]; + expected = [ 1 ]; + }; + # This would stack overflow if `commonPrefix` were implemented using recursion + testListCommonPrefixLong = + let + longList = genList (n: n) 100000; + in { + expr = lists.commonPrefix longList longList; + expected = longList; + }; + testSort = { expr = sort builtins.lessThan [ 40 2 30 42 ]; expected = [2 30 40 42]; @@ -518,45 +563,55 @@ runTests { expected = false; }; - testFindFirstExample1 = { - expr = findFirst (x: x > 3) 7 [ 1 6 4 ]; - expected = 6; + testFindFirstIndexExample1 = { + expr = lists.findFirstIndex (x: x > 3) (abort "index found, so a default must not be evaluated") [ 1 6 4 ]; + expected = 1; }; - testFindFirstExample2 = { - expr = findFirst (x: x > 9) 7 [ 1 6 4 ]; - expected = 7; + testFindFirstIndexExample2 = { + expr = lists.findFirstIndex (x: x > 9) "a very specific default" [ 1 6 4 ]; + expected = "a very specific default"; }; - testFindFirstEmpty = { - expr = findFirst (abort "when the list is empty, the predicate is not needed") null []; + testFindFirstIndexEmpty = { + expr = lists.findFirstIndex (abort "when the list is empty, the predicate is not needed") null []; expected = null; }; - testFindFirstSingleMatch = { - expr = findFirst (x: x == 5) null [ 5 ]; - expected = 5; + testFindFirstIndexSingleMatch = { + expr = lists.findFirstIndex (x: x == 5) null [ 5 ]; + expected = 0; }; - testFindFirstSingleDefault = { - expr = findFirst (x: false) null [ (abort "if the predicate doesn't access the value, it must not be evaluated") ]; + testFindFirstIndexSingleDefault = { + expr = lists.findFirstIndex (x: false) null [ (abort "if the predicate doesn't access the value, it must not be evaluated") ]; expected = null; }; - testFindFirstNone = { - expr = builtins.tryEval (findFirst (x: x == 2) null [ 1 (throw "the last element must be evaluated when there's no match") ]); + testFindFirstIndexNone = { + expr = builtins.tryEval (lists.findFirstIndex (x: x == 2) null [ 1 (throw "the last element must be evaluated when there's no match") ]); expected = { success = false; value = false; }; }; # Makes sure that the implementation doesn't cause a stack overflow - testFindFirstBig = { - expr = findFirst (x: x == 1000000) null (range 0 1000000); + testFindFirstIndexBig = { + expr = lists.findFirstIndex (x: x == 1000000) null (range 0 1000000); expected = 1000000; }; - testFindFirstLazy = { - expr = findFirst (x: x == 1) 7 [ 1 (abort "list elements after the match must not be evaluated") ]; - expected = 1; + testFindFirstIndexLazy = { + expr = lists.findFirstIndex (x: x == 1) null [ 1 (abort "list elements after the match must not be evaluated") ]; + expected = 0; + }; + + testFindFirstExample1 = { + expr = lists.findFirst (x: x > 3) 7 [ 1 6 4 ]; + expected = 6; + }; + + testFindFirstExample2 = { + expr = lists.findFirst (x: x > 9) 7 [ 1 6 4 ]; + expected = 7; }; # ATTRSETS @@ -609,6 +664,31 @@ runTests { }; }; + + testMergeAttrsListExample1 = { + expr = attrsets.mergeAttrsList [ { a = 0; b = 1; } { c = 2; d = 3; } ]; + expected = { a = 0; b = 1; c = 2; d = 3; }; + }; + testMergeAttrsListExample2 = { + expr = attrsets.mergeAttrsList [ { a = 0; } { a = 1; } ]; + expected = { a = 1; }; + }; + testMergeAttrsListExampleMany = + let + list = genList (n: + listToAttrs (genList (m: + let + # Integer divide n by two to create duplicate attributes + str = "halfn${toString (n / 2)}m${toString m}"; + in + nameValuePair str str + ) 100) + ) 100; + in { + expr = attrsets.mergeAttrsList list; + expected = foldl' mergeAttrs { } list; + }; + # code from the example testRecursiveUpdateUntil = { expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) { diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index 50f24c09ca..b933a24a57 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -1,7 +1,13 @@ #!/usr/bin/env bash -# + # This script is used to test that the module system is working as expected. +# Executing it runs tests for `lib.modules`, `lib.options` and `lib.types`. # By default it test the version of nixpkgs which is defined in the NIX_PATH. +# +# Run: +# [nixpkgs]$ lib/tests/modules.sh +# or: +# [nixpkgs]$ nix-build lib/tests/release.nix set -o errexit -o noclobber -o nounset -o pipefail shopt -s failglob inherit_errexit @@ -63,6 +69,28 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix +# Check that a module argument is passed, also when a default is available +# (but not needed) +# +# When the default is needed, we currently fail to do what the users expect, as +# we pass our own argument anyway, even if it *turns out* not to exist. +# +# The reason for this is that we don't know at invocation time what is in the +# _module.args option. That value is only available *after* all modules have been +# invoked. +# +# Hypothetically, Nix could help support this by giving access to the default +# values, through a new built-in function. +# However the default values are allowed to depend on other arguments, so those +# would have to be passed in somehow, making this not just a getter but +# something more complicated. +# +# At that point we have to wonder whether the extra complexity is worth the cost. +# Another - subjective - reason not to support it is that default values +# contradict the notion that an option has a single value, where _module.args +# is the option. +checkConfigOutput '^true$' config.result ./module-argument-default.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 @@ -365,6 +393,9 @@ checkConfigError \ config.set \ ./declare-set.nix ./declare-enable-nested.nix +# Check that that merging of option collisions doesn't depend on type being set +checkConfigError 'The option .group..*would be a parent of the following options, but its type .. does not support nested options.\n\s*- option.s. with prefix .group.enable..*' config.group.enable ./merge-typeless-option.nix + # Test that types.optionType merges types correctly checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix diff --git a/third_party/nixpkgs/lib/tests/modules/merge-typeless-option.nix b/third_party/nixpkgs/lib/tests/modules/merge-typeless-option.nix new file mode 100644 index 0000000000..627d90b15d --- /dev/null +++ b/third_party/nixpkgs/lib/tests/modules/merge-typeless-option.nix @@ -0,0 +1,25 @@ +{ lib, ... }: + +let + typeless = + { lib, ... }: + + { + options.group = lib.mkOption { }; + }; + childOfTypeless = + { lib, ... }: + + { + options.group.enable = lib.mkEnableOption "nothing"; + }; +in + +{ + imports = [ + typeless + childOfTypeless + ]; + + config.group.enable = false; +} diff --git a/third_party/nixpkgs/lib/tests/modules/module-argument-default.nix b/third_party/nixpkgs/lib/tests/modules/module-argument-default.nix new file mode 100644 index 0000000000..8dbb783e2d --- /dev/null +++ b/third_party/nixpkgs/lib/tests/modules/module-argument-default.nix @@ -0,0 +1,9 @@ +{ a ? false, lib, ... }: { + options = { + result = lib.mkOption {}; + }; + config = { + _module.args.a = true; + result = a; + }; +} diff --git a/third_party/nixpkgs/lib/tests/sources.sh b/third_party/nixpkgs/lib/tests/sources.sh index cda77aa96b..079c7eea56 100755 --- a/third_party/nixpkgs/lib/tests/sources.sh +++ b/third_party/nixpkgs/lib/tests/sources.sh @@ -1,4 +1,11 @@ #!/usr/bin/env bash + +# Tests lib/sources.nix +# Run: +# [nixpkgs]$ lib/tests/sources.sh +# or: +# [nixpkgs]$ nix-build lib/tests/release.nix + set -euo pipefail shopt -s inherit_errexit diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 5294d2e0e4..8a468301ea 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -418,6 +418,12 @@ githubId = 1250775; name = "Adolfo E. García Castro"; }; + adriandole = { + email = "adrian@dole.tech"; + github = "adriandole"; + githubId = 25236206; + name = "Adrian Dole"; + }; AdsonCicilioti = { name = "Adson Cicilioti"; email = "adson.cicilioti@live.com"; @@ -581,6 +587,12 @@ githubId = 1318982; name = "Anders Claesson"; }; + akechishiro = { + email = "akechishiro-aur+nixpkgs@lahfa.xyz"; + github = "AkechiShiro"; + githubId = 14914796; + name = "Samy Lahfa"; + }; a-kenji = { email = "aks.kenji@protonmail.com"; github = "a-kenji"; @@ -638,6 +650,13 @@ githubId = 82811; name = "Aldo Borrero"; }; + alejandrosame = { + email = "alejandrosanchzmedina@gmail.com"; + matrix = "@alejandrosame:matrix.org"; + github = "alejandrosame"; + githubId = 1078000; + name = "Alejandro Sánchez Medina"; + }; aleksana = { email = "me@aleksana.moe"; github = "Aleksanaa"; @@ -1148,6 +1167,9 @@ githubId = 48802534; name = "Anselm Schüler"; matrix = "@schuelermine:matrix.org"; + keys = [{ + fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955"; + }]; }; anthonyroussel = { email = "anthony@roussel.dev"; @@ -1237,6 +1259,12 @@ githubId = 30842467; name = "April John"; }; + aqrln = { + email = "nix@aqrln.net"; + github = "aqrln"; + githubId = 4923335; + name = "Alexey Orlenko"; + }; ar1a = { email = "aria@ar1as.space"; github = "ar1a"; @@ -1389,6 +1417,12 @@ githubId = 37193992; name = "Arthur Teisseire"; }; + arti5an = { + email = "artis4n@outlook.com"; + github = "arti5an"; + githubId = 14922630; + name = "Richard Smith"; + }; artturin = { email = "artturin@artturin.com"; matrix = "@artturin:matrix.org"; @@ -1499,6 +1533,13 @@ fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; }]; }; + atalii = { + email = "taliauster@gmail.com"; + github = "atalii"; + githubId = 120901234; + name = "tali auster"; + matrix = "@atalii:matrix.org"; + }; ataraxiasjel = { email = "nix@ataraxiadev.com"; github = "AtaraxiaSjel"; @@ -1691,6 +1732,13 @@ fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; }]; }; + azazak123 = { + email = "azazaka2002@gmail.com"; + matrix = "@ne_dvoeshnik:matrix.org"; + name = "Volodymyr Antonov"; + github = "azazak123"; + githubId = 50211158; + }; azd325 = { email = "tim.kleinschmidt@gmail.com"; github = "Azd325"; @@ -1730,6 +1778,12 @@ fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; }]; }; + babeuh = { + name = "Raphael Le Goaller"; + email = "babeuh@rlglr.fr"; + github = "babeuh"; + githubId = 60193302; + }; bachp = { email = "pascal.bach@nextrem.ch"; matrix = "@bachp:matrix.org"; @@ -2554,7 +2608,7 @@ }; cafkafk = { email = "christina@cafkafk.com"; - matrix = "@cafkafk:m.cafkafk.com"; + matrix = "@cafkafk:nixos.dev"; name = "Christina Sørensen"; github = "cafkafk"; githubId = 89321978; @@ -2563,7 +2617,7 @@ fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; } { - fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; + fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; } ]; }; @@ -2737,6 +2791,12 @@ githubId = 3471749; name = "Claudio Bley"; }; + cbourjau = { + email = "christianb@posteo.de"; + github = "cbourjau"; + githubId = 3288058; + name = "Christian Bourjau"; + }; cbrewster = { email = "cbrewster@hey.com"; github = "cbrewster"; @@ -2765,6 +2825,13 @@ githubId = 64804; name = "Dennis Gosnell"; }; + cdmistman = { + name = "Colton Donnelly"; + email = "colton@donn.io"; + matrix = "@donnellycolton:matrix.org"; + github = "cdmistman"; + githubId = 23486351; + }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; @@ -3864,6 +3931,12 @@ githubId = 75067; name = "Daniel Duan"; }; + de11n = { + email = "nixpkgs-commits@deshaw.com"; + github = "de11n"; + githubId = 130508846; + name = "Elliot Cameron"; + }; dearrude = { name = "Ebrahim Nejati"; email = "dearrude@tfwno.gf"; @@ -4108,6 +4181,12 @@ fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; }]; }; + dgollings = { + email = "daniel.gollings+nixpkgs@gmail.com"; + github = "dgollings"; + githubId = 2032823; + name = "Daniel Gollings"; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; @@ -4309,6 +4388,12 @@ githubId = 10998835; name = "Doron Behar"; }; + dotemup = { + email = "dotemup.designs+nixpkgs@gmail.com"; + github = "dotemup"; + githubId = 11077277; + name = "Dote"; + }; dotlambda = { email = "rschuetz17@gmail.com"; matrix = "@robert:funklause.de"; @@ -4400,6 +4485,13 @@ fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; }]; }; + DrSensor = { + name = "Fahmi Akbar Wildana"; + email = "sensorfied@gmail.com"; + matrix = "@drsensor:matrix.org"; + github = "DrSensor"; + githubId = 4953069; + }; drupol = { name = "Pol Dellaiera"; email = "pol.dellaiera@protonmail.com"; @@ -5312,6 +5404,12 @@ githubId = 4246921; name = "Florian Beeres"; }; + fd = { + email = "simon.menke@gmail.com"; + github = "fd"; + githubId = 591; + name = "Simon Menke"; + }; fdns = { email = "fdns02@gmail.com"; github = "fdns"; @@ -5601,6 +5699,12 @@ githubId = 84968; name = "Florian Paul Schmidt"; }; + fptje = { + email = "fpeijnenburg@gmail.com"; + github = "FPtje"; + githubId = 1202014; + name = "Falco Peijnenburg"; + }; fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; @@ -5756,6 +5860,11 @@ githubId = 17859309; name = "Fuzen"; }; + fwc = { + github = "fwc"; + githubId = 29337229; + name = "mtths"; + }; fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; @@ -5961,6 +6070,12 @@ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; + gerg-l = { + email = "gregleyda@proton.me"; + github = "Gerg-L"; + githubId = 88247690; + name = "Greg Leyda"; + }; geri1701 = { email = "geri@sdf.org"; github = "geri1701"; @@ -6011,6 +6126,15 @@ githubId = 127353; name = "Geoffrey Huntley"; }; + gigglesquid = { + email = "jack.connors@protonmail.com"; + github = "gigglesquid"; + githubId = 3685154; + name = "Jack connors"; + keys = [{ + fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; + }]; + }; gila = { email = "jeffry.molanus@gmail.com"; github = "gila"; @@ -6583,6 +6707,12 @@ githubId = 41522204; name = "hexchen"; }; + hexclover = { + email = "hexclover@outlook.com"; + github = "hexclover"; + githubId = 47456195; + name = "hexclover"; + }; heyimnova = { email = "git@heyimnova.dev"; github = "heyimnova"; @@ -7076,12 +7206,6 @@ fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; }]; }; - imsofi = { - email = "sofi+git@mailbox.org"; - github = "imsofi"; - githubId = 20756843; - name = "Sofi"; - }; imuli = { email = "i@imu.li"; github = "imuli"; @@ -7147,6 +7271,12 @@ fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; }]; }; + invokes-su = { + email = "nixpkgs-commits@deshaw.com"; + github = "invokes-su"; + githubId = 88038050; + name = "Souvik Sen"; + }; ionutnechita = { email = "ionut_n2001@yahoo.com"; github = "ionutnechita"; @@ -7622,6 +7752,13 @@ githubId = 1608697; name = "Jens Binkert"; }; + jeremiahs = { + email = "jeremiah@secrist.xyz"; + github = "JeremiahSecrist"; + githubId = 26032621; + matrix = "@jeremiahs:matrix.org"; + name = "Jeremiah Secrist"; + }; jeremyschlatter = { email = "github@jeremyschlatter.com"; github = "jeremyschlatter"; @@ -8247,6 +8384,12 @@ name = "John Soo"; githubId = 10039785; }; + jtbx = { + email = "jtbx@duck.com"; + name = "Jeremy Baxter"; + github = "jtbx"; + githubId = 92071952; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; @@ -8349,6 +8492,12 @@ githubId = 662666; name = "Justinas Stankevičius"; }; + justinlime = { + email = "justinlime1999@gmail.com"; + github = "justinlime"; + githubId = 119710965; + name = "Justin Fields"; + }; justinlovinger = { email = "git@justinlovinger.com"; github = "JustinLovinger"; @@ -8593,6 +8742,11 @@ githubId = 762421; name = "Pierre Thierry"; }; + keto = { + github = "TheRealKeto"; + githubId = 24854941; + name = "Keto"; + }; ketzacoatl = { email = "ketzacoatl@protonmail.com"; github = "ketzacoatl"; @@ -8631,6 +8785,12 @@ githubId = 546087; name = "Kristoffer K. Føllesdal"; }; + khaneliman = { + email = "khaneliman12@gmail.com"; + github = "khaneliman"; + githubId = 1778670; + name = "Austin Horstman"; + }; khaser = { email = "a-horohorin@mail.ru"; github = "khaser"; @@ -8866,6 +9026,12 @@ githubId = 3287933; name = "Josef Kemetmüller"; }; + knightpp = { + email = "knightpp@proton.me"; + github = "knightpp"; + githubId = 28928944; + name = "Danylo Kondratiev"; + }; knl = { email = "nikola@knezevic.co"; github = "knl"; @@ -8921,6 +9087,12 @@ githubId = 524268; name = "Koral"; }; + koralowiec = { + email = "qnlgzyrw@anonaddy.me"; + github = "koralowiec"; + githubId = 36413794; + name = "Arek Kalandyk"; + }; koslambrou = { email = "koslambrou@gmail.com"; github = "koslambrou"; @@ -9017,6 +9189,12 @@ githubId = 5759930; name = "Alexis Destrez"; }; + krupkat = { + github = "krupkat"; + githubId = 6817216; + name = "Tomas Krupka"; + matrix = "@krupkat:matrix.org"; + }; ktf = { email = "giulio.eulisse@cern.ch"; github = "ktf"; @@ -9091,6 +9269,12 @@ fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; }]; }; + l0b0 = { + email = "victor@engmark.name"; + github = "l0b0"; + githubId = 168301; + name = "Victor Engmark"; + }; l3af = { email = "L3afMeAlon3@gmail.com"; matrix = "@L3afMe:matrix.org"; @@ -9547,6 +9731,12 @@ fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; }]; }; + locochoco = { + email = "contact@locochoco.dev"; + github = "loco-choco"; + githubId = 58634087; + name = "Ivan Pancheniak"; + }; lodi = { email = "anthony.lodi@gmail.com"; github = "lodi"; @@ -9743,6 +9933,15 @@ githubId = 1168435; name = "Ludovic Courtès"; }; + ludovicopiero = { + email = "ludovicopiero@pm.me"; + github = "ludovicopiero"; + githubId = 44255157; + name = "Ludovico Piero"; + keys = [{ + fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C"; + }]; + }; lufia = { email = "lufia@lufia.org"; github = "lufia"; @@ -9770,6 +9969,15 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luisdaranda = { + email = "luisdomingoaranda@gmail.com"; + github = "propet"; + githubId = 8515861; + name = "Luis D. Aranda Sánchez"; + keys = [{ + fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; + }]; + }; luisnquin = { email = "lpaandres2020@gmail.com"; matrix = "@luisnquin:matrix.org"; @@ -9865,6 +10073,12 @@ githubId = 782440; name = "Luna Nova"; }; + lurkki = { + email = "jussi.kuokkanen@protonmail.com"; + github = "Lurkki14"; + githubId = 44469719; + name = "Jussi Kuokkanen"; + }; lux = { email = "lux@lux.name"; github = "luxzeitlos"; @@ -9976,6 +10190,16 @@ githubId = 93990818; name = "Madoura"; }; + maeve = { + email = "mrey@mailbox.org"; + matrix = "@maeve:catgirl.cloud"; + github = "m-rey"; + githubId = 42996147; + name = "Mæve"; + keys = [{ + fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; + }]; + }; mafo = { email = "Marc.Fontaine@gmx.de"; github = "MarcFontaine"; @@ -10132,6 +10356,13 @@ githubId = 105451387; name = "Maria"; }; + marie = { + email = "tabmeier12+nix@gmail.com"; + github = "nycodeghg"; + githubId = 37078297; + matrix = "@marie:marie.cologne"; + name = "Marie Ramlow"; + }; marijanp = { name = "Marijan Petričević"; email = "marijan.petricevic94@gmail.com"; @@ -10366,6 +10597,12 @@ fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; }]; }; + max-amb = { + email = "maxpeterambaum@gmail.com"; + github = "max-amb"; + githubId = 137820334; + name = "Max Ambaum"; + }; maxbrunet = { email = "max@brnt.mx"; github = "maxbrunet"; @@ -10509,12 +10746,6 @@ githubId = 10420834; name = "Mihai-Drosi Caju"; }; - mcbeth = { - email = "mcbeth@broggs.org"; - github = "mcbeth"; - githubId = 683809; - name = "Jeffrey Brent McBeth"; - }; mccurdyc = { email = "mccurdyc22@gmail.com"; github = "mccurdyc"; @@ -10718,6 +10949,16 @@ fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F"; }]; }; + mib = { + name = "mib"; + email = "mib@kanp.ai"; + matrix = "@mib:kanp.ai"; + github = "mibmo"; + githubId = 87388017; + keys = [{ + fingerprint = "AB0D C647 B2F7 86EB 045C 7EFE CF6E 67DE D6DC 1E3F"; + }]; + }; mic92 = { email = "joerg@thalheim.io"; matrix = "@mic92:nixos.dev"; @@ -10814,6 +11055,12 @@ fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; }]; }; + mig4ng = { + email = "mig4ng@gmail.com"; + github = "mig4ng"; + githubId = 5817039; + name = "Miguel Carneiro"; + }; mightyiam = { email = "mightyiampresence@gmail.com"; github = "mightyiam"; @@ -11300,6 +11547,12 @@ name = "Maxim Schuwalow"; email = "maxim.schuwalow@gmail.com"; }; + mschwaig = { + name = "Martin Schwaighofer"; + github = "mschwaig"; + githubId = 3856390; + email = "mschwaig+nixpkgs@eml.cc"; + }; msfjarvis = { github = "msfjarvis"; githubId = 13348378; @@ -14179,6 +14432,12 @@ githubId = 1069318; name = "Robin Lambertz"; }; + robwalt = { + email = "robwalter96@gmail.com"; + github = "robwalt"; + githubId = 26892280; + name = "Robert Walter"; + }; roconnor = { email = "roconnor@theorem.ca"; github = "roconnor"; @@ -14303,6 +14562,15 @@ }]; name = "Rahul Butani"; }; + rs0vere = { + email = "rs0vere@outlook.com"; + github = "rs0vere"; + githubId = 140035635; + keys = [{ + fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D"; + }]; + name = "Red Star Over Earth"; + }; rski = { name = "rski"; email = "rom.skiad+nix@gmail.com"; @@ -14416,6 +14684,12 @@ githubId = 889991; name = "Ryan Artecona"; }; + ryanccn = { + email = "hello@ryanccn.dev"; + github = "ryanccn"; + githubId = 70191398; + name = "Ryan Cao"; + }; ryane = { email = "ryanesc@gmail.com"; github = "ryane"; @@ -14470,6 +14744,12 @@ githubId = 3280280; name = "Ryne Everett"; }; + ryota-ka = { + email = "ok@ryota-ka.me"; + github = "ryota-ka"; + githubId = 7309170; + name = "Ryota Kameoka"; + }; rytone = { email = "max@ryt.one"; github = "rastertail"; @@ -14875,6 +15155,16 @@ githubId = 4805746; name = "Sebastian Jordan"; }; + septem9er = { + name = "Septem9er"; + email = "develop@septem9er.de"; + matrix = "@septem9er:fairydust.space"; + github = "septem9er"; + githubId = 33379902; + keys = [{ + fingerprint = "C408 07F9 8677 3D98 EFF3 0980 355A 9AFB FD8E AD33"; + }]; +}; seqizz = { email = "seqizz@gmail.com"; github = "seqizz"; @@ -15279,6 +15569,12 @@ githubId = 3789764; name = "skykanin"; }; + slbtty = { + email = "shenlebantongying@gmail.com"; + github = "shenlebantongying"; + githubId = 20123683; + name = "Shenleban Tongying"; + }; sleexyz = { email = "freshdried@gmail.com"; github = "sleexyz"; @@ -15456,6 +15752,12 @@ githubId = 6277322; name = "Wei Tang"; }; + soupglasses = { + email = "sofi+git@mailbox.org"; + github = "soupglasses"; + githubId = 20756843; + name = "Sofi"; + }; soywod = { name = "Clément DOUIN"; email = "clement.douin@posteo.net"; @@ -15478,6 +15780,12 @@ githubId = 7669898; name = "Katharina Fey"; }; + spalf = { + email = "tom@tombarrett.xyz"; + name = "tom barrett"; + github = "70m6"; + githubId = 105207964; + }; spease = { email = "peasteven@gmail.com"; github = "spease"; @@ -15509,6 +15817,12 @@ githubId = 6391601; name = "Roger Mason"; }; + sputn1ck = { + email = "kon@kon.ninja"; + github = "sputn1ck"; + githubId = 8904314; + name = "Konstantin Nick"; + }; squalus = { email = "squalus@squalus.net"; github = "squalus"; @@ -15545,6 +15859,13 @@ githubId = 219362; name = "Sarah Brofeldt"; }; + srid = { + email = "srid@srid.ca"; + matrix = "@srid:matrix.org"; + github = "srid"; + githubId = 3998; + name = "Sridhar Ratnakumar"; + }; srounce = { name = "Samuel Rounce"; email = "me@samuelrounce.co.uk"; @@ -15813,6 +16134,12 @@ githubId = 16734772; name = "Sumner Evans"; }; + sund3RRR = { + email = "evenquantity@gmail.com"; + github = "sund3RRR"; + githubId = 73298492; + name = "Mikhail Kiselev"; + }; suominen = { email = "kimmo@suominen.com"; github = "suominen"; @@ -16714,6 +17041,14 @@ githubId = 8577941; name = "Kevin Rauscher"; }; + tomasajt = { + github = "TomaSajt"; + githubId = 62384384; + name = "TomaSajt"; + keys = [{ + fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1"; + }]; + }; tomaskala = { email = "public+nixpkgs@tomaskala.com"; github = "tomaskala"; @@ -16990,6 +17325,12 @@ matrix = "@ty:tjll.net"; name = "Tyler Langlois"; }; + tymscar = { + email = "oscar@tymscar.com"; + github = "tymscar"; + githubId = 3742502; + name = "Oscar Molnar"; + }; typetetris = { email = "ericwolf42@mail.com"; github = "typetetris"; @@ -17350,6 +17691,12 @@ fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; }]; }; + vinetos = { + name = "vinetos"; + email = "vinetosdev@gmail.com"; + github = "vinetos"; + githubId = 10145351; + }; vinnymeller = { email = "vinnymeller@proton.me"; github = "vinnymeller"; @@ -17453,6 +17800,12 @@ githubId = 3413119; name = "Vonfry"; }; + votava = { + email = "votava@gmail.com"; + github = "janvotava"; + githubId = 367185; + name = "Jan Votava"; + }; vq = { email = "vq@erq.se"; github = "vq"; @@ -18036,6 +18389,12 @@ githubId = 73759599; name = "Yaya"; }; + yboettcher = { + name = "Yannik Böttcher"; + github = "yboettcher"; + githubId = 39460066; + email = "yannikboettcher@outlook.de"; + }; ydlr = { name = "ydlr"; email = "ydlr@ydlr.io"; @@ -18106,6 +18465,12 @@ github = "ymeister"; githubId = 47071325; }; + yoavlavi = { + email = "yoav@yoavlavi.com"; + github = "yoav-lavi"; + githubId = 14347895; + name = "Yoav Lavi"; + }; yochai = { email = "yochai@titat.info"; github = "yochai"; @@ -18355,12 +18720,6 @@ github = "zfnmxt"; githubId = 37446532; }; - zgrannan = { - email = "zgrannan@gmail.com"; - github = "zgrannan"; - githubId = 1141948; - name = "Zack Grannan"; - }; zhaofengli = { email = "hello@zhaofeng.li"; matrix = "@zhaofeng:zhaofeng.li"; @@ -18392,6 +18751,19 @@ githubId = 1108325; name = "Théo Zimmermann"; }; + zmitchell = { + name = "Zach Mitchell"; + email = "zmitchell@fastmail.com"; + matrix = "@zmitchell:matrix.org"; + github = "zmitchell"; + githubId = 10246891; + }; + znewman01 = { + email = "znewman01@gmail.com"; + github = "znewman01"; + githubId = 873857; + name = "Zack Newman"; + }; zoedsoupe = { github = "zoedsoupe"; githubId = 44469426; diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh index a7cfecbbb0..5aa644a3d0 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh +++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-hackage.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=. +#! nix-shell -i bash -p nix curl jq git gnused -I nixpkgs=. # See regenerate-hackage-packages.sh for details on the purpose of this script. diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh index 4fee433084..ba64b42ba9 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh +++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=. +#! nix-shell -i bash -p nix curl jq git gnused gnugrep -I nixpkgs=. # shellcheck shell=bash set -eu -o pipefail diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index e93ceeebc9..52ac8a9343 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -86,6 +86,7 @@ luuid,,,,,, luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc +magick,,,,,,donovanglover markdown,,,,,, mediator_lua,,,,,, mpack,,,,,, diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 821486d55a..f541d01a68 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -193,10 +193,11 @@ with lib.maintainers; { deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ - limeytexan + de11n + invokes-su ]; scope = "Group registration for D. E. Shaw employees who collectively maintain packages."; - shortName = "Shaw employees"; + shortName = "D. E. Shaw employees"; }; determinatesystems = { @@ -410,6 +411,14 @@ with lib.maintainers; { shortName = "Jitsi"; }; + jupyter = { + members = [ + natsukium + ]; + scope = "Maintain Jupyter and related packages."; + shortName = "Jupyter"; + }; + kubernetes = { members = [ johanot @@ -570,6 +579,7 @@ with lib.maintainers; { ralith dandellion sumnerevans + nickcao ]; scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; shortName = "Matrix"; @@ -820,9 +830,7 @@ with lib.maintainers; { }; sphinx = { - members = [ - SuperSandro2000 - ]; + members = [ ]; scope = "Maintain Sphinx related packages."; shortName = "Sphinx"; }; diff --git a/third_party/nixpkgs/nixos/doc/manual/common.nix b/third_party/nixpkgs/nixos/doc/manual/common.nix new file mode 100644 index 0000000000..48d1d90949 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/common.nix @@ -0,0 +1,4 @@ +{ + outputPath = "share/doc/nixos"; + indexPath = "index.html"; +} diff --git a/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md b/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md index c306cc084c..4633c7e1b0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -11,6 +11,8 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux If the build succeeds, the manual will be in `./result/share/doc/nixos/index.html`. +There's also [a convenient development daemon](https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-devmode). + **Contributing to the man pages** The man pages are written in [DocBook] which is XML. diff --git a/third_party/nixpkgs/nixos/doc/manual/default.nix b/third_party/nixpkgs/nixos/doc/manual/default.nix index 40af4c1fa0..902dee7018 100644 --- a/third_party/nixpkgs/nixos/doc/manual/default.nix +++ b/third_party/nixpkgs/nixos/doc/manual/default.nix @@ -16,6 +16,8 @@ let lib = pkgs.lib; + common = import ./common.nix; + manpageUrls = pkgs.path + "/doc/manpage-urls.json"; # We need to strip references to /nix/store/* from options, @@ -63,6 +65,9 @@ let optionIdPrefix = "test-opt-"; }; + testDriverMachineDocstrings = pkgs.callPackage + ../../../nixos/lib/test-driver/nixos-test-driver-docstrings.nix {}; + prepareManualFromMD = '' cp -r --no-preserve=all $inputs/* . @@ -75,11 +80,13 @@ let substituteInPlace ./nixos-options.md \ --replace \ '@NIXOS_OPTIONS_JSON@' \ - ${optionsDoc.optionsJSON}/share/doc/nixos/options.json + ${optionsDoc.optionsJSON}/${common.outputPath}/options.json substituteInPlace ./development/writing-nixos-tests.section.md \ --replace \ '@NIXOS_TEST_OPTIONS_JSON@' \ - ${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json + ${testOptionsDoc.optionsJSON}/${common.outputPath}/options.json + sed -e '/@PYTHON_MACHINE_METHODS@/ {' -e 'r ${testDriverMachineDocstrings}/machine-methods.md' -e 'd' -e '}' \ + -i ./development/writing-nixos-tests.section.md ''; in rec { @@ -94,7 +101,7 @@ in rec { } '' # Generate the HTML manual. - dst=$out/share/doc/nixos + dst=$out/${common.outputPath} mkdir -p $dst cp ${../../../doc/style.css} $dst/style.css @@ -115,7 +122,7 @@ in rec { --toc-depth 1 \ --chunk-toc-depth 1 \ ./manual.md \ - $dst/index.html + $dst/${common.indexPath} mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products @@ -126,7 +133,7 @@ in rec { manual = manualHTML; # Index page of the NixOS manual. - manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html"; + manualHTMLIndex = "${manualHTML}/${common.outputPath}/${common.indexPath}"; manualEpub = runCommand "nixos-manual-epub" { nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ]; @@ -157,7 +164,7 @@ in rec { } '' # Generate the epub manual. - dst=$out/share/doc/nixos + dst=$out/${common.outputPath} xsltproc \ --param chapter.autolabel 0 \ @@ -192,7 +199,7 @@ in rec { mkdir -p $out/share/man/man5 nixos-render-docs -j $NIX_BUILD_CORES options manpage \ --revision ${lib.escapeShellArg revision} \ - ${optionsJSON}/share/doc/nixos/options.json \ + ${optionsJSON}/${common.outputPath}/options.json \ $out/share/man/man5/configuration.nix.5 ''; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md index 486a4b64a2..84b247fd20 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -139,210 +139,7 @@ to Python as `machine_a`. The following methods are available on machine objects: -`start` - -: Start the virtual machine. This method is asynchronous --- it does - not wait for the machine to finish booting. - -`shutdown` - -: Shut down the machine, waiting for the VM to exit. - -`crash` - -: Simulate a sudden power failure, by telling the VM to exit - immediately. - -`block` - -: Simulate unplugging the Ethernet cable that connects the machine to - the other machines. - -`unblock` - -: Undo the effect of `block`. - -`screenshot` - -: Take a picture of the display of the virtual machine, in PNG format. - The screenshot is linked from the HTML log. - -`get_screen_text_variants` - -: Return a list of different interpretations of what is currently - visible on the machine's screen using optical character - recognition. The number and order of the interpretations is not - specified and is subject to change, but if no exception is raised at - least one will be returned. - - ::: {.note} - This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. - ::: - -`get_screen_text` - -: Return a textual representation of what is currently visible on the - machine's screen using optical character recognition. - - ::: {.note} - This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. - ::: - -`send_monitor_command` - -: Send a command to the QEMU monitor. This is rarely used, but allows - doing stuff such as attaching virtual USB disks to a running - machine. - -`send_key` - -: Simulate pressing keys on the virtual keyboard, e.g., - `send_key("ctrl-alt-delete")`. - -`send_chars` - -: Simulate typing a sequence of characters on the virtual keyboard, - e.g., `send_chars("foobar\n")` will type the string `foobar` - followed by the Enter key. - -`send_console` - -: Send keys to the kernel console. This allows interaction with the systemd - emergency mode, for example. Takes a string that is sent, e.g., - `send_console("\n\nsystemctl default\n")`. - -`execute` - -: Execute a shell command, returning a list `(status, stdout)`. - - Commands are run with `set -euo pipefail` set: - - - If several commands are separated by `;` and one fails, the - command as a whole will fail. - - - For pipelines, the last non-zero exit status will be returned - (if there is one; otherwise zero will be returned). - - - Dereferencing unset variables fails the command. - - - It will wait for stdout to be closed. - - If the command detaches, it must close stdout, as `execute` will wait - for this to consume all output reliably. This can be achieved by - redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or - a file. Examples of detaching commands are `sleep 365d &`, where the - shell forks a new process that can write to stdout and `xclip -i`, where - the `xclip` command itself forks without closing stdout. - - Takes an optional parameter `check_return` that defaults to `True`. - Setting this parameter to `False` will not check for the return code - and return -1 instead. This can be used for commands that shut down - the VM and would therefore break the pipe that would be used for - retrieving the return code. - - A timeout for the command can be specified (in seconds) using the optional - `timeout` parameter, e.g., `execute(cmd, timeout=10)` or - `execute(cmd, timeout=None)`. The default is 900 seconds. - -`succeed` - -: Execute a shell command, raising an exception if the exit status is - not zero, otherwise returning the standard output. Similar to `execute`, - except that the timeout is `None` by default. See `execute` for details on - command execution. - -`fail` - -: Like `succeed`, but raising an exception if the command returns a zero - status. - -`wait_until_succeeds` - -: Repeat a shell command with 1-second intervals until it succeeds. - Has a default timeout of 900 seconds which can be modified, e.g. - `wait_until_succeeds(cmd, timeout=10)`. See `execute` for details on - command execution. - -`wait_until_fails` - -: Like `wait_until_succeeds`, but repeating the command until it fails. - -`wait_for_unit` - -: Wait until the specified systemd unit has reached the "active" - state. - -`wait_for_file` - -: Wait until the specified file exists. - -`wait_for_open_port` - -: Wait until a process is listening on the given TCP port and IP address - (default `localhost`). - -`wait_for_closed_port` - -: Wait until nobody is listening on the given TCP port and IP address - (default `localhost`). - -`wait_for_x` - -: Wait until the X11 server is accepting connections. - -`wait_for_text` - -: Wait until the supplied regular expressions matches the textual - contents of the screen by using optical character recognition (see - `get_screen_text` and `get_screen_text_variants`). - - ::: {.note} - This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. - ::: - -`wait_for_console_text` - -: Wait until the supplied regular expressions match a line of the - serial console output. This method is useful when OCR is not - possible or accurate enough. - -`wait_for_window` - -: Wait until an X11 window has appeared whose name matches the given - regular expression, e.g., `wait_for_window("Terminal")`. - -`copy_from_host` - -: Copies a file from host to machine, e.g., - `copy_from_host("myfile", "/etc/my/important/file")`. - - The first argument is the file on the host. The file needs to be - accessible while building the nix derivation. The second argument is - the location of the file on the machine. - -`systemctl` - -: Runs `systemctl` commands with optional support for - `systemctl --user` - - ```py - machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` - machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` - ``` - -`shell_interact` - -: Allows you to directly interact with the guest shell. This should - only be used during test development, not in production tests. - Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends - the guest session. - -`console_interact` - -: Allows you to directly interact with QEMU's stdin. This should - only be used during test development, not in production tests. - Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and - `Ctrl-d` closes console and returns to the test runner. +@PYTHON_MACHINE_METHODS@ To test user units declared by `systemd.user.services` the optional `user` argument can be used: diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md index 53cf9ed14c..815bcc071c 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md @@ -249,14 +249,14 @@ update /etc/fstab. which will be used by the boot partition. ```ShellSession - # parted /dev/sda -- mkpart primary 512MB -8GB + # parted /dev/sda -- mkpart root ext4 512MB -8GB ``` 3. Next, add a *swap* partition. The size required will vary according to needs, here a 8GB one is created. ```ShellSession - # parted /dev/sda -- mkpart primary linux-swap -8GB 100% + # parted /dev/sda -- mkpart swap linux-swap -8GB 100% ``` ::: {.note} @@ -550,8 +550,8 @@ corresponding configuration Nix expression. ### Example partition schemes for NixOS on `/dev/sda` (UEFI) ```ShellSession # parted /dev/sda -- mklabel gpt -# parted /dev/sda -- mkpart primary 512MB -8GB -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% +# parted /dev/sda -- mkpart root ext4 512MB -8GB +# parted /dev/sda -- mkpart swap linux-swap -8GB 100% # parted /dev/sda -- mkpart ESP fat32 1MB 512MB # parted /dev/sda -- set 3 esp on ``` 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 a31f3511a4..c9da29063e 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 @@ -83,6 +83,8 @@ In addition to numerous new and updated packages, this release has the following - [gitea-actions-runner](https://gitea.com/gitea/act_runner), a CI runner for Gitea/Forgejo Actions. Available as [services.gitea-actions-runner](#opt-services.gitea-actions-runner.instances). +- [evdevremapkeys](https://github.com/philipl/evdevremapkeys), a daemon to remap key events. Available as [services.evdevremapkeys](#opt-services.evdevremapkeys.enable). + - [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). 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 5ccaa92914..4e8bd36428 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 @@ -16,16 +16,30 @@ - [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable). +- [wayfire](https://wayfire.org), A modular and extensible wayland compositor. Available as [programs.wayfire](#opt-programs.wayfire.enable). + - [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.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). + - [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). - [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). - [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. +- [pgBouncer](https://www.pgbouncer.org), a PostgreSQL connection pooler. Available as [services.pgbouncer](#opt-services.pgbouncer.enable). + - [trust-dns](https://trust-dns.org/), a Rust based DNS server built to be safe and secure from the ground up. Available as [services.trust-dns](#opt-services.trust-dns.enable). +- [osquery](https://www.osquery.io/), a SQL powered operating system instrumentation, monitoring, and analytics. + +- [ebusd](https://ebusd.eu), a daemon for handling communication with eBUS devices connected to a 2-wire bus system (“energy bus” used by numerous heating systems). Available as [services.ebusd](#opt-services.ebusd.enable). + +- [systemd-sysupdate](https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html), atomically updates the host OS, container images, portable service images or other sources. Available as [systemd.sysupdate](opt-systemd.sysupdate). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - 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. @@ -62,6 +76,8 @@ - PHP now defaults to PHP 8.2, updated from 8.1. +- 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. + - `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. @@ -86,12 +102,20 @@ - `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`. + +- The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations. + - 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. - 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. + +- `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. + ## 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. @@ -110,6 +134,10 @@ - DocBook option documentation is no longer supported, all module documentation now uses markdown. +- `buildGoModule` `go-modules` attrs have been renamed to `goModules`. + +- The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively. + - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. - The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki. @@ -126,8 +154,16 @@ The module update takes care of the new config syntax and the data itself (user - `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`. +- `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. + ## 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. + - 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 diff --git a/third_party/nixpkgs/nixos/doc/manual/shell.nix b/third_party/nixpkgs/nixos/doc/manual/shell.nix new file mode 100644 index 0000000000..70500a12b0 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/shell.nix @@ -0,0 +1,20 @@ +let + pkgs = import ../../.. { + config = {}; + overlays = []; + }; + + common = import ./common.nix; + inherit (common) outputPath indexPath; + + web-devmode = import ../../../pkgs/tools/nix/web-devmode.nix { + inherit pkgs; + buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; + open = "/${outputPath}/${indexPath}"; + }; +in + pkgs.mkShell { + packages = [ + web-devmode + ]; + } diff --git a/third_party/nixpkgs/nixos/lib/eval-config.nix b/third_party/nixpkgs/nixos/lib/eval-config.nix index e1242276a7..81a5ea1750 100644 --- a/third_party/nixpkgs/nixos/lib/eval-config.nix +++ b/third_party/nixpkgs/nixos/lib/eval-config.nix @@ -109,8 +109,10 @@ let nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; + withExtraArgs = nixosSystem: nixosSystem // { + inherit extraArgs; + inherit (nixosSystem._module.args) pkgs; + extendModules = args: withExtraArgs (nixosSystem.extendModules args); + }; in -withWarnings nixosWithUserModules // { - inherit extraArgs; - inherit (nixosWithUserModules._module.args) pkgs; -} +withWarnings (withExtraArgs nixosWithUserModules) diff --git a/third_party/nixpkgs/nixos/lib/make-disk-image.nix b/third_party/nixpkgs/nixos/lib/make-disk-image.nix index fc121345d6..e5d82f4de7 100644 --- a/third_party/nixpkgs/nixos/lib/make-disk-image.nix +++ b/third_party/nixpkgs/nixos/lib/make-disk-image.nix @@ -572,7 +572,7 @@ let format' = format; in let ${lib.optionalString installBootLoader '' # In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb # Use this option to create a symlink from vda to any arbitrary device you want. - ${optionalString (config.boot.loader.grub.device != "/dev/vda") '' + ${optionalString (config.boot.loader.grub.enable && config.boot.loader.grub.device != "/dev/vda") '' mkdir -p $(dirname ${config.boot.loader.grub.device}) ln -s /dev/vda ${config.boot.loader.grub.device} ''} diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix index eb2bcb9d3b..641b47def0 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix @@ -63,7 +63,12 @@ in rec { assertMacAddress = name: group: attr: optional (attr ? ${name} && ! isMacAddress attr.${name}) - "Systemd ${group} field `${name}' must be a valid mac address."; + "Systemd ${group} field `${name}' must be a valid MAC address."; + + assertNetdevMacAddress = name: group: attr: + optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none")) + "Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`."; + isPort = i: i >= 0 && i <= 65535; @@ -438,4 +443,21 @@ in rec { ${attrsToSection def.sliceConfig} ''; }; + + # Create a directory that contains systemd definition files from an attrset + # that contains the file names as keys and the content as values. The values + # in that attrset are determined by the supplied format. + definitions = directoryName: format: definitionAttrs: + let + listOfDefinitions = lib.mapAttrsToList + (name: format.generate "${name}.conf") + definitionAttrs; + in + pkgs.runCommand directoryName { } '' + mkdir -p $out + ${(lib.concatStringsSep "\n" + (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions) + )} + ''; + } diff --git a/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py b/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py new file mode 100644 index 0000000000..5aec4c89a9 --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py @@ -0,0 +1,66 @@ +import ast +import sys + +""" +This program takes all the Machine class methods and prints its methods in +markdown-style. These can then be included in the NixOS test driver +markdown style, assuming the docstrings themselves are also in markdown. + +These are included in the test driver documentation in the NixOS manual. +See https://nixos.org/manual/nixos/stable/#ssec-machine-objects + +The python input looks like this: + +```py +... + +class Machine(...): + ... + + def some_function(self, param1, param2): + "" + documentation string of some_function. + foo bar baz. + "" + ... +``` + +Output will be: + +```markdown +... + +some_function(param1, param2) + +: documentation string of some_function. + foo bar baz. + +... +``` + +""" + +assert len(sys.argv) == 2 + +with open(sys.argv[1], "r") as f: + module = ast.parse(f.read()) + +class_definitions = (node for node in module.body if isinstance(node, ast.ClassDef)) + +machine_class = next(filter(lambda x: x.name == "Machine", class_definitions)) +assert machine_class is not None + +function_definitions = [ + node for node in machine_class.body if isinstance(node, ast.FunctionDef) +] +function_definitions.sort(key=lambda x: x.name) + +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})" + + docstr = "\n".join((f" {l}" for l in docstr.strip().splitlines())) + + print(f"{f.name}{args}\n\n:{docstr[1:]}\n") diff --git a/third_party/nixpkgs/nixos/lib/test-driver/nixos-test-driver-docstrings.nix b/third_party/nixpkgs/nixos/lib/test-driver/nixos-test-driver-docstrings.nix new file mode 100644 index 0000000000..a3ef50e4e8 --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/test-driver/nixos-test-driver-docstrings.nix @@ -0,0 +1,13 @@ +{ runCommand +, python3 +}: + +let + env = { nativeBuildInputs = [ python3 ]; }; +in + +runCommand "nixos-test-driver-docstrings" env '' + mkdir $out + python3 ${./extract-docstrings.py} ${./test_driver/machine.py} \ + > $out/machine-methods.md +'' 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 c315f9b2f5..809fd690d7 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 @@ -416,6 +416,10 @@ class Machine: return answer def send_monitor_command(self, command: str) -> str: + """ + Send a command to the QEMU monitor. This allows attaching + virtual USB disks to a running machine, among other things. + """ self.run_callbacks() message = f"{command}\n".encode() assert self.monitor is not None @@ -425,9 +429,10 @@ class Machine: def wait_for_unit( self, unit: str, user: Optional[str] = None, timeout: int = 900 ) -> None: - """Wait for a systemd unit to get into "active" state. - Throws exceptions on "failed" and "inactive" states as well as - after timing out. + """ + Wait for a systemd unit to get into "active" state. + Throws exceptions on "failed" and "inactive" states as well as after + timing out. """ def check_active(_: Any) -> bool: @@ -476,6 +481,19 @@ class Machine: ) def systemctl(self, q: str, user: Optional[str] = None) -> Tuple[int, str]: + """ + Runs `systemctl` commands with optional support for + `systemctl --user` + + ```py + # run `systemctl list-jobs --no-pager` + machine.systemctl("list-jobs --no-pager") + + # spawn a shell for `any-user` and run + # `systemctl --user list-jobs --no-pager` + machine.systemctl("list-jobs --no-pager", "any-user") + ``` + """ if user is not None: q = q.replace("'", "\\'") return self.execute( @@ -520,6 +538,38 @@ class Machine: check_output: bool = True, timeout: Optional[int] = 900, ) -> Tuple[int, str]: + """ + Execute a shell command, returning a list `(status, stdout)`. + + Commands are run with `set -euo pipefail` set: + + - If several commands are separated by `;` and one fails, the + command as a whole will fail. + + - For pipelines, the last non-zero exit status will be returned + (if there is one; otherwise zero will be returned). + + - Dereferencing unset variables fails the command. + + - It will wait for stdout to be closed. + + If the command detaches, it must close stdout, as `execute` will wait + for this to consume all output reliably. This can be achieved by + redirecting stdout to stderr `>&2`, to `/dev/console`, `/dev/null` or + a file. Examples of detaching commands are `sleep 365d &`, where the + shell forks a new process that can write to stdout and `xclip -i`, where + the `xclip` command itself forks without closing stdout. + + Takes an optional parameter `check_return` that defaults to `True`. + Setting this parameter to `False` will not check for the return code + and return -1 instead. This can be used for commands that shut down + the VM and would therefore break the pipe that would be used for + retrieving the return code. + + A timeout for the command can be specified (in seconds) using the optional + `timeout` parameter, e.g., `execute(cmd, timeout=10)` or + `execute(cmd, timeout=None)`. The default is 900 seconds. + """ self.run_callbacks() self.connect() @@ -533,7 +583,7 @@ class Machine: # While sh is bash on NixOS, this is not the case for every distro. # We explicitly call bash here to allow for the driver to boot other distros as well. out_command = ( - f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n" + f"{timeout_str} bash -c {shlex.quote(command)} | (base64 -w 0; echo)\n" ) assert self.shell @@ -555,10 +605,11 @@ class Machine: return (rc, output.decode(errors="replace")) def shell_interact(self, address: Optional[str] = None) -> None: - """Allows you to interact with the guest shell for debugging purposes. - - @address string passed to socat that will be connected to the guest shell. - Check the `Running Tests interactivly` chapter of NixOS manual for an example. + """ + Allows you to directly interact with the guest shell. This should + only be used during test development, not in production tests. + Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends + the guest session. """ self.connect() @@ -577,12 +628,14 @@ class Machine: pass def console_interact(self) -> None: - """Allows you to interact with QEMU's stdin - - The shell can be exited with Ctrl+D. Note that Ctrl+C is not allowed to be used. - QEMU's stdout is read line-wise. - - Should only be used during test development, not in the production test.""" + """ + Allows you to directly interact with QEMU's stdin, by forwarding + terminal input to the QEMU process. + This is for use with the interactive test driver, not for production + tests, which run unattended. + Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and + `Ctrl-d` closes console and returns to the test runner. + """ self.log("Terminal is ready (there is no prompt):") assert self.process @@ -599,7 +652,12 @@ class Machine: self.send_console(char.decode()) def succeed(self, *commands: str, timeout: Optional[int] = None) -> str: - """Execute each command and check that it succeeds.""" + """ + Execute a shell command, raising an exception if the exit status is + not zero, otherwise returning the standard output. Similar to `execute`, + except that the timeout is `None` by default. See `execute` for details on + command execution. + """ output = "" for command in commands: with self.nested(f"must succeed: {command}"): @@ -611,7 +669,10 @@ class Machine: return output def fail(self, *commands: str, timeout: Optional[int] = None) -> str: - """Execute each command and check that it fails.""" + """ + Like `succeed`, but raising an exception if the command returns a zero + status. + """ output = "" for command in commands: with self.nested(f"must fail: {command}"): @@ -622,7 +683,11 @@ class Machine: return output def wait_until_succeeds(self, command: str, timeout: int = 900) -> str: - """Wait until a command returns success and return its output. + """ + Repeat a shell command with 1-second intervals until it succeeds. + Has a default timeout of 900 seconds which can be modified, e.g. + `wait_until_succeeds(cmd, timeout=10)`. See `execute` for details on + command execution. Throws an exception on timeout. """ output = "" @@ -637,8 +702,8 @@ class Machine: return output def wait_until_fails(self, command: str, timeout: int = 900) -> str: - """Wait until a command returns failure. - Throws an exception on timeout. + """ + Like `wait_until_succeeds`, but repeating the command until it fails. """ output = "" @@ -690,12 +755,19 @@ class Machine: retry(tty_matches) def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: + """ + Simulate typing a sequence of characters on the virtual keyboard, + e.g., `send_chars("foobar\n")` will type the string `foobar` + followed by the Enter key. + """ with self.nested(f"sending keys {repr(chars)}"): for char in chars: self.send_key(char, delay, log=False) def wait_for_file(self, filename: str) -> None: - """Waits until the file exists in machine's file system.""" + """ + Waits until the file exists in the machine's file system. + """ def check_file(_: Any) -> bool: status, _ = self.execute(f"test -e {filename}") @@ -705,6 +777,11 @@ class Machine: retry(check_file) def wait_for_open_port(self, port: int, addr: str = "localhost") -> None: + """ + Wait until a process is listening on the given TCP port and IP address + (default `localhost`). + """ + def port_is_open(_: Any) -> bool: status, _ = self.execute(f"nc -z {addr} {port}") return status == 0 @@ -713,6 +790,11 @@ class Machine: retry(port_is_open) def wait_for_closed_port(self, port: int, addr: str = "localhost") -> None: + """ + Wait until nobody is listening on the given TCP port and IP address + (default `localhost`). + """ + def port_is_closed(_: Any) -> bool: status, _ = self.execute(f"nc -z {addr} {port}") return status != 0 @@ -751,6 +833,9 @@ class Machine: # TODO: do we want to bail after a set number of attempts? while not shell_ready(timeout_secs=30): self.log("Guest root shell did not produce any data yet...") + self.log( + " To debug, enter the VM and run 'systemctl status backdoor.service'." + ) while True: chunk = self.shell.recv(1024) @@ -766,6 +851,10 @@ class Machine: self.connected = True def screenshot(self, filename: str) -> None: + """ + Take a picture of the display of the virtual machine, in PNG format. + The screenshot will be available in the derivation output. + """ if "." not in filename: filename += ".png" if "/" not in filename: @@ -795,8 +884,21 @@ class Machine: ) def copy_from_host(self, source: str, target: str) -> None: - """Copy a file from the host into the guest via the `shared_dir` shared - among all the VMs (using a temporary directory). + """ + Copies a file from host to machine, e.g., + `copy_from_host("myfile", "/etc/my/important/file")`. + + The first argument is the file on the host. Note that the "host" refers + to the environment in which the test driver runs, which is typically the + Nix build sandbox. + + The second argument is the location of the file on the machine that will + be written to. + + The file is copied via the `shared_dir` directory which is shared among + all the VMs (using a temporary directory). + The access rights bits will mimic the ones from the host file and + user:group will be root:root. """ host_src = Path(source) vm_target = Path(target) @@ -848,12 +950,41 @@ class Machine: return _perform_ocr_on_screenshot(screenshot_path, model_ids) def get_screen_text_variants(self) -> List[str]: + """ + Return a list of different interpretations of what is currently + visible on the machine's screen using optical character + recognition. The number and order of the interpretations is not + specified and is subject to change, but if no exception is raised at + least one will be returned. + + ::: {.note} + This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. + ::: + """ return self._get_screen_text_variants([0, 1, 2]) def get_screen_text(self) -> str: + """ + Return a textual representation of what is currently visible on the + machine's screen using optical character recognition. + + ::: {.note} + This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. + ::: + """ return self._get_screen_text_variants([2])[0] def wait_for_text(self, regex: str) -> None: + """ + Wait until the supplied regular expressions matches the textual + contents of the screen by using optical character recognition (see + `get_screen_text` and `get_screen_text_variants`). + + ::: {.note} + This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. + ::: + """ + def screen_matches(last: bool) -> bool: variants = self.get_screen_text_variants() for text in variants: @@ -870,12 +1001,9 @@ class Machine: def wait_for_console_text(self, regex: str, timeout: int | None = None) -> None: """ - Wait for the provided regex to appear on console. - For each reads, - - If timeout is None, timeout is infinite. - - `timeout` is in seconds. + Wait until the supplied regular expressions match a line of the + serial console output. + This method is useful when OCR is not possible or inaccurate. """ # Buffer the console output, this is needed # to match multiline regexes. @@ -903,6 +1031,13 @@ class Machine: def send_key( self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True ) -> None: + """ + Simulate pressing keys on the virtual keyboard, e.g., + `send_key("ctrl-alt-delete")`. + + Please also refer to the QEMU documentation for more information on the + input syntax: https://en.wikibooks.org/wiki/QEMU/Monitor#sendkey_keys + """ key = CHAR_TO_KEY.get(key, key) context = self.nested(f"sending key {repr(key)}") if log else nullcontext() with context: @@ -911,12 +1046,21 @@ class Machine: time.sleep(delay) def send_console(self, chars: str) -> None: + r""" + Send keys to the kernel console. This allows interaction with the systemd + emergency mode, for example. Takes a string that is sent, e.g., + `send_console("\n\nsystemctl default\n")`. + """ assert self.process assert self.process.stdin self.process.stdin.write(chars.encode()) self.process.stdin.flush() def start(self, allow_reboot: bool = False) -> None: + """ + Start the virtual machine. This method is asynchronous --- it does + not wait for the machine to finish booting. + """ if self.booted: return @@ -974,6 +1118,9 @@ class Machine: rootlog.log("if you want to keep the VM state, pass --keep-vm-state") def shutdown(self) -> None: + """ + Shut down the machine, waiting for the VM to exit. + """ if not self.booted: return @@ -982,6 +1129,9 @@ class Machine: self.wait_for_shutdown() def crash(self) -> None: + """ + Simulate a sudden power failure, by telling the VM to exit immediately. + """ if not self.booted: return @@ -999,8 +1149,8 @@ class Machine: self.connected = False def wait_for_x(self) -> None: - """Wait until it is possible to connect to the X server. Note that - testing the existence of /tmp/.X11-unix/X0 is insufficient. + """ + Wait until it is possible to connect to the X server. """ def check_x(_: Any) -> bool: @@ -1023,6 +1173,10 @@ class Machine: ).splitlines() def wait_for_window(self, regexp: str) -> None: + """ + Wait until an X11 window has appeared whose name matches the given + regular expression, e.g., `wait_for_window("Terminal")`. + """ pattern = re.compile(regexp) def window_is_visible(last_try: bool) -> bool: @@ -1043,20 +1197,26 @@ class Machine: self.succeed(f"sleep {secs}") def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None: - """Forward a TCP port on the host to a TCP port on the guest. + """ + Forward a TCP port on the host to a TCP port on the guest. Useful during interactive testing. """ self.send_monitor_command(f"hostfwd_add tcp::{host_port}-:{guest_port}") def block(self) -> None: - """Make the machine unreachable by shutting down eth1 (the multicast - interface used to talk to the other VMs). We keep eth0 up so that - the test driver can continue to talk to the machine. + """ + Simulate unplugging the Ethernet cable that connects the machine to + the other machines. + This happens by shutting down eth1 (the multicast interface used to talk + to the other VMs). eth0 is kept online to still enable the test driver + to communicate with the machine. """ self.send_monitor_command("set_link virtio-net-pci.1 off") def unblock(self) -> None: - """Make the machine reachable.""" + """ + Undo the effect of `block`. + """ self.send_monitor_command("set_link virtio-net-pci.1 on") def release(self) -> None: diff --git a/third_party/nixpkgs/nixos/lib/testing/driver.nix b/third_party/nixpkgs/nixos/lib/testing/driver.nix index 444236efb1..23574698c0 100644 --- a/third_party/nixpkgs/nixos/lib/testing/driver.nix +++ b/third_party/nixpkgs/nixos/lib/testing/driver.nix @@ -65,7 +65,8 @@ let echo "${builtins.toString vlanNames}" >> testScriptWithTypes echo -n "$testScript" >> testScriptWithTypes - cat -n testScriptWithTypes + echo "Running type check (enable/disable: config.skipTypeCheck)" + echo "See https://nixos.org/manual/nixos/stable/#test-opt-skipTypeCheck" mypy --no-implicit-optional \ --pretty \ @@ -79,6 +80,9 @@ let ${testDriver}/bin/generate-driver-symbols ${lib.optionalString (!config.skipLint) '' + echo "Linting test script (enable/disable: config.skipLint)" + echo "See https://nixos.org/manual/nixos/stable/#test-opt-skipLint" + PYFLAKES_BUILTINS="$( echo -n ${lib.escapeShellArg (lib.concatStringsSep "," pythonizedNames)}, < ${lib.escapeShellArg "driver-symbols"} diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix index 2eee5cd34d..5e2e054f7c 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix @@ -42,7 +42,7 @@ let # looking things up. makeCacheConf = { }: let - makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; + makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.packages; }; cache = makeCache pkgs.fontconfig; cache32 = makeCache pkgs.pkgsi686Linux.fontconfig; in @@ -51,7 +51,7 @@ let - ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} + ${concatStringsSep "\n" (map (font: "${font}") config.fonts.packages)} ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' ${cache} diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix index 9d41463c94..3b5eaf5b2d 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix @@ -9,7 +9,7 @@ let x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' mkdir -p "$out/share/X11/fonts" font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' - find ${toString config.fonts.fonts} -regex "$font_regexp" \ + find ${toString config.fonts.packages} -regex "$font_regexp" \ -exec ln -sf -t "$out/share/X11/fonts" '{}' \; cd "$out/share/X11/fonts" ${optionalString cfg.decompressFonts '' diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix deleted file mode 100644 index 87cf837e7c..0000000000 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.fonts; - - defaultFonts = - [ pkgs.dejavu_fonts - pkgs.freefont_ttf - pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts - pkgs.liberation_ttf - pkgs.unifont - pkgs.noto-fonts-emoji - ]; -in -{ - imports = [ - (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.") - ]; - - options = { - - fonts = { - - # TODO: find another name for it. - fonts = mkOption { - type = types.listOf types.path; - default = []; - example = literalExpression "[ pkgs.dejavu_fonts ]"; - description = lib.mdDoc "List of primary font paths."; - }; - - enableDefaultFonts = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable a basic set of fonts providing several font styles - and families and reasonable coverage of Unicode. - ''; - }; - }; - - }; - - config = { fonts.fonts = mkIf cfg.enableDefaultFonts defaultFonts; }; -} diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix index c284c4a0b0..c41fcdaaa3 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix @@ -3,31 +3,21 @@ with lib; { - options = { - - fonts = { - - enableGhostscriptFonts = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to add the fonts provided by Ghostscript (such as - various URW fonts and the “Base-14” Postscript fonts) to the - list of system fonts, making them available to X11 - applications. - ''; - }; - + fonts.enableGhostscriptFonts = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to add the fonts provided by Ghostscript (such as + various URW fonts and the “Base-14” Postscript fonts) to the + list of system fonts, making them available to X11 + applications. + ''; }; }; - config = mkIf config.fonts.enableGhostscriptFonts { - - fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; - + fonts.packages = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ]; }; - } diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/packages.nix b/third_party/nixpkgs/nixos/modules/config/fonts/packages.nix new file mode 100644 index 0000000000..46907d5411 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/config/fonts/packages.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.fonts; +in +{ + imports = [ + (lib.mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.packages = [ pkgs.corefonts ]; instead.") + (lib.mkRenamedOptionModule [ "fonts" "enableDefaultFonts" ] [ "fonts" "enableDefaultPackages" ]) + (lib.mkRenamedOptionModule [ "fonts" "fonts" ] [ "fonts" "packages" ]) + ]; + + options = { + fonts = { + packages = lib.mkOption { + type = with lib.types; listOf path; + default = []; + example = lib.literalExpression "[ pkgs.dejavu_fonts ]"; + description = lib.mdDoc "List of primary font packages."; + }; + + enableDefaultPackages = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enable a basic set of fonts providing several styles + and families and reasonable coverage of Unicode. + ''; + }; + }; + }; + + config = { + fonts.packages = lib.mkIf cfg.enableDefaultPackages (with pkgs; [ + dejavu_fonts + freefont_ttf + gyre-fonts # TrueType substitutes for standard PostScript fonts + liberation_ttf + unifont + noto-fonts-emoji + ]); + }; +} diff --git a/third_party/nixpkgs/nixos/modules/config/nix-channel.nix b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix index 557f17d8b3..3f8e088ede 100644 --- a/third_party/nixpkgs/nixos/modules/config/nix-channel.nix +++ b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix @@ -3,12 +3,13 @@ configuration to work. See also - - ./nix.nix - - ./nix-flakes.nix + - ./nix.nix + - ./nix-flakes.nix */ { config, lib, ... }: let inherit (lib) + mkDefault mkIf mkOption stringAfter @@ -21,13 +22,42 @@ in { options = { nix = { + channel = { + enable = mkOption { + description = lib.mdDoc '' + Whether the `nix-channel` command and state files are made available on the machine. + + The following files are initialized when enabled: + - `/nix/var/nix/profiles/per-user/root/channels` + - `/root/.nix-channels` + - `$HOME/.nix-defexpr/channels` (on login) + + Disabling this option will not remove the state files from the system. + ''; + type = types.bool; + default = true; + }; + }; + nixPath = mkOption { type = types.listOf types.str; - default = [ - "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - ]; + default = + if cfg.channel.enable + then [ + "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" + "nixos-config=/etc/nixos/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ] + else [ ]; + defaultText = '' + if nix.channel.enable + then [ + "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" + "nixos-config=/etc/nixos/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ] + else []; + ''; description = lib.mdDoc '' The default Nix expression search path, used by the Nix evaluator to look up paths enclosed in angle brackets @@ -49,22 +79,30 @@ in config = mkIf cfg.enable { environment.extraInit = - '' + mkIf cfg.channel.enable '' if [ -e "$HOME/.nix-defexpr/channels" ]; then export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}" fi ''; + environment.extraSetup = mkIf (!cfg.channel.enable) '' + rm --force $out/bin/nix-channel + ''; + + # NIX_PATH has a non-empty default according to Nix docs, so we don't unset + # it when empty. environment.sessionVariables = { NIX_PATH = cfg.nixPath; }; - system.activationScripts.nix-channel = stringAfter [ "etc" "users" ] - '' + nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault ""); + + system.activationScripts.nix-channel = mkIf cfg.channel.enable + (stringAfter [ "etc" "users" ] '' # Subscribe the root user to the NixOS channel by default. if [ ! -e "/root/.nix-channels" ]; then echo "${config.system.defaultChannel} nixos" > "/root/.nix-channels" fi - ''; + ''); }; } diff --git a/third_party/nixpkgs/nixos/modules/config/qt.nix b/third_party/nixpkgs/nixos/modules/config/qt.nix index cf4e9621d7..2b09281e46 100644 --- a/third_party/nixpkgs/nixos/modules/config/qt.nix +++ b/third_party/nixpkgs/nixos/modules/config/qt.nix @@ -19,7 +19,7 @@ let pkgs.qgnomeplatform-qt6 pkgs.adwaita-qt6 ] - else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] + else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins pkgs.qt6Packages.qt6gtk2 ] else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ] else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ] else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ] @@ -86,6 +86,7 @@ in "adwaita-qt" "adwaita-qt6" ["libsForQt5" "qtstyleplugins"] + ["qt6Packages" "qt6gtk2"] ]; description = lib.mdDoc '' Selects the style to use for Qt applications. diff --git a/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix b/third_party/nixpkgs/nixos/modules/hardware/usb-modeswitch.nix similarity index 69% rename from third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix rename to third_party/nixpkgs/nixos/modules/hardware/usb-modeswitch.nix index 69673872cf..773891b003 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/usb-modeswitch.nix @@ -7,12 +7,15 @@ with lib; options = { - hardware.usbWwan = { + hardware.usb-modeswitch = { enable = mkOption { type = types.bool; default = false; description = lib.mdDoc '' - Enable this option to support USB WWAN adapters. + Enable this option to support certain USB WLAN and WWAN adapters. + + These network adapters initial present themselves as Flash Drives containing their drivers. + This option enables automatic switching to the networking mode. ''; }; }; @@ -20,7 +23,11 @@ with lib; ###### implementation - config = mkIf config.hardware.usbWwan.enable { + imports = [ + (mkRenamedOptionModule ["hardware" "usbWwan" ] ["hardware" "usb-modeswitch" ]) + ]; + + config = mkIf config.hardware.usb-modeswitch.enable { # Attaches device specific handlers. services.udev.packages = with pkgs; [ usb-modeswitch-data ]; diff --git a/third_party/nixpkgs/nixos/modules/hardware/wooting.nix b/third_party/nixpkgs/nixos/modules/hardware/wooting.nix index 90d046d49f..78bbcb61ac 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/wooting.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/wooting.nix @@ -2,8 +2,8 @@ with lib; { - options.hardware.wooting.enable = - mkEnableOption (lib.mdDoc "support for Wooting keyboards"); + options.hardware.wooting.enable = mkEnableOption (lib.mdDoc ''support for Wooting keyboards. + Note that users must be in the "input" group for udev rules to apply''); config = mkIf config.hardware.wooting.enable { environment.systemPackages = [ pkgs.wootility ]; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix index 7251240d26..39952d6c39 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix @@ -12,12 +12,34 @@ in i18n.inputMethod.fcitx5 = { addons = mkOption { type = with types; listOf package; - default = []; + default = [ ]; example = literalExpression "with pkgs; [ fcitx5-rime ]"; description = lib.mdDoc '' Enabled Fcitx5 addons. ''; }; + quickPhrase = mkOption { + type = with types; attrsOf string; + default = { }; + example = literalExpression '' + { + smile = "（・∀・）"; + angry = "(￣ー￣)"; + } + ''; + description = lib.mdDoc "Quick phrases."; + }; + quickPhraseFiles = mkOption { + type = with types; attrsOf path; + default = { }; + example = literalExpression '' + { + words = ./words.mb; + numbers = ./numbers.mb; + } + ''; + description = lib.mdDoc "Quick phrase files."; + }; }; }; @@ -30,6 +52,16 @@ in config = mkIf (im.enabled == "fcitx5") { i18n.inputMethod.package = fcitx5Package; + i18n.inputMethod.fcitx5.addons = lib.optionals (cfg.quickPhrase != { }) [ + (pkgs.writeTextDir "share/fcitx5/data/QuickPhrase.mb" + (lib.concatStringsSep "\n" + (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.quickPhrase))) + ] ++ lib.optionals (cfg.quickPhraseFiles != { }) [ + (pkgs.linkFarm "quickPhraseFiles" (lib.mapAttrs' + (name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value) + cfg.quickPhraseFiles)) + ]; + environment.variables = { GTK_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx"; diff --git a/third_party/nixpkgs/nixos/modules/image/amend-repart-definitions.py b/third_party/nixpkgs/nixos/modules/image/amend-repart-definitions.py new file mode 100644 index 0000000000..52f10303eb --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/image/amend-repart-definitions.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python + +"""Amend systemd-repart definiton files. + +In order to avoid Import-From-Derivation (IFD) when building images with +systemd-repart, the definition files created by Nix need to be amended with the +store paths from the closure. + +This is achieved by adding CopyFiles= instructions to the definition files. + +The arbitrary files configured via `contents` are also added to the definition +files using the same mechanism. +""" + +import json +import sys +import shutil +from pathlib import Path + + +def add_contents_to_definition( + definition: Path, contents: dict[str, dict[str, str]] | None +) -> None: + """Add CopyFiles= instructions to a definition for all files in contents.""" + if not contents: + return + + copy_files_lines: list[str] = [] + for target, options in contents.items(): + source = options["source"] + + copy_files_lines.append(f"CopyFiles={source}:{target}\n") + + with open(definition, "a") as f: + f.writelines(copy_files_lines) + + +def add_closure_to_definition( + definition: Path, closure: Path | None, strip_nix_store_prefix: bool | None +) -> None: + """Add CopyFiles= instructions to a definition for all paths in the closure. + + If strip_nix_store_prefix is True, `/nix/store` is stripped from the target path. + """ + if not closure: + return + + copy_files_lines: list[str] = [] + with open(closure, "r") as f: + for line in f: + if not isinstance(line, str): + continue + + source = Path(line.strip()) + target = str(source.relative_to("/nix/store/")) + target = f":{target}" if strip_nix_store_prefix else "" + + copy_files_lines.append(f"CopyFiles={source}{target}\n") + + with open(definition, "a") as f: + f.writelines(copy_files_lines) + + +def main() -> None: + """Amend the provided repart definitions by adding CopyFiles= instructions. + + For each file specified in the `contents` field of a partition in the + partiton config file, a `CopyFiles=` instruction is added to the + corresponding definition file. + + The same is done for every store path of the `closure` field. + + Print the path to a directory that contains the amended repart + definitions to stdout. + """ + partition_config_file = sys.argv[1] + if not partition_config_file: + print("No partition config file was supplied.") + sys.exit(1) + + repart_definitions = sys.argv[2] + if not repart_definitions: + print("No repart definitions were supplied.") + sys.exit(1) + + with open(partition_config_file, "rb") as f: + partition_config = json.load(f) + + if not partition_config: + print("Partition config is empty.") + sys.exit(1) + + target_dir = Path("amended-repart.d") + target_dir.mkdir() + shutil.copytree(repart_definitions, target_dir, dirs_exist_ok=True) + + for name, config in partition_config.items(): + definition = target_dir.joinpath(f"{name}.conf") + definition.chmod(0o644) + + contents = config.get("contents") + add_contents_to_definition(definition, contents) + + closure = config.get("closure") + strip_nix_store_prefix = config.get("stripStorePaths") + add_closure_to_definition(definition, closure, strip_nix_store_prefix) + + print(target_dir.absolute()) + + +if __name__ == "__main__": + main() diff --git a/third_party/nixpkgs/nixos/modules/image/repart.md b/third_party/nixpkgs/nixos/modules/image/repart.md new file mode 100644 index 0000000000..6d0675f21a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/image/repart.md @@ -0,0 +1,137 @@ +# Building Images via `systemd-repart` {#sec-image-repart} + +You can build disk images in NixOS with the `image.repart` option provided by +the module [image/repart.nix][]. This module uses `systemd-repart` to build the +images and exposes it's entire interface via the `repartConfig` option. + +[image/repart.nix]: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/image/repart.nix + +An example of how to build an image: + +```nix +{ config, modulesPath, ... }: { + + imports = [ "${modulesPath}/image/repart.nix" ]; + + image.repart = { + name = "image"; + partitions = { + "esp" = { + contents = { + ... + }; + repartConfig = { + Type = "esp"; + ... + }; + }; + "root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Label = "nixos"; + ... + }; + }; + }; + }; + +} +``` + +## Nix Store Partition {#sec-image-repart-store-partition} + +You can define a partition that only contains the Nix store and then mount it +under `/nix/store`. Because the `/nix/store` part of the paths is already +determined by the mount point, you have to set `stripNixStorePrefix = true;` so +that the prefix is stripped from the paths before copying them into the image. + +```nix +fileSystems."/nix/store".device = "/dev/disk/by-partlabel/nix-store" + +image.repart.partitions = { + "store" = { + storePaths = [ config.system.build.toplevel ]; + stripNixStorePrefix = true; + repartConfig = { + Type = "linux-generic"; + Label = "nix-store"; + ... + }; + }; +}; +``` + +## Appliance Image {#sec-image-repart-appliance} + +The `image/repart.nix` module can also be used to build self-contained [software +appliances][]. + +[software appliances]: https://en.wikipedia.org/wiki/Software_appliance + +The generation based update mechanism of NixOS is not suited for appliances. +Updates of appliances are usually either performed by replacing the entire +image with a new one or by updating partitions via an A/B scheme. See the +[Chrome OS update process][chrome-os-update] for an example of how to achieve +this. The appliance image built in the following example does not contain a +`configuration.nix` and thus you will not be able to call `nixos-rebuild` from +this system. + +[chrome-os-update]: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/HEAD/README.md + +```nix +let + pkgs = import { }; + efiArch = pkgs.stdenv.hostPlatform.efiArch; +in +(pkgs.nixos [ + ({ config, lib, pkgs, modulesPath, ... }: { + + imports = [ "${modulesPath}/image/repart.nix" ]; + + boot.loader.grub.enable = false; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + image.repart = { + name = "image"; + partitions = { + "esp" = { + contents = { + "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = + "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; + + "/loader/entries/nixos.conf".source = pkgs.writeText "nixos.conf" '' + title NixOS + linux /EFI/nixos/kernel.efi + initrd /EFI/nixos/initrd.efi + options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + ''; + + "/EFI/nixos/kernel.efi".source = + "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; + + "/EFI/nixos/initrd.efi".source = + "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + }; + repartConfig = { + Type = "esp"; + Format = "vfat"; + SizeMinBytes = "96M"; + }; + }; + "root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = "ext4"; + Label = "nixos"; + Minimize = "guess"; + }; + }; + }; + }; + + }) +]).image +``` diff --git a/third_party/nixpkgs/nixos/modules/image/repart.nix b/third_party/nixpkgs/nixos/modules/image/repart.nix new file mode 100644 index 0000000000..4362982f5b --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/image/repart.nix @@ -0,0 +1,209 @@ +# This module exposes options to build a disk image with a GUID Partition Table +# (GPT). It uses systemd-repart to build the image. + +{ config, pkgs, lib, utils, ... }: + +let + cfg = config.image.repart; + + partitionOptions = { + options = { + storePaths = lib.mkOption { + type = with lib.types; listOf path; + default = [ ]; + description = lib.mdDoc "The store paths to include in the partition."; + }; + + stripNixStorePrefix = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Whether to strip `/nix/store/` from the store paths. This is useful + when you want to build a partition that only contains store paths and + is mounted under `/nix/store`. + ''; + }; + + contents = lib.mkOption { + type = with lib.types; attrsOf (submodule { + options = { + source = lib.mkOption { + type = types.path; + description = lib.mdDoc "Path of the source file."; + }; + }; + }); + default = { }; + example = lib.literalExpression '' { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + + "/loader/entries/nixos.conf".source = systemdBootEntry; + } + ''; + description = lib.mdDoc "The contents to end up in the filesystem image."; + }; + + repartConfig = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool ]); + example = { + Type = "home"; + SizeMinBytes = "512M"; + SizeMaxBytes = "2G"; + }; + description = lib.mdDoc '' + Specify the repart options for a partiton as a structural setting. + See + for all available options. + ''; + }; + }; + }; +in +{ + options.image.repart = { + + name = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc "The name of the image."; + }; + + seed = lib.mkOption { + type = with lib.types; nullOr str; + # Generated with `uuidgen`. Random but fixed to improve reproducibility. + default = "0867da16-f251-457d-a9e8-c31f9a3c220b"; + description = lib.mdDoc '' + A UUID to use as a seed. You can set this to `null` to explicitly + randomize the partition UUIDs. + ''; + }; + + split = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enables generation of split artifacts from partitions. If enabled, for + each partition with SplitName= set, a separate output file containing + just the contents of that partition is generated. + ''; + }; + + partitions = lib.mkOption { + type = with lib.types; attrsOf (submodule partitionOptions); + default = { }; + example = lib.literalExpression '' { + "10-esp" = { + contents = { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + } + repartConfig = { + Type = "esp"; + Format = "fat"; + }; + }; + "20-root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = "ext4"; + Minimize = "guess"; + }; + }; + }; + ''; + description = lib.mdDoc '' + Specify partitions as a set of the names of the partitions with their + configuration as the key. + ''; + }; + + }; + + config = { + + system.build.image = + let + fileSystemToolMapping = with pkgs; { + "vfat" = [ dosfstools mtools ]; + "ext4" = [ e2fsprogs.bin ]; + "squashfs" = [ squashfsTools ]; + "erofs" = [ erofs-utils ]; + "btrfs" = [ btrfs-progs ]; + "xfs" = [ xfsprogs ]; + }; + + fileSystems = lib.filter + (f: f != null) + (lib.mapAttrsToList (_n: v: v.repartConfig.Format or null) cfg.partitions); + + fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems; + + + makeClosure = paths: pkgs.closureInfo { rootPaths = paths; }; + + # Add the closure of the provided Nix store paths to cfg.partitions so + # that amend-repart-definitions.py can read it. + addClosure = _name: partitionConfig: partitionConfig // ( + lib.optionalAttrs + (partitionConfig.storePaths or [ ] != [ ]) + { closure = "${makeClosure partitionConfig.storePaths}/store-paths"; } + ); + + + finalPartitions = lib.mapAttrs addClosure cfg.partitions; + + + amendRepartDefinitions = pkgs.runCommand "amend-repart-definitions.py" + { + nativeBuildInputs = with pkgs; [ black ruff mypy ]; + buildInputs = [ pkgs.python3 ]; + } '' + install ${./amend-repart-definitions.py} $out + patchShebangs --host $out + + black --check --diff $out + ruff --line-length 88 $out + mypy --strict $out + ''; + + format = pkgs.formats.ini { }; + + definitionsDirectory = utils.systemdUtils.lib.definitions + "repart.d" + format + (lib.mapAttrs (_n: v: { Partition = v.repartConfig; }) finalPartitions); + + partitions = pkgs.writeText "partitions.json" (builtins.toJSON finalPartitions); + in + pkgs.runCommand cfg.name + { + nativeBuildInputs = with pkgs; [ + fakeroot + systemd + ] ++ fileSystemTools; + } '' + amendedRepartDefinitions=$(${amendRepartDefinitions} ${partitions} ${definitionsDirectory}) + + mkdir -p $out + cd $out + + fakeroot systemd-repart \ + --dry-run=no \ + --empty=create \ + --size=auto \ + --seed="${cfg.seed}" \ + --definitions="$amendedRepartDefinitions" \ + --split="${lib.boolToString cfg.split}" \ + --json=pretty \ + image.raw \ + | tee repart-output.json + ''; + + meta = { + maintainers = with lib.maintainers; [ nikstur ]; + doc = ./repart.md; + }; + + }; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh index 20fec525e7..4e42875c03 100755 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh @@ -206,7 +206,7 @@ if [[ -z $noBootLoader ]]; then mount --rbind --mkdir / "$mountPoint" mount --make-rslave "$mountPoint" /run/current-system/bin/switch-to-configuration boot - umount -R "$mountPoint" && rmdir "$mountPoint" + umount -R "$mountPoint" && (rmdir "$mountPoint" 2>/dev/null || true) EOF )" fi diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index 54b0f81ee7..4dce4f9980 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -126,7 +126,7 @@ in # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running `nixos-help`). - { config, pkgs, ... }: + { config, lib, pkgs, ... }: { imports = diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 97abbe2191..29fcabaefa 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -4,8 +4,8 @@ ./config/debug-info.nix ./config/fonts/fontconfig.nix ./config/fonts/fontdir.nix - ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix + ./config/fonts/packages.nix ./config/gnu.nix ./config/gtk/gtk-icon-cache.nix ./config/i18n.nix @@ -93,8 +93,8 @@ ./hardware/tuxedo-keyboard.nix ./hardware/ubertooth.nix ./hardware/uinput.nix + ./hardware/usb-modeswitch.nix ./hardware/usb-storage.nix - ./hardware/usb-wwan.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/bumblebee.nix ./hardware/video/capture/mwprocapture.nix @@ -221,7 +221,9 @@ ./programs/nncp.nix ./programs/noisetorch.nix ./programs/npm.nix + ./programs/ns-usbloader.nix ./programs/oblogout.nix + ./programs/oddjobd.nix ./programs/openvpn3.nix ./programs/pantheon-tweaks.nix ./programs/partition-manager.nix @@ -263,6 +265,7 @@ ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/waybar.nix + ./programs/wayland/wayfire.nix ./programs/weylus.nix ./programs/wireshark.nix ./programs/xastir.nix @@ -417,6 +420,7 @@ ./services/databases/neo4j.nix ./services/databases/openldap.nix ./services/databases/opentsdb.nix + ./services/databases/pgbouncer.nix ./services/databases/pgmanage.nix ./services/databases/postgresql.nix ./services/databases/redis.nix @@ -535,6 +539,7 @@ ./services/hardware/usbrelayd.nix ./services/hardware/vdr.nix ./services/hardware/keyd.nix + ./services/home-automation/ebusd.nix ./services/home-automation/esphome.nix ./services/home-automation/evcc.nix ./services/home-automation/home-assistant.nix @@ -598,6 +603,7 @@ ./services/matrix/mjolnir.nix ./services/matrix/mx-puppet-discord.nix ./services/matrix/pantalaimon.nix + ./services/matrix/matrix-sliding-sync.nix ./services/matrix/synapse.nix ./services/misc/airsonic.nix ./services/misc/ananicy.nix @@ -608,6 +614,7 @@ ./services/misc/autorandr.nix ./services/misc/autosuspend.nix ./services/misc/bazarr.nix + ./services/misc/bcg.nix ./services/misc/beanstalkd.nix ./services/misc/bees.nix ./services/misc/bepasty.nix @@ -631,6 +638,7 @@ ./services/misc/etcd.nix ./services/misc/etebase-server.nix ./services/misc/etesync-dav.nix + ./services/misc/evdevremapkeys.nix ./services/misc/felix.nix ./services/misc/freeswitch.nix ./services/misc/fstrim.nix @@ -665,6 +673,7 @@ ./services/misc/mediatomb.nix ./services/misc/metabase.nix ./services/misc/moonraker.nix + ./services/misc/mqtt2influxdb.nix ./services/misc/n8n.nix ./services/misc/nitter.nix ./services/misc/nix-gc.nix @@ -761,6 +770,7 @@ ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix ./services/monitoring/opentelemetry-collector.nix + ./services/monitoring/osquery.nix ./services/monitoring/parsedmarc.nix ./services/monitoring/prometheus/alertmanager-irc-relay.nix ./services/monitoring/prometheus/alertmanager.nix @@ -855,7 +865,6 @@ ./services/networking/croc.nix ./services/networking/dante.nix ./services/networking/dhcpcd.nix - ./services/networking/dhcpd.nix ./services/networking/dnscache.nix ./services/networking/dnscrypt-proxy2.nix ./services/networking/dnscrypt-wrapper.nix @@ -1103,6 +1112,7 @@ ./services/search/meilisearch.nix ./services/search/opensearch.nix ./services/search/qdrant.nix + ./services/search/typesense.nix ./services/security/aesmd.nix ./services/security/authelia.nix ./services/security/certmgr.nix @@ -1142,6 +1152,7 @@ ./services/security/vaultwarden/default.nix ./services/security/yubikey-agent.nix ./services/system/automatic-timezoned.nix + ./services/system/bpftune.nix ./services/system/cachix-agent/default.nix ./services/system/cachix-watch-store.nix ./services/system/cloud-init.nix @@ -1255,6 +1266,7 @@ ./services/web-apps/rss-bridge.nix ./services/web-apps/selfoss.nix ./services/web-apps/shiori.nix + ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix ./services/web-apps/sogo.nix ./services/web-apps/trilium.nix @@ -1387,6 +1399,7 @@ ./system/boot/systemd/oomd.nix ./system/boot/systemd/repart.nix ./system/boot/systemd/shutdown.nix + ./system/boot/systemd/sysupdate.nix ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix ./system/boot/systemd/userdbd.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix b/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix index 83a8499561..cc01b16960 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/macos-builder.nix @@ -21,7 +21,8 @@ in ../virtualisation/nixos-containers.nix ../services/x11/desktop-managers/xterm.nix ]; - config = { }; + # swraid's default depends on stateVersion + config.boot.swraid.enable = false; options.boot.isContainer = lib.mkOption { default = false; internal = true; }; } ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/atop.nix b/third_party/nixpkgs/nixos/modules/programs/atop.nix index 9d5843bd67..a5f4d990bd 100644 --- a/third_party/nixpkgs/nixos/modules/programs/atop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix @@ -123,8 +123,8 @@ in boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; systemd = let - mkSystemd = type: cond: name: restartTriggers: { - ${name} = lib.mkIf cond { + mkSystemd = type: name: restartTriggers: { + ${name} = { inherit restartTriggers; wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ]; }; @@ -134,42 +134,44 @@ in in { packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; - services = - mkService cfg.atopService.enable "atop" [ atop ] - // lib.mkIf cfg.atopService.enable { - # always convert logs to newer version first - # XXX might trigger TimeoutStart but restarting atop.service will - # convert remainings logs and start eventually - atop.serviceConfig.ExecStartPre = pkgs.writeShellScript "atop-update-log-format" '' - set -e -u - shopt -s nullglob - for logfile in "$LOGPATH"/atop_* - do - ${atop}/bin/atopconvert "$logfile" "$logfile".new - # only replace old file if version was upgraded to avoid - # false positives for atop-rotate.service - if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new - then - ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile" - else - ${pkgs.coreutils}/bin/rm -f "$logfile".new - fi - done - ''; - } - // mkService cfg.atopacctService.enable "atopacct" [ atop ] - // mkService cfg.netatop.enable "netatop" [ cfg.netatop.package ] - // mkService cfg.atopgpu.enable "atopgpu" [ atop ]; - timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ]; + services = lib.mkMerge [ + (lib.mkIf cfg.atopService.enable (lib.recursiveUpdate + (mkService "atop" [ atop ]) + { + # always convert logs to newer version first + # XXX might trigger TimeoutStart but restarting atop.service will + # convert remainings logs and start eventually + atop.preStart = '' + set -e -u + shopt -s nullglob + for logfile in "$LOGPATH"/atop_* + do + ${atop}/bin/atopconvert "$logfile" "$logfile".new + # only replace old file if version was upgraded to avoid + # false positives for atop-rotate.service + if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new + then + ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile" + else + ${pkgs.coreutils}/bin/rm -f "$logfile".new + fi + done + ''; + })) + (lib.mkIf cfg.atopacctService.enable (mkService "atopacct" [ atop ])) + (lib.mkIf cfg.netatop.enable (mkService "netatop" [ cfg.netatop.package ])) + (lib.mkIf cfg.atopgpu.enable (mkService "atopgpu" [ atop ])) + ]; + timers = lib.mkIf cfg.atopRotateTimer.enable (mkTimer "atop-rotate" [ atop ]); }; security.wrappers = lib.mkIf cfg.setuidWrapper.enable { - atop = - { setuid = true; - owner = "root"; - group = "root"; - source = "${atop}/bin/atop"; - }; + atop = { + setuid = true; + owner = "root"; + group = "root"; + source = "${atop}/bin/atop"; + }; }; } ); diff --git a/third_party/nixpkgs/nixos/modules/programs/firefox.nix b/third_party/nixpkgs/nixos/modules/programs/firefox.nix index ead048134d..d67bbee9a7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/firefox.nix +++ b/third_party/nixpkgs/nixos/modules/programs/firefox.nix @@ -233,7 +233,6 @@ in nixpkgs.config.firefox = { enableBrowserpass = nmh.browserpass; enableBukubrow = nmh.bukubrow; - enableEUWebID = nmh.euwebid; enableTridactylNative = nmh.tridactyl; enableUgetIntegrator = nmh.ugetIntegrator; enableFXCastBridge = nmh.fxCast; diff --git a/third_party/nixpkgs/nixos/modules/programs/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix index 478f07d013..8b78d3d9e2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fish.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix @@ -37,7 +37,7 @@ let babelfishTranslate = path: name: pkgs.runCommandLocal "${name}.fish" { nativeBuildInputs = [ pkgs.babelfish ]; - } "${pkgs.babelfish}/bin/babelfish < ${path} > $out;"; + } "babelfish < ${path} > $out;"; in diff --git a/third_party/nixpkgs/nixos/modules/programs/hyprland.nix b/third_party/nixpkgs/nixos/modules/programs/hyprland.nix index 92b8e992e6..faeaa8973f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/hyprland.nix +++ b/third_party/nixpkgs/nixos/modules/programs/hyprland.nix @@ -6,10 +6,10 @@ with lib; let cfg = config.programs.hyprland; - defaultHyprlandPackage = pkgs.hyprland.override { - enableXWayland = cfg.xwayland.enable; - hidpiXWayland = cfg.xwayland.hidpi; - nvidiaPatches = cfg.nvidiaPatches; + finalPortalPackage = cfg.portalPackage.override { + hyprland-share-picker = pkgs.hyprland-share-picker.override { + hyprland = cfg.finalPackage; + }; }; in { @@ -25,24 +25,25 @@ in ''; }; - package = mkOption { - type = types.path; - default = defaultHyprlandPackage; - defaultText = literalExpression '' - pkgs.hyprland.override { - enableXWayland = config.programs.hyprland.xwayland.enable; - hidpiXWayland = config.programs.hyprland.xwayland.hidpi; - nvidiaPatches = config.programs.hyprland.nvidiaPatches; - } - ''; - example = literalExpression ".packages..default"; + package = mkPackageOptionMD pkgs "hyprland" { }; + + finalPackage = mkOption { + type = types.package; + readOnly = true; + default = cfg.package.override { + enableXWayland = cfg.xwayland.enable; + hidpiXWayland = cfg.xwayland.hidpi; + nvidiaPatches = cfg.nvidiaPatches; + }; + defaultText = literalExpression + "`wayland.windowManager.hyprland.package` with applied configuration"; description = mdDoc '' - The Hyprland package to use. - Setting this option will make {option}`programs.hyprland.xwayland` and - {option}`programs.hyprland.nvidiaPatches` not work. + The Hyprland package after applying configuration. ''; }; + portalPackage = mkPackageOptionMD pkgs "xdg-desktop-portal-hyprland" { }; + xwayland = { enable = mkEnableOption (mdDoc "XWayland") // { default = true; }; hidpi = mkEnableOption null // { @@ -57,9 +58,9 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.finalPackage ]; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; hardware.opengl.enable = mkDefault true; programs = { @@ -69,13 +70,11 @@ in security.polkit.enable = true; - services.xserver.displayManager.sessionPackages = [ cfg.package ]; + services.xserver.displayManager.sessionPackages = [ cfg.finalPackage ]; xdg.portal = { enable = mkDefault true; - extraPortals = [ - pkgs.xdg-desktop-portal-hyprland - ]; + extraPortals = [ finalPortalPackage ]; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/miriway.nix b/third_party/nixpkgs/nixos/modules/programs/miriway.nix index a67e1a17a7..e8a10770b6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/miriway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/miriway.nix @@ -66,7 +66,7 @@ in { }; hardware.opengl.enable = lib.mkDefault true; - fonts.enableDefaultFonts = lib.mkDefault true; + fonts.enableDefaultPackages = lib.mkDefault true; programs.dconf.enable = lib.mkDefault true; programs.xwayland.enable = lib.mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/programs/ns-usbloader.nix b/third_party/nixpkgs/nixos/modules/programs/ns-usbloader.nix new file mode 100644 index 0000000000..8d0b698d6b --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/ns-usbloader.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.programs.ns-usbloader; +in +{ + options = { + programs.ns-usbloader = { + enable = lib.mkEnableOption (lib.mdDoc "ns-usbloader application with udev rules applied"); + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.ns-usbloader ]; + services.udev.packages = [ pkgs.ns-usbloader ]; + }; + + meta.maintainers = pkgs.ns-usbloader.meta.maintainers; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/oddjobd.nix b/third_party/nixpkgs/nixos/modules/programs/oddjobd.nix new file mode 100644 index 0000000000..b0920d007c --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/oddjobd.nix @@ -0,0 +1,33 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.programs.oddjobd; +in +{ + options.programs.oddjobd = { + enable = lib.mkEnableOption "oddjob"; + package = lib.mkPackageOption pkgs "oddjob" {}; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { assertion = false; + message = "The oddjob service was found to be broken without NixOS test or maintainer. Please take ownership of this service."; + } + ]; + systemd.packages = [ cfg.package ]; + + systemd.services.oddjobd = { + wantedBy = [ "multi-user.target"]; + after = [ "network.target"]; + description = "DBUS Odd-job Daemon"; + enable = true; + documentation = [ "man:oddjobd(8)" "man:oddjobd.conf(5)" ]; + serviceConfig = { + Type = "dbus"; + BusName = "org.freedesktop.oddjob"; + ExecStart = "${lib.getBin cfg.package}/bin/oddjobd"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix new file mode 100644 index 0000000000..d0b280e394 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.programs.wayfire; +in +{ + meta.maintainers = with lib.maintainers; [ rewine ]; + + options.programs.wayfire = { + enable = lib.mkEnableOption (lib.mdDoc "Wayfire, a wayland compositor based on wlroots."); + + package = lib.mkPackageOptionMD pkgs "wayfire" { }; + + plugins = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = with pkgs.wayfirePlugins; [ wcm wf-shell ]; + defaultText = lib.literalExpression "with pkgs.wayfirePlugins; [ wcm wf-shell ]"; + example = lib.literalExpression '' + with pkgs.wayfirePlugins; [ + wcm + wf-shell + wayfire-plugins-extra + ]; + ''; + description = lib.mdDoc '' + Additional plugins to use with the wayfire window manager. + ''; + }; + }; + + config = let + finalPackage = pkgs.wayfire-with-plugins.override { + wayfire = cfg.package; + plugins = cfg.plugins; + }; + in + lib.mkIf cfg.enable { + environment.systemPackages = [ + finalPackage + ]; + + services.xserver.displayManager.sessionPackages = [ finalPackage ]; + + xdg.portal = { + enable = lib.mkDefault true; + wlr.enable = lib.mkDefault true; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix index 3cbfef4d61..da117ceae0 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/wayland-session.nix @@ -5,7 +5,7 @@ }; hardware.opengl.enable = mkDefault true; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; programs = { dconf.enable = mkDefault true; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 0e8b823c2b..45014ed3c6 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -72,7 +72,6 @@ in (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") - (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. '') @@ -115,6 +114,16 @@ in (mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.") (mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Please use fcitx5 instead") + (mkRemovedOptionModule [ "services" "dhcpd4" ] '' + The dhcpd4 module has been removed because ISC DHCP reached its end of life. + See https://www.isc.org/blogs/isc-dhcp-eol/ for details. + Please switch to a different implementation like kea or dnsmasq. + '') + (mkRemovedOptionModule [ "services" "dhcpd6" ] '' + The dhcpd6 module has been removed because ISC DHCP reached its end of life. + See https://www.isc.org/blogs/isc-dhcp-eol/ for details. + Please switch to a different implementation like kea or dnsmasq. + '') # Do NOT add any option renames here, see top of the file ]; diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix b/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix index adfca04426..88051de484 100644 --- a/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix +++ b/third_party/nixpkgs/nixos/modules/security/apparmor/includes.nix @@ -62,7 +62,7 @@ config.security.apparmor.includes = { include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base" r ${pkgs.stdenv.cc.libc}/share/locale/**, r ${pkgs.stdenv.cc.libc}/share/locale.alias, - ${lib.optionalString (pkgs.glibcLocales != null) "r ${pkgs.glibcLocales}/lib/locale/locale-archive,"} + r ${config.i18n.glibcLocales}/lib/locale/locale-archive, ${etcRule "localtime"} r ${pkgs.tzdata}/share/zoneinfo/**, r ${pkgs.stdenv.cc.libc}/share/i18n/**, @@ -72,7 +72,7 @@ config.security.apparmor.includes = { # bash inspects filesystems at startup # and /etc/mtab is linked to /proc/mounts - @{PROC}/mounts + r @{PROC}/mounts, # system-wide bash configuration '' + lib.concatMapStringsSep "\n" etcRule [ @@ -211,6 +211,9 @@ config.security.apparmor.includes = { "abstractions/nis" = '' include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nis" ''; + "abstractions/nss-systemd" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nss-systemd" + ''; "abstractions/nvidia" = '' include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nvidia" ${etcRule "vdpau_wrapper.cfg"} @@ -279,6 +282,8 @@ config.security.apparmor.includes = { r /var/lib/acme/*/chain.pem, r /var/lib/acme/*/fullchain.pem, + r /etc/pki/tls/certs/, + '' + lib.concatMapStringsSep "\n" etcRule [ "ssl/certs/ca-certificates.crt" "ssl/certs/ca-bundle.crt" diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix index c6392c679c..348c7b2568 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix @@ -44,5 +44,5 @@ in }; }; - meta.maintainers = with maintainers; [ SuperSandro2000 ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index 0da70112d4..3b44f097ab 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -33,7 +33,7 @@ let } trap on_exit EXIT - archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})" + archiveName="${optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})" archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" ${cfg.preHook} '' + optionalString cfg.doInit '' diff --git a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix index b34aa3ff50..9e1db23ca2 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix @@ -32,6 +32,8 @@ in services.tarsnap = { enable = mkEnableOption (lib.mdDoc "periodic tarsnap backups"); + package = mkPackageOption pkgs "tarsnap" { }; + keyfile = mkOption { type = types.str; default = "/root/tarsnap.key"; @@ -307,7 +309,7 @@ in requires = [ "network-online.target" ]; after = [ "network-online.target" ]; - path = with pkgs; [ iputils tarsnap util-linux ]; + path = with pkgs; [ iputils gcfg.package util-linux ]; # In order for the persistent tarsnap timer to work reliably, we have to # make sure that the tarsnap server is reachable after systemd starts up @@ -318,7 +320,7 @@ in ''; script = let - tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"''; + tarsnap = ''${lib.getExe gcfg.package} --configfile "/etc/tarsnap/${name}.conf"''; run = ''${tarsnap} -c -f "${name}-$(date +"%Y%m%d%H%M%S")" \ ${optionalString cfg.verbose "-v"} \ ${optionalString cfg.explicitSymlinks "-H"} \ @@ -355,10 +357,10 @@ in description = "Tarsnap restore '${name}'"; requires = [ "network-online.target" ]; - path = with pkgs; [ iputils tarsnap util-linux ]; + path = with pkgs; [ iputils gcfg.package util-linux ]; script = let - tarsnap = ''tarsnap --configfile "/etc/tarsnap/${name}.conf"''; + tarsnap = ''${lib.getExe gcfg.package} --configfile "/etc/tarsnap/${name}.conf"''; lastArchive = "$(${tarsnap} --list-archives | sort | tail -1)"; run = ''${tarsnap} -x -f "${lastArchive}" ${optionalString cfg.verbose "-v"}''; cachedir = escapeShellArg cfg.cachedir; @@ -402,6 +404,6 @@ in { text = configFile name cfg; }) gcfg.archives; - environment.systemPackages = [ pkgs.tarsnap ]; + environment.systemPackages = [ gcfg.package ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix index 83b372f594..9bf3a28583 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/patroni/default.nix @@ -6,9 +6,6 @@ let defaultGroup = "patroni"; format = pkgs.formats.yaml { }; - #boto doesn't support python 3.10 yet - patroni = pkgs.patroni.override { pythonPackages = pkgs.python39Packages; }; - configFileName = "patroni-${cfg.scope}-${cfg.name}.yaml"; configFile = format.generate configFileName cfg.settings; in @@ -224,7 +221,7 @@ in script = '' ${concatStringsSep "\n" (attrValues (mapAttrs (name: path: ''export ${name}="$(< ${escapeShellArg path})"'') cfg.environmentFiles))} - exec ${patroni}/bin/patroni ${configFile} + exec ${pkgs.patroni}/bin/patroni ${configFile} ''; serviceConfig = mkMerge [ @@ -252,7 +249,7 @@ in ''; environment.systemPackages = [ - patroni + pkgs.patroni cfg.postgresqlPackage (mkIf cfg.raft pkgs.python310Packages.pysyncobj) ]; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix index 1879fef966..51475171bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix @@ -31,6 +31,7 @@ in type = types.package; default = pkgs.boinc; defaultText = literalExpression "pkgs.boinc"; + example = literalExpression "pkgs.boinc-headless"; description = lib.mdDoc '' Which BOINC package to use. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix index a40b939a16..a35ca41680 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -1,64 +1,49 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.buildkite-agents; - mkHookOption = { name, description, example ? null }: { - inherit name; - value = mkOption { - default = null; - description = lib.mdDoc description; - type = types.nullOr types.lines; - } // (lib.optionalAttrs (example != null) { inherit example; }); - }; - mkHookOptions = hooks: listToAttrs (map mkHookOption hooks); - - hooksDir = cfg: let - mkHookEntry = name: value: '' - cat > $out/${name} <<'EOF' - #! ${pkgs.runtimeShell} - set -e - ${value} - EOF - chmod 755 $out/${name} + hooksDir = hooks: + let + mkHookEntry = name: text: '' + ln --symbolic ${pkgs.writeShellApplication { inherit name text; }}/bin/${name} $out/${name} + ''; + in + pkgs.runCommandLocal "buildkite-agent-hooks" { } '' + mkdir $out + ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkHookEntry hooks)} ''; - in pkgs.runCommand "buildkite-agent-hooks" { preferLocalBuild = true; } '' - mkdir $out - ${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))} - ''; buildkiteOptions = { name ? "", config, ... }: { options = { - enable = mkOption { + enable = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = lib.mdDoc "Whether to enable this buildkite agent"; }; - package = mkOption { + package = lib.mkOption { default = pkgs.buildkite-agent; - defaultText = literalExpression "pkgs.buildkite-agent"; + defaultText = lib.literalExpression "pkgs.buildkite-agent"; description = lib.mdDoc "Which buildkite-agent derivation to use"; - type = types.package; + type = lib.types.package; }; - dataDir = mkOption { + dataDir = lib.mkOption { default = "/var/lib/buildkite-agent-${name}"; description = lib.mdDoc "The workdir for the agent"; - type = types.str; + type = lib.types.str; }; - runtimePackages = mkOption { + runtimePackages = lib.mkOption { default = [ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]; - defaultText = literalExpression "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]"; + defaultText = lib.literalExpression "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]"; description = lib.mdDoc "Add programs to the buildkite-agent environment"; - type = types.listOf types.package; + type = lib.types.listOf lib.types.package; }; - tokenPath = mkOption { - type = types.path; + tokenPath = lib.mkOption { + type = lib.types.path; description = lib.mdDoc '' The token from your Buildkite "Agents" page. @@ -67,25 +52,25 @@ let ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "%hostname-${name}-%n"; description = lib.mdDoc '' The name of the agent as seen in the buildkite dashboard. ''; }; - tags = mkOption { - type = types.attrsOf (types.either types.str (types.listOf types.str)); - default = {}; - example = { queue = "default"; docker = "true"; ruby2 ="true"; }; + tags = lib.mkOption { + type = lib.types.attrsOf (lib.types.either lib.types.str (lib.types.listOf lib.types.str)); + default = { }; + example = { queue = "default"; docker = "true"; ruby2 = "true"; }; description = lib.mdDoc '' Tags for the agent. ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; example = "debug=true"; description = lib.mdDoc '' @@ -93,8 +78,8 @@ let ''; }; - privateSshKeyPath = mkOption { - type = types.nullOr types.path; + privateSshKeyPath = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; ## maximum care is taken so that secrets (ssh keys and the CI token) ## don't end up in the Nix store. @@ -108,67 +93,25 @@ let ''; }; - hooks = mkHookOptions [ - { name = "checkout"; - description = '' - The `checkout` hook script will replace the default checkout routine of the - bootstrap.sh script. You can use this hook to do your own SCM checkout - behaviour - ''; } - { name = "command"; - description = '' - The `command` hook script will replace the default implementation of running - the build command. - ''; } - { name = "environment"; - description = '' - The `environment` hook will run before all other commands, and can be used - to set up secrets, data, etc. Anything exported in hooks will be available - to the build script. + hooks = lib.mkOption { + type = lib.types.attrsOf lib.types.lines; + default = { }; + example = lib.literalExpression '' + { + environment = ''' + export SECRET_VAR=`head -1 /run/keys/secret` + '''; + }''; + description = lib.mdDoc '' + "Agent" hooks to install. + See for possible options. + ''; + }; - Note: the contents of this file will be copied to the world-readable - Nix store. - ''; - example = '' - export SECRET_VAR=`head -1 /run/keys/secret` - ''; } - { name = "post-artifact"; - description = '' - The `post-artifact` hook will run just after artifacts are uploaded - ''; } - { name = "post-checkout"; - description = '' - The `post-checkout` hook will run after the bootstrap script has checked out - your projects source code. - ''; } - { name = "post-command"; - description = '' - The `post-command` hook will run after the bootstrap script has run your - build commands - ''; } - { name = "pre-artifact"; - description = '' - The `pre-artifact` hook will run just before artifacts are uploaded - ''; } - { name = "pre-checkout"; - description = '' - The `pre-checkout` hook will run just before your projects source code is - checked out from your SCM provider - ''; } - { name = "pre-command"; - description = '' - The `pre-command` hook will run just before your build command runs - ''; } - { name = "pre-exit"; - description = '' - The `pre-exit` hook will run just before your build job finishes - ''; } - ]; - - hooksPath = mkOption { - type = types.path; - default = hooksDir config; - defaultText = literalMD "generated from {option}`services.buildkite-agents..hooks`"; + hooksPath = lib.mkOption { + type = lib.types.path; + default = hooksDir config.hooks; + defaultText = lib.literalMD "generated from {option}`services.buildkite-agents..hooks`"; description = lib.mdDoc '' Path to the directory storing the hooks. Consider using {option}`services.buildkite-agents..hooks.` @@ -176,10 +119,10 @@ let ''; }; - shell = mkOption { - type = types.str; + shell = lib.mkOption { + type = lib.types.str; default = "${pkgs.bash}/bin/bash -e -c"; - defaultText = literalExpression ''"''${pkgs.bash}/bin/bash -e -c"''; + defaultText = lib.literalExpression ''"''${pkgs.bash}/bin/bash -e -c"''; description = lib.mdDoc '' Command that buildkite-agent 3 will execute when it spawns a shell. ''; @@ -190,9 +133,9 @@ let mapAgents = function: lib.mkMerge (lib.mapAttrsToList function enabledAgents); in { - options.services.buildkite-agents = mkOption { - type = types.attrsOf (types.submodule buildkiteOptions); - default = {}; + options.services.buildkite-agents = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule buildkiteOptions); + default = { }; description = lib.mdDoc '' Attribute set of buildkite agents. The attribute key is combined with the hostname and a unique integer to @@ -213,23 +156,24 @@ in }; }); config.users.groups = mapAgents (name: cfg: { - "buildkite-agent-${name}" = {}; + "buildkite-agent-${name}" = { }; }); config.systemd.services = mapAgents (name: cfg: { - "buildkite-agent-${name}" = - { description = "Buildkite Agent"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - path = cfg.runtimePackages ++ [ cfg.package pkgs.coreutils ]; - environment = config.networking.proxy.envVars // { - HOME = cfg.dataDir; - NIX_REMOTE = "daemon"; - }; + "buildkite-agent-${name}" = { + description = "Buildkite Agent"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = cfg.runtimePackages ++ [ cfg.package pkgs.coreutils ]; + environment = config.networking.proxy.envVars // { + HOME = cfg.dataDir; + NIX_REMOTE = "daemon"; + }; - ## NB: maximum care is taken so that secrets (ssh keys and the CI token) - ## don't end up in the Nix store. - preStart = let + ## NB: maximum care is taken so that secrets (ssh keys and the CI token) + ## don't end up in the Nix store. + preStart = + let sshDir = "${cfg.dataDir}/.ssh"; tagStr = name: value: if lib.isList value @@ -237,44 +181,39 @@ in else "${name}=${value}"; tagsStr = lib.concatStringsSep "," (lib.mapAttrsToList tagStr cfg.tags); in - optionalString (cfg.privateSshKeyPath != null) '' - mkdir -m 0700 -p "${sshDir}" - install -m600 "${toString cfg.privateSshKeyPath}" "${sshDir}/id_rsa" - '' + '' - cat > "${cfg.dataDir}/buildkite-agent.cfg" < "${cfg.dataDir}/buildkite-agent.cfg" <' are mutually exclusive. - ''; - } - ]); - - imports = [ - (mkRemovedOptionModule [ "services" "buildkite-agent"] "services.buildkite-agent has been upgraded from version 2 to version 3 and moved to an attribute set at services.buildkite-agents. Please consult the 20.03 release notes for more information.") - ]; + config.assertions = mapAgents (name: cfg: [{ + assertion = cfg.hooksPath != hooksDir cfg.hooks -> cfg.hooks == { }; + message = '' + Options `services.buildkite-agents.${name}.hooksPath' and + `services.buildkite-agents.${name}.hooks.' are mutually exclusive. + ''; + }]); } diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix index a9a587b41e..e4d54b0cb0 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -210,9 +210,7 @@ in { preStart = let replacePlugins = - if cfg.plugins == null - then "" - else + optionalString (cfg.plugins != null) ( let pluginCmds = lib.attrsets.mapAttrsToList (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi") cfg.plugins; @@ -220,7 +218,7 @@ in { rm -r ${cfg.home}/plugins || true mkdir -p ${cfg.home}/plugins ${lib.strings.concatStringsSep "\n" pluginCmds} - ''; + ''); in '' rm -rf ${cfg.home}/war ${replacePlugins} diff --git a/third_party/nixpkgs/nixos/modules/services/databases/pgbouncer.nix b/third_party/nixpkgs/nixos/modules/services/databases/pgbouncer.nix new file mode 100644 index 0000000000..1aec03c114 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/databases/pgbouncer.nix @@ -0,0 +1,632 @@ +{ lib, pkgs, config, ... } : + +with lib; + +let + cfg = config.services.pgbouncer; + + confFile = pkgs.writeTextFile { + name = "pgbouncer.ini"; + text = '' + [databases] + ${concatStringsSep "\n" + (mapAttrsToList (dbname : settings : "${dbname} = ${settings}") cfg.databases)} + + [users] + ${concatStringsSep "\n" + (mapAttrsToList (username : settings : "${username} = ${settings}") cfg.users)} + + [peers] + ${concatStringsSep "\n" + (mapAttrsToList (peerid : settings : "${peerid} = ${settings}") cfg.peers)} + + [pgbouncer] + # general + ${optionalString (cfg.ignoreStartupParameters != null) "ignore_startup_parameters = ${cfg.ignoreStartupParameters}"} + listen_port = ${toString cfg.listenPort} + ${optionalString (cfg.listenAddress != null) "listen_addr = ${cfg.listenAddress}"} + pool_mode = ${cfg.poolMode} + max_client_conn = ${toString cfg.maxClientConn} + default_pool_size = ${toString cfg.defaultPoolSize} + max_user_connections = ${toString cfg.maxUserConnections} + max_db_connections = ${toString cfg.maxDbConnections} + + #auth + auth_type = ${cfg.authType} + ${optionalString (cfg.authHbaFile != null) "auth_hba_file = ${cfg.authHbaFile}"} + ${optionalString (cfg.authFile != null) "auth_file = ${cfg.authFile}"} + ${optionalString (cfg.authUser != null) "auth_user = ${cfg.authUser}"} + ${optionalString (cfg.authQuery != null) "auth_query = ${cfg.authQuery}"} + ${optionalString (cfg.authDbname != null) "auth_dbname = ${cfg.authDbname}"} + + # TLS + ${optionalString (cfg.tls.client != null) '' + client_tls_sslmode = ${cfg.tls.client.sslmode} + client_tls_key_file = ${cfg.tls.client.keyFile} + client_tls_cert_file = ${cfg.tls.client.certFile} + client_tls_ca_file = ${cfg.tls.client.caFile} + ''} + ${optionalString (cfg.tls.server != null) '' + server_tls_sslmode = ${cfg.tls.server.sslmode} + server_tls_key_file = ${cfg.tls.server.keyFile} + server_tls_cert_file = ${cfg.tls.server.certFile} + server_tls_ca_file = ${cfg.tls.server.caFile} + ''} + + # log + ${optionalString (cfg.logFile != null) "logfile = ${cfg.homeDir}/${cfg.logFile}"} + ${optionalString (cfg.syslog != null) '' + syslog = ${if cfg.syslog.enable then "1" else "0"} + syslog_ident = ${cfg.syslog.syslogIdent} + syslog_facility = ${cfg.syslog.syslogFacility} + ''} + ${optionalString (cfg.verbose != null) "verbose = ${toString cfg.verbose}"} + + # console access + ${optionalString (cfg.adminUsers != null) "admin_users = ${cfg.adminUsers}"} + ${optionalString (cfg.statsUsers != null) "stats_users = ${cfg.statsUsers}"} + + # linux + pidfile = /run/pgbouncer/pgbouncer.pid + + # extra + ${cfg.extraConfig} + ''; + }; + +in { + + options.services.pgbouncer = { + + # NixOS settings + + enable = mkEnableOption (lib.mdDoc "PostgreSQL connection pooler"); + + package = mkOption { + type = types.package; + default = pkgs.pgbouncer; + defaultText = literalExpression "pkgs.pgbouncer"; + description = lib.mdDoc '' + The pgbouncer package to use. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to automatically open the specified TCP port in the firewall. + ''; + }; + + # Generic settings + + logFile = mkOption { + type = types.nullOr types.str; + default = "pgbouncer.log"; + description = lib.mdDoc '' + Specifies the log file. + Either this or syslog has to be specified. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.commas; + example = "*"; + default = null; + description = lib.mdDoc '' + Specifies a list (comma-separated) of addresses where to listen for TCP connections. + You may also use * meaning “listen on all addresses”. + When not set, only Unix socket connections are accepted. + + Addresses can be specified numerically (IPv4/IPv6) or by name. + ''; + }; + + listenPort = mkOption { + type = types.port; + default = 6432; + description = lib.mdDoc '' + Which port to listen on. Applies to both TCP and Unix sockets. + ''; + }; + + poolMode = mkOption { + type = types.enum [ "session" "transaction" "statement" ]; + default = "session"; + description = lib.mdDoc '' + Specifies when a server connection can be reused by other clients. + + session + Server is released back to pool after client disconnects. Default. + transaction + Server is released back to pool after transaction finishes. + statement + Server is released back to pool after query finishes. + Transactions spanning multiple statements are disallowed in this mode. + ''; + }; + + maxClientConn = mkOption { + type = types.int; + default = 100; + description = lib.mdDoc '' + Maximum number of client connections allowed. + + When this setting is increased, then the file descriptor limits in the operating system + might also have to be increased. Note that the number of file descriptors potentially + used is more than maxClientConn. If each user connects under its own user name to the server, + the theoretical maximum used is: + maxClientConn + (max pool_size * total databases * total users) + + If a database user is specified in the connection string (all users connect under the same user name), + the theoretical maximum is: + maxClientConn + (max pool_size * total databases) + + The theoretical maximum should never be reached, unless somebody deliberately crafts a special load for it. + Still, it means you should set the number of file descriptors to a safely high number. + ''; + }; + + defaultPoolSize = mkOption { + type = types.int; + default = 20; + description = lib.mdDoc '' + How many server connections to allow per user/database pair. + Can be overridden in the per-database configuration. + ''; + }; + + maxDbConnections = mkOption { + type = types.int; + default = 0; + description = lib.mdDoc '' + Do not allow more than this many server connections per database (regardless of user). + This considers the PgBouncer database that the client has connected to, + not the PostgreSQL database of the outgoing connection. + + This can also be set per database in the [databases] section. + + Note that when you hit the limit, closing a client connection to one pool will + not immediately allow a server connection to be established for another pool, + because the server connection for the first pool is still open. + Once the server connection closes (due to idle timeout), + a new server connection will immediately be opened for the waiting pool. + + 0 = unlimited + ''; + }; + + maxUserConnections = mkOption { + type = types.int; + default = 0; + description = lib.mdDoc '' + Do not allow more than this many server connections per user (regardless of database). + This considers the PgBouncer user that is associated with a pool, + which is either the user specified for the server connection + or in absence of that the user the client has connected as. + + This can also be set per user in the [users] section. + + Note that when you hit the limit, closing a client connection to one pool + will not immediately allow a server connection to be established for another pool, + because the server connection for the first pool is still open. + Once the server connection closes (due to idle timeout), a new server connection + will immediately be opened for the waiting pool. + + 0 = unlimited + ''; + }; + + ignoreStartupParameters = mkOption { + type = types.nullOr types.commas; + example = "extra_float_digits"; + default = null; + description = lib.mdDoc '' + By default, PgBouncer allows only parameters it can keep track of in startup packets: + client_encoding, datestyle, timezone and standard_conforming_strings. + + All others parameters will raise an error. + To allow others parameters, they can be specified here, so that PgBouncer knows that + they are handled by the admin and it can ignore them. + + If you need to specify multiple values, use a comma-separated list. + + IMPORTANT: When using prometheus-pgbouncer-exporter, you need: + extra_float_digits + + ''; + }; + + # Section [databases] + databases = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + exampledb = "host=/run/postgresql/ port=5432 auth_user=exampleuser dbname=exampledb sslmode=require"; + bardb = "host=localhost dbname=bazdb"; + foodb = "host=host1.example.com port=5432"; + }; + description = lib.mdDoc '' + Detailed information about PostgreSQL database definitions: + + ''; + }; + + # Section [users] + users = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + user1 = "pool_mode=session"; + }; + description = lib.mdDoc '' + Optional. + + Detailed information about PostgreSQL user definitions: + + ''; + }; + + # Section [peers] + peers = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "1" = "host=host1.example.com"; + "2" = "host=/tmp/pgbouncer-2 port=5555"; + }; + description = lib.mdDoc '' + Optional. + + Detailed information about PostgreSQL database definitions: + + ''; + }; + + # Authentication settings + authType = mkOption { + type = types.enum [ "cert" "md5" "scram-sha-256" "plain" "trust" "any" "hba" "pam" ]; + default = "md5"; + description = lib.mdDoc '' + How to authenticate users. + + cert + Client must connect over TLS connection with a valid client certificate. + The user name is then taken from the CommonName field from the certificate. + md5 + Use MD5-based password check. This is the default authentication method. + authFile may contain both MD5-encrypted and plain-text passwords. + If md5 is configured and a user has a SCRAM secret, then SCRAM authentication is used automatically instead. + scram-sha-256 + Use password check with SCRAM-SHA-256. authFile has to contain SCRAM secrets or plain-text passwords. + plain + The clear-text password is sent over the wire. Deprecated. + trust + No authentication is done. The user name must still exist in authFile. + any + Like the trust method, but the user name given is ignored. + Requires that all databases are configured to log in as a specific user. + Additionally, the console database allows any user to log in as admin. + hba + The actual authentication type is loaded from authHbaFile. + This allows different authentication methods for different access paths, + for example: connections over Unix socket use the peer auth method, connections over TCP must use TLS. + pam + PAM is used to authenticate users, authFile is ignored. + This method is not compatible with databases using the authUser option. + The service name reported to PAM is “pgbouncer”. pam is not supported in the HBA configuration file. + ''; + }; + + authHbaFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/secrets/pgbouncer_hba"; + description = lib.mdDoc '' + HBA configuration file to use when authType is hba. + + See HBA file format details: + + ''; + }; + + authFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/secrets/pgbouncer_authfile"; + description = lib.mdDoc '' + The name of the file to load user names and passwords from. + + See section Authentication file format details: + + + Most authentication types require that either authFile or authUser be set; + otherwise there would be no users defined. + ''; + }; + + authUser = mkOption { + type = types.nullOr types.str; + default = null; + example = "pgbouncer"; + description = lib.mdDoc '' + If authUser is set, then any user not specified in authFile will be queried + through the authQuery query from pg_shadow in the database, using authUser. + The password of authUser will be taken from authFile. + (If the authUser does not require a password then it does not need to be defined in authFile.) + + Direct access to pg_shadow requires admin rights. + It's preferable to use a non-superuser that calls a SECURITY DEFINER function instead. + ''; + }; + + authQuery = mkOption { + type = types.nullOr types.str; + default = null; + example = "SELECT usename, passwd FROM pg_shadow WHERE usename=$1"; + description = lib.mdDoc '' + Query to load user's password from database. + + Direct access to pg_shadow requires admin rights. + It's preferable to use a non-superuser that calls a SECURITY DEFINER function instead. + + Note that the query is run inside the target database. + So if a function is used, it needs to be installed into each database. + ''; + }; + + authDbname = mkOption { + type = types.nullOr types.str; + default = null; + example = "authdb"; + description = lib.mdDoc '' + Database name in the [database] section to be used for authentication purposes. + This option can be either global or overriden in the connection string if this parameter is specified. + ''; + }; + + # TLS settings + tls.client = mkOption { + type = types.nullOr (types.submodule { + options = { + sslmode = mkOption { + type = types.enum [ "disable" "allow" "prefer" "require" "verify-ca" "verify-full" ]; + default = "disable"; + description = lib.mdDoc '' + TLS mode to use for connections from clients. + TLS connections are disabled by default. + + When enabled, tls.client.keyFile and tls.client.certFile + must be also configured to set up the key and certificate + PgBouncer uses to accept client connections. + + disable + Plain TCP. If client requests TLS, it's ignored. Default. + allow + If client requests TLS, it is used. If not, plain TCP is used. + If the client presents a client certificate, it is not validated. + prefer + Same as allow. + require + Client must use TLS. If not, the client connection is rejected. + If the client presents a client certificate, it is not validated. + verify-ca + Client must use TLS with valid client certificate. + verify-full + Same as verify-ca + ''; + }; + certFile = mkOption { + type = types.path; + example = "/secrets/pgbouncer.key"; + description = lib.mdDoc "Path to certificate for private key. Clients can validate it"; + }; + keyFile = mkOption { + type = types.path; + example = "/secrets/pgbouncer.crt"; + description = lib.mdDoc "Path to private key for PgBouncer to accept client connections"; + }; + caFile = mkOption { + type = types.path; + example = "/secrets/pgbouncer.crt"; + description = lib.mdDoc "Path to root certificate file to validate client certificates"; + }; + }; + }); + default = null; + description = lib.mdDoc '' + + ''; + }; + + tls.server = mkOption { + type = types.nullOr (types.submodule { + options = { + sslmode = mkOption { + type = types.enum [ "disable" "allow" "prefer" "require" "verify-ca" "verify-full" ]; + default = "disable"; + description = lib.mdDoc '' + TLS mode to use for connections to PostgreSQL servers. + TLS connections are disabled by default. + + disable + Plain TCP. TLS is not even requested from the server. Default. + allow + FIXME: if server rejects plain, try TLS? + prefer + TLS connection is always requested first from PostgreSQL. + If refused, the connection will be established over plain TCP. + Server certificate is not validated. + require + Connection must go over TLS. If server rejects it, plain TCP is not attempted. + Server certificate is not validated. + verify-ca + Connection must go over TLS and server certificate must be valid according to tls.server.caFile. + Server host name is not checked against certificate. + verify-full + Connection must go over TLS and server certificate must be valid according to tls.server.caFile. + Server host name must match certificate information. + ''; + }; + certFile = mkOption { + type = types.path; + example = "/secrets/pgbouncer_server.key"; + description = lib.mdDoc "Certificate for private key. PostgreSQL server can validate it."; + }; + keyFile = mkOption { + type = types.path; + example = "/secrets/pgbouncer_server.crt"; + description = lib.mdDoc "Private key for PgBouncer to authenticate against PostgreSQL server."; + }; + caFile = mkOption { + type = types.path; + example = "/secrets/pgbouncer_server.crt"; + description = lib.mdDoc "Root certificate file to validate PostgreSQL server certificates."; + }; + }; + }); + default = null; + description = lib.mdDoc '' + + ''; + }; + + # Log settings + syslog = mkOption { + type = types.nullOr (types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Toggles syslog on/off. + ''; + }; + syslogIdent = mkOption { + type = types.str; + default = "pgbouncer"; + description = lib.mdDoc '' + Under what name to send logs to syslog. + ''; + }; + syslogFacility = mkOption { + type = types.enum [ "auth" "authpriv" "daemon" "user" "local0" "local1" "local2" "local3" "local4" "local5" "local6" "local7" ]; + default = "daemon"; + description = lib.mdDoc '' + Under what facility to send logs to syslog. + ''; + }; + }; + }); + default = null; + description = lib.mdDoc '' + + ''; + }; + + verbose = lib.mkOption { + type = lib.types.int; + default = 0; + description = lib.mdDoc '' + Increase verbosity. Mirrors the “-v” switch on the command line. + ''; + }; + + # Console access control + adminUsers = mkOption { + type = types.nullOr types.commas; + default = null; + description = lib.mdDoc '' + Comma-separated list of database users that are allowed to connect and run all commands on the console. + Ignored when authType is any, in which case any user name is allowed in as admin. + ''; + }; + + statsUsers = mkOption { + type = types.nullOr types.commas; + default = null; + description = lib.mdDoc '' + Comma-separated list of database users that are allowed to connect and run read-only queries on the console. + That means all SHOW commands except SHOW FDS. + ''; + }; + + # Linux settings + openFilesLimit = lib.mkOption { + type = lib.types.int; + default = 65536; + description = lib.mdDoc '' + Maximum number of open files. + ''; + }; + + user = mkOption { + type = types.str; + default = "pgbouncer"; + description = lib.mdDoc '' + The user pgbouncer is run as. + ''; + }; + + group = mkOption { + type = types.str; + default = "pgbouncer"; + description = lib.mdDoc '' + The group pgbouncer is run as. + ''; + }; + + homeDir = mkOption { + type = types.path; + default = "/var/lib/pgbouncer"; + description = lib.mdDoc '' + Specifies the home directory. + ''; + }; + + # Extra settings + extraConfig = mkOption { + type = types.lines; + description = lib.mdDoc '' + Any additional text to be appended to config.ini + . + ''; + default = ""; + }; + }; + + config = mkIf cfg.enable { + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { + description = "PgBouncer service user"; + group = cfg.group; + home = cfg.homeDir; + createHome = true; + isSystemUser = true; + }; + + systemd.services.pgbouncer = { + description = "PgBouncer - PostgreSQL connection pooler"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.pgbouncer}/bin/pgbouncer -d ${confFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; + RuntimeDirectory = "pgbouncer"; + PIDFile = "/run/pgbouncer/pgbouncer.pid"; + LimitNOFILE = cfg.openFilesLimit; + }; + }; + + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + }; + + meta.maintainers = [ maintainers._1000101 ]; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index a7016bbee3..0acaf0fd00 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -404,8 +404,8 @@ in { log_connections = true; log_statement = "all"; - logging_collector = true - log_disconnections = true + logging_collector = true; + log_disconnections = true; log_destination = lib.mkForce "syslog"; } ''; diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix index 2be46e47d6..fe3a101597 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix @@ -96,7 +96,7 @@ in environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; - environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor"); + environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "emacseditor"); }; meta.doc = ./emacs.md; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix index c53dbf4777..5c058f1f0a 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix @@ -71,12 +71,16 @@ in environment.systemPackages = [ pkgs.udisks2 ]; - environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // { - # We need to make sure /etc/libblockdev/conf.d is populated to avoid + environment.etc = (mapAttrs' (name: value: nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // ( + let + libblockdev = pkgs.udisks2.libblockdev; + majorVer = versions.major libblockdev.version; + in { + # We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid # warnings - "libblockdev/conf.d/00-default.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/00-default.cfg"; - "libblockdev/conf.d/10-lvm-dbus.cfg".source = "${pkgs.libblockdev}/etc/libblockdev/conf.d/10-lvm-dbus.cfg"; - }; + "libblockdev/${majorVer}/conf.d/00-default.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/00-default.cfg"; + "libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg".source = "${libblockdev}/etc/libblockdev/${majorVer}/conf.d/10-lvm-dbus.cfg"; + }); security.polkit.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix new file mode 100644 index 0000000000..519d116e0e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/ebusd.nix @@ -0,0 +1,270 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ebusd; + + package = pkgs.ebusd; + + arguments = [ + "${package}/bin/ebusd" + "--foreground" + "--updatecheck=off" + "--device=${cfg.device}" + "--port=${toString cfg.port}" + "--configpath=${cfg.configpath}" + "--scanconfig=${cfg.scanconfig}" + "--log=main:${cfg.logs.main}" + "--log=network:${cfg.logs.network}" + "--log=bus:${cfg.logs.bus}" + "--log=update:${cfg.logs.update}" + "--log=other:${cfg.logs.other}" + "--log=all:${cfg.logs.all}" + ] ++ lib.optionals cfg.readonly [ + "--readonly" + ] ++ lib.optionals cfg.mqtt.enable [ + "--mqtthost=${cfg.mqtt.host}" + "--mqttport=${toString cfg.mqtt.port}" + "--mqttuser=${cfg.mqtt.user}" + "--mqttpass=${cfg.mqtt.password}" + ] ++ lib.optionals cfg.mqtt.home-assistant [ + "--mqttint=${package}/etc/ebusd/mqtt-hassio.cfg" + "--mqttjson" + ] ++ lib.optionals cfg.mqtt.retain [ + "--mqttretain" + ] ++ cfg.extraArguments; + + usesDev = hasPrefix "/" cfg.device; + + command = concatStringsSep " " arguments; + +in +{ + meta.maintainers = with maintainers; [ nathan-gs ]; + + options.services.ebusd = { + enable = mkEnableOption (lib.mdDoc "ebusd service"); + + device = mkOption { + type = types.str; + default = ""; + example = "IP:PORT"; + description = lib.mdDoc '' + Use DEV as eBUS device [/dev/ttyUSB0]. + This can be either: + enh:DEVICE or enh:IP:PORT for enhanced device (only adapter v3 and newer), + ens:DEVICE for enhanced high speed serial device (only adapter v3 and newer with firmware since 20220731), + DEVICE for serial device (normal speed, for all other serial adapters like adapter v2 as well as adapter v3 in non-enhanced mode), or + [udp:]IP:PORT for network device. + https://github.com/john30/ebusd/wiki/2.-Run#device-options + ''; + }; + + port = mkOption { + default = 8888; + type = types.port; + description = lib.mdDoc '' + The port on which to listen on + ''; + }; + + readonly = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Only read from device, never write to it + ''; + }; + + configpath = mkOption { + type = types.str; + default = "https://cfg.ebusd.eu/"; + description = lib.mdDoc '' + Read CSV config files from PATH (local folder or HTTPS URL) [https://cfg.ebusd.eu/] + ''; + }; + + scanconfig = mkOption { + type = types.str; + default = "full"; + description = lib.mdDoc '' + Pick CSV config files matching initial scan ("none" or empty for no initial scan message, "full" for full scan, or a single hex address to scan, default is to send a broadcast ident message). + If combined with --checkconfig, you can add scan message data as arguments for checking a particular scan configuration, e.g. "FF08070400/0AB5454850303003277201". For further details on this option, + see [Automatic configuration](https://github.com/john30/ebusd/wiki/4.7.-Automatic-configuration). + ''; + }; + + logs = { + main = mkOption { + type = types.enum [ "error" "notice" "info" "debug"]; + default = "info"; + description = lib.mdDoc '' + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. + ''; + }; + + network = mkOption { + type = types.enum [ "error" "notice" "info" "debug"]; + default = "info"; + description = lib.mdDoc '' + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. + ''; + }; + + bus = mkOption { + type = types.enum [ "error" "notice" "info" "debug"]; + default = "info"; + description = lib.mdDoc '' + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. + ''; + }; + + update = mkOption { + type = types.enum [ "error" "notice" "info" "debug"]; + default = "info"; + description = lib.mdDoc '' + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. + ''; + }; + + other = mkOption { + type = types.enum [ "error" "notice" "info" "debug"]; + default = "info"; + description = lib.mdDoc '' + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. + ''; + }; + + all = mkOption { + type = types.enum [ "error" "notice" "info" "debug"]; + default = "info"; + description = lib.mdDoc '' + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. + ''; + }; + }; + + mqtt = { + + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Adds support for MQTT + ''; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = lib.mdDoc '' + Connect to MQTT broker on HOST. + ''; + }; + + port = mkOption { + default = 1883; + type = types.port; + description = lib.mdDoc '' + The port on which to connect to MQTT + ''; + }; + + home-assistant = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Adds the Home Assistant topics to MQTT, read more at [MQTT Integration](https://github.com/john30/ebusd/wiki/MQTT-integration) + ''; + }; + + retain = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Set the retain flag on all topics instead of only selected global ones + ''; + }; + + user = mkOption { + type = types.str; + description = lib.mdDoc '' + The MQTT user to use + ''; + }; + + password = mkOption { + type = types.str; + description = lib.mdDoc '' + The MQTT password. + ''; + }; + + }; + + extraArguments = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + Extra arguments to the ebus daemon + ''; + }; + + }; + + config = mkIf (cfg.enable) { + + systemd.services.ebusd = { + description = "EBUSd Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = command; + DynamicUser = true; + Restart = "on-failure"; + + # Hardening + CapabilityBoundingSet = ""; + DeviceAllow = lib.optionals usesDev [ + cfg.device + ] ; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = false; + NoNewPrivileges = true; + PrivateDevices = usesDev; + PrivateUsers = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SupplementaryGroups = [ + "dialout" + ]; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service @pkey" + "~@privileged @resources" + ]; + UMask = "0077"; + }; + }; + + }; +} 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 abe0b93e41..0b8b1d7194 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 @@ -451,6 +451,7 @@ in { "eufylife_ble" "esphome" "fjaraskupan" + "gardena_bluetooth" "govee_ble" "homekit_controller" "inkbird" diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix index 5526df785c..d153ffc2ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix @@ -12,16 +12,14 @@ let configFile = pkgs.runCommand "matrix-appservice-irc.yml" { # Because this program will be run at build time, we need `nativeBuildInputs` - nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ]; + nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.jsonschema ])) pkgs.remarshal ]; preferLocalBuild = true; config = builtins.toJSON cfg.settings; passAsFile = [ "config" ]; } '' # The schema is given as yaml, we need to convert it to json - python -c 'import json; import yaml; import sys; json.dump(yaml.safe_load(sys.stdin), sys.stdout)' \ - < ${pkg}/lib/node_modules/matrix-appservice-irc/config.schema.yml \ - > config.schema.json + remarshal --if yaml --of json -i ${pkg}/config.schema.yml -o config.schema.json python -m jsonschema config.schema.json -i $configPath cp "$configPath" "$out" ''; @@ -215,7 +213,10 @@ in { LockPersonality = true; RestrictRealtime = true; PrivateMounts = true; - SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap"; + SystemCallFilter = [ + "@system-service @pkey" + "~@privileged @resources" + ]; SystemCallArchitectures = "native"; # AF_UNIX is required to connect to a postgres socket. RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix index c8d89ed33f..16c4f571da 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix @@ -138,10 +138,12 @@ in "~@privileged" ]; StateDirectory = "matrix-conduit"; + StateDirectoryMode = "0700"; ExecStart = "${cfg.package}/bin/conduit"; Restart = "on-failure"; RestartSec = 10; StartLimitBurst = 5; + UMask = "077"; }; }; }; 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 new file mode 100644 index 0000000000..9bf4de3317 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix @@ -0,0 +1,96 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.matrix-synapse.sliding-sync; +in +{ + options.services.matrix-synapse.sliding-sync = { + enable = lib.mkEnableOption (lib.mdDoc "sliding sync"); + + package = lib.mkPackageOption pkgs "matrix-sliding-sync" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = with lib.types; attrsOf str; + options = { + SYNCV3_SERVER = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc '' + The destination homeserver to talk to not including `/_matrix/` e.g `https://matrix.example.org`. + ''; + }; + + SYNCV3_DB = lib.mkOption { + type = lib.types.str; + default = "postgresql:///matrix-sliding-sync?host=/run/postgresql"; + description = lib.mdDoc '' + The postgres connection string. + Refer to . + ''; + }; + + SYNCV3_BINDADDR = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1:8009"; + example = "[::]:8008"; + description = lib.mdDoc "The interface and port to listen on."; + }; + + SYNCV3_LOG_LEVEL = lib.mkOption { + type = lib.types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ]; + default = "info"; + description = lib.mdDoc "The level of verbosity for messages logged."; + }; + }; + }; + default = { }; + description = '' + Freeform environment variables passed to the sliding sync proxy. + Refer to for all supported values. + ''; + }; + + createDatabase = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Whether to enable and configure `services.postgres` to ensure that the database user `matrix-sliding-sync` + and the database `matrix-sliding-sync` exist. + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc '' + Environment file as defined in {manpage}`systemd.exec(5)`. + + This must contain the {env}`SYNCV3_SECRET` variable which should + be generated with {command}`openssl rand -hex 32`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.postgresql = lib.optionalAttrs cfg.createDatabase { + enable = true; + ensureDatabases = [ "matrix-sliding-sync" ]; + ensureUsers = [ rec { + name = "matrix-sliding-sync"; + ensurePermissions."DATABASE \"${name}\"" = "ALL PRIVILEGES"; + } ]; + }; + + systemd.services.matrix-sliding-sync = { + after = lib.optional cfg.createDatabase "postgresql.service"; + wantedBy = [ "multi-user.target" ]; + environment = cfg.settings; + serviceConfig = { + DynamicUser = true; + EnvironmentFile = cfg.environmentFile; + ExecStart = lib.getExe cfg.package; + StateDirectory = "matrix-sliding-sync"; + WorkingDirectory = "%S/matrix-sliding-sync"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix index 202bd4dfca..57ff02df7d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix @@ -1,14 +1,12 @@ { config, pkgs, lib, ... }: - -with lib; - let + inherit (lib) mkOption types mdDoc mkIf; cfg = config.services.atuin; in { options = { services.atuin = { - enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin"); + enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin"); openRegistration = mkOption { type = types.bool; @@ -50,16 +48,28 @@ in createLocally = mkOption { type = types.bool; default = true; - description = lib.mdDoc "Create the database and database user locally."; + description = mdDoc "Create the database and database user locally."; + }; + + uri = mkOption { + type = types.str; + default = "postgresql:///atuin?host=/run/postgresql"; + example = "postgresql://atuin@localhost:5432/atuin"; + description = mdDoc "URI to the database"; }; }; }; }; config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.database.createLocally -> config.services.postgresql.enable; + message = "Postgresql must be enabled to create a local database"; + } + ]; - # enable postgres to host atuin db - services.postgresql = { + services.postgresql = mkIf cfg.database.createLocally { enable = true; ensureUsers = [{ name = "atuin"; @@ -73,7 +83,7 @@ in systemd.services.atuin = { description = "atuin server"; requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ]; - after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ] ; + after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -81,20 +91,55 @@ in RuntimeDirectory = "atuin"; RuntimeDirectoryMode = "0700"; DynamicUser = true; + + # Hardening + CapabilityBoundingSet = ""; + LockPersonality = true; + NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + # Required for connecting to database sockets, + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; }; environment = { ATUIN_HOST = cfg.host; ATUIN_PORT = toString cfg.port; ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength; - ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration; - ATUIN_DB_URI = mkIf cfg.database.createLocally "postgresql:///atuin"; + ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration; + ATUIN_DB_URI = cfg.database.uri; ATUIN_PATH = cfg.path; ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables }; }; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; - }; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix b/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix new file mode 100644 index 0000000000..214c89dbfe --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/bcg.nix @@ -0,0 +1,175 @@ +{ + config, + lib, + pkgs, + ... +}: + +with lib; + +let + cfg = config.services.bcg; + configFile = (pkgs.formats.yaml {}).generate "bcg.conf.yaml" ( + filterAttrsRecursive (n: v: v != null) { + inherit (cfg) device name mqtt; + retain_node_messages = cfg.retainNodeMessages; + qos_node_messages = cfg.qosNodeMessages; + base_topic_prefix = cfg.baseTopicPrefix; + automatic_remove_kit_from_names = cfg.automaticRemoveKitFromNames; + automatic_rename_kit_nodes = cfg.automaticRenameKitNodes; + automatic_rename_generic_nodes = cfg.automaticRenameGenericNodes; + automatic_rename_nodes = cfg.automaticRenameNodes; + } + ); +in +{ + options = { + services.bcg = { + enable = mkEnableOption (mdDoc "BigClown gateway"); + package = mkOption { + default = pkgs.python3Packages.bcg; + defaultText = literalExpression "pkgs.python3Packages.bcg"; + description = mdDoc "Which bcg derivation to use."; + type = types.package; + }; + environmentFiles = mkOption { + type = types.listOf types.path; + default = []; + example = [ "/run/keys/bcg.env" ]; + description = mdDoc '' + File to load as environment file. Environment variables from this file + will be interpolated into the config file using envsubst with this + syntax: `$ENVIRONMENT` or `''${VARIABLE}`. + This is useful to avoid putting secrets into the nix store. + ''; + }; + verbose = mkOption { + type = types.enum ["CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG"]; + default = "WARNING"; + description = mdDoc "Verbosity level."; + }; + device = mkOption { + type = types.str; + description = mdDoc "Device name to configure gateway to use."; + }; + name = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc '' + Name for the device. + + Supported variables: + * `{ip}` IP address + * `{id}` The ID of the connected usb-dongle or core-module + + `null` can be used for automatic detection from gateway firmware. + ''; + }; + mqtt = { + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = mdDoc "Host where MQTT server is running."; + }; + port = mkOption { + type = types.port; + default = 1883; + description = mdDoc "Port of MQTT server."; + }; + username = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "MQTT server access username."; + }; + password = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "MQTT server access password."; + }; + cafile = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "Certificate Authority file for MQTT server access."; + }; + certfile = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "Certificate file for MQTT server access."; + }; + keyfile = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "Key file for MQTT server access."; + }; + }; + retainNodeMessages = mkOption { + type = types.bool; + default = false; + description = mdDoc "Specify that node messages should be retaied in MQTT broker."; + }; + qosNodeMessages = mkOption { + type = types.int; + default = 1; + description = mdDoc "Set the guarantee of MQTT message delivery."; + }; + baseTopicPrefix = mkOption { + type = types.str; + default = ""; + description = mdDoc "Topic prefix added to all MQTT messages."; + }; + automaticRemoveKitFromNames = mkOption { + type = types.bool; + default = true; + description = mdDoc "Automatically remove kits."; + }; + automaticRenameKitNodes = mkOption { + type = types.bool; + default = true; + description = mdDoc "Automatically rename kit's nodes."; + }; + automaticRenameGenericNodes = mkOption { + type = types.bool; + default = true; + description = mdDoc "Automatically rename generic nodes."; + }; + automaticRenameNodes = mkOption { + type = types.bool; + default = true; + description = mdDoc "Automatically rename all nodes."; + }; + rename = mkOption { + type = with types; attrsOf str; + default = {}; + description = mdDoc "Rename nodes to different name."; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + python3Packages.bcg + python3Packages.bch + ]; + + systemd.services.bcg = let + envConfig = cfg.environmentFiles != []; + finalConfig = if envConfig + then "$RUNTIME_DIRECTORY/bcg.config.yaml" + else configFile; + in { + description = "BigClown Gateway"; + wantedBy = [ "multi-user.target" ]; + wants = mkIf config.services.mosquitto.enable [ "mosquitto.service" ]; + after = [ "network-online.target" ]; + preStart = '' + umask 077 + ${pkgs.envsubst}/bin/envsubst -i "${configFile}" -o "${finalConfig}" + ''; + serviceConfig = { + EnvironmentFile = cfg.environmentFiles; + ExecStart="${cfg.package}/bin/bcg -c ${finalConfig} -v ${cfg.verbose}"; + RuntimeDirectory = "bcg"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix index fced106cb3..a6fbfee73b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix @@ -11,7 +11,7 @@ let mapAttrsToList (n: v: ''"${n}": "${(concatStringsSep "," (map convType v))}"'') (foldAttrs (n: a: [n] ++ a) [] cfg.hardware); mergedConfig = with builtins; - mapAttrsToList (n: v: ''"${n}": ${if isBool v then "" else ''"''}${convType v}${if isBool v then "" else ''"''}'') + mapAttrsToList (n: v: ''"${n}": ${if isBool v then convType v else ''"${convType v}"''}'') cfg.config; cgminerConfig = pkgs.writeText "cgminer.conf" '' diff --git a/third_party/nixpkgs/nixos/modules/services/misc/evdevremapkeys.nix b/third_party/nixpkgs/nixos/modules/services/misc/evdevremapkeys.nix new file mode 100644 index 0000000000..11ea6a5f03 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/evdevremapkeys.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + format = pkgs.formats.yaml { }; + cfg = config.services.evdevremapkeys; + +in +{ + options.services.evdevremapkeys = { + enable = mkEnableOption (lib.mdDoc ''evdevremapkeys''); + + settings = mkOption { + type = format.type; + default = { }; + description = lib.mdDoc '' + config.yaml for evdevremapkeys + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "uinput" ]; + services.udev.extraRules = '' + KERNEL=="uinput", MODE="0660", GROUP="input" + ''; + users.groups.evdevremapkeys = { }; + users.users.evdevremapkeys = { + description = "evdevremapkeys service user"; + group = "evdevremapkeys"; + extraGroups = [ "input" ]; + isSystemUser = true; + }; + systemd.services.evdevremapkeys = { + description = "evdevremapkeys"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + let + config = format.generate "config.yaml" cfg.settings; + in + { + ExecStart = "${pkgs.evdevremapkeys}/bin/evdevremapkeys --config-file ${config}"; + User = "evdevremapkeys"; + Group = "evdevremapkeys"; + StateDirectory = "evdevremapkeys"; + Restart = "always"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateNetwork = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectSystem = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix index 945009f005..ec88de6da3 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix @@ -15,6 +15,7 @@ let APP_NAME = ${cfg.appName} RUN_USER = ${cfg.user} RUN_MODE = prod + WORK_PATH = ${cfg.stateDir} ${generators.toINI {} cfg.settings} @@ -439,6 +440,8 @@ in lfs = mkIf cfg.lfs.enable { PATH = cfg.lfs.contentDir; }; + + packages.CHUNKED_UPLOAD_PATH = "${cfg.stateDir}/tmp/package-upload"; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { @@ -583,7 +586,7 @@ in Restart = "always"; # Runtime directory and mode RuntimeDirectory = "gitea"; - RuntimeDirectoryMode = "0750"; + RuntimeDirectoryMode = "0755"; # Proc filesystem ProcSubset = "pid"; ProtectProc = "invisible"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index a497fbb300..c5e38b4988 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -1635,7 +1635,7 @@ in { "gitlab-config.service" "gitlab-db-config.service" ] ++ optional (cfg.databaseHost == "") "postgresql.service"; - wantedBy = [ "gitlab.target" ]; + requiredBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; environment = gitlabEnv; path = with pkgs; [ diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix index fa172ed277..9bf7e4aab8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix @@ -6,16 +6,16 @@ let cfg = config.services.gogs; opt = options.services.gogs; configFile = pkgs.writeText "app.ini" '' - APP_NAME = ${cfg.appName} + BRAND_NAME = ${cfg.appName} RUN_USER = ${cfg.user} RUN_MODE = prod [database] - DB_TYPE = ${cfg.database.type} + TYPE = ${cfg.database.type} HOST = ${cfg.database.host}:${toString cfg.database.port} NAME = ${cfg.database.name} USER = ${cfg.database.user} - PASSWD = #dbpass# + PASSWORD = #dbpass# PATH = ${cfg.database.path} [repository] @@ -25,7 +25,7 @@ let DOMAIN = ${cfg.domain} HTTP_ADDR = ${cfg.httpAddress} HTTP_PORT = ${toString cfg.httpPort} - ROOT_URL = ${cfg.rootUrl} + EXTERNAL_URL = ${cfg.rootUrl} [session] COOKIE_NAME = session diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix b/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix new file mode 100644 index 0000000000..621f51a4e7 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/mqtt2influxdb.nix @@ -0,0 +1,253 @@ +{ + config, + lib, + pkgs, + ... +}: + +with lib; + +let + cfg = config.services.mqtt2influxdb; + filterNull = filterAttrsRecursive (n: v: v != null); + configFile = (pkgs.formats.yaml {}).generate "mqtt2influxdb.config.yaml" ( + filterNull { + inherit (cfg) mqtt influxdb; + points = map filterNull cfg.points; + } + ); + + pointType = types.submodule { + options = { + measurement = mkOption { + type = types.str; + description = mdDoc "Name of the measurement"; + }; + topic = mkOption { + type = types.str; + description = mdDoc "MQTT topic to subscribe to."; + }; + fields = mkOption { + type = types.submodule { + options = { + value = mkOption { + type = types.str; + default = "$.payload"; + description = mdDoc "Value to be picked up"; + }; + type = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "Type to be picked up"; + }; + }; + }; + description = mdDoc "Field selector."; + }; + tags = mkOption { + type = with types; attrsOf str; + default = {}; + description = mdDoc "Tags applied"; + }; + }; + }; + + defaultPoints = [ + { + measurement = "temperature"; + topic = "node/+/thermometer/+/temperature"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + channel = "$.topic[3]"; + }; + } + { + measurement = "relative-humidity"; + topic = "node/+/hygrometer/+/relative-humidity"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + channel = "$.topic[3]"; + }; + } + { + measurement = "illuminance"; + topic = "node/+/lux-meter/0:0/illuminance"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + }; + } + { + measurement = "pressure"; + topic = "node/+/barometer/0:0/pressure"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + }; + } + { + measurement = "co2"; + topic = "node/+/co2-meter/-/concentration"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + }; + } + { + measurement = "voltage"; + topic = "node/+/battery/+/voltage"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + }; + } + { + measurement = "button"; + topic = "node/+/push-button/+/event-count"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + channel = "$.topic[3]"; + }; + } + { + measurement = "tvoc"; + topic = "node/+/voc-lp-sensor/0:0/tvoc"; + fields.value = "$.payload"; + tags = { + id = "$.topic[1]"; + }; + } + ]; +in { + options = { + services.mqtt2influxdb = { + enable = mkEnableOption (mdDoc "BigClown MQTT to InfluxDB bridge."); + environmentFiles = mkOption { + type = types.listOf types.path; + default = []; + example = [ "/run/keys/mqtt2influxdb.env" ]; + description = mdDoc '' + File to load as environment file. Environment variables from this file + will be interpolated into the config file using envsubst with this + syntax: `$ENVIRONMENT` or `''${VARIABLE}`. + This is useful to avoid putting secrets into the nix store. + ''; + }; + mqtt = { + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = mdDoc "Host where MQTT server is running."; + }; + port = mkOption { + type = types.port; + default = 1883; + description = mdDoc "MQTT server port."; + }; + username = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "Username used to connect to the MQTT server."; + }; + password = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc '' + MQTT password. + + It is highly suggested to use here replacement through + environmentFiles as otherwise the password is put world readable to + the store. + ''; + }; + cafile = mkOption { + type = with types; nullOr path; + default = null; + description = mdDoc "Certification Authority file for MQTT"; + }; + certfile = mkOption { + type = with types; nullOr path; + default = null; + description = mdDoc "Certificate file for MQTT"; + }; + keyfile = mkOption { + type = with types; nullOr path; + default = null; + description = mdDoc "Key file for MQTT"; + }; + }; + influxdb = { + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = mdDoc "Host where InfluxDB server is running."; + }; + port = mkOption { + type = types.port; + default = 8086; + description = mdDoc "InfluxDB server port"; + }; + database = mkOption { + type = types.str; + description = mdDoc "Name of the InfluxDB database."; + }; + username = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc "Username for InfluxDB login."; + }; + password = mkOption { + type = with types; nullOr str; + default = null; + description = mdDoc '' + Password for InfluxDB login. + + It is highly suggested to use here replacement through + environmentFiles as otherwise the password is put world readable to + the store. + ''; + }; + ssl = mkOption { + type = types.bool; + default = false; + description = mdDoc "Use SSL to connect to the InfluxDB server."; + }; + verify_ssl = mkOption { + type = types.bool; + default = true; + description = mdDoc "Verify SSL certificate when connecting to the InfluxDB server."; + }; + }; + points = mkOption { + type = types.listOf pointType; + default = defaultPoints; + description = mdDoc "Points to bridge from MQTT to InfluxDB."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.bigclown-mqtt2influxdb = let + envConfig = cfg.environmentFiles != []; + finalConfig = if envConfig + then "$RUNTIME_DIRECTORY/mqtt2influxdb.config.yaml" + else configFile; + in { + description = "BigClown MQTT to InfluxDB bridge"; + wantedBy = ["multi-user.target"]; + wants = mkIf config.services.mosquitto.enable ["mosquitto.service"]; + preStart = '' + umask 077 + ${pkgs.envsubst}/bin/envsubst -i "${configFile}" -o "${finalConfig}" + ''; + serviceConfig = { + EnvironmentFile = cfg.environmentFiles; + ExecStart = "${cfg.package}/bin/mqtt2influxdb -dc ${finalConfig}"; + RuntimeDirectory = "mqtt2influxdb"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix index 8fe628a408..1845d8ad29 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix @@ -26,14 +26,11 @@ let lib.mapAttrs (_: toString) cfg.extraConfig ); - manage = - let - setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); - in - pkgs.writeShellScript "manage" '' - ${setupEnv} - exec ${pkg}/bin/paperless-ngx "$@" - ''; + manage = pkgs.writeShellScript "manage" '' + set -o allexport # Export the following env vars + ${lib.toShellVars env} + exec ${pkg}/bin/paperless-ngx "$@" + ''; # Secure the services defaultServiceConfig = { @@ -172,19 +169,32 @@ in description = lib.mdDoc "Web interface port."; }; + # FIXME this should become an RFC42-style settings attr extraConfig = mkOption { type = types.attrs; default = { }; description = lib.mdDoc '' Extra paperless config options. - See [the documentation](https://paperless-ngx.readthedocs.io/en/latest/configuration.html) + See [the documentation](https://docs.paperless-ngx.com/configuration/) for available options. + + Note that some options such as `PAPERLESS_CONSUMER_IGNORE_PATTERN` expect JSON values. Use `builtins.toJSON` to ensure proper quoting. + ''; + example = literalExpression '' + { + PAPERLESS_OCR_LANGUAGE = "deu+eng"; + + PAPERLESS_DBHOST = "/run/postgresql"; + + PAPERLESS_CONSUMER_IGNORE_PATTERN = builtins.toJSON [ ".DS_STORE/*" "desktop.ini" ]; + + PAPERLESS_OCR_USER_ARGS = builtins.toJSON { + optimize = 1; + pdfa_image_compression = "lossless"; + }; + }; ''; - example = { - PAPERLESS_OCR_LANGUAGE = "deu+eng"; - PAPERLESS_DBHOST = "/run/postgresql"; - }; }; user = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix index d4391bc49e..580a009a0a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix @@ -8,13 +8,13 @@ let settingsFormat = pkgs.formats.ini { listToValue = concatMapStringsSep "," (generators.mkValueStringDefault {}); mkKeyValue = k: v: - if v == null then "" - else generators.mkKeyValueDefault { + optionalString (v != null) + (generators.mkKeyValueDefault { mkValueString = v: if v == true then "yes" else if v == false then "no" else generators.mkValueStringDefault {} v; - } "=" k v; + } "=" k v); }; configIniOfService = srv: settingsFormat.generate "sourcehut-${srv}-config.ini" # Each service needs access to only a subset of sections (and secrets). diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix index 7c7a3b464a..f83c82bbb7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix @@ -135,7 +135,7 @@ in { ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0"; }; restartTriggers = [ - config.environment.etc."sssd/sssd.conf".source + settingsFileUnsubstituted ]; }; systemd.sockets.sssd-kcm = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix index 9461bd3f35..f37f268992 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix @@ -375,7 +375,7 @@ in # Munin is hardcoded to use DejaVu Mono and the graphs come out wrong if # it's not available. - fonts.fonts = [ pkgs.dejavu_fonts ]; + fonts.packages = [ pkgs.dejavu_fonts ]; systemd.timers.munin-cron = { description = "batch Munin master programs"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index ebfbbf8f37..89a842023c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -225,7 +225,7 @@ in { ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf"; ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" '' - while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done + while [ "$(${cfg.package}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done ''; TimeoutStopSec = cfg.deadlineBeforeStopSec; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/osquery.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/osquery.nix new file mode 100644 index 0000000000..4f6c2557a6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/osquery.nix @@ -0,0 +1,97 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.osquery; + dirname = path: with lib.strings; with lib.lists; concatStringsSep "/" + (init (splitString "/" (normalizePath path))); + + # conf is the osquery configuration file used when the --config_plugin=filesystem. + # filesystem is the osquery default value for the config_plugin flag. + conf = pkgs.writeText "osquery.conf" (builtins.toJSON cfg.settings); + + # flagfile is the file containing osquery command line flags to be + # provided to the application using the special --flagfile option. + flagfile = pkgs.writeText "osquery.flags" + (concatStringsSep "\n" + (mapAttrsToList (name: value: "--${name}=${value}") + # Use the conf derivation if not otherwise specified. + ({ config_path = conf; } // cfg.flags))); + + osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \ + --add-flags "--flagfile ${flagfile} --disable-database" + ''; +in +{ + options.services.osquery = { + enable = mkEnableOption (mdDoc "osqueryd daemon"); + + settings = mkOption { + default = { }; + description = mdDoc '' + Configuration to be written to the osqueryd JSON configuration file. + To understand the configuration format, refer to https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-components. + ''; + example = { + options.utc = false; + }; + type = types.attrs; + }; + + flags = mkOption { + default = { }; + description = mdDoc '' + Attribute set of flag names and values to be written to the osqueryd flagfile. + For more information, refer to https://osquery.readthedocs.io/en/stable/installation/cli-flags. + ''; + example = { + config_refresh = "10"; + }; + type = with types; + submodule { + freeformType = attrsOf str; + options = { + database_path = mkOption { + default = "/var/lib/osquery/osquery.db"; + readOnly = true; + description = mdDoc "Path used for the database file."; + type = path; + }; + logger_path = mkOption { + default = "/var/log/osquery"; + readOnly = true; + description = mdDoc "Base directory used for logging."; + type = path; + }; + pidfile = mkOption { + default = "/run/osquery/osqueryd.pid"; + readOnly = true; + description = mdDoc "Path used for pid file."; + type = path; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ osqueryi ]; + systemd.services.osqueryd = { + after = [ "network.target" "syslog.service" ]; + description = "The osquery daemon"; + serviceConfig = { + ExecStart = "${pkgs.osquery}/bin/osqueryd --flagfile ${flagfile}"; + PIDFile = cfg.flags.pidfile; + LogsDirectory = cfg.flags.logger_path; + StateDirectory = dirname cfg.flags.database_path; + Restart = "always"; + }; + wantedBy = [ "multi-user.target" ]; + }; + systemd.tmpfiles.rules = [ + "d ${dirname (cfg.flags.pidfile)} 0755 root root -" + ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix index 55c4f4aa48..9adbe31d84 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix @@ -37,5 +37,6 @@ in { ] ++ extraFlags); ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix index e02acad3ec..f95412efd7 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -104,12 +104,12 @@ in LoadCredential = "configFile:${computedConfigFile}"; ExecStart = '' ${cfg.package}/bin/pve_exporter \ - --${if cfg.collectors.status == true then "" else "no-"}collector.status \ - --${if cfg.collectors.version == true then "" else "no-"}collector.version \ - --${if cfg.collectors.node == true then "" else "no-"}collector.node \ - --${if cfg.collectors.cluster == true then "" else "no-"}collector.cluster \ - --${if cfg.collectors.resources == true then "" else "no-"}collector.resources \ - --${if cfg.collectors.config == true then "" else "no-"}collector.config \ + --${optionalString (!cfg.collectors.status) "no-"}collector.status \ + --${optionalString (!cfg.collectors.version) "no-"}collector.version \ + --${optionalString (!cfg.collectors.node) "no-"}collector.node \ + --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \ + --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \ + --${optionalString (!cfg.collectors.config) "no-"}collector.config \ %d/configFile \ ${toString cfg.port} ${cfg.listenAddress} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix index 24407f05de..ad60079621 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix @@ -11,13 +11,6 @@ in { enable = mkEnableOption (lib.mdDoc '' Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device, to be found by Web Service Discovery Clients like Windows. - - ::: {.note} - If you use the firewall consider adding the following: - - networking.firewall.allowedTCPPorts = [ 5357 ]; - networking.firewall.allowedUDPPorts = [ 3702 ]; - ::: ''); interface = mkOption { type = types.nullOr types.str; @@ -31,6 +24,13 @@ in { example = 2; description = lib.mdDoc "Hop limit for multicast packets (default = 1)."; }; + openFirewall = mkOption { + description = lib.mdDoc '' + Whether to open the required firewall ports in the firewall. + ''; + default = false; + type = lib.types.bool; + }; workgroup = mkOption { type = types.nullOr types.str; default = null; @@ -120,5 +120,10 @@ in { SystemCallFilter = "~@cpu-emulation @debug @mount @obsolete @privileged @resources"; }; }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 5357 ]; + allowedUDPPorts = [ 3702 ]; + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix index 1428856764..d44a46b35a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix @@ -8,8 +8,7 @@ let settingsFile = pkgs.writeText "biboumi.cfg" ( generators.toKeyValue { mkKeyValue = k: v: - if v == null then "" - else generators.mkKeyValueDefault {} "=" k v; + lib.optionalString (v != null) (generators.mkKeyValueDefault {} "=" k v); } cfg.settings); need_CAP_NET_BIND_SERVICE = cfg.settings.identd_port != 0 && cfg.settings.identd_port < 1024; in diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix index 77e0b3f8af..9deeb7694d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix @@ -61,7 +61,7 @@ in checkPhase = optionalString cfg.checkConfig '' ln -s $out bird2.conf ${cfg.preCheckConfig} - ${pkgs.bird}/bin/bird -d -p -c bird2.conf + ${pkgs.buildPackages.bird}/bin/bird -d -p -c bird2.conf ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix index 5a19475161..80085da927 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix @@ -239,7 +239,7 @@ in after = [ "network-online.target" ]; bindsTo = [ "network-online.target" ]; - preStart = if cfg.confFile != null then "" else '' + preStart = optionalString (cfg.confFile == null) '' [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys if [ -z "$CJDNS_PRIVATE_KEY" ]; then diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix deleted file mode 100644 index a981a255c3..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix +++ /dev/null @@ -1,230 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg4 = config.services.dhcpd4; - cfg6 = config.services.dhcpd6; - - writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf" - '' - default-lease-time 600; - max-lease-time 7200; - ${optionalString (!cfg.authoritative) "not "}authoritative; - ddns-update-style interim; - log-facility local1; # see dhcpd.nix - - ${cfg.extraConfig} - - ${lib.concatMapStrings - (machine: '' - host ${machine.hostName} { - hardware ethernet ${machine.ethernetAddress}; - fixed-address${ - optionalString (postfix == "6") postfix - } ${machine.ipAddress}; - } - '') - cfg.machines - } - ''; - - dhcpdService = postfix: cfg: - let - configFile = - if cfg.configFile != null - then cfg.configFile - else writeConfig postfix cfg; - leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases"; - args = [ - "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" - "-pf" "/run/dhcpd${postfix}/dhcpd.pid" - "-cf" configFile - "-lf" leaseFile - ] ++ cfg.extraFlags - ++ cfg.interfaces; - in - optionalAttrs cfg.enable { - "dhcpd${postfix}" = { - description = "DHCPv${postfix} server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - preStart = "touch ${leaseFile}"; - serviceConfig = { - ExecStart = concatMapStringsSep " " escapeShellArg args; - Type = "forking"; - Restart = "always"; - DynamicUser = true; - User = "dhcpd"; - Group = "dhcpd"; - AmbientCapabilities = [ - "CAP_NET_RAW" # to send ICMP messages - "CAP_NET_BIND_SERVICE" # to bind on DHCP port (67) - ]; - StateDirectory = "dhcpd${postfix}"; - RuntimeDirectory = "dhcpd${postfix}"; - PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; - }; - }; - }; - - machineOpts = { ... }: { - - options = { - - hostName = mkOption { - type = types.str; - example = "foo"; - description = lib.mdDoc '' - Hostname which is assigned statically to the machine. - ''; - }; - - ethernetAddress = mkOption { - type = types.str; - example = "00:16:76:9a:32:1d"; - description = lib.mdDoc '' - MAC address of the machine. - ''; - }; - - ipAddress = mkOption { - type = types.str; - example = "192.168.1.10"; - description = lib.mdDoc '' - IP address of the machine. - ''; - }; - - }; - }; - - dhcpConfig = postfix: { - - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to enable the DHCPv${postfix} server. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - example = '' - option subnet-mask 255.255.255.0; - option broadcast-address 192.168.1.255; - option routers 192.168.1.5; - option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1; - option domain-name "example.org"; - subnet 192.168.1.0 netmask 255.255.255.0 { - range 192.168.1.100 192.168.1.200; - } - ''; - description = lib.mdDoc '' - Extra text to be appended to the DHCP server configuration - file. Currently, you almost certainly need to specify something - there, such as the options specifying the subnet mask, DNS servers, - etc. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - description = lib.mdDoc '' - Additional command line flags to be passed to the dhcpd daemon. - ''; - }; - - configFile = mkOption { - type = types.nullOr types.path; - default = null; - description = lib.mdDoc '' - The path of the DHCP server configuration file. If no file - is specified, a file is generated using the other options. - ''; - }; - - interfaces = mkOption { - type = types.listOf types.str; - default = ["eth0"]; - description = lib.mdDoc '' - The interfaces on which the DHCP server should listen. - ''; - }; - - machines = mkOption { - type = with types; listOf (submodule machineOpts); - default = []; - example = [ - { hostName = "foo"; - ethernetAddress = "00:16:76:9a:32:1d"; - ipAddress = "192.168.1.10"; - } - { hostName = "bar"; - ethernetAddress = "00:19:d1:1d:c4:9a"; - ipAddress = "192.168.1.11"; - } - ]; - description = lib.mdDoc '' - A list mapping Ethernet addresses to IPv${postfix} addresses for the - DHCP server. - ''; - }; - - authoritative = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether the DHCP server shall send DHCPNAK messages to misconfigured - clients. If this is not done, clients may be unable to get a correct - IP address after changing subnets until their old lease has expired. - ''; - }; - - }; - -in - -{ - - imports = [ - (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) - ] ++ flip map [ "4" "6" ] (postfix: - mkRemovedOptionModule [ "services" "dhcpd${postfix}" "stateDir" ] '' - The DHCP server state directory is now managed with the systemd's DynamicUser mechanism. - This means the directory is named after the service (dhcpd${postfix}), created under - /var/lib/private/ and symlinked to /var/lib/. - '' - ); - - ###### interface - - options = { - - services.dhcpd4 = dhcpConfig "4"; - services.dhcpd6 = dhcpConfig "6"; - - }; - - - ###### implementation - - config = mkIf (cfg4.enable || cfg6.enable) { - - systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; - - warnings = [ - '' - The dhcpd4 and dhcpd6 modules will be removed from NixOS 23.11, because ISC DHCP reached its end of life. - See https://www.isc.org/blogs/isc-dhcp-eol/ for details. - Please switch to a different implementation like kea, systemd-networkd or dnsmasq. - '' - ]; - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix index 45e32dc3b3..924abfc295 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix @@ -921,9 +921,7 @@ in { }; config = let - bss = bssSubmod.name; bssCfg = bssSubmod.config; - pairwiseCiphers = concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers ++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"])); @@ -964,9 +962,9 @@ in { } // optionalAttrs (bssCfg.bssid != null) { bssid = bssCfg.bssid; } // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) { - accept_mac_file = "/run/hostapd/${bss}.mac.allow"; + accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow"; } // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) { - deny_mac_file = "/run/hostapd/${bss}.mac.deny"; + deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny"; } // optionalAttrs (bssCfg.authentication.mode == "none") { wpa = mkDefault 0; } // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") { @@ -1051,7 +1049,6 @@ in { }; config.settings = let - radio = radioSubmod.name; radioCfg = radioSubmod.config; in { driver = radioCfg.driver; @@ -1268,6 +1265,7 @@ in { "AF_INET6" "AF_NETLINK" "AF_UNIX" + "AF_PACKET" ]; RestrictNamespaces = true; RestrictRealtime = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix index 785729d8f7..db4d2f7f0b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix @@ -14,8 +14,8 @@ let nonchars = filter (x : !(elem x.value chars)) (imap0 (i: v: {ind = i; value = v;}) (stringToCharacters str)); in - if length nonchars == 0 then "" - else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str; + lib.optionalString (nonchars != [ ]) + (substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str); indent = str: concatStrings (concatMap (s: [" " (trim [" " "\t"] s) "\n"]) (splitString "\n" str)); configText = indent (toString cfg.configSetup); connectionText = concatStrings (mapAttrsToList (n: v: diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix index a4fd2fd7c8..c53d86c0ba 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix @@ -42,12 +42,15 @@ let }; passwordFile = mkOption { - type = uniq (nullOr types.path); + type = uniq (nullOr path); example = "/path/to/file"; default = null; description = lib.mdDoc '' Specifies the path to a file containing the clear text password for the MQTT user. + The file is securely passed to mosquitto by + leveraging systemd credentials. No special + permissions need to be set on this file. ''; }; @@ -64,7 +67,7 @@ let }; hashedPasswordFile = mkOption { - type = uniq (nullOr types.path); + type = uniq (nullOr path); example = "/path/to/file"; default = null; description = mdDoc '' @@ -73,6 +76,9 @@ let To generate hashed password install the `mosquitto` package and use `mosquitto_passwd`, then remove the `username:` prefix from the generated file. + The file is securely passed to mosquitto by + leveraging systemd credentials. No special + permissions need to be set on this file. ''; }; @@ -102,15 +108,43 @@ let message = "Cannot set more than one password option for user ${n} in ${prefix}"; }) users; - makePasswordFile = users: path: + listenerScope = index: "listener-${toString index}"; + userScope = prefix: index: "${prefix}-user-${toString index}"; + credentialID = prefix: credential: "${prefix}-${credential}"; + + toScopedUsers = listenerScope: users: pipe users [ + attrNames + (imap0 (index: user: nameValuePair user + (users.${user} // { scope = userScope listenerScope index; }) + )) + listToAttrs + ]; + + userCredentials = user: credentials: pipe credentials [ + (filter (credential: user.${credential} != null)) + (map (credential: "${credentialID user.scope credential}:${user.${credential}}")) + ]; + usersCredentials = listenerScope: users: credentials: pipe users [ + (toScopedUsers listenerScope) + (mapAttrsToList (_: user: userCredentials user credentials)) + concatLists + ]; + systemdCredentials = listeners: listenerCredentials: pipe listeners [ + (imap0 (index: listener: listenerCredentials (listenerScope index) listener)) + concatLists + ]; + + makePasswordFile = listenerScope: users: path: let - makeLines = store: file: + makeLines = store: file: let + scopedUsers = toScopedUsers listenerScope users; + in mapAttrsToList - (n: u: "addLine ${escapeShellArg n} ${escapeShellArg u.${store}}") - (filterAttrs (_: u: u.${store} != null) users) + (name: user: ''addLine ${escapeShellArg name} "''$(systemd-creds cat ${credentialID user.scope store})"'') + (filterAttrs (_: user: user.${store} != null) scopedUsers) ++ mapAttrsToList - (n: u: "addFile ${escapeShellArg n} ${escapeShellArg "${u.${file}}"}") - (filterAttrs (_: u: u.${file} != null) users); + (name: user: ''addFile ${escapeShellArg name} "''${CREDENTIALS_DIRECTORY}/${credentialID user.scope file}"'') + (filterAttrs (_: user: user.${file} != null) scopedUsers); plainLines = makeLines "password" "passwordFile"; hashedLines = makeLines "hashedPassword" "hashedPasswordFile"; in @@ -581,6 +615,19 @@ in ExecStart = "${cfg.package}/bin/mosquitto -c ${configFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + # Credentials + SetCredential = let + listenerCredentials = listenerScope: listener: + usersCredentials listenerScope listener.users [ "password" "hashedPassword" ]; + in + systemdCredentials cfg.listeners listenerCredentials; + + LoadCredential = let + listenerCredentials = listenerScope: listener: + usersCredentials listenerScope listener.users [ "passwordFile" "hashedPasswordFile" ]; + in + systemdCredentials cfg.listeners listenerCredentials; + # Hardening CapabilityBoundingSet = ""; DevicePolicy = "closed"; @@ -653,7 +700,7 @@ in concatStringsSep "\n" (imap0 - (idx: listener: makePasswordFile listener.users "${cfg.dataDir}/passwd-${toString idx}") + (idx: listener: makePasswordFile (listenerScope idx) listener.users "${cfg.dataDir}/passwd-${toString idx}") cfg.listeners); }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix index ebade7aa8e..20c2eff11e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -19,8 +19,8 @@ let welcometext="${cfg.welcometext}" port=${toString cfg.port} - ${if cfg.hostName == "" then "" else "host="+cfg.hostName} - ${if cfg.password == "" then "" else "serverpassword="+cfg.password} + ${optionalString (cfg.hostName != "") "host=${cfg.hostName}"} + ${optionalString (cfg.password != "") "serverpassword=${cfg.password}"} bandwidth=${toString cfg.bandwidth} users=${toString cfg.users} @@ -32,17 +32,17 @@ let bonjour=${boolToString cfg.bonjour} sendversion=${boolToString cfg.sendVersion} - ${if cfg.registerName == "" then "" else "registerName="+cfg.registerName} - ${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword} - ${if cfg.registerUrl == "" then "" else "registerUrl="+cfg.registerUrl} - ${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname} + ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"} + ${optionalString (cfg.registerPassword == "") "registerPassword=${cfg.registerPassword}"} + ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"} + ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"} certrequired=${boolToString cfg.clientCertRequired} - ${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert} - ${if cfg.sslKey == "" then "" else "sslKey="+cfg.sslKey} - ${if cfg.sslCa == "" then "" else "sslCA="+cfg.sslCa} + ${optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"} + ${optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"} + ${optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"} - ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"} + ${optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"} ${cfg.extraConfig} ''; @@ -355,5 +355,37 @@ in ''; destination = "/share/dbus-1/system.d/murmur.conf"; })]; + + security.apparmor.policies."bin.mumble-server".profile = '' + include + + ${cfg.package}/bin/{mumble-server,.mumble-server-wrapped} { + include + include + include + include "${pkgs.apparmorRulesFromClosure { name = "mumble-server"; } cfg.package}" + pix ${cfg.package}/bin/.mumble-server-wrapped, + + r ${config.environment.etc."os-release".source}, + r ${config.environment.etc."lsb-release".source}, + owner rwk /var/lib/murmur/murmur.sqlite, + owner rw /var/lib/murmur/murmur.sqlite-journal, + owner r /var/lib/murmur/, + r /run/murmur/murmurd.pid, + r /run/murmur/murmurd.ini, + r ${configFile}, + '' + optionalString (cfg.logFile != null) '' + rw ${cfg.logFile}, + '' + optionalString (cfg.sslCert != "") '' + r ${cfg.sslCert}, + '' + optionalString (cfg.sslKey != "") '' + r ${cfg.sslKey}, + '' + optionalString (cfg.sslCa != "") '' + r ${cfg.sslCa}, + '' + optionalString (cfg.dbus != null) '' + dbus bus=${cfg.dbus} + '' + '' + } + ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index 3b28cec83c..e28f96f7a6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -461,6 +461,8 @@ in { "d /var/lib/NetworkManager-fortisslvpn 0700 root root -" "d /var/lib/misc 0755 root root -" # for dnsmasq.leases + # ppp isn't able to mkdir that directory at runtime + "d /run/pppd/lock 0700 root root -" ]; systemd.services.NetworkManager = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix index 09f3bdc7ae..6db728e7aa 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -137,8 +137,8 @@ let ''; yesOrNo = b: if b then "yes" else "no"; - maybeString = prefix: x: if x == null then "" else ''${prefix} "${x}"''; - maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString x}''; + maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"''; + maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}''; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix index af64969c2f..129e420555 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix @@ -165,9 +165,7 @@ in ${lsh}/sbin/lshd --daemonic \ --password-helper="${lsh}/sbin/lsh-pam-checkpw" \ -p ${toString portNumber} \ - ${if interfaces == [] then "" - else (concatStrings (map (i: "--interface=\"${i}\"") - interfaces))} \ + ${optionalString (interfaces != []) (concatStrings (map (i: "--interface=\"${i}\"") interfaces))} \ -h "${hostKey}" \ ${optionalString (!syslog) "--no-syslog" } \ ${if passwordAuthentication then "--password" else "--no-password" } \ diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index 69b45eb02d..346b50700c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -7,31 +7,33 @@ let opt = options.services.syncthing; defaultUser = "syncthing"; defaultGroup = defaultUser; + settingsFormat = pkgs.formats.json { }; + cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != {})) cfg.settings; - devices = mapAttrsToList (name: device: { + devices = mapAttrsToList (_: device: device // { deviceID = device.id; - inherit (device) name addresses introducer autoAcceptFolders; - }) cfg.devices; + }) cfg.settings.devices; - folders = mapAttrsToList ( _: folder: { - inherit (folder) path id label type; - devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices; - rescanIntervalS = folder.rescanInterval; - fsWatcherEnabled = folder.watch; - fsWatcherDelayS = folder.watchDelay; - ignorePerms = folder.ignorePerms; - ignoreDelete = folder.ignoreDelete; - versioning = folder.versioning; - }) (filterAttrs ( - _: folder: + folders = mapAttrsToList (_: folder: folder // + throwIf (folder?rescanInterval || folder?watch || folder?watchDelay) '' + The options services.syncthing.settings.folders..{rescanInterval,watch,watchDelay} + were removed. Please use, respectively, {rescanIntervalS,fsWatcherEnabled,fsWatcherDelayS} instead. + '' { + devices = map (device: + if builtins.isString device then + { deviceId = cfg.settings.devices.${device}.id; } + else + device + ) folder.devices; + }) (filterAttrs (_: folder: folder.enable - ) cfg.folders); + ) cfg.settings.folders); - updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' + jq = "${pkgs.jq}/bin/jq"; + updateConfig = pkgs.writers.writeBash "merge-syncthing-config" ('' set -efu # be careful not to leak secrets in the filesystem or in process listings - umask 0077 # get the api key by parsing the config.xml @@ -49,25 +51,85 @@ let --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" } + '' + - # query the old config - old_cfg=$(curl ${cfg.guiAddress}/rest/config) - - # generate the new config by merging with the NixOS config options - new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { - "devices": ('${escapeShellArg (builtins.toJSON devices)}'${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}), - "folders": ('${escapeShellArg (builtins.toJSON folders)}'${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"}) - } * '${escapeShellArg (builtins.toJSON cfg.extraOptions)}) - - # send the new config - curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config - + /* Syncthing's rest API for the folders and devices is almost identical. + Hence we iterate them using lib.pipe and generate shell commands for both at + the sime time. */ + (lib.pipe { + # The attributes below are the only ones that are different for devices / + # folders. + devs = { + new_conf_IDs = map (v: v.id) devices; + GET_IdAttrName = "deviceID"; + override = cfg.overrideDevices; + conf = devices; + baseAddress = "${cfg.guiAddress}/rest/config/devices"; + }; + dirs = { + new_conf_IDs = map (v: v.id) folders; + GET_IdAttrName = "id"; + override = cfg.overrideFolders; + conf = folders; + baseAddress = "${cfg.guiAddress}/rest/config/folders"; + }; + } [ + # Now for each of these attributes, write the curl commands that are + # identical to both folders and devices. + (mapAttrs (conf_type: s: + # We iterate the `conf` list now, and run a curl -X POST command for each, that + # should update that device/folder only. + lib.pipe s.conf [ + # Quoting https://docs.syncthing.net/rest/config.html: + # + # > PUT takes an array and POST a single object. In both cases if a + # given folder/device already exists, it’s replaced, otherwise a new + # one is added. + # + # What's not documented, is that using PUT will remove objects that + # don't exist in the array given. That's why we use here `POST`, and + # only if s.override == true then we DELETE the relevant folders + # afterwards. + (map (new_cfg: '' + curl -d ${lib.escapeShellArg (builtins.toJSON new_cfg)} -X POST ${s.baseAddress} + '')) + (lib.concatStringsSep "\n") + ] + /* If we need to override devices/folders, we iterate all currently configured + IDs, via another `curl -X GET`, and we delete all IDs that are not part of + 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 + done + '' + )) + builtins.attrValues + (lib.concatStringsSep "\n") + ]) + + /* Now we update the other settings defined in cleanedConfig which are not + "folders" or "devices". */ + (lib.pipe cleanedConfig [ + builtins.attrNames + (lib.subtractLists ["folders" "devices"]) + (map (subOption: '' + curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} \ + ${cfg.guiAddress}/rest/config/${subOption} + '')) + (lib.concatStringsSep "\n") + ]) + '' # restart Syncthing if required if curl ${cfg.guiAddress}/rest/config/restart-required | - ${pkgs.jq}/bin/jq -e .requiresRestart > /dev/null; then + ${jq} -e .requiresRestart > /dev/null; then curl -X POST ${cfg.guiAddress}/rest/system/restart fi - ''; + ''); in { ###### interface options = { @@ -99,287 +161,282 @@ in { default = true; description = mdDoc '' Whether to delete the devices which are not configured via the - [devices](#opt-services.syncthing.devices) option. + [devices](#opt-services.syncthing.settings.devices) option. If set to `false`, devices added via the web interface will persist and will have to be deleted manually. ''; }; - devices = mkOption { - default = {}; - description = mdDoc '' - Peers/devices which Syncthing should communicate with. - - Note that you can still add devices manually, but those changes - will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices) - is enabled. - ''; - example = { - bigbox = { - id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; - addresses = [ "tcp://192.168.0.10:51820" ]; - }; - }; - type = types.attrsOf (types.submodule ({ name, ... }: { - options = { - - name = mkOption { - type = types.str; - default = name; - description = lib.mdDoc '' - The name of the device. - ''; - }; - - addresses = mkOption { - type = types.listOf types.str; - default = []; - description = lib.mdDoc '' - The addresses used to connect to the device. - If this is left empty, dynamic configuration is attempted. - ''; - }; - - id = mkOption { - type = types.str; - description = mdDoc '' - The device ID. See . - ''; - }; - - introducer = mkOption { - type = types.bool; - default = false; - description = mdDoc '' - Whether the device should act as an introducer and be allowed - to add folders on this computer. - See . - ''; - }; - - autoAcceptFolders = mkOption { - type = types.bool; - default = false; - description = mdDoc '' - Automatically create or share folders that this device advertises at the default path. - See . - ''; - }; - - }; - })); - }; - overrideFolders = mkOption { type = types.bool; default = true; description = mdDoc '' Whether to delete the folders which are not configured via the - [folders](#opt-services.syncthing.folders) option. + [folders](#opt-services.syncthing.settings.folders) option. If set to `false`, folders added via the web interface will persist and will have to be deleted manually. ''; }; - folders = mkOption { - default = {}; - description = mdDoc '' - Folders which should be shared by Syncthing. - - Note that you can still add folders manually, but those changes - will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders) - is enabled. - ''; - example = literalExpression '' - { - "/home/user/sync" = { - id = "syncme"; - devices = [ "bigbox" ]; - }; - } - ''; - type = types.attrsOf (types.submodule ({ name, ... }: { + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; options = { - - enable = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to share this folder. - This option is useful when you want to define all folders - in one place, but not every machine should share all folders. - ''; - }; - - path = mkOption { - # TODO for release 23.05: allow relative paths again and set - # working directory to cfg.dataDir - type = types.str // { - check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/"); - description = types.str.description + " starting with / or ~/"; - }; - default = name; - description = lib.mdDoc '' - The path to the folder which should be shared. - Only absolute paths (starting with `/`) and paths relative to - the [user](#opt-services.syncthing.user)'s home directory - (starting with `~/`) are allowed. - ''; - }; - - id = mkOption { - type = types.str; - default = name; - description = lib.mdDoc '' - The ID of the folder. Must be the same on all devices. - ''; - }; - - label = mkOption { - type = types.str; - default = name; - description = lib.mdDoc '' - The label of the folder. - ''; - }; - - devices = mkOption { - type = types.listOf types.str; - default = []; + # global options + options = mkOption { + default = {}; description = mdDoc '' - The devices this folder should be shared with. Each device must - be defined in the [devices](#opt-services.syncthing.devices) option. + The options element contains all other global configuration options ''; - }; - - versioning = mkOption { - default = null; - description = mdDoc '' - How to keep changed/deleted files with Syncthing. - There are 4 different types of versioning with different parameters. - See . - ''; - example = literalExpression '' - [ - { - versioning = { - type = "simple"; - params.keep = "10"; - }; - } - { - versioning = { - type = "trashcan"; - params.cleanoutDays = "1000"; - }; - } - { - versioning = { - type = "staggered"; - fsPath = "/syncthing/backup"; - params = { - cleanInterval = "3600"; - maxAge = "31536000"; - }; - }; - } - { - versioning = { - type = "external"; - params.versionsPath = pkgs.writers.writeBash "backup" ''' - folderpath="$1" - filepath="$2" - rm -rf "$folderpath/$filepath" - '''; - }; - } - ] - ''; - type = with types; nullOr (submodule { + type = types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; options = { - type = mkOption { - type = enum [ "external" "simple" "staggered" "trashcan" ]; - description = mdDoc '' - The type of versioning. - See . + localAnnounceEnabled = mkOption { + type = types.nullOr types.bool; + default = null; + description = lib.mdDoc '' + Whether to send announcements to the local LAN, also use such announcements to find other devices. ''; }; - fsPath = mkOption { - default = ""; - type = either str path; - description = mdDoc '' - Path to the versioning folder. - See . + + localAnnouncePort = mkOption { + type = types.nullOr types.int; + default = null; + description = lib.mdDoc '' + The port on which to listen and send IPv4 broadcast announcements to. ''; }; - params = mkOption { - type = attrsOf (either str path); - description = mdDoc '' - The parameters for versioning. Structure depends on - [versioning.type](#opt-services.syncthing.folders._name_.versioning.type). - See . + + relaysEnabled = mkOption { + type = types.nullOr types.bool; + default = null; + description = lib.mdDoc '' + When true, relays will be connected to and potentially used for device to device connections. + ''; + }; + + urAccepted = mkOption { + type = types.nullOr types.int; + default = null; + description = lib.mdDoc '' + Whether the user has accepted to submit anonymous usage data. + The default, 0, mean the user has not made a choice, and Syncthing will ask at some point in the future. + "-1" means no, a number above zero means that that version of usage reporting has been accepted. + ''; + }; + + limitBandwidthInLan = mkOption { + type = types.nullOr types.bool; + default = null; + description = lib.mdDoc '' + Whether to apply bandwidth limits to devices in the same broadcast domain as the local device. + ''; + }; + + maxFolderConcurrency = mkOption { + type = types.nullOr types.int; + default = null; + description = lib.mdDoc '' + This option controls how many folders may concurrently be in I/O-intensive operations such as syncing or scanning. + The mechanism is described in detail in a [separate chapter](https://docs.syncthing.net/advanced/option-max-concurrency.html). ''; }; }; }); }; - rescanInterval = mkOption { - type = types.int; - default = 3600; - description = lib.mdDoc '' - How often the folder should be rescanned for changes. - ''; - }; - - type = mkOption { - type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ]; - default = "sendreceive"; - description = lib.mdDoc '' - Whether to only send changes for this folder, only receive them - or both. `receiveencrypted` can be used for untrusted devices. See - for reference. - ''; - }; - - watch = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether the folder should be watched for changes by inotify. - ''; - }; - - watchDelay = mkOption { - type = types.int; - default = 10; - description = lib.mdDoc '' - The delay after an inotify event is triggered. - ''; - }; - - ignorePerms = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to ignore permission changes. - ''; - }; - - ignoreDelete = mkOption { - type = types.bool; - default = false; + # device settings + devices = mkOption { + default = {}; description = mdDoc '' - Whether to skip deleting files that are deleted by peers. - See . - ''; - }; - }; - })); - }; + Peers/devices which Syncthing should communicate with. - extraOptions = mkOption { - type = types.addCheck (pkgs.formats.json {}).type isAttrs; + Note that you can still add devices manually, but those changes + will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices) + is enabled. + ''; + example = { + bigbox = { + id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; + addresses = [ "tcp://192.168.0.10:51820" ]; + }; + }; + type = types.attrsOf (types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + options = { + + name = mkOption { + type = types.str; + default = name; + description = lib.mdDoc '' + The name of the device. + ''; + }; + + id = mkOption { + type = types.str; + description = mdDoc '' + The device ID. See . + ''; + }; + + autoAcceptFolders = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Automatically create or share folders that this device advertises at the default path. + See . + ''; + }; + + }; + })); + }; + + # folder settings + folders = mkOption { + default = {}; + description = mdDoc '' + Folders which should be shared by Syncthing. + + Note that you can still add folders manually, but those changes + will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders) + is enabled. + ''; + example = literalExpression '' + { + "/home/user/sync" = { + id = "syncme"; + devices = [ "bigbox" ]; + }; + } + ''; + type = types.attrsOf (types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + options = { + + enable = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to share this folder. + This option is useful when you want to define all folders + in one place, but not every machine should share all folders. + ''; + }; + + path = mkOption { + # TODO for release 23.05: allow relative paths again and set + # working directory to cfg.dataDir + type = types.str // { + check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/"); + description = types.str.description + " starting with / or ~/"; + }; + default = name; + description = lib.mdDoc '' + The path to the folder which should be shared. + Only absolute paths (starting with `/`) and paths relative to + the [user](#opt-services.syncthing.user)'s home directory + (starting with `~/`) are allowed. + ''; + }; + + id = mkOption { + type = types.str; + default = name; + description = lib.mdDoc '' + The ID of the folder. Must be the same on all devices. + ''; + }; + + label = mkOption { + type = types.str; + default = name; + description = lib.mdDoc '' + The label of the folder. + ''; + }; + + devices = mkOption { + type = types.listOf types.str; + default = []; + description = mdDoc '' + The devices this folder should be shared with. Each device must + be defined in the [devices](#opt-services.syncthing.settings.devices) option. + ''; + }; + + versioning = mkOption { + default = null; + description = mdDoc '' + How to keep changed/deleted files with Syncthing. + There are 4 different types of versioning with different parameters. + See . + ''; + example = literalExpression '' + [ + { + versioning = { + type = "simple"; + params.keep = "10"; + }; + } + { + versioning = { + type = "trashcan"; + params.cleanoutDays = "1000"; + }; + } + { + versioning = { + type = "staggered"; + fsPath = "/syncthing/backup"; + params = { + cleanInterval = "3600"; + maxAge = "31536000"; + }; + }; + } + { + versioning = { + type = "external"; + params.versionsPath = pkgs.writers.writeBash "backup" ''' + folderpath="$1" + filepath="$2" + rm -rf "$folderpath/$filepath" + '''; + }; + } + ] + ''; + type = with types; nullOr (submodule { + freeformType = settingsFormat.type; + options = { + type = mkOption { + type = enum [ "external" "simple" "staggered" "trashcan" ]; + description = mdDoc '' + The type of versioning. + See . + ''; + }; + }; + }); + }; + + copyOwnershipFromParent = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + On Unix systems, tries to copy file/folder ownership from the parent directory (the directory it’s located in). + Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux). + ''; + }; + }; + })); + }; + + }; + }; default = {}; description = mdDoc '' Extra configuration options for Syncthing. @@ -530,6 +587,10 @@ in { This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher". It can be enabled on a per-folder basis through the web interface. '') + (mkRenamedOptionModule [ "services" "syncthing" "extraOptions" ] [ "services" "syncthing" "settings" ]) + (mkRenamedOptionModule [ "services" "syncthing" "folders" ] [ "services" "syncthing" "settings" "folders" ]) + (mkRenamedOptionModule [ "services" "syncthing" "devices" ] [ "services" "syncthing" "settings" "devices" ]) + (mkRenamedOptionModule [ "services" "syncthing" "options" ] [ "services" "syncthing" "settings" "options" ]) ] ++ map (o: mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ] ) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"]; @@ -615,9 +676,7 @@ in { ]; }; }; - syncthing-init = mkIf ( - cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {} - ) { + syncthing-init = mkIf (cleanedConfig != {}) { description = "Syncthing configuration updater"; requisite = [ "syncthing.service" ]; after = [ "syncthing.service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index 6eeee71e83..f308b7e331 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -29,12 +29,7 @@ in { description = lib.mdDoc "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node."; }; - package = mkOption { - type = types.package; - default = pkgs.tailscale; - defaultText = literalExpression "pkgs.tailscale"; - description = lib.mdDoc "The package to use for tailscale"; - }; + package = lib.mkPackageOptionMD pkgs "tailscale" {}; useRoutingFeatures = mkOption { type = types.enum [ "none" "client" "server" "both" ]; @@ -49,6 +44,22 @@ in { When set to `server` or `both`, IP forwarding will be enabled. ''; }; + + authKeyFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/tailscale_key"; + description = lib.mdDoc '' + A file containing the auth key. + ''; + }; + + extraUpFlags = mkOption { + description = lib.mdDoc "Extra flags to pass to {command}`tailscale up`."; + type = types.listOf types.str; + default = []; + example = ["--ssh"]; + }; }; config = mkIf cfg.enable { @@ -82,6 +93,21 @@ in { stopIfChanged = false; }; + systemd.services.tailscaled-autoconnect = mkIf (cfg.authKeyFile != null) { + after = ["tailscale.service"]; + wants = ["tailscale.service"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + }; + script = '' + status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service) + if [[ $status != Connected* ]]; then + ${cfg.package}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags} + fi + ''; + }; + boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") { "net.ipv4.conf.all.forwarding" = mkOverride 97 true; "net.ipv6.conf.all.forwarding" = mkOverride 97 true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix b/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix index 1454a7431c..170d392bf2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix @@ -12,7 +12,7 @@ in config = lib.mkIf cfg.enable { systemd.packages = [ cfg.package ]; systemd.services.twingate = { - preStart = "cp -r -n ${cfg.package}/etc/twingate/. /etc/twingate/"; + preStart = "cp -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/"; wantedBy = [ "multi-user.target" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix index ed7f1dadd3..218b440aab 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix @@ -121,7 +121,7 @@ in icons.enable = true; }; - fonts.enableDefaultFonts = mkDefault true; + fonts.enableDefaultPackages = mkDefault true; systemd = { services.xrdp = { diff --git a/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix b/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix index f1d2f462a7..47bd358f97 100644 --- a/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix +++ b/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix @@ -6,7 +6,7 @@ let cfg = config.services.fcron; - queuelen = if cfg.queuelen == null then "" else "-q ${toString cfg.queuelen}"; + queuelen = optionalString (cfg.queuelen != null) "-q ${toString cfg.queuelen}"; # Duplicate code, also found in cron.nix. Needs deduplication. systemCronJobs = diff --git a/third_party/nixpkgs/nixos/modules/services/search/typesense.nix b/third_party/nixpkgs/nixos/modules/services/search/typesense.nix new file mode 100644 index 0000000000..856c3cad22 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/search/typesense.nix @@ -0,0 +1,125 @@ +{ config, lib, pkgs, ... }: let + inherit + (lib) + concatMapStringsSep + generators + mdDoc + mkEnableOption + mkIf + mkOption + mkPackageOption + optionalString + types + ; + + cfg = config.services.typesense; + settingsFormatIni = pkgs.formats.ini { + listToValue = concatMapStringsSep " " (generators.mkValueStringDefault { }); + mkKeyValue = generators.mkKeyValueDefault + { + mkValueString = v: + if v == null then "" + else generators.mkValueStringDefault { } v; + } + "="; + }; + configFile = settingsFormatIni.generate "typesense.ini" cfg.settings; +in { + options.services.typesense = { + enable = mkEnableOption "typesense"; + package = mkPackageOption pkgs "typesense" {}; + + apiKeyFile = mkOption { + type = types.path; + description = '' + Sets the admin api key for typesense. Always use this option + instead of {option}`settings.server.api-key` to prevent the key + from being written to the world-readable nix store. + ''; + }; + + settings = mkOption { + description = mdDoc "Typesense configuration. Refer to [the documentation](https://typesense.org/docs/0.24.1/api/server-configuration.html) for supported values."; + default = {}; + type = types.submodule { + freeformType = settingsFormatIni.type; + options.server = { + data-dir = mkOption { + type = types.str; + default = "/var/lib/typesense"; + description = mdDoc "Path to the directory where data will be stored on disk."; + }; + + api-address = mkOption { + type = types.str; + description = mdDoc "Address to which Typesense API service binds."; + }; + + api-port = mkOption { + type = types.port; + default = 8108; + description = mdDoc "Port on which the Typesense API service listens."; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.typesense = { + description = "Typesense search engine"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + script = '' + export TYPESENSE_API_KEY=$(cat ${cfg.apiKeyFile}) + exec ${cfg.package}/bin/typesense-server --config ${configFile} + ''; + + serviceConfig = { + Restart = "on-failure"; + DynamicUser = true; + User = "typesense"; + Group = "typesense"; + + StateDirectory = "typesense"; + StateDirectoryMode = "0700"; + + # Hardening + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateUsers = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix index cea2a56bdc..6fb9f71a48 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix @@ -122,8 +122,8 @@ in }; log_level = lib.mkOption { description = lib.mdDoc "Log level of the server."; - default = "default"; - type = lib.types.enum [ "default" "verbose" "perfbasic" "perffull" ]; + default = "info"; + type = lib.types.enum [ "info" "debug" "trace" ]; }; role = lib.mkOption { description = lib.mdDoc "The role of this server. This affects the replication relationship and thereby available features."; @@ -236,17 +236,23 @@ in { StateDirectory = "kanidm"; StateDirectoryMode = "0700"; + RuntimeDirectory = "kanidmd"; ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}"; User = "kanidm"; Group = "kanidm"; + BindPaths = [ + # To create the socket + "/run/kanidmd:/run/kanidmd" + ]; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; # This would otherwise override the CAP_NET_BIND_SERVICE capability. PrivateUsers = lib.mkForce false; # Port needs to be exposed to the host network PrivateNetwork = lib.mkForce false; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; TemporaryFileSystem = "/:ro"; } ]; @@ -273,6 +279,8 @@ in "-/etc/static/kanidm" "-/etc/ssl" "-/etc/static/ssl" + "-/etc/passwd" + "-/etc/group" ]; BindPaths = [ # To create the socket @@ -327,6 +335,9 @@ in # These paths are hardcoded environment.etc = lib.mkMerge [ + (lib.mkIf cfg.enableServer { + "kanidm/server.toml".source = serverConfigFile; + }) (lib.mkIf options.services.kanidm.clientSettings.isDefined { "kanidm/config".source = clientConfigFile; }) 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 98ab8595bd..d22e6b5b40 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -121,7 +121,7 @@ in { The available configuration options can be found in [the environment template file](https://github.com/dani-garcia/vaultwarden/blob/${vaultwarden.version}/.env.template). - See ()[#opt-services.vaultwarden.environmentFile) for how + See [](#opt-services.vaultwarden.environmentFile) for how to set up access to the Admin UI to invite initial users. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/bpftune.nix b/third_party/nixpkgs/nixos/modules/services/system/bpftune.nix new file mode 100644 index 0000000000..d656a19c0a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/system/bpftune.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.bpftune; +in +{ + meta = { + maintainers = with lib.maintainers; [ nickcao ]; + }; + + options = { + services.bpftune = { + enable = lib.mkEnableOption (lib.mdDoc "bpftune BPF driven auto-tuning"); + + package = lib.mkPackageOptionMD pkgs "bpftune" { }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + systemd.services.bpftune.wantedBy = [ "multi-user.target" ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix index 0d6bec8883..c9df20196d 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix @@ -168,14 +168,16 @@ in systemd.packages = [ nixPackage ]; - systemd.tmpfiles = - if (isNixAtLeast "2.8") then { + systemd.tmpfiles = mkMerge [ + (mkIf (isNixAtLeast "2.8") { packages = [ nixPackage ]; - } else { + }) + (mkIf (!isNixAtLeast "2.8") { rules = [ "d /nix/var/nix/daemon-socket 0755 root root - -" ]; - }; + }) + ]; systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix index 1d98e7ddac..0a12ef48d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix @@ -111,7 +111,7 @@ in { fonts = mkIf (cfg.fonts != null) { fontconfig.enable = true; - fonts = map (f: f.package) cfg.fonts; + packages = map (f: f.package) cfg.fonts; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix index 217637cbeb..8db2bfae80 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix @@ -322,6 +322,16 @@ in ''; }; + systemd.services.nginx.serviceConfig.SupplementaryGroups = [ + "frigate" + ]; + + users.users.frigate = { + isSystemUser = true; + group = "frigate"; + }; + users.groups.frigate = {}; + systemd.services.frigate = { after = [ "go2rtc.service" @@ -349,15 +359,18 @@ in serviceConfig = { ExecStart = "${cfg.package.python.interpreter} -m frigate"; - DynamicUser = true; User = "frigate"; + Group = "frigate"; + + UMask = "0027"; StateDirectory = "frigate"; - UMask = "0077"; + StateDirectoryMode = "0750"; # Caches PrivateTmp = true; CacheDirectory = "frigate"; + CacheDirectoryMode = "0750"; BindPaths = [ "/migrations:${cfg.package}/share/frigate/migrations:ro" diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix index 330dce1d0c..cf4c0798cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix +++ b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix @@ -23,6 +23,15 @@ in { example = ["-d"]; }; + options.services.cage.environment = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + WLR_LIBINPUT_NO_DEVICES = "1"; + }; + description = lib.mdDoc "Additional environment variables to pass to Cage."; + }; + options.services.cage.program = mkOption { type = types.path; default = "${pkgs.xterm}/bin/xterm"; @@ -79,6 +88,7 @@ in { # Set up a full (custom) user session for the user, required by Cage. PAMName = "cage"; }; + environment = cfg.environment; }; security.polkit.enable = true; 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 da2cf93d7f..9261de8d43 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix @@ -308,6 +308,8 @@ 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/engelsystem.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix index f1d71f1744..138e2f3f1b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix @@ -104,6 +104,7 @@ in { ''; services.phpfpm.pools.engelsystem = { + phpPackage = pkgs.php81; user = "engelsystem"; settings = { "listen.owner" = config.services.nginx.user; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix index 89e29f7ccb..ffc05d0e41 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix @@ -7,7 +7,7 @@ let poolName = "freshrss"; in { - meta.maintainers = with maintainers; [ etu stunkymonkey ]; + meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ]; options.services.freshrss = { enable = mkEnableOption (mdDoc "FreshRSS feed reader"); @@ -27,7 +27,8 @@ in }; passwordFile = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; description = mdDoc "Password for the defaultUser for FreshRSS."; example = "/run/secrets/freshrss"; }; @@ -120,7 +121,13 @@ in user = mkOption { type = types.str; default = "freshrss"; - description = lib.mdDoc "User under which Freshrss runs."; + description = lib.mdDoc "User under which FreshRSS runs."; + }; + + authType = mkOption { + type = types.enum [ "form" "http_auth" "none" ]; + default = "form"; + description = mdDoc "Authentication type for FreshRSS."; }; }; @@ -160,6 +167,14 @@ in }; in mkIf cfg.enable { + assertions = mkIf (cfg.authType == "form") [ + { + assertion = cfg.passwordFile != null; + message = '' + `passwordFile` must be supplied when using "form" authentication! + ''; + } + ]; # Set up a Nginx virtual host. services.nginx = mkIf (cfg.virtualHost != null) { enable = true; @@ -227,7 +242,7 @@ in settingsFlags = concatStringsSep " \\\n " (mapAttrsToList (k: v: "${k} ${toString v}") { "--default_user" = ''"${cfg.defaultUser}"''; - "--auth_type" = ''"form"''; + "--auth_type" = ''"${cfg.authType}"''; "--base_url" = ''"${cfg.baseUrl}"''; "--language" = ''"${cfg.language}"''; "--db-type" = ''"${cfg.database.type}"''; @@ -255,20 +270,30 @@ in FRESHRSS_DATA_PATH = cfg.dataDir; }; - script = '' - # do installation or reconfigure - if test -f ${cfg.dataDir}/config.php; then - # reconfigure with settings - ./cli/reconfigure.php ${settingsFlags} - ./cli/update-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})" - else - # check correct folders in data folder - ./cli/prepare.php - # install with settings - ./cli/do-install.php ${settingsFlags} - ./cli/create-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})" - fi - ''; + script = + let + userScriptArgs = ''--user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"''; + updateUserScript = optionalString (cfg.authType == "form") '' + ./cli/update-user.php ${userScriptArgs} + ''; + createUserScript = optionalString (cfg.authType == "form") '' + ./cli/create-user.php ${userScriptArgs} + ''; + in + '' + # do installation or reconfigure + if test -f ${cfg.dataDir}/config.php; then + # reconfigure with settings + ./cli/reconfigure.php ${settingsFlags} + ${updateUserScript} + else + # check correct folders in data folder + ./cli/prepare.php + # install with settings + ./cli/do-install.php ${settingsFlags} + ${createUserScript} + fi + ''; }; systemd.services.freshrss-updater = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix index e2014a9b7e..bfa5fd5aff 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) literalExpression mdDoc mkEnableOption mkIf mkOption mkPackageOptionMD mkRenamedOptionModule types versionAtLeast; + cfg = config.services.hedgedoc; # 21.03 will not be an official release - it was instead 21.05. This @@ -32,6 +32,7 @@ in ]; options.services.hedgedoc = { + package = mkPackageOptionMD pkgs "hedgedoc" { }; enable = mkEnableOption (lib.mdDoc "the HedgeDoc Markdown Editor"); groups = mkOption { @@ -107,6 +108,13 @@ in {option}`protocolUseSSL`. ''; }; + enableStatsApi = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enables or disables the /status and /metrics endpoint. + ''; + }; hsts = { enable = mkOption { type = types.bool; @@ -1018,16 +1026,6 @@ in `HedgeDoc` is running. ''; }; - - package = mkOption { - type = types.package; - default = pkgs.hedgedoc; - defaultText = literalExpression "pkgs.hedgedoc"; - description = lib.mdDoc '' - Package that provides HedgeDoc. - ''; - }; - }; config = mkIf cfg.enable { @@ -1060,7 +1058,7 @@ in serviceConfig = { WorkingDirectory = cfg.workDir; StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ]; - ExecStart = "${cfg.package}/bin/hedgedoc"; + ExecStart = "${lib.getExe cfg.package}"; EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ "CMD_CONFIG_FILE=${cfg.workDir}/config.json" diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix index e875be47fb..8823da0100 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix @@ -62,7 +62,7 @@ let port = cfg.database.port; # Blank for unix sockets, see # https://github.com/will/crystal-pg/blob/1548bb255210/src/pq/conninfo.cr#L100-L108 - host = if cfg.database.host == null then "" else cfg.database.host; + host = lib.optionalString (cfg.database.host != null) cfg.database.host; # Not needed because peer authentication is enabled password = lib.mkIf (cfg.database.host == null) ""; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix index 8be1fd3055..f419b75cf7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix @@ -16,7 +16,7 @@ let DB_HOSTNAME=${cfg.database.host} DB_USERNAME=${cfg.database.user} # NOTE: file_get_contents adds newline at the end of returned string - DB_PASSWORD=${if cfg.database.passwordFile == null then "" else "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"} + DB_PASSWORD=${optionalString (cfg.database.passwordFile != null) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"} DB_DATABASE=${cfg.database.name} DB_PORT=${toString cfg.database.port} SESS_EXPIRATION=864000 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 a8ad4c50f2..6dfba907fb 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, utils, ... }: with lib; let cfg = config.services.lemmy; @@ -41,6 +41,30 @@ in default = null; description = lib.mdDoc "The connection URI to use. Takes priority over the configuration file if set."; }; + + uriFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the database uri."; + }; + }; + + pictrsApiKeyFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the value of `pictrs.api_key`."; + }; + + smtpPasswordFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the value of `email.smtp_password`."; + }; + + adminPasswordFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc "File which contains the value of `setup.admin_password`."; }; settings = mkOption { @@ -76,17 +100,20 @@ in }; }; }; - - secretFile = mkOption { - type = with types; nullOr path; - default = null; - description = lib.mdDoc "Path to a secret JSON configuration file which is merged at runtime with the one generated from {option}`services.lemmy.settings`."; - }; }; config = + let + secretOptions = { + pictrsApiKeyFile = { setting = [ "pictrs" "api_key" ]; path = cfg.pictrsApiKeyFile; }; + smtpPasswordFile = { setting = [ "email" "smtp_password" ]; path = cfg.smtpPasswordFile; }; + adminPasswordFile = { setting = [ "setup" "admin_password" ]; path = cfg.adminPasswordFile; }; + uriFile = { setting = [ "database" "uri" ]; path = cfg.database.uriFile; }; + }; + secrets = lib.filterAttrs (option: data: data.path != null) secretOptions; + in lib.mkIf cfg.enable { - services.lemmy.settings = (mapAttrs (name: mkDefault) + services.lemmy.settings = lib.attrsets.recursiveUpdate (mapAttrs (name: mkDefault) { bind = "127.0.0.1"; tls_enabled = true; @@ -104,14 +131,15 @@ in rate_limit.image = 6; rate_limit.image_per_second = 3600; } // { - database = mapAttrs (name: mkDefault) { - user = "lemmy"; - host = "/run/postgresql"; - port = 5432; - database = "lemmy"; - pool_size = 5; - }; - }); + database = mapAttrs (name: mkDefault) { + user = "lemmy"; + host = "/run/postgresql"; + port = 5432; + database = "lemmy"; + pool_size = 5; + }; + }) (lib.foldlAttrs (acc: option: data: acc // lib.setAttrByPath data.setting { _secret = option; }) {} secrets); + # the option name is the id of the credential loaded by LoadCredential services.postgresql = mkIf cfg.database.createLocally { enable = true; @@ -202,16 +230,19 @@ in assertion = (!(hasAttrByPath ["federation"] cfg.settings)) && (!(hasAttrByPath ["federation" "enabled"] cfg.settings)); message = "`services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect"; } + { + assertion = cfg.database.uriFile != null -> cfg.database.uri == null && !cfg.database.createLocally; + message = "specifying a database uri while also specifying a database uri file is not allowed"; + } ]; systemd.services.lemmy = let - configFile = settingsFormat.generate "config.hjson" cfg.settings; - mergedConfig = "/run/lemmy/config.hjson"; + substitutedConfig = "/run/lemmy/config.hjson"; in { description = "Lemmy server"; environment = { - LEMMY_CONFIG_LOCATION = if cfg.secretFile == null then configFile else mergedConfig; + LEMMY_CONFIG_LOCATION = if secrets == {} then settingsFormat.generate "config.hjson" cfg.settings else substitutedConfig; LEMMY_DATABASE_URL = if cfg.database.uri != null then cfg.database.uri else (mkIf (cfg.database.createLocally) "postgres:///lemmy?host=/run/postgresql&user=lemmy"); }; @@ -226,21 +257,20 @@ in requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ]; - path = mkIf (cfg.secretFile != null) [ pkgs.jq ]; - - # merge the two configs and prevent others from reading the result + # substitute secrets and prevent others from reading the result # if somehow $CREDENTIALS_DIRECTORY is not set we fail - preStart = mkIf (cfg.secretFile != null) '' + preStart = mkIf (secrets != {}) '' set -u - umask 177 - jq --slurp '.[0] * .[1]' ${lib.escapeShellArg configFile} "$CREDENTIALS_DIRECTORY/secretFile" > ${lib.escapeShellArg mergedConfig} + umask u=rw,g=,o= + cd "$CREDENTIALS_DIRECTORY" + ${utils.genJqSecretsReplacementSnippet cfg.settings substitutedConfig} ''; serviceConfig = { DynamicUser = true; RuntimeDirectory = "lemmy"; ExecStart = "${cfg.server.package}/bin/lemmy_server"; - LoadCredential = mkIf (cfg.secretFile != null) "secretFile:${toString cfg.secretFile}"; + LoadCredential = lib.foldlAttrs (acc: option: data: acc ++ [ "${option}:${toString data.path}" ]) [] secrets; PrivateTmp = true; MemoryDenyWriteExecute = true; NoNewPrivileges = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 7cc8ce10ff..3374c746ad 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -130,5 +130,17 @@ in environment = cfg.config; }; environment.systemPackages = [ cfg.package ]; + + security.apparmor.policies."bin.miniflux".profile = '' + include + ${cfg.package}/bin/miniflux { + include + include + include + include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}" + r ${cfg.package}/bin/miniflux, + r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size, + } + ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix index 58c110c951..c67562d389 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix @@ -12,22 +12,9 @@ in services.nexus = { enable = mkEnableOption (lib.mdDoc "Sonatype Nexus3 OSS service"); - package = mkOption { - type = types.package; - default = pkgs.nexus; - defaultText = literalExpression "pkgs.nexus"; - description = lib.mdDoc "Package which runs Nexus3"; - }; + package = lib.mkPackageOption pkgs "nexus" { }; - jdkPackage = mkOption { - type = types.package; - default = pkgs.openjdk8; - defaultText = literalExample "pkgs.openjdk8"; - example = literalExample "pkgs.openjdk8"; - description = '' - The JDK package to use. - ''; - }; + jdkPackage = lib.mkPackageOption pkgs "openjdk8" { }; user = mkOption { type = types.str; @@ -114,8 +101,7 @@ in config = mkIf cfg.enable { users.users.${cfg.user} = { isSystemUser = true; - group = cfg.group; - home = cfg.home; + inherit (cfg) group home; createHome = true; }; @@ -132,7 +118,7 @@ in NEXUS_USER = cfg.user; NEXUS_HOME = cfg.home; - INSTALL4J_JAVA_HOME = "${cfg.jdkPackage}"; + INSTALL4J_JAVA_HOME = cfg.jdkPackage; VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix index 4826b2cab6..17e170c33d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix @@ -348,7 +348,7 @@ in { }; redis = { hostname = "${toString cfg.redis.host}"; - port = (if cfg.redis.port == null then "" else cfg.redis.port); + port = (lib.optionalString (cfg.redis.port != null) cfg.redis.port); }; storage = { tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix new file mode 100644 index 0000000000..33353a5944 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/slskd.nix @@ -0,0 +1,211 @@ +{ lib, pkgs, config, ... }: + +let + settingsFormat = pkgs.formats.yaml {}; +in { + options.services.slskd = with lib; with types; { + enable = mkEnableOption "enable slskd"; + + rotateLogs = mkEnableOption "enable an unit and timer that will rotate logs in /var/slskd/logs"; + + package = mkPackageOptionMD pkgs "slskd" { }; + + nginx = mkOption { + description = lib.mdDoc "options for nginx"; + example = { + enable = true; + domain = "example.com"; + contextPath = "/slskd"; + }; + type = submodule ({name, config, ...}: { + options = { + enable = mkEnableOption "enable nginx as a reverse proxy"; + + domainName = mkOption { + type = str; + description = "Domain you want to use"; + }; + contextPath = mkOption { + type = types.path; + default = "/"; + description = lib.mdDoc '' + The context path, i.e., the last part of the slskd + URL. Typically '/' or '/slskd'. Default '/' + ''; + }; + }; + }); + }; + + environmentFile = mkOption { + type = path; + description = '' + Path to a file containing secrets. + It must at least contain the variable `SLSKD_SLSK_PASSWORD` + ''; + }; + + openFirewall = mkOption { + type = bool; + description = '' + Whether to open the firewall for services.slskd.settings.listen_port"; + ''; + default = false; + }; + + settings = mkOption { + description = lib.mdDoc '' + Configuration for slskd, see + [available options](https://github.com/slskd/slskd/blob/master/docs/config.md) + `APP_DIR` is set to /var/lib/slskd, where default download & incomplete directories, + log and databases will be created. + ''; + default = {}; + type = submodule { + freeformType = settingsFormat.type; + options = { + + soulseek = { + username = mkOption { + type = str; + description = "Username on the Soulseek Network"; + }; + listen_port = mkOption { + type = port; + description = "Port to use for communication on the Soulseek Network"; + default = 50000; + }; + }; + + web = { + port = mkOption { + type = port; + default = 5001; + description = "The HTTP listen port"; + }; + url_base = mkOption { + type = path; + default = config.services.slskd.nginx.contextPath; + defaultText = "config.services.slskd.nginx.contextPath"; + description = lib.mdDoc '' + The context path, i.e., the last part of the slskd URL + ''; + }; + }; + + shares = { + directories = mkOption { + type = listOf str; + description = lib.mdDoc '' + Paths to your shared directories. See + [documentation](https://github.com/slskd/slskd/blob/master/docs/config.md#directories) + for advanced usage + ''; + }; + }; + + directories = { + incomplete = mkOption { + type = nullOr path; + description = "Directory where downloading files are stored"; + defaultText = "/incomplete"; + default = null; + }; + downloads = mkOption { + type = nullOr path; + description = "Directory where downloaded files are stored"; + defaultText = "/downloads"; + default = null; + }; + }; + }; + }; + }; + }; + + config = let + cfg = config.services.slskd; + + confWithoutNullValues = (lib.filterAttrs (key: value: value != null) cfg.settings); + + configurationYaml = settingsFormat.generate "slskd.yml" confWithoutNullValues; + + in lib.mkIf cfg.enable { + + users = { + users.slskd = { + isSystemUser = true; + group = "slskd"; + }; + groups.slskd = {}; + }; + + # Reverse proxy configuration + services.nginx.enable = true; + services.nginx.virtualHosts."${cfg.nginx.domainName}" = { + forceSSL = true; + enableACME = true; + locations = { + "${cfg.nginx.contextPath}" = { + proxyPass = "http://localhost:${toString cfg.settings.web.port}"; + proxyWebsockets = true; + }; + }; + }; + + # Hide state & logs + systemd.tmpfiles.rules = [ + "d /var/lib/slskd/data 0750 slskd slskd - -" + "d /var/lib/slskd/logs 0750 slskd slskd - -" + ]; + + systemd.services.slskd = { + description = "A modern client-server application for the Soulseek file sharing network"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + User = "slskd"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + StateDirectory = "slskd"; + ExecStart = "${cfg.package}/bin/slskd --app-dir /var/lib/slskd --config ${configurationYaml}"; + Restart = "on-failure"; + ReadOnlyPaths = map (d: builtins.elemAt (builtins.split "[^/]*(/.+)" d) 1) cfg.settings.shares.directories; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + }; + }; + + networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.settings.soulseek.listen_port; + + systemd.services.slskd-rotatelogs = lib.mkIf cfg.rotateLogs { + description = "Rotate slskd logs"; + serviceConfig = { + Type = "oneshot"; + User = "slskd"; + ExecStart = [ + "${pkgs.findutils}/bin/find /var/lib/slskd/logs/ -type f -mtime +10 -delete" + "${pkgs.findutils}/bin/find /var/lib/slskd/logs/ -type f -mtime +1 -exec ${pkgs.gzip}/bin/gzip -q {} ';'" + ]; + }; + startAt = "daily"; + }; + + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix index 5e5d947282..9427eff35d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix @@ -232,8 +232,8 @@ in { proxy_connect_timeout 90; proxy_send_timeout 90; proxy_read_timeout 90; - proxy_buffer_size 4k; - proxy_buffers 4 32k; + proxy_buffer_size 64k; + proxy_buffers 8 64k; proxy_busy_buffers_size 64k; proxy_temp_file_write_size 64k; client_max_body_size 50m; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix index 5042fbf1f8..e9f42c4118 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.lighttpd.cgit; - pathPrefix = if stringLength cfg.subdir == 0 then "" else "/" + cfg.subdir; + pathPrefix = optionalString (stringLength cfg.subdir != 0) ("/" + cfg.subdir); configFile = pkgs.writeText "cgitrc" '' # default paths to static assets 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 e87159ba99..fccc31b511 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 @@ -261,23 +261,6 @@ let ${proxyCachePathConfig} - ${optionalString cfg.statusPage '' - server { - listen ${toString cfg.defaultHTTPListenPort}; - ${optionalString enableIPv6 "listen [::]:${toString cfg.defaultHTTPListenPort};" } - - server_name localhost; - - location /nginx_status { - stub_status on; - access_log off; - allow 127.0.0.1; - ${optionalString enableIPv6 "allow ::1;"} - deny all; - } - } - ''} - ${vhosts} ${cfg.appendHttpConfig} @@ -352,7 +335,7 @@ let + ";")) + " listen ${addr}:${toString port} " - + optionalString (ssl && vhost.http2) "http2 " + + optionalString (ssl && vhost.http2 && oldHTTP2) "http2 " + optionalString ssl "ssl " + optionalString vhost.default "default_server " + optionalString vhost.reuseport "reuseport " @@ -362,7 +345,9 @@ let redirectListen = filter (x: !x.ssl) defaultListen; - acmeLocation = optionalString (vhost.enableACME || vhost.useACMEHost != null) '' + # The acme-challenge location doesn't need to be added if we are not using any automated + # certificate provisioning and can also be omitted when we use a certificate obtained via a DNS-01 challenge + acmeLocation = optionalString (vhost.enableACME || (vhost.useACMEHost != null && config.security.acme.certs.${vhost.useACMEHost}.dnsProvider == null)) '' # Rule for legitimate ACME Challenge requests (like /.well-known/acme-challenge/xxxxxxxxx) # We use ^~ here, so that we don't check any regexes (which could # otherwise easily override this intended match accidentally). @@ -395,6 +380,9 @@ let server { ${concatMapStringsSep "\n" listenString hostListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; + ${optionalString (hasSSL && vhost.http2 && !oldHTTP2) '' + http2 on; + ''} ${optionalString (hasSSL && vhost.quic) '' http3 ${if vhost.http3 then "on" else "off"}; http3_hq ${if vhost.http3_hq then "on" else "off"}; @@ -478,6 +466,8 @@ let ); mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; + + oldHTTP2 = versionOlder cfg.package.version "1.25.1"; in { @@ -1175,6 +1165,21 @@ in services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli ++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd; + services.nginx.virtualHosts.localhost = mkIf cfg.statusPage { + listenAddresses = lib.mkDefault ([ + "0.0.0.0" + ] ++ lib.optional enableIPv6 "[::]"); + locations."/nginx_status" = { + extraConfig = '' + stub_status on; + access_log off; + allow 127.0.0.1; + ${optionalString enableIPv6 "allow ::1;"} + deny all; + ''; + }; + }; + systemd.services.nginx = { description = "Nginx Web Server"; wantedBy = [ "multi-user.target" ]; 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 b7341d4d8b..a734bc288c 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 @@ -156,7 +156,7 @@ in { ++ cfg.sessionPath; # Fonts. - fonts.fonts = mkDefault [ + fonts.packages = mkDefault [ pkgs.noto-fonts pkgs.hack-font ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index c7755aca4b..b3cbe4c324 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -218,7 +218,7 @@ in qt.style = "adwaita"; # Default Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ source-code-pro # Default monospace font in 3.32 ubuntu_font_family # required for default theme ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix index 70be6ed7c0..b2369e2426 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -67,7 +67,7 @@ in networking.networkmanager.enable = mkDefault true; programs.dconf.enable = mkDefault true; - fonts.fonts = with pkgs; [ noto-fonts ]; + fonts.packages = with pkgs; [ noto-fonts ]; xdg.mime.enable = true; xdg.menus.enable = true; xdg.icons.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 2de5d845d6..1512b5fdf8 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -92,7 +92,7 @@ in environment.etc."X11/xkb".source = xcfg.xkbDir; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; + fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; 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 79b2e7c6ea..5d950f7d7f 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 @@ -432,7 +432,7 @@ in isSystem = true; }; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ cantarell-fonts dejavu_fonts source-code-pro # Default monospace font in 3.32 diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index e87ae5ae81..d8a47e93af 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -199,6 +199,7 @@ in gnome.adwaita-icon-theme gtk3.out # for gtk-launch program onboard + orca # elementary/greeter#668 qgnomeplatform sound-theme-freedesktop xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ @@ -265,7 +266,7 @@ in qt.style = "adwaita"; # Default Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ inter open-dyslexic open-sans @@ -306,7 +307,7 @@ in ])) config.environment.pantheon.excludePackages; # needed by screenshot - fonts.fonts = [ + fonts.packages = [ pkgs.pantheon.elementary-redacted-script ]; }) diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix index 3cfa6e044b..e4cd9fd99e 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -100,7 +100,7 @@ let }; }; - optionalKV = k: v: if v == null then "" else "${k} = ${builtins.toString v}"; + optionalKV = k: v: optionalString (v != null) "${k} = ${builtins.toString v}"; renderPhocOutput = name: output: let modelines = if builtins.isList output.modeline 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 38f932ffb4..15a510fd8f 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 @@ -332,7 +332,7 @@ in # Enable GTK applications to load SVG icons services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; - fonts.fonts = with pkgs; [ cfg.notoPackage hack-font ]; + fonts.packages = with pkgs; [ cfg.notoPackage hack-font ]; fonts.fontconfig.defaultFonts = { monospace = [ "Hack" "Noto Sans Mono" ]; sansSerif = [ "Noto Sans" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix index eee1f63ebd..191b3690c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -1,9 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let cfg = config.services.xserver.desktopManager.xfce; + excludePackages = config.environment.xfce.excludePackages; in { @@ -69,10 +70,17 @@ in description = lib.mdDoc "Enable the XFCE screensaver."; }; }; + + environment.xfce.excludePackages = mkOption { + default = []; + example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]"; + type = types.listOf types.package; + description = lib.mdDoc "Which packages XFCE should exclude from the default environment"; + }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs.xfce // pkgs; [ + environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [ glib # for gsettings gtk3.out # gtk-update-icon-cache @@ -121,7 +129,7 @@ in ] ++ optionals (!cfg.noDesktop) [ xfce4-panel xfdesktop - ] ++ optional cfg.enableScreensaver xfce4-screensaver; + ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages; programs.xfconf.enable = true; programs.thunar.enable = true; @@ -165,9 +173,9 @@ in programs.zsh.vteIntegration = mkDefault true; # Systemd services - systemd.packages = with pkgs.xfce; [ + systemd.packages = utils.removePackagesByName (with pkgs.xfce; [ xfce4-notifyd - ]; + ]) excludePackages; security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index 4456374cc5..ee9b4016c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -142,7 +142,7 @@ in theme ]; - fonts.fonts = [ font ]; + fonts.packages = [ font ]; environment.etc."lightdm/slick-greeter.conf".source = slickGreeterConf; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index 53d9c99b47..c2e6da4b45 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -22,7 +22,7 @@ let }; fontsForXServer = - config.fonts.fonts ++ + config.fonts.packages ++ # We don't want these fonts in fonts.conf, because then modern, # fontconfig-based applications will get horrible bitmapped # Helvetica fonts. It's better to get a substitution (like Nimbus @@ -883,8 +883,8 @@ in ${cfg.extraConfig} ''; - fonts.enableDefaultFonts = mkDefault true; - fonts.fonts = [ + fonts.enableDefaultPackages = mkDefault true; + fonts.packages = [ (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) pkgs.xorg.fontmiscmisc ]; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix index e8bbf1d040..1d95742fac 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix @@ -7,8 +7,8 @@ let cfg = config.boot.initrd.network; dhcpInterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {})); - doDhcp = config.networking.useDHCP || dhcpInterfaces != []; - dhcpIfShellExpr = if config.networking.useDHCP + doDhcp = cfg.udhcpc.enable || dhcpInterfaces != []; + dhcpIfShellExpr = if config.networking.useDHCP || cfg.udhcpc.enable then "$(ls /sys/class/net/ | grep -v ^lo$)" else lib.concatMapStringsSep " " lib.escapeShellArg dhcpInterfaces; @@ -79,13 +79,24 @@ in ''; }; + boot.initrd.network.udhcpc.enable = mkOption { + default = config.networking.useDHCP; + defaultText = "networking.useDHCP"; + type = types.bool; + description = lib.mdDoc '' + Enables the udhcpc service during stage 1 of the boot process. This + defaults to {option}`networking.useDHCP`. Therefore, this useful if + useDHCP is off but the initramfs should do dhcp. + ''; + }; + boot.initrd.network.udhcpc.extraArgs = mkOption { default = []; type = types.listOf types.str; description = lib.mdDoc '' - Additional command-line arguments passed verbatim to udhcpc if - {option}`boot.initrd.network.enable` and {option}`networking.useDHCP` - are enabled. + Additional command-line arguments passed verbatim to + udhcpc if {option}`boot.initrd.network.enable` and + {option}`boot.initrd.network.udhcpc.enable` are enabled. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix index 31e9ec626c..e618070f0d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix @@ -70,11 +70,10 @@ let let val = if item.freeform != null then item.freeform else item.tristate; in - if val == null - then "" - else if (item.optional) + optionalString (val != null) + (if (item.optional) then "${key}? ${mkValue val}\n" - else "${key} ${mkValue val}\n"; + else "${key} ${mkValue val}\n"); mkConf = cfg: concatStrings (mapAttrsToList mkConfigLine cfg); in mkConf exprs; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index b57e343d2a..8f2f578e30 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -40,7 +40,10 @@ let backgroundColor = f cfg.backgroundColor; entryOptions = f cfg.entryOptions; subEntryOptions = f cfg.subEntryOptions; - grub = f grub; + # PC platforms (like x86_64-linux) have a non-EFI target (`grubTarget`), but other platforms + # (like aarch64-linux) have an undefined `grubTarget`. Avoid providing the path to a non-EFI + # GRUB on those platforms. + grub = f (if (grub.grubTarget or "") != "" then grub else ""); grubTarget = f (grub.grubTarget or ""); shell = "${pkgs.runtimeShell}"; fullName = lib.getName realGrub; @@ -65,8 +68,8 @@ let [ coreutils gnused gnugrep findutils diffutils btrfs-progs util-linux mdadm ] ++ optional cfg.efiSupport efibootmgr ++ optionals cfg.useOSProber [ busybox os-prober ]); - font = if cfg.font == null then "" - else (if lib.last (lib.splitString "." cfg.font) == "pf2" + font = lib.optionalString (cfg.font != null) ( + if lib.last (lib.splitString "." cfg.font) == "pf2" then cfg.font else "${convertedFont}"); }); diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index c5fc259e26..6d0afcc57f 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -171,7 +171,7 @@ let "batadv" ]) (assertByteFormat "MTUBytes") - (assertMacAddress "MACAddress") + (assertNetdevMacAddress "MACAddress") ]; sectionVLAN = checkUnitConfig "VLAN" [ @@ -223,6 +223,7 @@ let "PortRange" "FlowLabel" "IPDoNotFragment" + "Independent" ]) (assertInt "VNI") (assertRange "VNI" 1 16777215) @@ -242,6 +243,7 @@ let (assertInt "FlowLabel") (assertRange "FlowLabel" 0 1048575) (assertValueOneOf "IPDoNotFragment" (boolValues + ["inherit"])) + (assertValueOneOf "Independent" boolValues) ]; sectionTunnel = checkUnitConfig "Tunnel" [ 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 eec3461de7..7aaa3f85bf 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -91,7 +91,7 @@ let # we just copy what we need from Glibc and use patchelf to make it # work. extraUtils = pkgs.runCommand "extra-utils" - { nativeBuildInputs = [pkgs.buildPackages.nukeReferences]; + { nativeBuildInputs = with pkgs.buildPackages; [ nukeReferences bintools ]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } '' @@ -122,7 +122,7 @@ let # code, using default options and effectively ignore security relevant # ZFS properties such as `setuid=off` and `exec=off` (unless manually # duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose). - copy_bin_and_libs ${pkgs.util-linux}/bin/mount + copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount copy_bin_and_libs ${pkgs.zfs}/bin/mount.zfs ''} diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 9557cf45d5..ac55461107 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -597,6 +597,11 @@ in # drop-in in /etc, it does apply. overrideStrategy = "asDropin"; }; + systemd.services."systemd-mkswap@" = { + restartIfChanged = false; + path = [ pkgs.util-linux ]; + overrideStrategy = "asDropin"; + }; systemd.services.systemd-random-seed.restartIfChanged = false; systemd.services.systemd-remount-fs.restartIfChanged = false; systemd.services.systemd-update-utmp.restartIfChanged = false; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix index e81b3e4ff2..2431c68ea1 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix @@ -1,28 +1,15 @@ -{ config, pkgs, lib, utils, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.systemd.repart; initrdCfg = config.boot.initrd.systemd.repart; - writeDefinition = name: partitionConfig: pkgs.writeText - "${name}.conf" - (lib.generators.toINI { } { Partition = partitionConfig; }); + format = pkgs.formats.ini { }; - listOfDefinitions = lib.mapAttrsToList - writeDefinition - (lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.partitions); - - # Create a directory in the store that contains a copy of all definition - # files. This is then passed to systemd-repart in the initrd so it can access - # the definition files after the sysroot has been mounted but before - # activation. This needs a hard copy of the files and not just symlinks - # because otherwise the files do not show up in the sysroot. - definitionsDirectory = pkgs.runCommand "systemd-repart-definitions" { } '' - mkdir -p $out - ${(lib.concatStringsSep "\n" - (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions) - )} - ''; + definitionsDirectory = utils.systemdUtils.lib.definitions + "repart.d" + format + (lib.mapAttrs (_n: v: { Partition = v; }) cfg.partitions); in { options = { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix index b4b750fa9a..d7300e940a 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix @@ -30,7 +30,11 @@ in { }; config = lib.mkIf cfg.enable { - systemd.shutdownRamfs.contents."/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown"; + systemd.shutdownRamfs.contents = { + "/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown"; + "/etc/initrd-release".source = config.environment.etc.os-release.source; + "/etc/os-release".source = config.environment.etc.os-release.source; + }; systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"]; systemd.mounts = [{ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysupdate.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysupdate.nix new file mode 100644 index 0000000000..b1914a9c4e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/sysupdate.nix @@ -0,0 +1,136 @@ +{ config, lib, pkgs, utils, ... }: + +let + cfg = config.systemd.sysupdate; + + format = pkgs.formats.ini { }; + + definitionsDirectory = utils.systemdUtils.lib.definitions + "sysupdate.d" + format + cfg.transfers; +in +{ + options.systemd.sysupdate = { + + enable = lib.mkEnableOption (lib.mdDoc "systemd-sysupdate") // { + description = lib.mdDoc '' + Atomically update the host OS, container images, portable service + images or other sources. + + If enabled, updates are triggered in regular intervals via a + `systemd.timer` unit. + + Please see + + for more details. + ''; + }; + + timerConfig = utils.systemdUtils.unitOptions.timerOptions.options.timerConfig // { + default = { }; + description = lib.mdDoc '' + The timer configuration for performing the update. + + By default, the upstream configuration is used: + + ''; + }; + + reboot = { + enable = lib.mkEnableOption (lib.mdDoc "automatically rebooting after an update") // { + description = lib.mdDoc '' + Whether to automatically reboot after an update. + + If set to `true`, the system will automatically reboot via a + `systemd.timer` unit but only after a new version was installed. + + This uses a unit completely separate from the one performing the + update because it is typically advisable to download updates + regularly while the system is up, but delay reboots until the + appropriate time (i.e. typically at night). + + Set this to `false` if you do not want to reboot after an update. This + is useful when you update a container image or another source where + rebooting is not necessary in order to finalize the update. + ''; + }; + + timerConfig = utils.systemdUtils.unitOptions.timerOptions.options.timerConfig // { + default = { }; + description = lib.mdDoc '' + The timer configuration for rebooting after an update. + + By default, the upstream configuration is used: + + ''; + }; + }; + + transfers = lib.mkOption { + type = with lib.types; attrsOf format.type; + default = { }; + example = { + "10-uki.conf" = { + Transfer = { + ProtectVersion = "%A"; + }; + + Source = { + Type = "url-file"; + Path = "https://download.example.com/"; + MatchPattern = "nixos_@v.efi.xz"; + }; + + Target = { + Type = "regular-file"; + Path = "/EFI/Linux"; + PathRelativeTo = "boot"; + MatchPattern = '' + nixos_@v+@l-@d.efi"; \ + nixos_@v+@l.efi \ + nixos_@v.efi + ''; + Mode = "0444"; + TriesLeft = 3; + TriesDone = 0; + InstancesMax = 2; + }; + }; + }; + description = lib.mdDoc '' + Specify transfers as a set of the names of the transfer files as the + key and the configuration as its value. The configuration can use all + upstream options. See + + for all available options. + ''; + }; + + }; + + config = lib.mkIf cfg.enable { + + systemd.additionalUpstreamSystemUnits = [ + "systemd-sysupdate.service" + "systemd-sysupdate.timer" + "systemd-sysupdate-reboot.service" + "systemd-sysupdate-reboot.timer" + ]; + + systemd.timers = { + "systemd-sysupdate" = { + wantedBy = [ "timers.target" ]; + timerConfig = cfg.timerConfig; + }; + "systemd-sysupdate-reboot" = lib.mkIf cfg.reboot.enable { + wantedBy = [ "timers.target" ]; + timerConfig = cfg.reboot.timerConfig; + }; + }; + + environment.etc."sysupdate.d".source = definitionsDirectory; + }; + + meta.maintainers = with lib.maintainers; [ nikstur ]; +} 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 92e1b08739..1b6398d2f9 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix @@ -42,7 +42,7 @@ let writeTmpfiles = { rules, user ? null }: let - suffix = if user == null then "" else "-${user}"; + suffix = optionalString (user != null) "-${user}"; in pkgs.writeTextFile { name = "nixos-user-tmpfiles.d${suffix}"; diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix index cfb9c39458..ea61e7384e 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix @@ -173,7 +173,7 @@ in config = { target = mkDefault name; source = mkIf (config.text != null) ( - let name' = "etc-" + baseNameOf name; + let name' = "etc-" + lib.replaceStrings ["/"] ["-"] name; in mkDerivedConfig options.text (pkgs.writeText name') ); }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 72b937f373..21d604bee6 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -110,17 +110,18 @@ let createImportService = { pool, systemd, force, prefix ? "" }: nameValuePair "zfs-import-${pool}" { description = "Import ZFS pool \"${pool}\""; - # we need systemd-udev-settle to ensure devices are available + # We wait for systemd-udev-settle to ensure devices are available, + # but don't *require* it, because mounts shouldn't be killed if it's stopped. # In the future, hopefully someone will complete this: # https://github.com/zfsonlinux/zfs/pull/4943 - requires = [ "systemd-udev-settle.service" ]; + wants = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" "systemd-modules-load.service" "systemd-ask-password-console.service" ]; - wantedBy = (getPoolMounts prefix pool) ++ [ "local-fs.target" ]; - before = (getPoolMounts prefix pool) ++ [ "local-fs.target" ]; + requiredBy = getPoolMounts prefix pool ++ [ "zfs-import.target" ]; + before = getPoolMounts prefix pool ++ [ "zfs-import.target" ]; unitConfig = { DefaultDependencies = "no"; }; @@ -628,6 +629,8 @@ in force = cfgZfs.forceImportRoot; prefix = "/sysroot"; }) rootPools); + targets.zfs-import.wantedBy = [ "zfs.target" ]; + targets.zfs.wantedBy = [ "initrd.target" ]; extraBin = { # zpool and zfs are already in thanks to fsPackages awk = "${pkgs.gawk}/bin/awk"; @@ -739,15 +742,7 @@ in map createSyncService allPools ++ map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]); - systemd.targets.zfs-import = - let - services = map (pool: "zfs-import-${pool}.service") dataPools; - in - { - requires = services; - after = services; - wantedBy = [ "zfs.target" ]; - }; + systemd.targets.zfs-import.wantedBy = [ "zfs.target" ]; systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; }) diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix index 046b8e2f79..20f47a76c8 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -158,6 +158,15 @@ in Docker package to be used in the module. ''; }; + + extraPackages = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExpression "with pkgs; [ criu ]"; + description = lib.mdDoc '' + Extra packages to add to PATH for the docker daemon process. + ''; + }; }; ###### implementation @@ -194,7 +203,8 @@ in }; path = [ pkgs.kmod ] ++ optional (cfg.storageDriver == "zfs") pkgs.zfs - ++ optional cfg.enableNvidia pkgs.nvidia-docker; + ++ optional cfg.enableNvidia pkgs.nvidia-docker + ++ cfg.extraPackages; }; systemd.sockets.docker = { diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix index 22e336c895..e22ba9a0ae 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -91,7 +91,7 @@ in { Enables the (experimental) LXD UI. ''); - package = mkPackageOption pkgs.lxd "ui" { }; + package = mkPackageOption pkgs.lxd-unwrapped "ui" { }; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix index c3fae4bac4..ec0b713e58 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix @@ -206,6 +206,11 @@ in systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; + systemd.timers.podman-prune.timerConfig = lib.mkIf cfg.autoPrune.enable { + Persistent = true; + RandomizedDelaySec = 1800; + }; + systemd.tmpfiles.packages = [ # The /run/podman rule interferes with our podman group, so we remove # it and let the systemd socket logic take care of it. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix index 1074b02d0e..62778f2626 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix @@ -69,6 +69,34 @@ with lib; VM name ''; }; + additionalSpace = mkOption { + type = types.str; + default = "512M"; + example = "2048M"; + description = lib.mdDoc '' + additional disk space to be added to the image if diskSize "auto" + is used. + ''; + }; + bootSize = mkOption { + type = types.str; + default = "256M"; + example = "512M"; + description = lib.mdDoc '' + Size of the boot partition. Is only used if partitionTableType is + either "efi" or "hybrid". + ''; + }; + diskSize = mkOption { + type = types.str; + default = "auto"; + example = "20480"; + description = lib.mdDoc '' + The size of the disk, in megabytes. + if "auto" size is calculated based on the contents copied to it and + additionalSpace is taken into account. + ''; + }; net0 = mkOption { type = types.commas; default = "virtio=00:00:00:00:00:00,bridge=vmbr0,firewall=1"; @@ -169,7 +197,7 @@ with lib; ]; system.build.VMA = import ../../lib/make-disk-image.nix { name = "proxmox-${cfg.filenameSuffix}"; - inherit partitionTableType; + inherit (cfg) partitionTableType; postVM = let # Build qemu with PVE's patch that adds support for the VMA format vma = (pkgs.qemu_kvm.override { @@ -236,6 +264,7 @@ with lib; mkdir -p $out/nix-support echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" >> $out/nix-support/hydra-build-products ''; + inherit (cfg.qemuConf) additionalSpace diskSize bootSize; format = "raw"; inherit config lib pkgs; }; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 723b030072..3b4a39f5ff 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -89,6 +89,7 @@ in { extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {}; lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {}; node-name = runTest ./nixos-test-driver/node-name.nix; + busybox = runTest ./nixos-test-driver/busybox.nix; }; # NixOS vm tests and non-vm unit tests @@ -111,6 +112,7 @@ in { anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; apcupsd = handleTest ./apcupsd.nix {}; apfs = runTest ./apfs.nix; + appliance-repart-image = runTest ./appliance-repart-image.nix; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; @@ -138,6 +140,7 @@ in { borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {}; + bpftune = handleTest ./bpftune.nix {}; breitbandmessung = handleTest ./breitbandmessung.nix {}; brscan5 = handleTest ./brscan5.nix {}; btrbk = handleTest ./btrbk.nix {}; @@ -202,6 +205,7 @@ in { couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cri-o.nix {}; cups-pdf = handleTest ./cups-pdf.nix {}; + curl-impersonate = handleTest ./curl-impersonate.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; darling = handleTest ./darling.nix {}; @@ -531,11 +535,12 @@ in { nginx-http3 = handleTest ./nginx-http3.nix {}; nginx-modsecurity = handleTest ./nginx-modsecurity.nix {}; nginx-njs = handleTest ./nginx-njs.nix {}; + nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; + nginx-status-page = handleTest ./nginx-status-page.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; - nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {}; nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {}; nitter = handleTest ./nitter.nix {}; nix-ld = handleTest ./nix-ld.nix {}; @@ -576,6 +581,7 @@ in { openvscode-server = handleTest ./openvscode-server.nix {}; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; + osquery = handleTestOn ["x86_64-linux"] ./osquery.nix {}; osrm-backend = handleTest ./osrm-backend.nix {}; overlayfs = handleTest ./overlayfs.nix {}; pacemaker = handleTest ./pacemaker.nix {}; @@ -597,6 +603,7 @@ in { peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {}; peroxide = handleTest ./peroxide.nix {}; pgadmin4 = handleTest ./pgadmin4.nix {}; + pgbouncer = handleTest ./pgbouncer.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; phosh = handleTest ./phosh.nix {}; @@ -726,6 +733,7 @@ in { switchTest = handleTest ./switch-test.nix {}; sympa = handleTest ./sympa.nix {}; syncthing = handleTest ./syncthing.nix {}; + syncthing-no-settings = handleTest ./syncthing-no-settings.nix {}; syncthing-init = handleTest ./syncthing-init.nix {}; syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; @@ -766,6 +774,7 @@ in { systemd-portabled = handleTest ./systemd-portabled.nix {}; systemd-repart = handleTest ./systemd-repart.nix {}; systemd-shutdown = handleTest ./systemd-shutdown.nix {}; + systemd-sysupdate = runTest ./systemd-sysupdate.nix; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-user-tmpfiles-rules = handleTest ./systemd-user-tmpfiles-rules.nix {}; systemd-misc = handleTest ./systemd-misc.nix {}; @@ -804,6 +813,7 @@ in { turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; tuxguitar = handleTest ./tuxguitar.nix {}; twingate = runTest ./twingate.nix; + typesense = handleTest ./typesense.nix {}; ucarp = handleTest ./ucarp.nix {}; udisks2 = handleTest ./udisks2.nix {}; ulogd = handleTest ./ulogd.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/appliance-repart-image.nix b/third_party/nixpkgs/nixos/tests/appliance-repart-image.nix new file mode 100644 index 0000000000..3f256db846 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/appliance-repart-image.nix @@ -0,0 +1,116 @@ +# Tests building and running a GUID Partition Table (GPT) appliance image. +# "Appliance" here means that the image does not contain the normal NixOS +# infrastructure of a system profile and cannot be re-built via +# `nixos-rebuild`. + +{ lib, ... }: + +let + rootPartitionLabel = "root"; + + bootLoaderConfigPath = "/loader/entries/nixos.conf"; + kernelPath = "/EFI/nixos/kernel.efi"; + initrdPath = "/EFI/nixos/initrd.efi"; +in +{ + name = "appliance-gpt-image"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { config, lib, pkgs, ... }: { + + imports = [ ../modules/image/repart.nix ]; + + virtualisation.directBoot.enable = false; + virtualisation.mountHostNixStore = false; + virtualisation.useEFIBoot = true; + + # Disable boot loaders because we install one "manually". + # TODO(raitobezarius): revisit this when #244907 lands + boot.loader.grub.enable = false; + + virtualisation.fileSystems = lib.mkForce { + "/" = { + device = "/dev/disk/by-partlabel/${rootPartitionLabel}"; + fsType = "ext4"; + }; + }; + + image.repart = { + name = "appliance-gpt-image"; + partitions = { + "esp" = { + contents = + let + efiArch = config.nixpkgs.hostPlatform.efiArch; + in + { + "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = + "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; + + # TODO: create an abstraction for Boot Loader Specification (BLS) entries. + "${bootLoaderConfigPath}".source = pkgs.writeText "nixos.conf" '' + title NixOS + linux ${kernelPath} + initrd ${initrdPath} + options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} + ''; + + "${kernelPath}".source = + "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; + + "${initrdPath}".source = + "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + }; + repartConfig = { + Type = "esp"; + Format = "vfat"; + # Minimize = "guess" seems to not work very vell for vfat + # partitons. It's better to set a sensible default instead. The + # aarch64 kernel seems to generally be a little bigger than the + # x86_64 kernel. To stay on the safe side, leave some more slack + # for every platform other than x86_64. + SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; + }; + }; + "root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = config.fileSystems."/".fsType; + Label = rootPartitionLabel; + Minimize = "guess"; + }; + }; + }; + }; + }; + + 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.image}/image.raw", + "-F", + "raw", + 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 + + bootctl_status = machine.succeed("bootctl status") + assert "${bootLoaderConfigPath}" in bootctl_status + assert "${kernelPath}" in bootctl_status + assert "${initrdPath}" in bootctl_status + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/atuin.nix b/third_party/nixpkgs/nixos/tests/atuin.nix index 9f23a3cf67..3164c83c68 100644 --- a/third_party/nixpkgs/nixos/tests/atuin.nix +++ b/third_party/nixpkgs/nixos/tests/atuin.nix @@ -14,6 +14,8 @@ in server = { ... }: { + services.postgresql.enable = true; + services.atuin = { enable = true; port = testPort; diff --git a/third_party/nixpkgs/nixos/tests/binary-cache.nix b/third_party/nixpkgs/nixos/tests/binary-cache.nix index 0809e59e5a..bc1c6fb9a2 100644 --- a/third_party/nixpkgs/nixos/tests/binary-cache.nix +++ b/third_party/nixpkgs/nixos/tests/binary-cache.nix @@ -1,16 +1,14 @@ -import ./make-test-python.nix ({ lib, ... }: - -with lib; +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "binary-cache"; - meta.maintainers = with maintainers; [ thomasjm ]; + meta.maintainers = with lib.maintainers; [ thomasjm ]; nodes.machine = { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; - environment.systemPackages = with pkgs; [python3]; - system.extraDependencies = with pkgs; [hello.inputDerivation]; + environment.systemPackages = [ pkgs.python3 ]; + system.extraDependencies = [ pkgs.hello.inputDerivation ]; nix.extraOptions = '' experimental-features = nix-command ''; diff --git a/third_party/nixpkgs/nixos/tests/bpftune.nix b/third_party/nixpkgs/nixos/tests/bpftune.nix new file mode 100644 index 0000000000..c17bbcd110 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/bpftune.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + + name = "bpftune"; + + meta = { + maintainers = with lib.maintainers; [ nickcao ]; + }; + + nodes = { + machine = { pkgs, ... }: { + services.bpftune.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("bpftune.service") + machine.wait_for_console_text("bpftune works") + ''; + +}) diff --git a/third_party/nixpkgs/nixos/tests/budgie.nix b/third_party/nixpkgs/nixos/tests/budgie.nix index b1b0e618c8..34ee1e303d 100644 --- a/third_party/nixpkgs/nixos/tests/budgie.nix +++ b/third_party/nixpkgs/nixos/tests/budgie.nix @@ -32,7 +32,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { in '' with subtest("Wait for login"): - machine.wait_for_x() + # wait_for_x() checks graphical-session.target, which is expected to be + # inactive on Budgie before #228946 (i.e. systemd managed gnome-session) is + # done on upstream. + # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/v10.7.2/src/session/budgie-desktop.in#L16 + # + # Previously this was unconditionally touched by xsessionWrapper but was + # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP). + # machine.wait_for_x() + machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') machine.wait_for_file("${user.home}/.Xauthority") machine.succeed("xauth merge ${user.home}/.Xauthority") diff --git a/third_party/nixpkgs/nixos/tests/buildkite-agents.nix b/third_party/nixpkgs/nixos/tests/buildkite-agents.nix index 2c5593323e..a5abfdb5e2 100644 --- a/third_party/nixpkgs/nixos/tests/buildkite-agents.nix +++ b/third_party/nixpkgs/nixos/tests/buildkite-agents.nix @@ -1,10 +1,8 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "buildkite-agent"; - meta = with pkgs.lib.maintainers; { - maintainers = [ flokli ]; - }; + meta.maintainers = with lib.maintainers; [ flokli ]; nodes.machine = { pkgs, ... }: { services.buildkite-agents = { diff --git a/third_party/nixpkgs/nixos/tests/cage.nix b/third_party/nixpkgs/nixos/tests/cage.nix index db1b785467..3b49185124 100644 --- a/third_party/nixpkgs/nixos/tests/cage.nix +++ b/third_party/nixpkgs/nixos/tests/cage.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { imports = [ ./common/user-account.nix ]; - fonts.fonts = with pkgs; [ dejavu_fonts ]; + fonts.packages = with pkgs; [ dejavu_fonts ]; services.cage = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/common/gpg-keyring.nix b/third_party/nixpkgs/nixos/tests/common/gpg-keyring.nix new file mode 100644 index 0000000000..fb8d07b118 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/common/gpg-keyring.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: + +pkgs.runCommand "gpg-keyring" { nativeBuildInputs = [ pkgs.gnupg ]; } '' + mkdir -p $out + export GNUPGHOME=$out + cat > foo < $out/pubkey.gpg +'' diff --git a/third_party/nixpkgs/nixos/tests/cups-pdf.nix b/third_party/nixpkgs/nixos/tests/cups-pdf.nix index 957b0296a7..5602193b04 100644 --- a/third_party/nixpkgs/nixos/tests/cups-pdf.nix +++ b/third_party/nixpkgs/nixos/tests/cups-pdf.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { nodes.machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; environment.systemPackages = [ pkgs.poppler_utils ]; - fonts.fonts = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf + fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf services.printing.cups-pdf.enable = true; services.printing.cups-pdf.instances = { opt = {}; diff --git a/third_party/nixpkgs/nixos/tests/curl-impersonate.nix b/third_party/nixpkgs/nixos/tests/curl-impersonate.nix new file mode 100644 index 0000000000..7954e9e558 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/curl-impersonate.nix @@ -0,0 +1,157 @@ +/* + Test suite for curl-impersonate + + Abstract: + Uses the test suite from the curl-impersonate source repo which: + + 1. Performs requests with libcurl and captures the TLS client-hello + packets with tcpdump to compare against known-good signatures + 2. Spins up an nghttpd2 server to test client HTTP/2 headers against + known-good headers + + See https://github.com/lwthiker/curl-impersonate/tree/main/tests/signatures + for details. + + Notes: + - We need to have our own web server running because the tests expect to be able + to hit domains like wikipedia.org and the sandbox has no internet + - We need to be able to do (verifying) TLS handshakes without internet access. + We do that by creating a trusted CA and issuing a cert that includes + all of the test domains as subject-alternative names and then spoofs the + hostnames in /etc/hosts. +*/ + +import ./make-test-python.nix ({ pkgs, lib, ... }: let + # Update with domains in TestImpersonate.TEST_URLS if needed from: + # https://github.com/lwthiker/curl-impersonate/blob/main/tests/test_impersonate.py + domains = [ + "www.wikimedia.org" + "www.wikipedia.org" + "www.mozilla.org" + "www.apache.org" + "www.kernel.org" + "git-scm.com" + ]; + + tls-certs = let + # Configure CA with X.509 v3 extensions that would be trusted by curl + ca-cert-conf = pkgs.writeText "curl-impersonate-ca.cnf" '' + basicConstraints = critical, CA:TRUE + subjectKeyIdentifier = hash + authorityKeyIdentifier = keyid:always, issuer:always + keyUsage = critical, cRLSign, digitalSignature, keyCertSign + ''; + + # Configure leaf certificate with X.509 v3 extensions that would be trusted + # by curl and set subject-alternative names for test domains + tls-cert-conf = pkgs.writeText "curl-impersonate-tls.cnf" '' + basicConstraints = critical, CA:FALSE + subjectKeyIdentifier = hash + authorityKeyIdentifier = keyid:always, issuer:always + keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment, keyAgreement + extendedKeyUsage = critical, serverAuth + subjectAltName = @alt_names + + [alt_names] + ${lib.concatStringsSep "\n" (lib.imap0 (idx: domain: "DNS.${toString idx} = ${domain}") domains)} + ''; + in pkgs.runCommand "curl-impersonate-test-certs" { + nativeBuildInputs = [ pkgs.openssl ]; + } '' + # create CA certificate and key + openssl req -newkey rsa:4096 -keyout ca-key.pem -out ca-csr.pem -nodes -subj '/CN=curl-impersonate-ca.nixos.test' + openssl x509 -req -sha512 -in ca-csr.pem -key ca-key.pem -out ca.pem -extfile ${ca-cert-conf} -days 36500 + openssl x509 -in ca.pem -text + + # create server certificate and key + openssl req -newkey rsa:4096 -keyout key.pem -out csr.pem -nodes -subj '/CN=curl-impersonate.nixos.test' + openssl x509 -req -sha512 -in csr.pem -CA ca.pem -CAkey ca-key.pem -CAcreateserial -out cert.pem -extfile ${tls-cert-conf} -days 36500 + openssl x509 -in cert.pem -text + + # output CA cert and server cert and key + mkdir -p $out + cp key.pem cert.pem ca.pem $out + ''; + + # Test script + curl-impersonate-test = let + # Build miniature libcurl client used by test driver + minicurl = pkgs.runCommandCC "minicurl" { + buildInputs = [ pkgs.curl ]; + } '' + mkdir -p $out/bin + $CC -Wall -Werror -o $out/bin/minicurl ${pkgs.curl-impersonate.src}/tests/minicurl.c `curl-config --libs` + ''; + in pkgs.writeShellScript "curl-impersonate-test" '' + set -euxo pipefail + + # Test driver requirements + export PATH="${with pkgs; lib.makeBinPath [ + bash + coreutils + python3Packages.pytest + nghttp2 + tcpdump + ]}" + export PYTHONPATH="${with pkgs.python3Packages; makePythonPath [ + pyyaml + pytest-asyncio + dpkt + ]}" + + # Prepare test root prefix + mkdir -p usr/{bin,lib} + cp -rs ${pkgs.curl-impersonate}/* ${minicurl}/* usr/ + + cp -r ${pkgs.curl-impersonate.src}/tests ./ + + # Run tests + cd tests + pytest . --install-dir ../usr --capture-interface eth1 + ''; +in { + name = "curl-impersonate"; + + meta = with lib.maintainers; { + maintainers = [ lilyinstarlight ]; + }; + + nodes = { + web = { nodes, pkgs, lib, config, ... }: { + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + services = { + nginx = { + enable = true; + virtualHosts."curl-impersonate.nixos.test" = { + default = true; + addSSL = true; + sslCertificate = "${tls-certs}/cert.pem"; + sslCertificateKey = "${tls-certs}/key.pem"; + }; + }; + }; + }; + + curl = { nodes, pkgs, lib, config, ... }: { + networking.extraHosts = lib.concatStringsSep "\n" (map (domain: "${nodes.web.networking.primaryIPAddress} ${domain}") domains); + + security.pki.certificateFiles = [ "${tls-certs}/ca.pem" ]; + }; + }; + + testScript = { nodes, ... }: '' + start_all() + + with subtest("Wait for network"): + web.wait_for_unit("network-online.target") + curl.wait_for_unit("network-online.target") + + with subtest("Wait for web server"): + web.wait_for_unit("nginx.service") + web.wait_for_open_port(443) + + with subtest("Run curl-impersonate tests"): + curl.succeed("${curl-impersonate-test}") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/deepin.nix b/third_party/nixpkgs/nixos/tests/deepin.nix index acec27ca1c..7b2e2430f3 100644 --- a/third_party/nixpkgs/nixos/tests/deepin.nix +++ b/third_party/nixpkgs/nixos/tests/deepin.nix @@ -1,9 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "deepin"; - meta = with lib; { - maintainers = teams.deepin.members; - }; + meta.maintainers = lib.teams.deepin.members; nodes.machine = { ... }: { imports = [ diff --git a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix index 664afc9bf4..d8c6ea0f72 100644 --- a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix +++ b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix @@ -7,8 +7,8 @@ import ./make-test-python.nix ({ lib, ... }: ]; nodes.machine = { config, pkgs, ... }: { - fonts.enableDefaultFonts = true; # Background fonts - fonts.fonts = with pkgs; [ + fonts.enableDefaultPackages = true; # Background fonts + fonts.packages = with pkgs; [ noto-fonts-emoji cantarell-fonts twitter-color-emoji diff --git a/third_party/nixpkgs/nixos/tests/freshrss-http-auth.nix b/third_party/nixpkgs/nixos/tests/freshrss-http-auth.nix new file mode 100644 index 0000000000..d0ec3da316 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/freshrss-http-auth.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "freshrss"; + meta.maintainers = with lib.maintainers; [ mattchrist ]; + + nodes.machine = { pkgs, ... }: { + services.freshrss = { + enable = true; + baseUrl = "http://localhost"; + dataDir = "/srv/freshrss"; + authType = "http_auth"; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(80) + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/") + assert 'Account: testuser' in response, "http_auth method didn't work." + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/gitea.nix b/third_party/nixpkgs/nixos/tests/gitea.nix index 2285bb5a42..b747659de8 100644 --- a/third_party/nixpkgs/nixos/tests/gitea.nix +++ b/third_party/nixpkgs/nixos/tests/gitea.nix @@ -37,9 +37,25 @@ let package = giteaPackage; settings.service.DISABLE_REGISTRATION = true; settings."repository.signing".SIGNING_KEY = signingPrivateKeyId; + settings.actions.ENABLED = true; }; environment.systemPackages = [ giteaPackage 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/gitea/runner_token"; + }; + }; }; client1 = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.git ]; @@ -49,8 +65,9 @@ let }; }; - testScript = let + 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 = "gitea@server:test/repo" @@ -121,14 +138,18 @@ let client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}") client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"') - server.succeed( + server.wait_until_succeeds( 'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits ' + '-H "Accept: application/json" | jq length)" = "1"' ) - client1.shutdown() - client2.shutdown() - server.shutdown() + with subtest("Testing runner registration"): + server.succeed( + "su -l gitea -c 'GITEA_WORK_DIR=/var/lib/gitea gitea actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/gitea/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 diff --git a/third_party/nixpkgs/nixos/tests/gnome-flashback.nix b/third_party/nixpkgs/nixos/tests/gnome-flashback.nix index 70569db797..876d36477c 100644 --- a/third_party/nixpkgs/nixos/tests/gnome-flashback.nix +++ b/third_party/nixpkgs/nixos/tests/gnome-flashback.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { nodes.machine = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in { imports = [ ./common/user-account.nix ]; @@ -27,12 +27,20 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; uid = toString user.uid; xauthority = "/run/user/${uid}/gdm/Xauthority"; in '' with subtest("Login to GNOME Flashback with GDM"): - machine.wait_for_x() + # wait_for_x() checks graphical-session.target, which is expected to be + # inactive on gnome-flashback before #228946 (i.e. systemd managed + # gnome-session) is done. + # https://github.com/NixOS/nixpkgs/pull/208060 + # + # Previously this was unconditionally touched by xsessionWrapper but was + # changed in #233981 (we have GNOME-Flashback:GNOME in XDG_CURRENT_DESKTOP). + # machine.wait_for_x() + machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') # Wait for alice to be logged in" machine.wait_for_unit("default.target", "${user.name}") machine.wait_for_file("${xauthority}") diff --git a/third_party/nixpkgs/nixos/tests/hibernate.nix b/third_party/nixpkgs/nixos/tests/hibernate.nix index cd8c436ee2..296aa9ba68 100644 --- a/third_party/nixpkgs/nixos/tests/hibernate.nix +++ b/third_party/nixpkgs/nixos/tests/hibernate.nix @@ -8,128 +8,48 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; -let - # System configuration of the installed system, which is used for the actual - # hibernate testing. - installedConfig = with pkgs.lib; { - imports = [ - ../modules/testing/test-instrumentation.nix - ../modules/profiles/qemu-guest.nix - ../modules/profiles/minimal.nix - ]; - - hardware.enableAllFirmware = mkForce false; - documentation.nixos.enable = false; - boot.loader.grub.device = "/dev/vda"; - - systemd.services.backdoor.conflicts = [ "sleep.target" ]; - - powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service"; - - fileSystems."/" = { - device = "/dev/vda2"; - fsType = "ext3"; - }; - swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ]; - boot.resumeDevice = mkIf systemdStage1 "/dev/vda1"; - boot.initrd.systemd = mkIf systemdStage1 { - enable = true; - emergencyAccess = true; - }; - }; - installedSystem = (import ../lib/eval-config.nix { - inherit system; - modules = [ installedConfig ]; - }).config.system.build.toplevel; -in makeTest { +makeTest { name = "hibernate"; nodes = { - # System configuration used for installing the installedConfig from above. machine = { config, lib, pkgs, ... }: { imports = [ - ../modules/profiles/installation-device.nix - ../modules/profiles/base.nix ./common/auto-format-root-device.nix ]; - nix.settings = { - substituters = lib.mkForce []; - hashed-mirrors = null; - connect-timeout = 1; - }; + systemd.services.backdoor.conflicts = [ "sleep.target" ]; + powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service"; - virtualisation.diskSize = 8 * 1024; - virtualisation.emptyDiskImages = [ - # Small root disk for installer - 512 - ]; - virtualisation.rootDevice = "/dev/vdb"; + virtualisation.emptyDiskImages = [ (2 * config.virtualisation.memorySize) ]; + virtualisation.useNixStoreImage = true; + + swapDevices = lib.mkOverride 0 [ { device = "/dev/vdc"; options = [ "x-systemd.makefs" ]; } ]; + boot.resumeDevice = "/dev/vdc"; + boot.initrd.systemd.enable = systemdStage1; }; }; - # 9P doesn't support reconnection to virtio transport after a hibernation. - # Therefore, machine just hangs on any Nix store access. - # To avoid this, we install NixOS onto a temporary disk with everything we need - # included into the store. + testScript = '' + # Drop in file that checks if we un-hibernated properly (and not booted fresh) + machine.wait_for_unit("default.target") + machine.succeed( + "mkdir /run/test", + "mount -t ramfs -o size=1m ramfs /run/test", + "echo not persisted to disk > /run/test/suspended", + ) - testScript = - '' - def create_named_machine(name): - machine = create_machine( - { - "qemuFlags": "-cpu max ${ - if system == "x86_64-linux" then "-m 1024" - else "-m 768 -enable-kvm -machine virt,gic-version=host"}", - "hdaInterface": "virtio", - "hda": "vm-state-machine/machine.qcow2", - "name": name, - } - ) - driver.machines.append(machine) - return machine + # Hibernate machine + machine.execute("systemctl hibernate >&2 &", check_return=False) + machine.wait_for_shutdown() + # Restore machine from hibernation, validate our ramfs file is there. + machine.start() + machine.succeed("grep 'not persisted to disk' /run/test/suspended") - # Install NixOS - machine.start() - machine.succeed( - # Partition /dev/vda - "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary linux-swap 1M 1024M" - + " mkpart primary ext2 1024M -1s", - "udevadm settle", - "mkfs.ext3 -L nixos /dev/vda2", - "mount LABEL=nixos /mnt", - "mkswap /dev/vda1 -L swap", - # Install onto /mnt - "nix-store --load-db < ${pkgs.closureInfo {rootPaths = [installedSystem];}}/registration", - "nixos-install --root /mnt --system ${installedSystem} --no-root-passwd --no-channel-copy >&2", - ) - machine.shutdown() - - # Start up - hibernate = create_named_machine("hibernate") - - # Drop in file that checks if we un-hibernated properly (and not booted fresh) - hibernate.succeed( - "mkdir /run/test", - "mount -t ramfs -o size=1m ramfs /run/test", - "echo not persisted to disk > /run/test/suspended", - ) - - # Hibernate machine - hibernate.execute("systemctl hibernate >&2 &", check_return=False) - hibernate.wait_for_shutdown() - - # Restore machine from hibernation, validate our ramfs file is there. - resume = create_named_machine("resume") - resume.start() - resume.succeed("grep 'not persisted to disk' /run/test/suspended") - - # Ensure we don't restore from hibernation when booting again - resume.crash() - resume.wait_for_unit("default.target") - resume.fail("grep 'not persisted to disk' /run/test/suspended") - ''; + # Ensure we don't restore from hibernation when booting again + machine.crash() + machine.wait_for_unit("default.target") + machine.fail("grep 'not persisted to disk' /run/test/suspended") + ''; } diff --git a/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix b/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix index 017de68820..17b6c21ff1 100644 --- a/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix +++ b/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix @@ -1,12 +1,10 @@ -import ../make-test-python.nix ({ lib, ... }: +import ../make-test-python.nix ({ lib, pkgs, ... }: { name = "initrd-network-ssh"; - meta = with lib.maintainers; { - maintainers = [ willibutz emily ]; - }; + meta.maintainers = with lib.maintainers; [ willibutz emily ]; - nodes = with lib; { + nodes = { server = { config, ... }: { @@ -17,7 +15,7 @@ import ../make-test-python.nix ({ lib, ... }: enable = true; ssh = { enable = true; - authorizedKeys = [ (readFile ./id_ed25519.pub) ]; + authorizedKeys = [ (lib.readFile ./id_ed25519.pub) ]; port = 22; hostKeys = [ ./ssh_host_ed25519_key ]; }; @@ -37,12 +35,12 @@ import ../make-test-python.nix ({ lib, ... }: { environment.etc = { knownHosts = { - text = concatStrings [ + text = lib.concatStrings [ "server," - "${toString (head (splitString " " ( - toString (elemAt (splitString "\n" config.networking.extraHosts) 2) + "${toString (lib.head (lib.splitString " " ( + toString (lib.elemAt (lib.splitString "\n" config.networking.extraHosts) 2) )))} " - "${readFile ./ssh_host_ed25519_key.pub}" + "${lib.readFile ./ssh_host_ed25519_key.pub}" ]; }; sshKey = { diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix index 78a6325a24..e87edb2007 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix @@ -107,5 +107,6 @@ in malcontent = callInstalledTest ./malcontent.nix {}; ostree = callInstalledTest ./ostree.nix {}; pipewire = callInstalledTest ./pipewire.nix {}; + upower = callInstalledTest ./upower.nix {}; xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {}; } diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/upower.nix b/third_party/nixpkgs/nixos/tests/installed-tests/upower.nix new file mode 100644 index 0000000000..a8e777a555 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/installed-tests/upower.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.upower; + + testConfig = { + services.upower.enable = true; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 4f4b915188..56ba85b76e 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -11,16 +11,20 @@ let # The configuration to install. makeConfig = { bootLoader, grubDevice, grubIdentifier, grubUseEfi - , extraConfig, forceGrubReinstallCount ? 0 + , extraConfig, forceGrubReinstallCount ? 0, flake ? false }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: { imports = [ ./hardware-configuration.nix - + ${if flake + then "" # Still included, but via installer/flake.nix + else ""} ]; + networking.hostName = "thatworked"; + documentation.enable = false; # To ensure that we can rebuild the grub configuration on the nixos-rebuild @@ -67,7 +71,7 @@ let # partitions and filesystems. testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi , grubIdentifier, preBootCommands, postBootCommands, extraConfig - , testSpecialisationConfig + , testSpecialisationConfig, testFlakeSwitch }: let iface = "virtio"; isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); @@ -86,9 +90,14 @@ let qemu_flags = {"qemuFlags": assemble_qemu_flags()} + import os + + image_dir = machine.state_dir + disk_image = os.path.join(image_dir, "machine.qcow2") + hd_flags = { "hdaInterface": "${iface}", - "hda": "vm-state-machine/machine.qcow2", + "hda": disk_image, } ${optionalString isEfi '' hd_flags.update( @@ -232,6 +241,11 @@ let machine = create_machine_named("boot-after-rebuild-switch") ${preBootCommands} machine.wait_for_unit("network.target") + + # Sanity check, is it the configuration.nix we generated? + hostname = machine.succeed("hostname").strip() + assert hostname == "thatworked" + ${postBootCommands} machine.shutdown() @@ -270,6 +284,84 @@ let with subtest("We should find a file named /etc/gitconfig"): machine.succeed("test -e /etc/gitconfig") + ${postBootCommands} + machine.shutdown() + '' + + optionalString testFlakeSwitch '' + ${preBootCommands} + machine.start() + + with subtest("Configure system with flake"): + # TODO: evaluate as user? + machine.succeed(""" + mkdir /root/my-config + mv /etc/nixos/hardware-configuration.nix /root/my-config/ + mv /etc/nixos/secret /root/my-config/ + rm /etc/nixos/configuration.nix + """) + machine.copy_from_host_via_shell( + "${makeConfig { + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig; + forceGrubReinstallCount = 1; + flake = true; + }}", + "/root/my-config/configuration.nix", + ) + machine.copy_from_host_via_shell( + "${./installer/flake.nix}", + "/root/my-config/flake.nix", + ) + machine.succeed(""" + # for some reason the image does not have `pkgs.path`, so + # we use readlink to find a Nixpkgs source. + pkgs=$(readlink -f /nix/var/nix/profiles/per-user/root/channels)/nixos + if ! [[ -e $pkgs/pkgs/top-level/default.nix ]]; then + echo 1>&2 "$pkgs does not seem to be a nixpkgs source. Please fix the test so that pkgs points to a nixpkgs source."; + exit 1; + fi + sed -e s^@nixpkgs@^$pkgs^ -i /root/my-config/flake.nix + """) + + with subtest("Switch to flake based config"): + machine.succeed("nixos-rebuild switch --flake /root/my-config#xyz") + + ${postBootCommands} + machine.shutdown() + + ${preBootCommands} + machine.start() + + machine.wait_for_unit("multi-user.target") + + with subtest("nix-channel command is not available anymore"): + machine.succeed("! which nix-channel") + + # Note that the channel profile is still present on disk, but configured + # not to be used. + with subtest("builtins.nixPath is now empty"): + machine.succeed(""" + [[ "[ ]" == "$(nix-instantiate builtins.nixPath --eval --expr)" ]] + """) + + with subtest(" does not resolve"): + machine.succeed(""" + ! nix-instantiate '' --eval --expr + """) + + with subtest("Evaluate flake config in fresh env without nix-channel"): + machine.succeed("nixos-rebuild switch --flake /root/my-config#xyz") + + with subtest("Evaluate flake config in fresh env without channel profiles"): + machine.succeed(""" + ( + exec 1>&2 + rm -v /root/.nix-channels + rm -vrf ~/.nix-defexpr + rm -vrf /nix/var/nix/profiles/per-user/root/channels* + ) + """) + machine.succeed("nixos-rebuild switch --flake /root/my-config#xyz") + ${postBootCommands} machine.shutdown() ''; @@ -282,6 +374,7 @@ let , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false , enableOCR ? false, meta ? {} , testSpecialisationConfig ? false + , testFlakeSwitch ? false }: makeTest { inherit enableOCR; @@ -334,6 +427,7 @@ let # The test cannot access the network, so any packages we # need must be included in the VM. system.extraDependencies = with pkgs; [ + bintools brotli brotli.dev brotli.lib @@ -387,7 +481,7 @@ let testScript = testScriptFun { inherit bootLoader createPartitions preBootCommands postBootCommands grubDevice grubIdentifier grubUseEfi extraConfig - testSpecialisationConfig; + testSpecialisationConfig testFlakeSwitch; }; }; @@ -439,6 +533,10 @@ let ''; }; + simple-test-config-flake = simple-test-config // { + testFlakeSwitch = true; + }; + simple-uefi-grub-config = { createPartitions = '' machine.succeed( @@ -493,6 +591,8 @@ in { # one big filesystem partition. simple = makeInstallerTest "simple" simple-test-config; + switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake; + # Test cloned configurations with the simple grub configuration simpleSpecialised = makeInstallerTest "simpleSpecialised" (simple-test-config // specialisation-test-extraconfig); diff --git a/third_party/nixpkgs/nixos/tests/installer/flake.nix b/third_party/nixpkgs/nixos/tests/installer/flake.nix new file mode 100644 index 0000000000..4bbef44e34 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/installer/flake.nix @@ -0,0 +1,20 @@ +# This file gets copied into the installation + +{ + # To keep things simple, we'll use an absolute path dependency here. + inputs.nixpkgs.url = "@nixpkgs@"; + + outputs = { nixpkgs, ... }: { + + nixosConfigurations.xyz = nixpkgs.lib.nixosSystem { + modules = [ + ./configuration.nix + ( nixpkgs + "/nixos/modules/testing/test-instrumentation.nix" ) + { + # We don't need nix-channel anymore + nix.channel.enable = false; + } + ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/jenkins.nix b/third_party/nixpkgs/nixos/tests/jenkins.nix index a1ede6dc91..a8f6210006 100644 --- a/third_party/nixpkgs/nixos/tests/jenkins.nix +++ b/third_party/nixpkgs/nixos/tests/jenkins.nix @@ -73,8 +73,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = { nodes, ... }: let - configWithoutJobs = "${nodes.master.config.system.build.toplevel}/specialisation/noJenkinsJobs"; - jenkinsPort = nodes.master.config.services.jenkins.port; + configWithoutJobs = "${nodes.master.system.build.toplevel}/specialisation/noJenkinsJobs"; + jenkinsPort = nodes.master.services.jenkins.port; jenkinsUrl = "http://localhost:${toString jenkinsPort}"; in '' start_all() diff --git a/third_party/nixpkgs/nixos/tests/kanidm.nix b/third_party/nixpkgs/nixos/tests/kanidm.nix index 673a65174d..3f5bca3977 100644 --- a/third_party/nixpkgs/nixos/tests/kanidm.nix +++ b/third_party/nixpkgs/nixos/tests/kanidm.nix @@ -67,9 +67,10 @@ import ./make-test-python.nix ({ pkgs, ... }: '' start_all() server.wait_for_unit("kanidm.service") + client.wait_for_unit("network-online.target") with subtest("Test HTTP interface"): - server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm") + server.wait_until_succeeds("curl -Lsf https://${serverDomain} | grep Kanidm") with subtest("Test LDAP interface"): server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'") @@ -80,15 +81,11 @@ import ./make-test-python.nix ({ pkgs, ... }: client.succeed("kanidm logout") with subtest("Recover idm_admin account"): - # Must stop the server for account recovery or else kanidmd fails with - # "unable to lock kanidm exclusive lock at /var/lib/kanidm/kanidm.db.klock". - server.succeed("systemctl stop kanidm") idm_admin_password = server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '").strip().removeprefix("'").removesuffix("'") - server.succeed("systemctl start kanidm") with subtest("Test unixd connection"): client.wait_for_unit("kanidm-unixd.service") - # TODO: client.wait_for_file("/run/kanidm-unixd/sock") + client.wait_for_file("/run/kanidm-unixd/sock") client.wait_until_succeeds("kanidm-unix status | grep working!") with subtest("Test user creation"): diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix index 76deb0f0aa..e4a8e06df1 100644 --- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix +++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix @@ -9,7 +9,7 @@ let testsForLinuxPackages = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { name = "kernel-${linuxPackages.kernel.version}"; meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus atemu ]; + maintainers = [ nequissimus atemu ma27 ]; }; nodes.machine = { ... }: @@ -31,8 +31,12 @@ let linux_5_10_hardened linux_5_15_hardened linux_6_1_hardened - linux_6_3_hardened linux_6_4_hardened + linux_rt_5_4 + linux_rt_5_10 + linux_rt_5_15 + linux_rt_6_1 + linux_libre linux_testing; }; diff --git a/third_party/nixpkgs/nixos/tests/keymap.nix b/third_party/nixpkgs/nixos/tests/keymap.nix index 0bde21093b..cc45824667 100644 --- a/third_party/nixpkgs/nixos/tests/keymap.nix +++ b/third_party/nixpkgs/nixos/tests/keymap.nix @@ -29,10 +29,10 @@ let mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; makeTest { name = "keymap-${layout}"; - machine.console.keyMap = mkOverride 900 layout; - machine.services.xserver.desktopManager.xterm.enable = false; - machine.services.xserver.layout = mkOverride 900 layout; - machine.imports = [ ./common/x11.nix extraConfig ]; + nodes.machine.console.keyMap = mkOverride 900 layout; + nodes.machine.services.xserver.desktopManager.xterm.enable = false; + nodes.machine.services.xserver.layout = mkOverride 900 layout; + nodes.machine.imports = [ ./common/x11.nix extraConfig ]; testScript = '' import json @@ -201,4 +201,33 @@ in pkgs.lib.mapAttrs mkKeyboardTest { extraConfig.console.keyMap = "de"; extraConfig.services.xserver.layout = "de"; }; + + custom = { + tests = { + us.qwerty = [ "a" "b" "g" "d" "z" "shift-2" "shift-3" ]; + us.expect = [ "a" "b" "g" "d" "z" "@" "#" ]; + greek.qwerty = map (x: "alt_r-${x}") + [ "a" "b" "g" "d" "z" ]; + greek.expect = [ "α" "β" "γ" "δ" "ζ" ]; + }; + + extraConfig.console.useXkbConfig = true; + extraConfig.services.xserver.layout = "us-greek"; + extraConfig.services.xserver.extraLayouts.us-greek = + { description = "US layout with alt-gr greek"; + languages = [ "eng" ]; + symbolsFile = pkgs.writeText "us-greek" '' + xkb_symbols "us-greek" + { + include "us(basic)" + include "level3(ralt_switch)" + key { [ a, A, Greek_alpha ] }; + key { [ b, B, Greek_beta ] }; + key { [ g, G, Greek_gamma ] }; + key { [ d, D, Greek_delta ] }; + key { [ z, Z, Greek_zeta ] }; + }; + ''; + }; + }; } diff --git a/third_party/nixpkgs/nixos/tests/lemmy.nix b/third_party/nixpkgs/nixos/tests/lemmy.nix index 8845777322..de2c4938fe 100644 --- a/third_party/nixpkgs/nixos/tests/lemmy.nix +++ b/third_party/nixpkgs/nixos/tests/lemmy.nix @@ -26,17 +26,11 @@ in admin_email = "mightyiam@example.com"; }; }; - secretFile = /etc/lemmy-config.hjson; + adminPasswordFile = /etc/lemmy-admin-password.txt; caddy.enable = true; }; - environment.etc."lemmy-config.hjson".text = '' - { - "setup": { - "admin_password": "ThisIsWhatIUseEverywhereTryIt" - } - } - ''; + environment.etc."lemmy-admin-password.txt".text = "ThisIsWhatIUseEverywhereTryIt"; networking.firewall.allowedTCPPorts = [ 80 ]; diff --git a/third_party/nixpkgs/nixos/tests/miniflux.nix b/third_party/nixpkgs/nixos/tests/miniflux.nix index be3e7abb6a..a3af53db0e 100644 --- a/third_party/nixpkgs/nixos/tests/miniflux.nix +++ b/third_party/nixpkgs/nixos/tests/miniflux.nix @@ -25,6 +25,7 @@ in default = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; inherit adminCredentialsFile; @@ -34,6 +35,7 @@ in withoutSudo = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; inherit adminCredentialsFile; @@ -44,6 +46,7 @@ in customized = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; config = { @@ -63,6 +66,7 @@ in default.succeed( "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) + default.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') withoutSudo.wait_for_unit("miniflux.service") withoutSudo.wait_for_open_port(${toString defaultPort}) @@ -70,6 +74,7 @@ in withoutSudo.succeed( "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) + withoutSudo.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') customized.wait_for_unit("miniflux.service") customized.wait_for_open_port(${toString port}) @@ -77,5 +82,6 @@ in customized.succeed( "curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) + customized.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') ''; }) diff --git a/third_party/nixpkgs/nixos/tests/miriway.nix b/third_party/nixpkgs/nixos/tests/miriway.nix index 9000e92781..f12c4d5ecc 100644 --- a/third_party/nixpkgs/nixos/tests/miriway.nix +++ b/third_party/nixpkgs/nixos/tests/miriway.nix @@ -83,7 +83,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; }; - fonts.fonts = [ pkgs.inconsolata ]; + fonts.packages = [ pkgs.inconsolata ]; }; enableOCR = true; diff --git a/third_party/nixpkgs/nixos/tests/mumble.nix b/third_party/nixpkgs/nixos/tests/mumble.nix index 2b5cc20163..8eee454721 100644 --- a/third_party/nixpkgs/nixos/tests/mumble.nix +++ b/third_party/nixpkgs/nixos/tests/mumble.nix @@ -20,6 +20,7 @@ in nodes = { server = { config, ... }: { + security.apparmor.enable = true; services.murmur.enable = true; services.murmur.registerName = "NixOS tests"; services.murmur.password = "$MURMURD_PASSWORD"; @@ -81,5 +82,8 @@ in server.sleep(5) # wait to get screenshot client1.screenshot("screen1") client2.screenshot("screen2") + + # check if apparmor denied anything + server.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') ''; }) diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 05fed0f4b4..46fc715d08 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -29,23 +29,49 @@ let ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ]; }))); }; - services.dhcpd4 = { - enable = true; - interfaces = map (n: "eth${toString n}") vlanIfs; - extraConfig = flip concatMapStrings vlanIfs (n: '' - subnet 192.168.${toString n}.0 netmask 255.255.255.0 { - option routers 192.168.${toString n}.1; - range 192.168.${toString n}.3 192.168.${toString n}.254; - } - '') - ; - machines = flip map vlanIfs (vlan: - { - hostName = "client${toString vlan}"; - ethernetAddress = qemu-common.qemuNicMac vlan 1; - ipAddress = "192.168.${toString vlan}.2"; - } - ); + services.kea = { + dhcp4 = { + enable = true; + settings = { + interfaces-config = { + interfaces = map (n: "eth${toString n}") vlanIfs; + dhcp-socket-type = "raw"; + service-sockets-require-all = true; + service-sockets-max-retries = 5; + service-sockets-retry-wait-time = 2500; + }; + subnet4 = map (n: { + id = n; + subnet = "192.168.${toString n}.0/24"; + pools = [{ pool = "192.168.${toString n}.3 - 192.168.${toString n}.254"; }]; + option-data = [{ name = "routers"; data = "192.168.${toString n}.1"; }]; + + reservations = [{ + hw-address = qemu-common.qemuNicMac n 1; + hostname = "client${toString n}"; + ip-address = "192.168.${toString n}.2"; + }]; + }) vlanIfs; + }; + }; + dhcp6 = { + enable = true; + settings = { + interfaces-config = { + interfaces = map (n: "eth${toString n}") vlanIfs; + service-sockets-require-all = true; + service-sockets-max-retries = 5; + service-sockets-retry-wait-time = 2500; + }; + + subnet6 = map (n: { + id = n; + subnet = "fd00:1234:5678:${toString n}::/64"; + interface = "eth${toString n}"; + pools = [{ pool = "fd00:1234:5678:${toString n}::2-fd00:1234:5678:${toString n}::2"; }]; + }) vlanIfs; + }; + }; }; services.radvd = { enable = true; @@ -61,17 +87,6 @@ let }; ''); }; - services.dhcpd6 = { - enable = true; - interfaces = map (n: "eth${toString n}") vlanIfs; - extraConfig = '' - authoritative; - '' + flip concatMapStrings vlanIfs (n: '' - subnet6 fd00:1234:5678:${toString n}::/64 { - range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2; - } - ''); - }; }; testCases = { @@ -117,8 +132,9 @@ let client.wait_for_unit("network.target") router.wait_for_unit("network-online.target") - with subtest("Make sure dhcpcd is not started"): - client.fail("systemctl status dhcpcd.service") + with subtest("Make sure DHCP server is not started"): + client.fail("systemctl status kea-dhcp4-server.service") + client.fail("systemctl status kea-dhcp6-server.service") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") @@ -1035,7 +1051,7 @@ let testScript = '' machine.succeed("udevadm settle") print(machine.succeed("ip link show dev enCustom")) - machine.wait_until_succeeds("ip link show dev enCustom | grep -q '52:54:00:12:0b:01") + machine.wait_until_succeeds("ip link show dev enCustom | grep -q 52:54:00:12:0b:01") ''; }; }; diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix index e17f701c54..db5cee9f65 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix @@ -14,12 +14,12 @@ in { client = { ... }: { services.davfs2.enable = true; system.activationScripts.davfs2-secrets = '' - echo "http://nextcloud/remote.php/webdav/ ${adminuser} ${adminpass}" > /tmp/davfs2-secrets + echo "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}" > /tmp/davfs2-secrets chmod 600 /tmp/davfs2-secrets ''; virtualisation.fileSystems = { "/mnt/dav" = { - device = "http://nextcloud/remote.php/webdav/"; + device = "http://nextcloud/remote.php/dav/files/${adminuser}"; fsType = "davfs"; options = let davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets"); @@ -70,7 +70,7 @@ in { withRcloneEnv = pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix b/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix index 659a4311cd..92beb869eb 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix @@ -33,7 +33,7 @@ in { withRcloneEnv = host: pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/dav/files/${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix index 915fa58ab1..e638f2e5b8 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix @@ -1,6 +1,6 @@ args@{ nextcloudVersion ? 27, ... }: (import ../make-test-python.nix ({ pkgs, ...}: let - username = "custom_admin_username"; + adminuser = "custom_admin_username"; # This will be used both for redis and postgresql pass = "hunter2"; # Don't do this at home, use a file outside of the nix store instead @@ -34,9 +34,9 @@ in { config = { dbtype = "pgsql"; dbname = "nextcloud"; - dbuser = username; + dbuser = adminuser; dbpassFile = passFile; - adminuser = username; + adminuser = adminuser; adminpassFile = passFile; }; secretFile = "/etc/nextcloud-secrets.json"; @@ -66,9 +66,9 @@ in { systemd.services.postgresql.postStart = pkgs.lib.mkAfter '' password=$(cat ${passFile}) ${config.services.postgresql.package}/bin/psql < foo < $out/pubkey.gpg - ''); + gpgKeyring = import ./common/gpg-keyring.nix { inherit pkgs; }; nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' mkdir -p $out diff --git a/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix b/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix index dad8167f19..ca6754046f 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-shutdown.nix @@ -22,6 +22,6 @@ in { machine.wait_for_console_text("Unmounting '/oldroot'") machine.wait_for_console_text("${msg}") # Don't try to sync filesystems - machine.booted = False + machine.wait_for_shutdown() ''; }) diff --git a/third_party/nixpkgs/nixos/tests/systemd-sysupdate.nix b/third_party/nixpkgs/nixos/tests/systemd-sysupdate.nix new file mode 100644 index 0000000000..37811605db --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-sysupdate.nix @@ -0,0 +1,66 @@ +# Tests downloading a signed update aritfact from a server to a target machine. +# This test does not rely on the `systemd.timer` units provided by the +# `systemd-sysupdate` module but triggers the `systemd-sysupdate` service +# manually to make the test more robust. + +{ lib, pkgs, ... }: + +let + gpgKeyring = import ./common/gpg-keyring.nix { inherit pkgs; }; +in +{ + name = "systemd-sysupdate"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes = { + server = { pkgs, ... }: { + networking.firewall.enable = false; + services.nginx = { + enable = true; + virtualHosts."server" = { + root = pkgs.runCommand "sysupdate-artifacts" { buildInputs = [ pkgs.gnupg ]; } '' + mkdir -p $out + cd $out + + echo "nixos" > nixos_1.efi + sha256sum nixos_1.efi > SHA256SUMS + + export GNUPGHOME="$(mktemp -d)" + cp -R ${gpgKeyring}/* $GNUPGHOME + + gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS + ''; + }; + }; + }; + + target = { + systemd.sysupdate = { + enable = true; + transfers = { + "uki" = { + Source = { + Type = "url-file"; + Path = "http://server/"; + MatchPattern = "nixos_@v.efi"; + }; + Target = { + Path = "/boot/EFI/Linux"; + MatchPattern = "nixos_@v.efi"; + }; + }; + }; + }; + + environment.etc."systemd/import-pubring.gpg".source = "${gpgKeyring}/pubkey.gpg"; + }; + }; + + testScript = '' + server.wait_for_unit("nginx.service") + + target.succeed("systemctl start systemd-sysupdate") + assert "nixos" in target.wait_until_succeeds("cat /boot/EFI/Linux/nixos_1.efi", timeout=5) + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/terminal-emulators.nix b/third_party/nixpkgs/nixos/tests/terminal-emulators.nix index 4269d05056..6d76cc8e57 100644 --- a/third_party/nixpkgs/nixos/tests/terminal-emulators.nix +++ b/third_party/nixpkgs/nixos/tests/terminal-emulators.nix @@ -35,6 +35,8 @@ let tests = { darktile.pkg = p: p.darktile; + deepin-terminal.pkg = p: p.deepin.deepin-terminal; + eterm.pkg = p: p.eterm; eterm.executable = "Eterm"; eterm.pinkValue = "#D40055"; @@ -72,6 +74,9 @@ let tests = { qterminal.pkg = p: p.lxqt.qterminal; qterminal.kill = true; + rio.pkg = p: p.rio; + rio.cmd = "rio -e $command"; + roxterm.pkg = p: p.roxterm; roxterm.cmd = "roxterm -e $command"; @@ -118,7 +123,7 @@ in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable} maintainers = [ jjjollyjim ]; }; - machine = { pkgsInner, ... }: + nodes.machine = { pkgsInner, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/third_party/nixpkgs/nixos/tests/twingate.nix b/third_party/nixpkgs/nixos/tests/twingate.nix index 8c7161b6fa..f8bede09d9 100644 --- a/third_party/nixpkgs/nixos/tests/twingate.nix +++ b/third_party/nixpkgs/nixos/tests/twingate.nix @@ -6,5 +6,9 @@ testScript = { nodes, ... }: '' machine.wait_for_unit("twingate.service") machine.succeed("twingate --version | grep '${nodes.machine.services.twingate.package.version}' >&2") + machine.succeed("twingate config log-level 'debug'") + machine.systemctl("restart twingate.service") + machine.succeed("grep 'debug' /etc/twingate/log_level.conf >&2") + machine.succeed("twingate config log-level | grep 'debug' >&2") ''; } diff --git a/third_party/nixpkgs/nixos/tests/typesense.nix b/third_party/nixpkgs/nixos/tests/typesense.nix new file mode 100644 index 0000000000..4f07a2e194 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/typesense.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ pkgs, ... }: let + testPort = 8108; +in { + name = "typesense"; + meta.maintainers = with pkgs.lib.maintainers; [ oddlama ]; + + nodes.machine = { ... }: { + services.typesense = { + enable = true; + apiKeyFile = pkgs.writeText "typesense-api-key" "dummy"; + settings.server = { + api-port = testPort; + api-address = "0.0.0.0"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("typesense.service") + machine.wait_for_open_port(${toString testPort}) + assert machine.succeed("curl --fail http://localhost:${toString testPort}/health") == '{"ok":true}' + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/vscodium.nix b/third_party/nixpkgs/nixos/tests/vscodium.nix index 3eda8b6cfb..d817ce927f 100644 --- a/third_party/nixpkgs/nixos/tests/vscodium.nix +++ b/third_party/nixpkgs/nixos/tests/vscodium.nix @@ -8,7 +8,7 @@ let environment.variables.NIXOS_OZONE_WL = "1"; environment.variables.DISPLAY = "do not use"; - fonts.fonts = with pkgs; [ dejavu_fonts ]; + fonts.packages = with pkgs; [ dejavu_fonts ]; }; xorg = { pkgs, ... }: { imports = [ ./common/user-account.nix ./common/x11.nix ]; diff --git a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix index 4f000df922..8c701ca7d5 100644 --- a/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/tests/wpa_supplicant.nix @@ -34,6 +34,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: ssid = "nixos-test-mixed"; authentication = { mode = "wpa3-sae-transition"; + saeAddToMacAllow = true; saePasswordsFile = pkgs.writeText "password" "reproducibility"; wpaPasswordFile = pkgs.writeText "password" "reproducibility"; }; 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 36d9ea7fb8..c479ebe7ee 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "18.0"; + version = "20.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-06mfTvt0BXHUGZG2rnEbuOPIP+jD76mQZTo+m4b4lo4="; + sha256 = "sha256-uflvUmUzOtF3BwiLfnd+qhz+ZYyn8AKvODFs599phhU="; }; nativeBuildInputs = [ meson ninja pkg-config ]; 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 80db9e85d3..9740c2f718 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 @@ -21,9 +21,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 alsa-lib ]; + postInstall = '' + substituteInPlace $out/share/applications/vu.b4.${pname}.desktop \ + --replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/${pname}" + ''; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 0cb33062bd..e805dd1f90 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,11 +1,13 @@ { stdenv , lib , fetchFromGitHub +, gitUpdater , pkg-config , qmake , qt5compat ? null , qtbase , qttools +, qtwayland , rtaudio , rtmidi , wrapQtAppsHook @@ -13,16 +15,16 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bambootracker"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw="; + hash = "sha256-rn6PNxVsLEXz8q3nvMMhKV1/Woq2CxROf0qsQJykyUs="; }; postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' @@ -41,14 +43,16 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase - rtaudio rtmidi + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ qt5compat - ]; + ] ++ rtaudio.buildInputs; qmakeFlags = [ - "CONFIG+=system_rtaudio" + # we don't have RtAudio 6 yet: https://github.com/NixOS/nixpkgs/pull/245075 + # "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; @@ -64,6 +68,12 @@ stdenv.mkDerivation rec { wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ''; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; + meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; homepage = "https://bambootracker.github.io/BambooTracker/"; @@ -71,4 +81,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; }; -} +}) 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 new file mode 100644 index 0000000000..75aef2b279 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -0,0 +1,126 @@ +{ stdenv +, fetchurl +, alsa-lib +, atk +, cairo +, dpkg +, ffmpeg +, freetype +, gdk-pixbuf +, glib +, gtk3 +, harfbuzz +, lib +, libglvnd +, libjack2 +, libjpeg +, libxkbcommon +, makeWrapper +, pango +, pipewire +, pulseaudio +, wrapGAppsHook +, xdg-utils +, xorg +, zlib +}: + +stdenv.mkDerivation rec { + pname = "bitwig-studio"; + version = "5.0.4"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; + sha256 = "sha256-IkhUkKO+Ay1WceZNekII6aHLOmgcgGfx0hGo5ldFE5Y="; + }; + + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + + unpackCmd = '' + mkdir -p root + dpkg-deb -x $curSrc root + ''; + + dontBuild = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + + buildInputs = with xorg; [ + alsa-lib + atk + cairo + freetype + gdk-pixbuf + glib + gtk3 + harfbuzz + libglvnd + libjack2 + # libjpeg8 is required for converting jpeg's to colour palettes + libjpeg + libxcb + libXcursor + libX11 + libXtst + libxkbcommon + pango + pipewire + pulseaudio + stdenv.cc.cc.lib + xcbutil + xcbutilwm + zlib + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + 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/com.bitwig.BitwigStudio.desktop \ + $out/share/applications/com.bitwig.BitwigStudio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + + runHook postInstall + ''; + + postFixup = '' + # patchelf fails to set rpath on BitwigStudioEngine, so we use + # the LD_LIBRARY_PATH way + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -name '*.jar' \ + -not -name 'jspawnhelper' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + # make xdg-open overrideable at runtime + wrapProgram $f \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \ + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ + --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}" + done + + find $out -type f -executable -name 'jspawnhelper' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + done + ''; + + meta = with lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = "https://www.bitwig.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz michalrus mrVanDalo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix index ebf72588df..a5d1a783b4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix @@ -107,5 +107,6 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; + mainProgram = "cadence"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix index 752e1d2dfc..e898f17d93 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ offline mirrexagon ]; platforms = platforms.linux; + mainProgram = "cava"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix index 17495ead35..8f15b7d611 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cmusfm"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Arkq"; repo = pname; rev = "v${version}"; - sha256 = "1px2is80jdxchg8cpn5cizg6jvcbzyxl0qzs3bn0k3d10qjvdww5"; + sha256 = "sha256-CA585ZpkxMMLgzv81QB2kKMFg5R5CwKS9xAYrU+pAxs="; }; configureFlags = lib.optional libnotifySupport "--enable-libnotify" diff --git a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix index 7e27bf7837..80018ecc39 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, libjack2, gettext, intltool, guile_2_0, lilypond +, libjack2, gettext, intltool, guile_2_2, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband , portaudio, portmidi, fftw, wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile + libjack2 guile_2_2 lilypond glib libxml2 librsvg libsndfile aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix index faffd14576..ac286d499f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix @@ -107,5 +107,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "easyeffects"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix index d53c0ac1ca..5e62399c8a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ aske ]; platforms = platforms.all; + mainProgram = "espeak-ng"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix index 81a2646ad7..89d6845237 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/famistudio/default.nix @@ -2,31 +2,35 @@ , stdenv , fetchzip , autoPatchelfHook +, dotnet-runtime +, ffmpeg +, libglvnd , makeWrapper -, mono , openal -, libGL }: stdenv.mkDerivation rec { pname = "famistudio"; - version = "4.0.6"; + version = "4.1.1"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - sha256 = "sha256-Se9EIQTjZQM5qqzlEB4hGVRHDFdu6GecNGpw9gYMbW4="; + hash = "sha256-fRNjboCfymBhr7Eg5ENnO1fchX0oTdeaJJ0SC3BKTVI="; }; + strictDeps = true; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; buildInputs = [ - mono + dotnet-runtime + ffmpeg + libglvnd openal - libGL ]; dontConfigure = true; @@ -38,9 +42,10 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/famistudio} mv * $out/lib/famistudio - makeWrapper ${mono}/bin/mono $out/bin/famistudio \ - --add-flags $out/lib/famistudio/FamiStudio.exe \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} + makeWrapper ${lib.getExe dotnet-runtime} $out/bin/famistudio \ + --add-flags $out/lib/famistudio/FamiStudio.dll \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} # Bundled openal lib freezes the application rm $out/lib/famistudio/libopenal32.so diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix deleted file mode 100644 index 81ce11b9ea..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix +++ /dev/null @@ -1,207 +0,0 @@ -{ lib, stdenv -, coreutils -, fetchurl -, makeWrapper -, pkg-config -}: - -with lib.strings; - -let - - version = "0.9.90"; - - src = fetchurl { - url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; - sha256 = "0d1fqwymyfb73zkmpwv4zk4gsg4ji7qs20mfsr20skmnqx30xvna"; - }; - - meta = with lib; { - homepage = "https://faust.grame.fr/"; - downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ magnetophon pmahoney ]; - }; - - faust = stdenv.mkDerivation { - pname = "faust"; - inherit version; - - inherit src; - - nativeBuildInputs = [ makeWrapper ]; - - passthru = { - inherit wrap wrapWithBuildEnv; - }; - - preConfigure = '' - makeFlags="$makeFlags prefix=$out" - - # The faust makefiles use 'system ?= $(shell uname -s)' but nix - # defines 'system' env var, so undefine that so faust detects the - # correct system. - unset system - ''; - - # Remove most faust2appl scripts since they won't run properly - # without additional paths setup. See faust.wrap, - # faust.wrapWithBuildEnv. - postInstall = '' - # syntax error when eval'd directly - pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" - (shopt -s extglob; rm "$out"/bin/$pattern) - ''; - - postFixup = '' - # Set faustpath explicitly. - substituteInPlace "$out"/bin/faustpath \ - --replace "/usr/local /usr /opt /opt/local" "$out" - - # The 'faustoptflags' is 'source'd into other faust scripts and - # not used as an executable, so patch 'uname' usage directly - # rather than use makeWrapper. - substituteInPlace "$out"/bin/faustoptflags \ - --replace uname "${coreutils}/bin/uname" - - # wrapper for scripts that don't need faust.wrap* - for script in "$out"/bin/faust2*; do - wrapProgram "$script" \ - --prefix PATH : "$out"/bin - done - ''; - - meta = meta // { - description = "A functional programming language for realtime audio signal processing"; - longDescription = '' - FAUST (Functional Audio Stream) is a functional programming - language specifically designed for real-time signal processing - and synthesis. FAUST targets high-performance signal processing - applications and audio plug-ins for a variety of platforms and - standards. - The Faust compiler translates DSP specifications into very - efficient C++ code. Thanks to the notion of architecture, - FAUST programs can be easily deployed on a large variety of - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, - puredata, csound, supercollider, pure, vst, coreaudio) without - any change to the FAUST code. - - This package has just the compiler, libraries, and headers. - Install faust2* for specific faust2appl scripts. - ''; - }; - - }; - - # Default values for faust2appl. - faust2ApplBase = - { baseName - , dir ? "tools/faust2appls" - , scripts ? [ baseName ] - , ... - }@args: - - args // { - name = "${baseName}-${version}"; - - inherit src; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - for script in ${concatStringsSep " " scripts}; do - cp "${dir}/$script" "$out/bin/" - done - - runHook postInstall - ''; - - postInstall = '' - # For the faust2appl script, change 'faustpath' and - # 'faustoptflags' to absolute paths. - for script in "$out"/bin/*; do - substituteInPlace "$script" \ - --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" - done - ''; - - meta = meta // { - description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; - }; - }; - - # Some 'faust2appl' scripts, such as faust2alsa, run faust to - # generate cpp code, then invoke the c++ compiler to build the code. - # This builder wraps these scripts in parts of the stdenv such that - # when the scripts are called outside any nix build, they behave as - # if they were running inside a nix build in terms of compilers and - # paths being configured (e.g. rpath is set so that compiled - # binaries link to the libs inside the nix store) - # - # The function takes two main args: the appl name (e.g. - # 'faust2alsa') and an optional list of propagatedBuildInputs. It - # returns a derivation that contains only the bin/${appl} script, - # wrapped up so that it will run as if it was inside a nix build - # with those build inputs. - # - # The build input 'faust' is automatically added to the - # propagatedBuildInputs. - wrapWithBuildEnv = - { baseName - , propagatedBuildInputs ? [ ] - , ... - }@args: - - stdenv.mkDerivation ((faust2ApplBase args) // { - - nativeBuildInputs = [ pkg-config makeWrapper ]; - - propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; - - postFixup = '' - - # export parts of the build environment - for script in "$out"/bin/*; do - wrapProgram "$script" \ - --set FAUSTLIB "${faust}/lib/faust" \ - --set FAUSTINC "${faust}/include/faust" \ - --prefix PATH : "$PATH" \ - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ - --set NIX_LDFLAGS "$NIX_LDFLAGS" - done - ''; - }); - - # Builder for 'faust2appl' scripts, such as faust2firefox that - # simply need to be wrapped with some dependencies on PATH. - # - # The build input 'faust' is automatically added to the PATH. - wrap = - { baseName - , runtimeInputs ? [ ] - , ... - }@args: - - let - - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); - - in stdenv.mkDerivation ((faust2ApplBase args) // { - - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - for script in "$out"/bin/*; do - wrapProgram "$script" --prefix PATH : "${runtimePath}" - done - ''; - - }); - -in faust diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix new file mode 100644 index 0000000000..b8b28f4768 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, meta +, fetchurl +, unzip +, mpv +, electron_24 +, makeDesktopItem +, makeWrapper +, pname +, appname +, version +}: + +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; + hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc="; + }; + + nativeBuildInputs = [ makeWrapper unzip ]; + + # Installs mpv as a requirement + propagatedBuildInputs = [ mpv ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appname}.app,bin} + cp -R . $out/Applications/${appname}.app + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + runHook postInstall + ''; + + shellHook = '' + set -x + export LD_LIBRARY_PATH=${mpv}/lib + set +x + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix new file mode 100644 index 0000000000..f9a670dbfa --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, callPackage +, ... +}@args: + +let + extraArgs = removeAttrs args [ "callPackage" ]; + + pname = "feishin"; + version = "0.2.0"; + appname = "Feishin"; + + meta = with lib; { + description = "Full-featured Subsonic/Jellyfin compatible desktop music player"; + homepage = "https://github.com/jeffvli/feishin"; + changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.mit; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + maintainers = with maintainers; [ onny ]; + }; + +in if stdenv.isDarwin +then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; }) +else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix new file mode 100644 index 0000000000..08adc69bb7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix @@ -0,0 +1,71 @@ +{ stdenv +, meta +, lib +, fetchurl +, mpv +, graphicsmagick +, electron_24 +, makeDesktopItem +, makeWrapper +, pname +, appname +, version +}: + +let + icon = fetchurl { + url = + "https://github.com/jeffvli/feishin/raw/development/assets/icons/1024x1024.png"; + sha256 = "sha256-8Qigt1CNMa3SDVK2cdqWJuMSl19yfy6nPQfME4qA48I="; + }; + + desktopItem = makeDesktopItem { + name = "feishin"; + desktopName = "Feishin"; + comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; + icon = "feishin"; + exec = "feishin %u"; + categories = [ "Audio" ]; + mimeTypes = [ "x-scheme-handler/feishin" ]; + }; +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; + hash = "sha256-o+fEjdG2iN84FEchyAKWZCpsrqDm1K1k+Q2K+cwYBZE="; + }; + + + nativeBuildInputs = [ makeWrapper graphicsmagick ]; + + # Installs mpv as a requirement + propagatedBuildInputs = [ mpv ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share + cp -r resources $out/share/${pname}/ + cp -r locales $out/share/${pname}/ + + makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/app.asar + install -m 444 -D "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + for size in 16 24 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/${appname}.png + done + runHook postInstall + ''; + + shellHook = '' + set -x + export LD_LIBRARY_PATH=${mpv}/lib + set +x + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index 41ee34847a..503e72dfe0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -1,19 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPackages, pkg-config, cmake , alsa-lib, glib, libjack2, libsndfile, libpulseaudio , AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices }: stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-BSJu3jB7b5G2ThXBUHUNnBGl55EXe3nIzdBdgfOWDSM="; + sha256 = "sha256-RqhlpvMbRSwdcY2uuFAdJnihN3aObcLVMuvCZ294dgo="; }; + patches = [ + # Fixes bad CMAKE_INSTALL_PREFIX + CMAKE_INSTALL_LIBDIR concatenation for Darwin install name dir + # Remove when PR merged & in release + (fetchpatch { + name = "0001-Fix-incorrect-way-of-turning-CMAKE_INSTALL_LIBDIR-absolute.patch"; + url = "https://github.com/FluidSynth/fluidsynth/pull/1261/commits/03cd38dd909fc24aa39553d869afbb4024416de8.patch"; + hash = "sha256-nV+MbFttnbNBO4zWnPLpnnEuoiESkV9BGFlUS9tQQfk="; + }) + ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; @@ -24,8 +34,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Denable-framework=off" - # set CMAKE_INSTALL_NAME_DIR to correct value on darwin - "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock index 0c91dab0bd..ee4b4ac20a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/Cargo.lock @@ -3,103 +3,108 @@ version = 3 [[package]] -name = "aho-corasick" -version = "0.7.18" +name = "addr2line" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] name = "ammonia" -version = "3.1.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35" +checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" dependencies = [ - "html5ever", - "lazy_static", + "html5ever 0.26.0", "maplit", - "markup5ever_rcdom", - "matches", + "once_cell", "tendril", "url", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "winapi", + "libc", ] [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" - -[[package]] -name = "atk" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba" -dependencies = [ - "atk-sys", - "bitflags", - "glib 0.14.8", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea" -dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", - "libc", - "system-deps 3.2.0", -] +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "atom_syndication" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fb6a0b39c6517edafe46f8137e53c51742425a4dae1c73ee12264a37ad7541" +checksum = "ca96cb38e3d8236f1573a84bbc55e130bd1ae07df770e36d0cf221ea7a50e36c" dependencies = [ "chrono", - "derive_builder 0.10.2", + "derive_builder", "diligent-date-parser", "never", "quick-xml", ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic_refcell" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] [[package]] name = "base64" -version = "0.13.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -108,60 +113,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bumpalo" -version = "3.8.0" +name = "bitflags" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] -name = "byteorder" -version = "1.4.3" +name = "bumpalo" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytes" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.14.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482" +checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", - "glib 0.14.8", + "glib 0.17.10", "libc", + "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.14.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570" +checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" dependencies = [ - "glib-sys 0.14.0", + "glib-sys 0.17.10", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "cc" -version = "1.0.72" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-expr" -version = "0.8.1" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -172,22 +179,24 @@ 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", - "time", + "time 0.1.45", + "wasm-bindgen", "winapi", ] [[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", @@ -195,15 +204,15 @@ 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 = "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", "crossbeam-utils", @@ -211,9 +220,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", @@ -222,105 +231,69 @@ 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", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "lazy_static", ] [[package]] name = "ctor" -version = "0.1.21" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "darling" -version = "0.10.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" -dependencies = [ - "darling_core 0.12.4", - "darling_macro 0.12.4", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.10.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_core" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn", + "strsim", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.10.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core 0.10.2", + "darling_core", "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" -dependencies = [ - "darling_core 0.12.4", - "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -335,162 +308,164 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.9.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" -dependencies = [ - "darling 0.10.2", - "derive_builder_core 0.9.0", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.9.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "darling 0.10.2", + "darling", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "derive_builder_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" -dependencies = [ - "darling 0.12.4", - "proc-macro2", - "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "derive_builder_macro" -version = "0.10.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core 0.10.2", - "syn", + "derive_builder_core", + "syn 1.0.109", ] [[package]] name = "diesel" -version = "1.4.8" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" +checksum = "f7a532c1f99a0f596f6960a60d1e119e91582b24b39e2d83a190e61262c3ef0c" dependencies = [ - "byteorder", "chrono", "diesel_derives", "libsqlite3-sys", "r2d2", + "time 0.3.22", ] [[package]] name = "diesel_derives" -version = "1.4.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" +checksum = "74398b79d81e52e130d991afeed9c86034bb1b7735f46d2f5bf7deb261d80303" dependencies = [ + "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn", + "syn 2.0.23", ] [[package]] name = "diesel_migrations" -version = "1.4.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" +checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" dependencies = [ + "diesel", "migrations_internals", "migrations_macros", ] [[package]] -name = "diff" -version = "0.1.12" +name = "diesel_table_macro_syntax" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.23", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] name = "diligent-date-parser" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d0fd95c7c02e2d6c588c6c5628466fff9bdde4b8c6196465e087b08e792720" +checksum = "f6cf7fe294274a222363f84bcb63cdea762979a0443b4cf1f4f8fd17c86b1182" dependencies = [ "chrono", ] -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "either" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encoding_rs" -version = "0.8.30" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] name = "env_logger" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", ] [[package]] -name = "field-offset" -version = "0.3.4" +name = "equivalent" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", "rustc_version", @@ -519,19 +494,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "fragile" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fuchsia-cprng" @@ -541,9 +515,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "futf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ "mac", "new_debug_unreachable", @@ -551,9 +525,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -566,9 +540,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -576,15 +550,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -593,38 +567,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.23", ] [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -639,61 +613,63 @@ dependencies = [ ] [[package]] -name = "gdk" -version = "0.14.3" +name = "gdk-pixbuf" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b" +checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib 0.17.10", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +dependencies = [ + "gio-sys", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +dependencies = [ + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", - "gdk-sys", + "gdk4-sys", "gio", - "glib 0.14.8", + "glib 0.17.10", "libc", "pango", ] [[package]] -name = "gdk-pixbuf" -version = "0.14.0" +name = "gdk4-sys" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib 0.14.8", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" -dependencies = [ - "gio-sys", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", - "libc", - "system-deps 3.2.0", -] - -[[package]] -name = "gdk-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e" +checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "libc", "pango-sys", "pkg-config", - "system-deps 3.2.0", + "system-deps", ] [[package]] @@ -709,13 +685,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -736,184 +712,255 @@ dependencies = [ ] [[package]] -name = "gio" -version = "0.14.8" +name = "gimli" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "gio" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", + "futures-util", "gio-sys", - "glib 0.14.8", + "glib 0.17.10", "libc", "once_cell", + "pin-project-lite", + "smallvec", "thiserror", ] [[package]] name = "gio-sys" -version = "0.14.0" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" +checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "libc", - "system-deps 3.2.0", + "system-deps", "winapi", ] [[package]] name = "glib" -version = "0.10.3" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", "futures-task", - "futures-util", - "glib-macros 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-macros 0.15.13", + "glib-sys 0.15.10", + "gobject-sys 0.15.10", "libc", "once_cell", + "smallvec", + "thiserror", ] [[package]] name = "glib" -version = "0.14.8" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4" +checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", "futures-task", - "glib-macros 0.14.1", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "futures-util", + "gio-sys", + "glib-macros 0.17.10", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "libc", + "memchr", "once_cell", "smallvec", + "thiserror", ] [[package]] name = "glib-macros" -version = "0.10.1" +version = "0.15.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck", - "itertools 0.9.0", - "proc-macro-crate 0.1.5", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "glib-macros" -version = "0.14.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" +checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" dependencies = [ "anyhow", "heck", - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "glib-sys" -version = "0.10.1" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 1.3.2", + "system-deps", ] [[package]] name = "glib-sys" -version = "0.14.0" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" +checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" dependencies = [ "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.10.0" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ - "glib-sys 0.10.1", + "glib-sys 0.15.10", "libc", - "system-deps 1.3.2", + "system-deps", ] [[package]] name = "gobject-sys" -version = "0.14.0" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" +checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" dependencies = [ - "glib-sys 0.14.0", + "glib-sys 0.17.10", "libc", - "system-deps 3.2.0", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +dependencies = [ + "glib 0.17.10", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" +dependencies = [ + "glib-sys 0.17.10", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk4", + "glib 0.17.10", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", ] [[package]] name = "gstreamer" -version = "0.17.4" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a255f142048ba2c4a4dce39106db1965abe355d23f4b5335edea43a553faa4" +checksum = "3113531138b4e41968e33fd003a0d1a635ef6e0cbc309dd5004123000863ac54" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "futures-channel", "futures-core", "futures-util", - "glib 0.14.8", + "glib 0.17.10", "gstreamer-sys", "libc", "muldiv", "num-integer", "num-rational", "once_cell", + "option-operations", "paste", "pretty-hex", + "smallvec", "thiserror", ] [[package]] name = "gstreamer-base" -version = "0.17.2" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0c1d8c62eb5d08fb80173609f2eea71d385393363146e4e78107facbd67715" +checksum = "0b8ff5dfbf7bcaf1466a385b836bad0d8da25759f121458727fdda1f771c69b3" dependencies = [ - "bitflags", + "atomic_refcell", + "bitflags 1.3.2", "cfg-if", - "glib 0.14.8", + "glib 0.17.10", "gstreamer", "gstreamer-base-sys", "libc", @@ -921,25 +968,25 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28169a7b58edb93ad8ac766f0fa12dcd36a2af4257a97ee10194c7103baf3e27" +checksum = "26114ed96f6668380f5a1554128159e98e06c3a7a8460f216d7cd6dce28f928c" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "gstreamer-sys", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "gstreamer-player" -version = "0.17.0" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c503dba6f79b5cd8a4be5329119892c196db013ce66fce16079a7df8ce819a3a" +checksum = "ec5e04059f117b82ca64c40901610ca9ac1734383437c9fb69afba26c9ebf5a3" dependencies = [ - "bitflags", - "glib 0.14.8", + "bitflags 1.3.2", + "glib 0.17.10", "gstreamer", "gstreamer-player-sys", "gstreamer-video", @@ -949,40 +996,40 @@ dependencies = [ [[package]] name = "gstreamer-player-sys" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e50bed2a120574750ea1370163df21b50762d0b4967f569fdc58232f4c930d5" +checksum = "15321aaaf3bb247b4af3e09456a62dc17f030515d6328377a34081d9ed5803c0" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "gstreamer-sys" -version = "0.17.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81704feeb3e8599913bdd1e738455c2991a01ff4a1780cb62200993e454cc3e" +checksum = "e56fe047adef7d47dbafa8bc1340fddb53c325e16574763063702fc94b5786d2" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "gstreamer-video" -version = "0.17.2" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3447ee95c8e79daec0b163260cf6a3de9bc19ff47a01b533787f900074a3476" +checksum = "dce97769effde2d779dc4f7037b37106457b74e53f2a711bddc90b30ffeb7e06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "futures-channel", - "glib 0.14.8", + "glib 0.17.10", "gstreamer", "gstreamer-base", "gstreamer-video-sys", @@ -992,79 +1039,79 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81608f4182bdddd5bd33aaaa341d5544eda12b067a3dab75b1b7d2de01a3ba7" +checksum = "66ddb6112d438aac0004d2db6053a572f92b1c5e0e9d6ff6c71d9245f7f73e46" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] -name = "gtk" -version = "0.14.3" +name = "gtk4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c" +checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" dependencies = [ - "atk", - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", - "gdk", "gdk-pixbuf", + "gdk4", "gio", - "glib 0.14.8", - "gtk-sys", - "gtk3-macros", + "glib 0.17.10", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", "libc", "once_cell", "pango", - "pkg-config", ] [[package]] -name = "gtk-sys" -version = "0.14.0" +name = "gtk4-macros" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", - "libc", - "pango-sys", - "system-deps 3.2.0", -] - -[[package]] -name = "gtk3-macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79" +checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" dependencies = [ "anyhow", - "heck", - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "gtk4-sys" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", ] [[package]] name = "h2" -version = "0.3.9" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f072413d126e57991455e0a922b31e4c8ba7c2ffbebf6b78b4f8521397d65cd" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1072,7 +1119,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1081,69 +1128,94 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "libc", + "windows-sys", ] [[package]] name = "html2text" -version = "0.2.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26379dcb715e237b96102a12b505c553e2bffa74bae2e54658748d298660ef1" +checksum = "74cda84f06c1cc83476f79ae8e2e892b626bdadafcb227baec54c918cadc18a0" dependencies = [ - "html5ever", - "markup5ever_rcdom", + "html5ever 0.26.0", + "markup5ever 0.11.0", + "tendril", "unicode-width", + "xml5ever 0.17.0", ] [[package]] name = "html5ever" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", - "markup5ever", + "markup5ever 0.10.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever 0.11.0", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] name = "http" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -1152,9 +1224,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1170,18 +1242,15 @@ checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.16" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1192,7 +1261,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.8", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -1214,6 +1283,29 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1222,23 +1314,32 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "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]] @@ -1250,47 +1351,64 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + [[package]] name = "ipnet" -version = "2.3.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] -name = "itertools" -version = "0.9.0" +name = "is-docker" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" dependencies = [ - "either", + "once_cell", ] [[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" +name = "is-terminal" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +dependencies = [ + "hermit-abi", + "rustix 0.38.2", + "windows-sys", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1302,66 +1420,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libc" -version = "0.2.112" +name = "libadwaita" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" - -[[package]] -name = "libdbus-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" dependencies = [ - "pkg-config", -] - -[[package]] -name = "libhandy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bcf9c79ec810a62f442ffd568d2de233983dc91c160abee4949b67a647024ed" -dependencies = [ - "bitflags", - "gdk", + "bitflags 1.3.2", "gdk-pixbuf", + "gdk4", "gio", - "glib 0.14.8", - "gtk", - "lazy_static", + "glib 0.17.10", + "gtk4", + "libadwaita-sys", "libc", - "libhandy-sys", "pango", ] [[package]] -name = "libhandy-sys" -version = "0.8.0" +name = "libadwaita-sys" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1938b93a8f29417992c452b7f43e7eff8a9f8d25b7f0bc923ae9d75b50a9cde3" +checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" dependencies = [ - "gdk-pixbuf-sys", - "gdk-sys", + "gdk4-sys", "gio-sys", - "glib-sys 0.14.0", - "gobject-sys 0.14.0", - "gtk-sys", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", + "gtk4-sys", "libc", "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ "pkg-config", - "system-deps 3.2.0", ] [[package]] name = "libsqlite3-sys" -version = "0.22.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "pkg-config", "vcpkg", ] +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + [[package]] name = "locale_config" version = "0.2.3" @@ -1375,21 +1502,19 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "mac" @@ -1410,8 +1535,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", - "phf", - "phf_codegen", + "phf 0.8.0", + "phf_codegen 0.8.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -1423,113 +1562,105 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" dependencies = [ - "html5ever", - "markup5ever", + "html5ever 0.25.2", + "markup5ever 0.10.1", "tendril", - "xml5ever", + "xml5ever 0.16.2", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[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 = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "migrations_internals" -version = "1.4.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" +checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" dependencies = [ - "diesel", + "serde", + "toml", ] [[package]] name = "migrations_macros" -version = "1.4.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" +checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" dependencies = [ "migrations_internals", "proc-macro2", "quote", - "syn", ] [[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 = "mime_guess" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime", "unicase", ] [[package]] -name = "mio" -version = "0.7.14" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", + "adler", ] [[package]] -name = "miow" -version = "0.3.7" +name = "mio" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ - "winapi", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] name = "mpris-player" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07" +checksum = "be832ec9171fdaf43609d02bb552f4129ba6eacd184bb25186e2906dbd3cf098" dependencies = [ "dbus", - "glib 0.10.3", + "glib 0.15.12", ] [[package]] name = "muldiv" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -1555,20 +1686,11 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - [[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", @@ -1576,9 +1698,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -1587,66 +1709,87 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", ] [[package]] -name = "once_cell" -version = "1.9.0" +name = "object" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "2.0.2" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176ee4b630d174d2da8241336763bb459281dddc0f4d87f72c3b1efc9a6109b7" +checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" dependencies = [ + "is-wsl", + "libc", "pathdiff", - "winapi", ] [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] [[package]] -name = "openssl-probe" -version = "0.1.4" +name = "openssl-macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1654,22 +1797,32 @@ dependencies = [ ] [[package]] -name = "output_vt100" -version = "0.1.2" +name = "option-operations" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" dependencies = [ "winapi", ] [[package]] name = "pango" -version = "0.14.8" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581" +checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" dependencies = [ - "bitflags", - "glib 0.14.8", + "bitflags 1.3.2", + "gio", + "glib 0.17.10", "libc", "once_cell", "pango-sys", @@ -1677,46 +1830,44 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.14.0" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" +checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" dependencies = [ - "glib-sys 0.14.0", - "gobject-sys 0.14.0", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "libc", - "system-deps 3.2.0", + "system-deps", ] [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "instant", "libc", "redox_syscall", "smallvec", - "winapi", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.6" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "pathdiff" @@ -1726,18 +1877,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" @@ -1745,7 +1887,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", ] [[package]] @@ -1754,8 +1905,18 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", ] [[package]] @@ -1764,10 +1925,20 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -1778,10 +1949,19 @@ dependencies = [ ] [[package]] -name = "pin-project-lite" -version = "0.2.8" +name = "phf_shared" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[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" @@ -1791,9 +1971,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "podcasts-data" @@ -1804,7 +1984,7 @@ dependencies = [ "base64", "chrono", "crossbeam-channel", - "derive_builder 0.9.0", + "derive_builder", "diesel", "diesel_migrations", "futures", @@ -1812,14 +1992,14 @@ dependencies = [ "http", "hyper", "hyper-tls", - "lazy_static", "log", "maplit", "mime_guess", "native-tls", "num_cpus", + "once_cell", "pretty_assertions", - "rand 0.8.4", + "rand 0.8.5", "rayon", "reqwest", "rfc822_sanitizer", @@ -1840,22 +2020,19 @@ dependencies = [ "chrono", "crossbeam-channel", "fragile", - "gdk", - "gdk-pixbuf", "gettext-rs", - "gio", - "glib 0.14.8", + "glob", "gstreamer", "gstreamer-player", - "gtk", + "gtk4", "html2text", - "html5ever", + "html5ever 0.25.2", "humansize", - "lazy_static", - "libhandy", + "libadwaita", "log", "markup5ever_rcdom", "mpris-player", + "once_cell", "open", "podcasts-data", "pretty_assertions", @@ -1870,9 +2047,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precomputed-hash" @@ -1882,27 +2059,27 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "pretty-hex" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "pretty_assertions" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "ansi_term", "ctor", "diff", "output_vt100", + "yansi", ] [[package]] name = "pretty_env_logger" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" dependencies = [ "env_logger", "log", @@ -1910,21 +2087,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" -dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -1936,7 +2104,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1953,24 +2121,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ - "unicode-xid", + "unicode-ident", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-xml" -version = "0.22.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" dependencies = [ "encoding_rs", "memchr", @@ -1978,18 +2140,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.14" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] [[package]] name = "r2d2" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", "parking_lot", @@ -2019,20 +2181,19 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", "rand_pcg", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", + "rand_core 0.6.4", ] [[package]] @@ -2052,7 +2213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2081,11 +2242,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.10", ] [[package]] @@ -2097,15 +2258,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_pcg" version = "0.2.1" @@ -2117,26 +2269,23 @@ dependencies = [ [[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", ] @@ -2151,28 +2300,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom 0.2.3", - "redox_syscall", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -2181,9 +2320,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "remove_dir_all" @@ -2196,25 +2335,26 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.8" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c4e0a76dc12a116108933f6301b95e83634e0c47b0afbed6abbaa0601e99258" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64", "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "serde", @@ -2222,6 +2362,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -2231,9 +2372,9 @@ dependencies = [ [[package]] name = "rfc822_sanitizer" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae57cb2820842d1ba94ba719453fffc6f8ab953059e133a04e2bf4016b3c4f9" +checksum = "d95e6ac0e635800681025bddc2fa6747cf1159bb897223a74e481ec54b4f5d44" dependencies = [ "chrono", "lazy_static", @@ -2242,46 +2383,78 @@ dependencies = [ [[package]] name = "rss" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e19e299f301be17927a7c05b8fa1c621e3227e6c3a0da65492701642901ff7" +checksum = "9acf62e0f3f4b52f61d3a12d6279e3f0b90d4811b0ae888eabdf61a2e7c03a95" dependencies = [ "atom_syndication", - "derive_builder 0.10.2", + "derive_builder", "never", "quick-xml", ] [[package]] -name = "rustc_version" -version = "0.3.3" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver", ] [[package]] -name = "ryu" -version = "1.0.9" +name = "rustix" +version = "0.37.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[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", ] [[package]] name = "scheduled-thread-pool" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ "parking_lot", ] @@ -2294,11 +2467,11 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" -version = "2.4.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2307,9 +2480,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -2317,74 +2490,88 @@ dependencies = [ [[package]] name = "semver" -version = "0.11.0" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.133" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.166" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] [[package]] name = "serde_json" -version = "1.0.74" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", "serde", ] [[package]] -name = "serde_urlencoded" -version = "0.7.0" +name = "serde_spanned" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] [[package]] name = "siphasher" -version = "0.3.7" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2392,36 +2579,30 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.8.2" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ - "lazy_static", "new_debug_unreachable", + "once_cell", "parking_lot", - "phf_shared", + "phf_shared 0.10.0", "precomputed-hash", "serde", ] [[package]] name = "string_cache_codegen" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.10.0", + "phf_shared 0.10.0", "proc-macro2", "quote", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -2429,85 +2610,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "strum" -version = "0.18.0" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" - -[[package]] -name = "strum" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" - -[[package]] -name = "strum_macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "heck", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "strum_macros" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.84" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "system-deps" -version = "1.3.2" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "heck", - "pkg-config", - "strum 0.18.0", - "strum_macros 0.18.0", - "thiserror", - "toml", - "version-compare 0.0.10", -] - -[[package]] -name = "system-deps" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" -dependencies = [ - "anyhow", "cfg-expr", "heck", - "itertools 0.10.3", "pkg-config", - "strum 0.21.0", - "strum_macros 0.21.1", - "thiserror", "toml", - "version-compare 0.0.11", + "version-compare", ] +[[package]] +name = "target-lexicon" +version = "0.12.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" + [[package]] name = "tempdir" version = "0.3.7" @@ -2520,23 +2662,23 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", - "libc", - "rand 0.8.4", + "fastrand", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix 0.37.22", + "windows-sys", ] [[package]] name = "tendril" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" dependencies = [ "futf", "mac", @@ -2545,90 +2687,120 @@ dependencies = [ [[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 = "thiserror" -version = "1.0.30" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.23", ] [[package]] name = "time" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] -name = "tinyvec" -version = "1.5.1" +name = "time" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.15.0" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ + "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", + "socket2", "tokio-macros", - "winapi", + "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.23", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -2636,38 +2808,63 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-sink", - "log", "pin-project-lite", "tokio", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] -name = "tower-service" -version = "0.3.1" +name = "toml_edit" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", @@ -2676,24 +2873,18 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "unicase" @@ -2706,46 +2897,39 @@ 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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[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-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "url" -version = "2.2.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -2763,15 +2947,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.0.10" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -2781,11 +2959,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[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", ] @@ -2797,15 +2974,21 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2813,24 +2996,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.23", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.28" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2840,9 +3023,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2850,28 +3033,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -2909,28 +3092,112 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "winreg" -version = "0.7.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[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" + +[[package]] +name = "winnow" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +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 = "xdg" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803" +checksum = "688597db5a750e9cad4511cb94729a078e274308099a0382b5b8203bbc767fee" dependencies = [ - "dirs", + "home", ] [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" [[package]] name = "xml5ever" @@ -2940,6 +3207,23 @@ checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865" dependencies = [ "log", "mac", - "markup5ever", - "time", + "markup5ever 0.10.1", + "time 0.1.45", ] + +[[package]] +name = "xml5ever" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" +dependencies = [ + "log", + "mac", + "markup5ever 0.11.0", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index b5889bcf63..2cbdeaad8c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -2,48 +2,36 @@ , lib , rustPlatform , fetchFromGitLab -, fetchpatch , cargo , meson , ninja , gettext -, python3 , pkg-config , rustc , glib -, libhandy -, gtk3 +, gtk4 +, libadwaita , appstream-glib , desktop-file-utils , dbus , openssl , sqlite , gst_all_1 -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "gnome-podcasts"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "podcasts"; rev = version; - sha256 = "00vy1qkkpn76jdpybsq9qp8s6fh1ih10j73p2x43sl97m5g8944h"; + hash = "sha256-jnuy2UUPklfOYObSJPSqNhqqrfUP7N80pPmnw0rlB9A="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next release. - # podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments. - # podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/World/podcasts/-/commit/6614bb62ecbec7c3b18ea7fe44beb50fe7942b27.patch"; - sha256 = "3TVKFV9V6Ofdajgkdc+j+yxsU21C4JWSc6GjLExSM00="; - }) - ]; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { @@ -55,21 +43,19 @@ stdenv.mkDerivation rec { meson ninja pkg-config - gettext - python3 cargo rustPlatform.cargoSetupHook rustc - wrapGAppsHook - glib + wrapGAppsHook4 + appstream-glib + desktop-file-utils ]; buildInputs = [ - appstream-glib - desktop-file-utils glib - gtk3 - libhandy + gtk4 + libadwaita + gettext dbus openssl sqlite @@ -82,11 +68,6 @@ stdenv.mkDerivation rec { # tests require network doCheck = false; - postPatch = '' - chmod +x scripts/compile-gschema.py # patchShebangs requires executable file - patchShebangs scripts/compile-gschema.py scripts/cargo.sh scripts/test.sh - ''; - meta = with lib; { description = "Listen to your favorite podcasts"; homepage = "https://wiki.gnome.org/Apps/Podcasts"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index 208b2154b1..185139da2a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.1.2"; + version = "4.1.4"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-ushJZKZPIUo6IO33E9A/CneLHHrE6MtdwpCYR4ivHmo="; + hash = "sha256-z4zyLHflmaX5k69KvPTISRIEHVjDmEGZenNXfYd3UUk="; }; deleteVendor = true; - vendorHash = "sha256-xzLUWqzDVT+Htw/BHygOJM16uQvWXopyxxHBZQKcOQ8="; + vendorHash = "sha256-S1OIrcn55wm/b7B3lz55guuS+mrv5MswNMO2UyfgjRc="; subPackages = [ "cmd/musicfox.go" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix index c293c3384d..76a1ce2d27 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; + mainProgram = "helvum"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix index ef0385d511..24aec647c5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, mkDerivation , fetchFromGitHub , pipewire , pulseaudio @@ -20,18 +19,16 @@ assert lib.asserts.assertMsg (usePipewire != usePulseaudio) "You need to enable one and only one of pulseaudio or pipewire support"; -let - pluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); -in - mkDerivation rec { +stdenv.mkDerivation rec { pname = "jamesdsp"; - version = "2.5.1"; + version = "2.6.0"; + src = fetchFromGitHub rec { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; rev = version; - hash = "sha256-osbRiUa/CKq4l3pV2MZYKcECEfa1ee3SAQ8RsiimbA4="; + hash = "sha256-pogBpmGlqQnkXMdp5HbMYISjwMJalSPvEV9MDHj8aec="; }; nativeBuildInputs = [ @@ -54,7 +51,9 @@ in gst_all_1.gstreamer ]; - qtWrapperArgs = lib.optionals usePulseaudio [ "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${pluginPath}" ]; + preFixup = lib.optionals usePulseaudio '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; qmakeFlags = lib.optionals usePulseaudio [ "CONFIG+=USE_PULSEAUDIO" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix index 590c695577..0bdd80a960 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jagrosh/MusicBot"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; inherit (jre_headless.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 005bef77d4..34dbf0318a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -106,5 +106,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; + mainProgram = "lollypop"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix index 7f5e26e8b2..a306b2e8c5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/milkytracker/default.nix @@ -1,49 +1,85 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper -, SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, gitUpdater +, alsa-lib +, cmake +, Cocoa +, CoreAudio +, Foundation +, libjack2 +, lhasa +, makeWrapper +, perl +, pkg-config +, rtmidi +, SDL2 +, zlib +, zziplib +}: -stdenv.mkDerivation rec { - version = "1.03.00"; +stdenv.mkDerivation (finalAttrs: { pname = "milkytracker"; + version = "1.04.00"; src = fetchFromGitHub { - owner = "milkytracker"; - repo = "MilkyTracker"; - rev = "v${version}"; - sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; + owner = "milkytracker"; + repo = "MilkyTracker"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ta4eV/FGBfgTppJwDam0OKQ7udtlinbWly/FPCE+Qss="; }; patches = [ + # Fix crash after querying midi ports + # Remove when version > 1.04.00 (fetchpatch { - name = "CVE-2022-34927.patch"; - url = "https://github.com/milkytracker/MilkyTracker/commit/3a5474f9102cbdc10fbd9e7b1b2c8d3f3f45d91b.patch"; - hash = "sha256-YnN1Khcbct7iG7TdwxFU1XVCeKR/Zrhe+oMepvh8cRU="; + url = "https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d.patch"; + hash = "sha256-CmnIwmGGnsnlRrvVAXe2zaQf1CFMB5BJPKmiwGOHgGY="; }) ]; - postPatch = '' - # https://github.com/milkytracker/MilkyTracker/issues/262 - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 98' 'CMAKE_CXX_STANDARD 11' - ''; + strictDeps = true; - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; - buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ]; + buildInputs = [ + lhasa + libjack2 + perl + rtmidi + SDL2 + zlib + zziplib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + CoreAudio + Foundation + ]; - # Somehow this does not get set automatically - cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ]; - - postInstall = '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = "https://milkytracker.org/"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; []; + platforms = platforms.unix; + # ibtool -> real Xcode -> I can't get that, and Ofborg can't test that + broken = stdenv.hostPlatform.isDarwin; + maintainers = with maintainers; [ OPNA2608 ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix index 832bd59c4d..2ff8accecb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' echo '#define GIT_REVISION "${finalAttrs.version}-NixOS"' > git-rev.h diff --git a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index bd98c85aa4..4a70f96994 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - version = "10.16"; + version = "10.17"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip"; - sha256 = "sha256-gRI2tzcybJx4ju2LCVc21Gb1ppd40qSA1J0TxNEk/Qs="; + sha256 = "sha256-yWoYeOGELXub/3kLC51SNPMC91u1aWAtdRsU6fRuX98="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix index cebf08f190..9f7d8a06e2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpc/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "mpc"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix index 35fe314958..92f66d375d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix @@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ apfelkuchen6 ]; + mainProgram = "mpdevil"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix index 5663070d7d..01940bfc4f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p"; }; - sourceRoot = "source/muse3"; + sourceRoot = "${src.name}/muse3"; patches = [ ./fix-parallel-building.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix deleted file mode 100644 index 652adb03b6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchurl, undmg }: - -let - versionComponents = [ "4" "0" "1" ]; - appName = "MuseScore ${builtins.head versionComponents}"; - ref = "230121751"; -in - -stdenv.mkDerivation rec { - pname = "musescore-darwin"; - version = lib.concatStringsSep "." versionComponents; - - # The disk image contains the .app and a symlink to /Applications. - sourceRoot = "${appName}.app"; - - src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.${ref}.dmg"; - hash = "sha256-tkIEV+tCS0SYh2TlC70/zEBUEOSg//EaSKDGA7kH/vo="; - }; - - buildInputs = [ undmg ]; - installPhase = '' - mkdir -p "$out/Applications/${appName}.app" - cp -R . "$out/Applications/${appName}.app" - chmod a+x "$out/Applications/${appName}.app/Contents/MacOS/mscore" - ''; - - meta = with lib; { - description = "Music notation and composition software"; - homepage = "https://musescore.org/"; - license = licenses.gpl3Only; - platforms = platforms.darwin; - maintainers = []; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix index 15828d2572..ecc2ccf875 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -1,55 +1,146 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ninja -, alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects, flac -, qtquickcontrols2, qtscript, qtsvg, qttools -, qtwebengine, qtxmlpatterns, qtnetworkauth, qtx11extras +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, wrapQtAppsHook +, pkg-config +, ninja +, alsa-lib +, alsa-plugins +, freetype +, libjack2 +, lame +, libogg +, libpulseaudio +, libsndfile +, libvorbis +, portaudio +, portmidi +, qtbase +, qtdeclarative +, qtgraphicaleffects +, flac +, qtquickcontrols +, qtquickcontrols2 +, qtscript +, qtsvg +, qtxmlpatterns +, qtnetworkauth +, qtx11extras , nixosTests +, darwin }: -mkDerivation rec { +let + stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv + # from Qt and the 11.0 SDK frameworks. + portaudio' = if stdenv.isDarwin then portaudio.override { + stdenv = stdenv'; + inherit (darwin.apple_sdk_11_0.frameworks) + AudioUnit + AudioToolbox + CoreAudio + CoreServices + Carbon + ; + } else portaudio; +in stdenv'.mkDerivation rec { pname = "musescore"; - version = "4.0.2"; + version = "4.1.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-3NSHUdTyAC/WOhkB6yBrqtV3LV4Hl1m3poB3ojtJMfs="; + sha256 = "sha256-jXievVIA0tqLdKLy6oPaOHPIbDoFstveEQBri9M0Aoo="; }; patches = [ - # See https://github.com/musescore/MuseScore/issues/15571 + # Upstream from some reason wants to install qml files from qtbase in + # installPhase, this patch removes this behavior. See: + # https://github.com/musescore/MuseScore/issues/18665 (fetchpatch { - url = "https://github.com/musescore/MuseScore/commit/365be5dfb7296ebee4677cb74b67c1721bc2cf7b.patch"; - hash = "sha256-tJ2M21i3geO9OsjUQKNatSXTkJ5U9qMT4RLNdJnyoKw="; + url = "https://github.com/doronbehar/MuseScore/commit/f48448a3ede46f5a7ef470940072fbfb6742487c.patch"; + hash = "sha256-UEc7auscnW0KMfWkLKQtm+UstuTNsuFeoNJYIidIlwM="; }) ]; cmakeFlags = [ - "-DMUSESCORE_BUILD_CONFIG=release" - # Disable the _usage_ of the `/bin/crashpad_handler` utility. See: - # https://github.com/musescore/MuseScore/pull/15577 - "-DBUILD_CRASHPAD_CLIENT=OFF" + "-DMUSESCORE_BUILD_MODE=release" + # Disable the build and usage of the `/bin/crashpad_handler` utility - it's + # not useful on NixOS, see: + # https://github.com/musescore/MuseScore/issues/15571 + "-DMUE_BUILD_CRASHPAD_CLIENT=OFF" # Use our freetype "-DUSE_SYSTEM_FREETYPE=ON" + # From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake, + # upstream defaults to compiling to x86_64 only, unless this cmake flag is + # set + "-DMUE_COMPILE_BUILD_MACOS_APPLE_SILICON=ON" + # Don't bundle qt qml files, relevant really only for darwin, but we set + # this for all platforms anyway. + "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF" ]; qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" + "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" + ] ++ lib.optionals (stdenv.isLinux) [ + "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" + ] ++ lib.optionals (!stdenv.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 "--set-default QT_QPA_PLATFORM xcb" ]; - nativeBuildInputs = [ cmake pkg-config ninja ]; + # HACK `propagatedSandboxProfile` does not appear to actually propagate the + # sandbox profile from `qtbase`, see: + # https://github.com/NixOS/nixpkgs/issues/237458 + sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; + + nativeBuildInputs = [ + wrapQtAppsHook + cmake + pkg-config + ninja + ]; buildInputs = [ - alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio portmidi flac # tesseract - qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 - qtscript qtsvg qttools qtwebengine qtxmlpatterns qtnetworkauth qtx11extras + libjack2 + freetype + lame + libogg + libpulseaudio + libsndfile + libvorbis + portaudio' + portmidi + flac + qtbase + qtdeclarative + qtgraphicaleffects + qtquickcontrols + qtquickcontrols2 + qtscript + qtsvg + qtxmlpatterns + qtnetworkauth + qtx11extras + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib ]; + postInstall = '' + # Remove unneeded bundled libraries and headers + rm -r $out/{include,lib} + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/mscore.app" "$out/Applications/mscore.app" + mkdir -p $out/bin + ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore. + ''; + passthru.tests = nixosTests.musescore; meta = with lib; { @@ -57,9 +148,9 @@ mkDerivation rec { homepage = "https://musescore.org/"; license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever turion doronbehar ]; - # Darwin requires CoreMIDI from SDK 11.3, we use the upstream built .dmg - # file in ./darwin.nix in the meantime. - platforms = platforms.linux; + # on aarch64-linux: + # error: cannot convert '' to 'float32x4_t' in assignment + broken = (stdenv.isLinux && stdenv.isAarch64); mainProgram = "mscore"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix index e97bb2c130..e88ce8c9e3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpcpp/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; + mainProgram = "ncmpcpp"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index 069c60c0f8..f98f45a1b5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-AXe/ysNYSWC4cuzvN4fLmDyeBxpzciDo8PFjXdzFMl0="; + hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg="; }; - cargoHash = "sha256-y7Vaf4jp2Zds0KsYqF0JBWsbq9IQVu6n0TMo3oGL14A="; + cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock index 50af298c2a..0fd4e15861 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock @@ -10,24 +10,39 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "anyhow" -version = "1.0.66" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "async-channel" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -36,9 +51,9 @@ dependencies = [ [[package]] name = "atomic_refcell" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d" +checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" [[package]] name = "atty" @@ -59,15 +74,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -83,15 +92,15 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.12.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -101,25 +110,19 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.16.1" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9ee4a4ca9239c9a839453dce04b7ddee2f859ec4cd7acd1f5703b68db549c" +checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" dependencies = [ "bitflags", "cairo-sys-rs", - "glib 0.16.2", + "glib 0.16.9", "libc", "once_cell", "thiserror", @@ -127,11 +130,11 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5119ea655ec777b523f0b57279e70f8a4542f61b0e98a48f892b4ef043fd4c5d" +checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", "system-deps", ] @@ -144,17 +147,21 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0" +dependencies = [ + "libc", +] [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -163,6 +170,21 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -171,13 +193,47 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ - "cache-padded", + "crossbeam-utils", ] +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time 0.3.25", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5a18f35792056f8c7c2de9c002e7e4fe44c7b5f66e7d99f46468dbb730a7ea7" +dependencies = [ + "cookie", + "idna 0.3.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time 0.3.25", + "url", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + [[package]] name = "crc32fast" version = "1.3.2" @@ -187,55 +243,15 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +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 = "curl" version = "0.4.44" @@ -253,9 +269,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.58+curl-7.86.0" +version = "0.4.65+curl-8.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430e2ecf0c5f4445334472cf8f9611a6eea404b4135ca5500f38a97a128c913e" +checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" dependencies = [ "cc", "libc", @@ -278,25 +294,25 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.8.0" +name = "deranged" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] name = "env_logger" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -305,27 +321,18 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[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.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.6.2", - "smallvec", - "threadpool", -] - [[package]] name = "fastrand" version = "1.8.0" @@ -336,10 +343,19 @@ dependencies = [ ] [[package]] -name = "field-offset" -version = "0.3.4" +name = "fdeflate" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", "rustc_version", @@ -347,25 +363,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.5.4", -] - -[[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", + "miniz_oxide", ] [[package]] @@ -391,39 +394,33 @@ 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", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[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", ] [[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", @@ -432,15 +429,15 @@ 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-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", "futures-core", @@ -453,32 +450,26 @@ dependencies = [ [[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" - [[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-core", "futures-macro", @@ -490,57 +481,57 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.16.0" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fb526c8c3a075eda15f961820edf3e15fe18576ac4fbabbb324e4cc6c421e6" +checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" dependencies = [ "bitflags", "gdk-pixbuf-sys", "gio", - "glib 0.16.2", + "glib 0.16.9", "libc", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df12d15c10c3c5a84d9fb4ba0e27659f6a2bdee4f27f8b17126da15d5ddd3f2" +checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" dependencies = [ "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", ] [[package]] name = "gdk4" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fe07f362c977c4684d1136a29f097208b3ccb2013ab6f441a3c60a046fd358" +checksum = "bb2181330ebf9d091f8ea7fed6877f7adc92114128592e1fdaeb1da28e0d01e9" dependencies = [ "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", "gio", - "glib 0.16.2", + "glib 0.16.9", "libc", "pango", ] [[package]] name = "gdk4-sys" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcf9e3ab5f237bb641e7f2fccc4b26d5b86f111f0d62e27d452dc24964541c2" +checksum = "de55cb49432901fe2b3534177fa06844665b9b0911d85d8601a8d8b88b7791db" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "pango-sys", "pkg-config", @@ -549,15 +540,13 @@ 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", - "wasm-bindgen", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -580,21 +569,11 @@ dependencies = [ "temp-dir", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gio" -version = "0.16.2" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1debf8d0315d69be0153aa76249db3c858ef69b7778ad3cc669e6d370c485" +checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" dependencies = [ "bitflags", "futures-channel", @@ -602,7 +581,7 @@ dependencies = [ "futures-io", "futures-util", "gio-sys", - "glib 0.16.2", + "glib 0.16.9", "libc", "once_cell", "pin-project-lite", @@ -612,12 +591,12 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da1bba9d3f2ab13a6e9932c40f240dc99ebc9f0bdc35cfb130d1a3df36f374c" +checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", "winapi", @@ -634,7 +613,7 @@ dependencies = [ "futures-core", "futures-executor", "futures-task", - "glib-macros 0.15.11", + "glib-macros 0.15.13", "glib-sys 0.15.10", "gobject-sys 0.15.10", "libc", @@ -645,9 +624,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.2" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5abffa711471e015eb93d65d6ea20e7e9f6f7951fc0a1042280439319b2de06" +checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" dependencies = [ "bitflags", "futures-channel", @@ -656,9 +635,9 @@ dependencies = [ "futures-task", "futures-util", "gio-sys", - "glib-macros 0.16.0", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-macros 0.16.8", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "once_cell", "smallvec", @@ -667,9 +646,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.11" +version = "0.15.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck", @@ -677,14 +656,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "glib-macros" -version = "0.16.0" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e195c1311fa6b04d7b896ea39385f6bd60ef5d25bf74a7c11c8c3f94f6c1a572" +checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" dependencies = [ "anyhow", "heck", @@ -692,7 +671,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -707,9 +686,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b33357bb421a77bd849f6a0bfcaf3b4b256a2577802971bb5dd522d530f27021" +checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" dependencies = [ "libc", "system-deps", @@ -728,33 +707,33 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ca11a57400f3d4fda594e002844be47900c9fb8b29e2155c6e37a1f24e51b3" +checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", "system-deps", ] [[package]] name = "graphene-rs" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a8de4506a64776d90fedf9c28fdca5a7127f8cc9c78976e8184ac6f42685d8" +checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b" dependencies = [ - "glib 0.16.2", + "glib 0.16.9", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c952f764f02f8546fcc5d014bc78aa704c6d453c828c8b429121f704349163" +checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", "pkg-config", "system-deps", @@ -762,14 +741,14 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc2b86c751a7fe9aad0fdba85937a6aace3a8453e0e2a08d2a31ce4bb8ae55" +checksum = "591239f5c52ca803b222124ac9c47f230cd180cee9b114c4d672e4a94b74f491" dependencies = [ "bitflags", "cairo-rs", "gdk4", - "glib 0.16.2", + "glib 0.16.9", "graphene-rs", "gsk4-sys", "libc", @@ -778,14 +757,14 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb53e25cbbe3fa8e3e9db7c06d65085086fadbec4cd0aa567b2e2a4917db83d" +checksum = "195a63f0be42529f98c3eb3bae0decfd0428ba2cc683b3e20ced88f340904ec5" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "graphene-sys", "libc", "pango-sys", @@ -794,16 +773,16 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.19.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e428081934c617115320750b7827f8f13131d9c3ae90b647c14a5d6019f47b4" +checksum = "85fc926d081923c840403ec5ec3b2157a7cd236a2587c3031a4f0206f13ed500" dependencies = [ "bitflags", "cfg-if", "futures-channel", "futures-core", "futures-util", - "glib 0.16.2", + "glib 0.16.9", "gstreamer-sys", "libc", "muldiv", @@ -818,14 +797,14 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "326674197c010e91a98d0f55a032abe22b1fd932456dbcdc3415450b4b653817" +checksum = "a61a299f9ea2ca892b43e2e428b86c679875e95ba23f8ae06fd730308df630f0" dependencies = [ "atomic_refcell", "bitflags", "cfg-if", - "glib 0.16.2", + "glib 0.16.9", "gstreamer", "gstreamer-base-sys", "libc", @@ -833,40 +812,40 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.19.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd55d3858fa65a99286c1cbe8db001f4ce5cff6a038f1c1253f5d99f840970de" +checksum = "dbc3c4476e1503ae245c89fbe20060c30ec6ade5f44620bcc402cbc70a3911a1" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-sys", "libc", "system-deps", ] [[package]] -name = "gstreamer-player" -version = "0.19.0" +name = "gstreamer-play" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796e053b45803544c37a150ae6cbedc8019bc5f410dff78aa6041e7a1a969f2b" +checksum = "7788ccf29b0311c272c7144e425bff8f15af38bcaca44b7e2229f4d36a266093" dependencies = [ "bitflags", - "glib 0.16.2", + "glib 0.16.9", "gstreamer", - "gstreamer-player-sys", + "gstreamer-play-sys", "gstreamer-video", "libc", "once_cell", ] [[package]] -name = "gstreamer-player-sys" -version = "0.19.0" +name = "gstreamer-play-sys" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7930b84f995cf393906ee8499d7bf643aba1899ace61e20fee0ea416ad532f32" +checksum = "a347e1ef8b62364451312f440c233a55ddaec94539d058553335677fa4bb151c" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-sys", "gstreamer-video-sys", "libc", @@ -875,26 +854,26 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.19.0" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaafc66df32b334d4aa28025fd5d83cadc971e1910205e140ea070f4ac4834f" +checksum = "545f52ad8a480732cc4290fd65dfe42952c8ae374fe581831ba15981fedf18a4" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", ] [[package]] name = "gstreamer-video" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b96daff8a3d853588e61207afac81a4879f3972430f6609721601ab757d7fd" +checksum = "eb19dcbdd5436483e764318bef157070f192acc5b1199e85878723a9ce33d4e3" dependencies = [ "bitflags", "cfg-if", "futures-channel", - "glib 0.16.2", + "glib 0.16.9", "gstreamer", "gstreamer-base", "gstreamer-video-sys", @@ -904,12 +883,12 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066ee44cd8d84f19a18c646128c1890878c034d3fb9f34d8d5f07311bbd9f41f" +checksum = "7546bc798c898f2083330d81a7efff48f65a31b03873f410538032d26ec0cdc7" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-base-sys", "gstreamer-sys", "libc", @@ -918,9 +897,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.5.1" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47223ddb27033731b71ea841d1b878bd87a275a865f1df60b41505f9e4933d64" +checksum = "fd89dba65def483a233dc4fdd3f3dab01576e3d83f80f6c9303ebe421661855e" dependencies = [ "bitflags", "cairo-rs", @@ -929,7 +908,7 @@ dependencies = [ "gdk-pixbuf", "gdk4", "gio", - "glib 0.16.2", + "glib 0.16.9", "graphene-rs", "gsk4", "gtk4-macros", @@ -941,30 +920,30 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.5.0" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5eb86364b216ee8c497b1121831168fb25130d3378495a135f8e5c1972db7b" +checksum = "42829d621396a69b352d80b952dfcb4ecb4272506b2e10a65457013af1b395a4" dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f04bd0b63d999a36ae53a916ee4b20ea64a3ef4732ca8a98b1fde4a22c1476c" +checksum = "e370564e3fdacff7cffc99f7366b6a4689feb44e819d3ccee598a9a215b71605" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "graphene-sys", "gsk4-sys", "libc", @@ -973,19 +952,16 @@ dependencies = [ ] [[package]] -name = "half" -version = "2.1.0" +name = "hashbrown" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" -dependencies = [ - "crunchy", -] +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[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" @@ -1004,18 +980,18 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "html-escape" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e7479fa1ef38eb49fb6a42c426be515df2d063f06cb8efd3e50af073dbc26c" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" dependencies = [ "utf8-width", ] [[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", @@ -1034,6 +1010,29 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "idna" version = "0.3.0" @@ -1045,22 +1044,37 @@ dependencies = [ ] [[package]] -name = "image" -version = "0.24.4" +name = "idna" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", "num-rational", "num-traits", "png", - "scoped_threadpool", - "tiff", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", ] [[package]] @@ -1102,24 +1116,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "jpeg-decoder" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" -dependencies = [ - "rayon", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[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", ] @@ -1130,24 +1135,18 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libadwaita" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed92f031cf7f3d501b84f41e4d05aed6ebfd8eed59a8fc0cccbf51359e92c8e3" +checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48" dependencies = [ "bitflags", "futures-channel", "gdk-pixbuf", "gdk4", "gio", - "glib 0.16.2", + "glib 0.16.9", "gtk4", "libadwaita-sys", "libc", @@ -1157,14 +1156,14 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec4243e86fb53d06df2461d543529a640c9a0fba2d4cc850b70e11a85f9d952" +checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b" dependencies = [ "gdk4-sys", "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gtk4-sys", "libc", "pango-sys", @@ -1173,15 +1172,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.137" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libdbus-sys" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ "pkg-config", ] @@ -1198,9 +1197,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1221,24 +1220,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" -version = "0.4.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" @@ -1257,35 +1243,27 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[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 = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -1300,23 +1278,14 @@ dependencies = [ [[package]] name = "muldiv" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "netease-cloud-music-api" -version = "1.0.2" -source = "git+https://github.com/gmg137/netease-cloud-music-api.git#08e08044a0726bcd2e0d01035b972cb7f7b56ae8" +version = "1.2.0" +source = "git+https://github.com/gmg137/netease-cloud-music-api.git?tag=1.2.0#519ab225a64a57e7a21b1060390d3bd6c651d1a8" dependencies = [ "anyhow", "base64", @@ -1333,15 +1302,16 @@ dependencies = [ [[package]] name = "netease-cloud-music-gtk4" -version = "2.0.3" +version = "2.2.0" dependencies = [ "anyhow", + "chrono", + "cookie_store", "env_logger", "fastrand", - "fragile", "gettext-rs", "gstreamer", - "gstreamer-player", + "gstreamer-play", "gtk4", "libadwaita", "log", @@ -1375,23 +1345,13 @@ 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.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "objc" version = "0.2.7" @@ -1423,15 +1383,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", @@ -1444,13 +1404,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -1461,11 +1421,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1483,13 +1442,13 @@ dependencies = [ [[package]] name = "pango" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7208c60f224cf6e44c551df5ee2ef38f9da0fd29d7c5a0402000b8ab0520e798" +checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" dependencies = [ "bitflags", "gio", - "glib 0.16.2", + "glib 0.16.9", "libc", "once_cell", "pango-sys", @@ -1497,69 +1456,59 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922441c228366ed98d3534b87bc7c987c50564094c3abbc3513717786419252d" +checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", ] [[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 = "paste" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" -dependencies = [ - "thiserror", - "ucd-trie", -] +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1569,41 +1518,44 @@ 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 = "png" -version = "0.17.6" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ "bitflags", "crc32fast", + "fdeflate", "flate2", - "miniz_oxide 0.5.4", + "miniz_oxide", ] [[package]] name = "polling" -version = "2.4.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", + "bitflags", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite", + "windows-sys", ] [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -1613,13 +1565,12 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -1631,7 +1582,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1648,18 +1599,34 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] -name = "qrcode-generator" -version = "4.1.6" +name = "psl-types" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501c33c9127afb867693646b38817bf63a9a756d4b66aefbc5c0d7e5e8c3125a" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "qrcode-generator" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76" dependencies = [ "html-escape", "image", @@ -1674,9 +1641,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1711,35 +1678,11 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rayon" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - [[package]] name = "regex" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -1748,90 +1691,65 @@ 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" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", "windows-sys", ] -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - [[package]] name = "semver" -version = "0.11.0" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -1839,10 +1757,25 @@ dependencies = [ ] [[package]] -name = "slab" -version = "0.4.7" +name = "serde_spanned" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -1860,34 +1793,36 @@ 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" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] [[package]] -name = "spin" -version = "0.9.4" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "lock_api", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.103" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -1896,9 +1831,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.3" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck", @@ -1907,6 +1842,12 @@ dependencies = [ "version-compare", ] +[[package]] +name = "target-lexicon" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" + [[package]] name = "temp-dir" version = "0.1.11" @@ -1915,51 +1856,70 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] -name = "threadpool" -version = "1.8.1" +name = "time" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ - "num_cpus", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", ] [[package]] -name = "tiff" -version = "0.7.3" +name = "time" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +dependencies = [ + "time-core", ] [[package]] @@ -1973,17 +1933,42 @@ 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 = "toml" -version = "0.5.9" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -2001,20 +1986,20 @@ dependencies = [ [[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", + "syn 2.0.28", ] [[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", ] @@ -2029,23 +2014,17 @@ dependencies = [ "tracing", ] -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - [[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.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2058,12 +2037,12 @@ dependencies = [ [[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", + "idna 0.4.0", "percent-encoding", ] @@ -2087,9 +2066,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -2103,6 +2082,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[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" @@ -2111,9 +2096,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2121,24 +2106,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", + "syn 2.0.28", "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", @@ -2146,37 +2131,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", + "syn 2.0.28", "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" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "winapi" @@ -2210,44 +2180,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[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-targets", +] + +[[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_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +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.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +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.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" +dependencies = [ + "memchr", +] diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 8a83da7ff5..9a9d9ee8cc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -23,22 +23,26 @@ stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "2.0.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gmg137"; repo = pname; rev = version; - hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc="; + hash = "sha256-9qUzRmm3WQEVjzhzHMT1vNw3r3ymWGlBWXnnPsYGSnk="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "netease-cloud-music-api-1.0.2" = "sha256-7Yp2ZBg5wHnDPtdPLwZQnqcSlVuGCrXpV5M/dp/IaOE="; + "netease-cloud-music-api-1.2.0" = "sha256-MR1yVPrNzhZC65mQen88t7NbLfRcoWvT6DMSLGCMeTY="; }; }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + nativeBuildInputs = [ meson ninja @@ -75,5 +79,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ diffumist ]; mainProgram = "netease-cloud-music-gtk4"; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix index fb13ac6ece..56ef666428 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Ogg Opus tags editor"; platforms = platforms.all; broken = stdenv.isDarwin; - maintainers = with maintainers; [ kmein SuperSandro2000 ]; + maintainers = with maintainers; [ kmein ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index d57c56a2ad..5cec295d0a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar globin ]; platforms = platforms.linux; + mainProgram = "pavucontrol"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix index e528cc8ade..e13573cf05 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix @@ -1,8 +1,33 @@ -{ lib, stdenv, curl, jq, htmlq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }: +{ lib +, stdenv +, curl +, jq +, htmlq +, xorg +, alsa-lib +, freetype +, p7zip +, autoPatchelfHook +, writeShellScript +, zlib +, libjack2 +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, librsvg +}: let - versionForFile = v: builtins.replaceStrings ["."] [""] v; + versionForFile = v: builtins.replaceStrings [ "." ] [ "" ] v; - mkPianoteq = { name, src, version, archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit", ... }: + mkPianoteq = + { name + , mainProgram + , startupWMClass + , src + , version + , archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit" + , ... + }: stdenv.mkDerivation rec { inherit src version; @@ -14,18 +39,34 @@ let nativeBuildInputs = [ autoPatchelfHook + copyDesktopItems makeWrapper + librsvg ]; buildInputs = [ stdenv.cc.cc.lib - xorg.libX11 # libX11.so.6 - xorg.libXext # libXext.so.6 - alsa-lib # libasound.so.2 - freetype # libfreetype.so.6 + xorg.libX11 # libX11.so.6 + xorg.libXext # libXext.so.6 + alsa-lib # libasound.so.2 + freetype # libfreetype.so.6 + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = ''"${mainProgram}"''; + desktopName = mainProgram; + icon = "pianoteq"; + comment = meta.description; + categories = [ "AudioVideo" "Audio" "Recorder" ]; + startupNotify = false; + inherit startupWMClass; + }) ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mv -t $out/bin Pianoteq*/${archdir}/* for f in $out/bin/Pianoteq*; do @@ -41,18 +82,31 @@ let } fi done + install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg + for size in 16 22 32 48 64 128 256; do + dir=$out/share/icons/hicolor/"$size"x"$size"/apps + mkdir -p $dir + rsvg-convert \ + --keep-aspect-ratio \ + --width $size \ + --height $size \ + --output $dir/pianoteq.png \ + ${./pianoteq.svg} + done + runHook postInstall ''; meta = with lib; { homepage = "https://www.modartt.com/pianoteq"; description = "Software synthesizer that features real-time MIDI-control of digital physically modeled pianos and related instruments"; license = licenses.unfree; + inherit mainProgram; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = [ maintainers.mausch ]; + maintainers = with maintainers; [ mausch ners ]; }; }; - fetchWithCurlScript = { name, sha256, script, impureEnvVars ? [] }: + fetchWithCurlScript = { name, hash, script, impureEnvVars ? [ ] }: stdenv.mkDerivation { inherit name; builder = writeShellScript "builder.sh" '' @@ -81,7 +135,7 @@ let ''; nativeBuildInputs = [ curl ]; outputHashAlgo = "sha256"; - outputHash = sha256; + outputHash = hash; impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ impureEnvVars ++ [ # This variable allows the user to pass additional options to curl @@ -89,9 +143,9 @@ let ]; }; - fetchPianoteqTrial = { name, sha256 }: + fetchPianoteqTrial = { name, hash }: fetchWithCurlScript { - inherit name sha256; + inherit name hash; script = '' html=$( "''${curl[@]}" --silent --request GET \ @@ -122,9 +176,9 @@ let ''; }; - fetchPianoteqWithLogin = { name, sha256 }: + fetchPianoteqWithLogin = { name, hash }: fetchWithCurlScript { - inherit name sha256; + inherit name hash; impureEnvVars = [ "NIX_MODARTT_USERNAME" "NIX_MODARTT_PASSWORD" ]; @@ -164,39 +218,58 @@ let ''; }; -in { +in +{ # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "8.0.8"; + mainProgram = "Pianoteq 8 STAGE"; + startupWMClass = "Pianoteq STAGE Trial"; + version = "8.1.1"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-dp0bTzzh4aQ2KQ3z9zk+3meKQY4YRYQ86rccHd3+hAQ="; + hash = "sha256-jMGv95WiD7UHAuSzKgauLhlsNvO/RWVrHd2Yf3kiUTo="; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "8.0.8"; + mainProgram = "Pianoteq 8"; + startupWMClass = "Pianoteq Trial"; + version = "8.1.1"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-LSrnrjkEhsX9TirUUFs9tNqH2A3cTt3I7YTfcTT6EP8="; + hash = "sha256-pL4tJMV8OTVLT4fwABcImWO+iaVe9gCdDN3rbkL+noc="; }; }; stage-6 = mkPianoteq rec { name = "stage-6"; + mainProgram = "Pianoteq 6 STAGE"; + startupWMClass = "Pianoteq STAGE"; version = "6.7.3"; archdir = if (stdenv.hostPlatform.system == "aarch64-linux") then throw "Pianoteq stage-6 is not supported on aarch64-linux" else "amd64"; src = fetchPianoteqWithLogin { name = "pianoteq_stage_linux_v${versionForFile version}.7z"; - sha256 = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy"; + hash = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy"; }; }; stage-7 = mkPianoteq rec { name = "stage-7"; + mainProgram = "Pianoteq 7 STAGE"; + startupWMClass = "Pianoteq STAGE"; version = "7.3.0"; src = fetchPianoteqWithLogin { name = "pianoteq_stage_linux_v${versionForFile version}.7z"; - sha256 = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx"; + hash = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx"; + }; + }; + standard-8 = mkPianoteq rec { + name = "standard-8"; + mainProgram = "Pianoteq 8"; + startupWMClass = "Pianoteq"; + version = "8.1.1"; + src = fetchPianoteqWithLogin { + name = "pianoteq_linux_v${versionForFile version}.7z"; + hash = "sha256-vWvo+ctJ0yN6XeJZZVhA3Ul9eWJWAh7Qo54w0TpOiVw="; }; }; # TODO other paid binaries, I don't own that so I don't know their hash. diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/pianoteq.svg b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/pianoteq.svg new file mode 100644 index 0000000000..0e410d0ff8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/pianoteq.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix index 8f11ec809c..e92319127d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picoloop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libjack2 ]; - sourceRoot = "source/picoloop"; + sourceRoot = "${src.name}/picoloop"; makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 111f97969e..d39b0217dc 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.7.4"; + version = "4.8.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "TZ7JNSrUtsqnH+fWIcd1v4fY0jPnMV7nqV/QsbD7ZpqIBCkN3R9WQvc/E9gah163Ab40g9CmdghTGo3v8VW2Rw=="; + sha512 = "7NQmH42yzItReQ5WPdcbNPr/xed74H4UyDNlX5PGmoJRBpV1RdeuW1KRweIWfYNhw0KeqULVTjr/aCggoWp4WA=="; }; 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/50"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/52"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh b/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh index 9671ccab02..470068755d 100755 --- a/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh +++ b/third_party/nixpkgs/pkgs/applications/audio/psst/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix wget nix-prefetch-github jq coreutils +#!nix-shell -i bash -p wget nix-prefetch-github jq coreutils # shellcheck shell=bash @@ -27,15 +27,12 @@ fi version="unstable-$(date +%F)" # Sources -src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .sha256) +src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .hash) # Cargo.lock src="https://raw.githubusercontent.com/jpochyla/psst/$rev" wget "${TOKEN_ARGS[@]}" "$src/Cargo.lock" -O Cargo.lock -# Use friendlier hashes -src_hash=$(nix hash to-sri --type sha256 "$src_hash") - sed -i -E -e "s#version = \".*\"#version = \"$version\"#" default.nix sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" default.nix sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index 12230d0601..c4955e15e8 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.4.4"; + version = "0.5.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-9HgxFqwmRG2mJy9aTT0MeWdtE+YKG6rU8g24IZFHSRY="; + sha256 = "sha256-HVeuqgqYf/gO1KdteXV4dWd13Q58GqHUz8CAYpruc18="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -29,6 +29,6 @@ mkDerivation rec { homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ kanashimia exi ]; + maintainers = with maintainers; [ kanashimia exi Scrumplex ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index ef0c514bce..0ddebe704f 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.80"; + version = "6.81"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-By97OxGC9YO7yEHzSjDAZHCtVaub1wNwWMOn4F+Qzpg="; - aarch64-linux = "sha256-11DiFfqULIi4tespho+yOH+Qy4s+lithCt19kb4RfhI="; + x86_64-linux = "sha256-Zzt/g96yAztE0NjVa4uaWXBckSvnGxP0K87Hmq82Mi0="; + aarch64-linux = "sha256-PNUUm7xNpPRyQaZm9YDXysJ1yo/IzxUz+kqI6/Z6fpo="; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix index acb7ae6e43..97f9b4f028 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.20.5"; + version = "5.20.13"; src = fetchurl { - url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U="; + url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; + sha256 = "sha256-6zaBDOmQlyMRQ84j64oS7TMwcctT1PSbuQOUYY9QjvY="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix index d853676264..95fe9c5880 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/soundkonverter/default.nix @@ -68,7 +68,7 @@ mkDerivation rec { buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; # add runt-time deps to PATH postInstall = '' wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps } diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix new file mode 100644 index 0000000000..e211a57366 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/soundsource/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "soundsource"; + version = "5.6.0"; + + src = fetchurl { + url = "https://web.archive.org/web/20230707140658/https://rogueamoeba.com/soundsource/download/SoundSource.zip"; + sha256 = "1avm1jr75mjbps0fad3glshrwl42vnhc0f9sak038ny85f3apyi0"; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Sound controller for macOS"; + homepage = "https://rogueamoeba.com/soundsource"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix index 8bce5c83a6..415bf352ca 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix @@ -12,7 +12,7 @@ let pname = "rnnoise-nu"; version = "unstable-07-10-2019"; src = speech-denoiser-src; - sourceRoot = "source/rnnoise"; + sourceRoot = "${speech-denoiser-src.name}/rnnoise"; nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--disable-examples" "--disable-doc" "--disable-shared" "--enable-static" ]; installTargets = [ "install-rnnoise-nu" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix index 1935b3fcf2..d9a0babb68 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spot/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { description = "Native Spotify client for the GNOME desktop"; homepage = "https://github.com/xou816/spot"; license = licenses.mit; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix index 7fcb3aad71..69c260a7bd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation { inherit pname; - version = "1.1.97.962.g24733a46"; + version = "1.2.15.828.g79f41970"; src = if stdenv.isAarch64 then ( fetchurl { - url = "https://web.archive.org/web/20221101120432/https://download.scdn.co/SpotifyARM64.dmg"; - sha256 = "sha256-8WDeVRgaZXuUa95PNa15Cuul95ynklBaZpuq+U1eGTU="; + url = "https://web.archive.org/web/20230710021420/https://download.scdn.co/SpotifyARM64.dmg"; + sha256 = "sha256-1X0Mln47uYs5l1t+5BFBk5lLnXZgnSqZLX41yA91I0s="; }) else ( fetchurl { - url = "https://web.archive.org/web/20221101120647/https://download.scdn.co/Spotify.dmg"; - sha256 = "sha256-uPpD8Hv70FlaSjtt9rq5ntI64agxG8+/LNEvRe4ocJ4="; + url = "https://web.archive.org/web/20230710021726/https://download.scdn.co/Spotify.dmg"; + sha256 = "sha256-CmKZx8Ad0w6STBN0O4Sc4XqidOM6fCl74u2sI8w+Swk="; }); nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix index 398d3a6ad9..df6d762c65 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix @@ -15,6 +15,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "spotify"; }; in if stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh index d12213f834..0a53ef9881 100755 --- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh +++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh @@ -12,8 +12,7 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -srcHash=$(nix-prefetch-github ralph-irving squeezelite --rev "$latestRev" | jq -r .sha256) -srcHash=$(nix hash to-sri --type sha256 "$srcHash") +srcHash=$(nix-prefetch-github ralph-irving squeezelite --rev "$latestRev" | jq -r .hash) update-source-version squeezelite "$latestVersion" "$srcHash" --rev="${latestRev}" diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index ee9cf4ff3d..25193d1b78 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; # upstream says darwin should work but they lack maintainers as of 0.6.6 platforms = platforms.linux; + mainProgram = "strawberry"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix index efac517024..4360defc18 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; + mainProgram = "tageditor"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix index e507618830..9cd9946be6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tagutil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oY1aGl5CKVtpOfh8Wskio/huWYMiPuxWPqxlooTutcw="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix index 8e6ab17fbd..04dd28e0b5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix @@ -49,14 +49,14 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "1.3-beta2"; + version = "1.3.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "tenacityteam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9gWoqFa87neIvRnezWI3RyCAOU4wKEHPn/Hgj3/fol0="; + sha256 = "sha256-wesnay+UQiPSDaRuSo86MgHdElN4s0rPIvokZhKM7GI="; }; postPatch = '' @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - rm $out/audacity + rm $out/tenacity wrapProgram "$out/bin/tenacity" \ --suffix AUDACITY_PATH : "$out/share/tenacity" \ --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix index 93922313dd..e70f952175 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.21"; + version = "9.25"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { - url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-9.21.0.tar.gz"; - sha256 = "sha256-M0hOJOsTTRxPef8rTO+/KpiP4lr8mtplS9KITaFOFPA="; + url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.0.tar.gz"; + sha256 = "sha256-vgl3BCAC7gOYTviHJzMbgZfHTpP90XUvxpC1IhvEZ8I="; } else throw "Platform not supported"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix index e92b2f1318..eb179bfa54 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix @@ -95,6 +95,6 @@ in python3.pkgs.buildPythonApplication rec { description = "A CD ripper aiming for accuracy over speed"; maintainers = with maintainers; [ emily ]; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix index 5e00a01633..63ecd18e46 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' substituteInPlace Misc/Config.cpp --replace /usr $out 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 802af13137..91cf74e65d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -34,5 +34,6 @@ appimageTools.wrapType2 rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = [ maintainers.aacebedo ]; + mainProgram = "youtube-music"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix index be2b85199b..534bee41a9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ytmdesktop/default.nix @@ -32,5 +32,6 @@ in appimageTools.wrapType2 rec { license = licenses.cc0; platforms = platforms.linux; maintainers = [ maintainers.lgcl ]; + mainProgram = "ytmdesktop"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix index f55ba109ba..efe99f8455 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = pname; rev = "v${version}"; - hash = "sha256-1Na+xGcb15/ZRbuy96qJwPg6Zo7FsGwCUXD3XgzWXo0="; + hash = "sha256-6wwBXgR0jutkM3L7Ihi4qryuOeBRItQTyKn2lNcvfdQ="; }; - cargoSha256 = "sha256-JjeOODm5xsRM5cJgCDb89cN60SuEeDzTVe6siKVDdcU="; + cargoSha256 = "sha256-9ksstWNqc2Rq5fdb4/LLHGMUXQgri9BAo2LlkFl3Irg="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix index 77cf29eb4d..d801d81f86 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.9.1"; + version = "0.9.4"; format = "pyproject"; @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "ep1cman"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L7uM5v2CYGFHYxzBUKlMF+ChtjBM24GZ8NuyoQaOU6U="; + hash = "sha256-MFg518iodxdHbr7k5kpkTWI59Kk7pPwyIVswVcjasl8="; }; pythonRelaxDeps = [ @@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec { aiorun aiosqlite apprise + async-lru click expiring-dict python-dateutil diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index 8c8d399d7d..7870b3c11e 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -4,6 +4,7 @@ , wrapQtAppsHook , borgbackup , qt5 +, stdenv }: python3Packages.buildPythonApplication rec { @@ -19,6 +20,10 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; + buildInputs = lib.optionals stdenv.isLinux [ + qt5.qtwayland + ]; + propagatedBuildInputs = with python3Packages; [ peewee pyqt5 @@ -29,8 +34,6 @@ python3Packages.buildPythonApplication rec { appdirs setuptools platformdirs - ] ++ lib.optionals stdenv.isLinux [ - qt5.qtwayland ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix new file mode 100644 index 0000000000..e208666bfe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/aperture/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "aperture"; + version = "0.2-beta"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "aperture"; + rev = "v${version}"; + hash = "sha256-l1fpjCAg+1PGNotKrjFLoYOMEzRNXC1mfdjRPfE0DsY="; + }; + + vendorHash = "sha256-tWFFmRSDUZXijAUTgR8k4EERHwIEBOyZZZ9BGXso/tU="; + + subPackages = [ "cmd/aperture" ]; + + meta = with lib; { + description = "L402 (Lightning HTTP 402) Reverse Proxy"; + homepage = "https://github.com/lightninglabs/aperture"; + license = licenses.mit; + maintainers = with maintainers; [ sputn1ck ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index c98e3e85ed..5a8ab4f0a4 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.10.3"; + version = "1.11.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-a2+Rh+Pxy4pCU9eo4L3986+yVvjrNZY2bFQiUpVuYqM="; + sha256 = "sha256-fKw1RKylpbejzSTO3Ti2toJiSwqtmNC1e2XDAYa9L/0="; }; 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 58bf97870f..54ef0abbe5 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,9 +8,9 @@ (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.28"; sha256 = "1zwixvm22nh76ril7w2rkwdvikm76b822iscscpyp6nrfl8mzqi0"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.29"; sha256 = "1kd07n0l0h6cmfxb5mdkawjsbmjynz2dknnj8c22wvk1jchif956"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.27"; sha256 = "14bgi3p31v8ypf1lqnc5xkpzfd2cj5a23v2wv1m38jl6ng2v6vqp"; }) + (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"; }) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix index 2dd063e3ee..a68e230c24 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.0"; + version = "2.48.1"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-L2uQJdC0Z5biv//QzgjPpygsk8GlUoQsSNH4Cp5TvhU="; + hash = "sha256-ApVsrK1Di6d3WBj/VIUcYJBceFDTeNfsXYPRfbytvZg="; fetchSubmodules = true; }; - vendorHash = "sha256-wzA75+BL5Fm6X13dF/ou7qvMEdeaImmSs2lypH4hOTY="; + vendorHash = "sha256-bsPeEAhvuT5GIpYMoyPyh0BHMDKyKjBiVnYLjtF4Mkc="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/gridcoin-research/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/gridcoin-research/default.nix new file mode 100644 index 0000000000..2e1b6563af --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -0,0 +1,73 @@ +{ fetchFromGitHub +, stdenv +, makeDesktopItem +, lib +, openssl +, boost +, curl +, libevent +, libzip +, qrencode +, qtbase +, qttools +, wrapQtAppsHook +, autoreconfHook +, pkg-config +, libtool +, miniupnpc +, hexdump +}: + +stdenv.mkDerivation rec { + pname = "gridcoin-research"; + version = "5.4.5.0"; + + src = fetchFromGitHub { + owner = "gridcoin-community"; + repo = "Gridcoin-Research"; + rev = "${version}"; + sha256 = "1a174m7821c7d3yh9lyh0r3ds6qn06x16aa1qxcbrqyxxc127yky"; + }; + + nativeBuildInputs = [ + pkg-config + wrapQtAppsHook + autoreconfHook + libtool + hexdump + ]; + + buildInputs = [ + qttools + qtbase + qrencode + libevent + libzip + openssl + boost + miniupnpc + curl + ]; + + configureFlags = [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + "--with-qrencode" + "--with-boost-libdir=${boost.out}/lib" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A POS-based cryptocurrency that rewards users for participating on the BOINC network"; + longDescription = '' + A POS-based cryptocurrency that rewards users for participating on the BOINC network, + using peer-to-peer technology to operate with no central authority - managing transactions, + issuing money and contributing to scientific research are carried out collectively by the network + ''; + homepage = "https://gridcoin.us/"; + license = licenses.mit; + maintainers = with maintainers; [ gigglesquid ]; + platforms = platforms.linux; + }; +} 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 4f53eaf580..2bc3a683ef 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkg-config -, boost, miniupnpc, openssl, unbound +, boost179, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson , easyloggingpp @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost miniupnpc openssl unbound + boost179 miniupnpc openssl unbound zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf 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 858931058f..bf84ab1ba4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.62.2"; + version = "2.64.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-Rb611v2QirGmJ01lZj6F3iHLTPI2eJp5acZDEQ4Ude0=="; + hash = "sha256-8cb5FA/Ogd6GI0AclxHicZGV3K5bVsZuIl/3A03r5qQ="; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock index a5abf52402..3930b50220 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -254,9 +254,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "array-bytes" -version = "4.1.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949" +checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd" [[package]] name = "arrayref" @@ -523,7 +523,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hash-db", "log", @@ -679,9 +679,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bounded-collections" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370" +checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6" dependencies = [ "log", "parity-scale-codec", @@ -932,13 +932,13 @@ dependencies = [ [[package]] name = "cid" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" +checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash 0.16.2", + "multihash", "serde", "unsigned-varint", ] @@ -1105,15 +1105,21 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121d8a5b0346092c18a4b2fd6f620d7a06f0eb7ac0a45860939a0884bc579c56" +checksum = "f9e1f7e5d046697d34b593bdba8ee31f4649366e452a2ccabb3baf3511e503d1" dependencies = [ "strum", "strum_macros", "unicode-width", ] +[[package]] +name = "common-path" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1457,9 +1463,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array 0.14.6", "rand_core 0.6.4", @@ -1570,7 +1576,7 @@ dependencies = [ "cfg-if", "fiat-crypto", "packed_simd_2", - "platforms 3.0.2", + "platforms", "subtle", "zeroize", ] @@ -1702,9 +1708,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.1" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" dependencies = [ "const-oid", "zeroize", @@ -1841,6 +1847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", + "const-oid", "crypto-common", "subtle", ] @@ -1918,18 +1925,39 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "docify" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18b972b74c30cbe838fc6a07665132ff94f257350e26fd01d80bc59ee7fcf129" +dependencies = [ + "docify_macros", +] + +[[package]] +name = "docify_macros" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c93004d1011191c56df9e853dca42f2012e7488638bcd5078935f5ce43e06cf3" +dependencies = [ + "common-path", + "derive-syn-parse", + "lazy_static", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "syn 2.0.16", + "termcolor", + "walkdir", +] + [[package]] name = "downcast" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - [[package]] name = "dtoa" version = "1.0.2" @@ -1977,14 +2005,16 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.1" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b0a1222f8072619e8a6b667a854020a03d363738303203c09468b3424a420a" +checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" dependencies = [ - "der 0.7.1", - "elliptic-curve 0.13.2", + "der 0.7.7", + "digest 0.10.6", + "elliptic-curve 0.13.5", "rfc6979 0.4.0", - "signature 2.0.0", + "signature 2.1.0", + "spki 0.7.2", ] [[package]] @@ -2054,17 +2084,17 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.2" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.1", + "crypto-bigint 0.5.2", "digest 0.10.6", "ff 0.13.0", "generic-array 0.14.6", "group 0.13.0", - "pkcs8 0.10.1", + "pkcs8 0.10.2", "rand_core 0.6.4", "sec1 0.7.1", "subtle", @@ -2172,7 +2202,7 @@ dependencies = [ [[package]] name = "erasure_coding_fuzzer" -version = "0.9.43" +version = "1.0.0" dependencies = [ "honggfuzz", "polkadot-erasure-coding", @@ -2257,19 +2287,6 @@ dependencies = [ "quote", ] -[[package]] -name = "expander" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" -dependencies = [ - "blake2", - "fs-err", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "expander" version = "2.0.0" @@ -2486,25 +2503,10 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", ] @@ -2527,7 +2529,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-support-procedural", @@ -2552,7 +2554,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "array-bytes", @@ -2586,12 +2588,13 @@ dependencies = [ "sp-database", "sp-externalities", "sp-inherents", + "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", + "sp-wasm-interface", "thiserror", "thousands", ] @@ -2599,7 +2602,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2610,7 +2613,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2627,7 +2630,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -2643,9 +2646,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "15.1.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" +checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ "cfg-if", "parity-scale-codec", @@ -2656,7 +2659,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-recursion", "futures", @@ -2677,7 +2680,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "bitflags", "environmental", @@ -2686,7 +2689,7 @@ dependencies = [ "impl-trait-for-tuples", "k256", "log", - "once_cell", + "macro_magic", "parity-scale-codec", "paste", "scale-info", @@ -2711,13 +2714,15 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +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", + "macro_magic", "proc-macro-warning", "proc-macro2", "quote", @@ -2727,7 +2732,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2739,7 +2744,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro2", "quote", @@ -2749,7 +2754,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-executive", @@ -2769,24 +2774,26 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-version", + "static_assertions", "trybuild", ] [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "serde", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "cfg-if", "frame-support", @@ -2805,7 +2812,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -2820,7 +2827,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-api", @@ -2829,7 +2836,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "parity-scale-codec", @@ -2867,9 +2874,9 @@ dependencies = [ [[package]] name = "fs_extra" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "funty" @@ -3011,15 +3018,15 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "chrono", "frame-election-provider-support", "frame-support", "frame-system", - "git2", "num-format", "pallet-staking", + "sp-staking", ] [[package]] @@ -3105,19 +3112,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "glob" version = "0.3.0" @@ -3443,21 +3437,23 @@ dependencies = [ "rustls 0.20.7", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.2", "webpki-roots", ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-rustls" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ - "bytes", + "http", "hyper", - "native-tls", + "log", + "rustls 0.21.2", + "rustls-native-certs", "tokio", - "tokio-native-tls", + "tokio-rustls 0.24.1", ] [[package]] @@ -3739,7 +3735,7 @@ dependencies = [ "soketto", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.2", "tokio-util", "tracing", "webpki-roots", @@ -3781,7 +3777,7 @@ checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" dependencies = [ "async-trait", "hyper", - "hyper-rustls", + "hyper-rustls 0.23.0", "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", @@ -3855,13 +3851,13 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa 0.16.1", - "elliptic-curve 0.13.2", + "ecdsa 0.16.7", + "elliptic-curve 0.13.5", "once_cell", "sha2 0.10.2", ] @@ -3874,7 +3870,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "kusama-runtime" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -3927,6 +3923,7 @@ dependencies = [ "pallet-society", "pallet-staking", "pallet-staking-runtime-api", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", @@ -3980,7 +3977,7 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -4033,6 +4030,17 @@ dependencies = [ "kvdb", ] +[[package]] +name = "landlock" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -4071,18 +4079,6 @@ dependencies = [ "rle-decode-fast", ] -[[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.2" @@ -4099,12 +4095,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" -[[package]] -name = "libm" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - [[package]] name = "libp2p" version = "0.51.3" @@ -4177,7 +4167,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -4237,7 +4227,7 @@ dependencies = [ "ed25519-dalek", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "quick-protobuf", "rand 0.8.5", "sha2 0.10.2", @@ -4484,7 +4474,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "log", - "multihash 0.17.0", + "multihash", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", @@ -4600,7 +4590,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" dependencies = [ "cc", - "libc", "pkg-config", "vcpkg", ] @@ -4668,24 +4657,14 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" dependencies = [ - "cfg-if", "serde", "value-bag", ] -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "lru" version = "0.9.0" @@ -4742,6 +4721,53 @@ dependencies = [ "libc", ] +[[package]] +name = "macro_magic" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614b1304ab7877b499925b4dcc5223ff480f2646ad4db1ee7065badb8d530439" +dependencies = [ + "macro_magic_core", + "macro_magic_macros", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "macro_magic_core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d72c1b662d07b8e482c80d3a7fc4168e058b3bef4c573e94feb714b670f406" +dependencies = [ + "derive-syn-parse", + "macro_magic_core_macros", + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "macro_magic_core_macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d7d9e6e234c040dafc745c7592738d56a03ad04b1fa04ab60821deb597466a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "macro_magic_macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffd19f13cfd2bfbd83692adfef8c244fe5109b3eb822a1fb4e0a6253b406cd81" +dependencies = [ + "macro_magic_core", + "quote", + "syn 2.0.16", +] + [[package]] name = "maplit" version = "1.0.2" @@ -4856,12 +4882,6 @@ dependencies = [ "hash-db", ] -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "merlin" version = "2.0.1" @@ -4931,7 +4951,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "log", @@ -4950,7 +4970,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", "jsonrpsee", @@ -5001,7 +5021,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash 0.17.0", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -5022,9 +5042,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "blake2b_simd", "blake2s_simd", @@ -5037,19 +5057,6 @@ dependencies = [ "unsigned-varint", ] -[[package]] -name = "multihash" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" -dependencies = [ - "core2", - "digest 0.10.6", - "multihash-derive", - "sha2 0.10.2", - "unsigned-varint", -] - [[package]] name = "multihash-derive" version = "0.8.0" @@ -5127,24 +5134,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "netlink-packet-core" version = "0.4.2" @@ -5391,51 +5380,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl" -version = "0.10.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" -dependencies = [ - "bitflags", - "cfg-if", - "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.109", -] - [[package]] name = "openssl-probe" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" -[[package]] -name = "openssl-sys" -version = "0.9.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "orchestra" version = "0.0.5" @@ -5527,13 +5477,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" dependencies = [ "cfg-if", - "libm 0.1.4", + "libm", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5548,7 +5498,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -5564,7 +5514,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -5578,7 +5528,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5602,7 +5552,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5622,7 +5572,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -5641,7 +5591,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5656,7 +5606,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -5675,7 +5625,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5699,7 +5649,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5717,7 +5667,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5736,7 +5686,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5753,7 +5703,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5770,7 +5720,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5788,7 +5738,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5811,7 +5761,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5824,7 +5774,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5836,14 +5786,16 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", + "sp-staking", "sp-std", ] [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -5860,7 +5812,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5883,7 +5835,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5899,7 +5851,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5919,7 +5871,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5936,7 +5888,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5953,7 +5905,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5972,7 +5924,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5989,7 +5941,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6005,7 +5957,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6021,7 +5973,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6038,7 +5990,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6058,7 +6010,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -6069,7 +6021,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6086,7 +6038,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6110,7 +6062,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6127,7 +6079,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6142,7 +6094,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6160,7 +6112,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6175,7 +6127,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "assert_matches", "frame-benchmarking", @@ -6194,7 +6146,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6211,7 +6163,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6232,7 +6184,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6248,13 +6200,18 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "hex-literal 0.3.4", + "log", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", + "sp-arithmetic", + "sp-io", "sp-runtime", "sp-std", ] @@ -6262,7 +6219,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6285,7 +6242,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6296,7 +6253,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "sp-arithmetic", @@ -6305,7 +6262,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-api", @@ -6314,7 +6271,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6331,7 +6288,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6346,7 +6303,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6364,7 +6321,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6383,7 +6340,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6399,7 +6356,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6415,7 +6372,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6427,7 +6384,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6444,7 +6401,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6459,7 +6416,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6475,7 +6432,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6490,7 +6447,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6504,7 +6461,7 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -6528,7 +6485,7 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -6573,9 +6530,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" +checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -6588,9 +6545,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.4" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" +checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6827,12 +6784,12 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.1", - "spki 0.7.0", + "der 0.7.7", + "spki 0.7.2", ] [[package]] @@ -6841,12 +6798,6 @@ version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" -[[package]] -name = "platforms" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" - [[package]] name = "platforms" version = "3.0.2" @@ -6855,14 +6806,15 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "polkadot" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_cmd", "color-eyre", "nix 0.26.2", "polkadot-cli", "polkadot-core-primitives", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf", + "polkadot-node-core-pvf-prepare-worker", "polkadot-overseer", "substrate-rpc-client", "tempfile", @@ -6872,11 +6824,12 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "env_logger 0.9.0", "futures", + "futures-timer", "log", "polkadot-node-jaeger", "polkadot-node-metrics", @@ -6898,12 +6851,13 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "bitvec", "env_logger 0.9.0", "futures", + "futures-timer", "log", "maplit", "polkadot-node-network-protocol", @@ -6923,7 +6877,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "derive_more", @@ -6952,7 +6906,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "env_logger 0.9.0", @@ -6981,14 +6935,14 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.43" +version = "1.0.0" dependencies = [ "clap 4.2.5", "frame-benchmarking-cli", "futures", "log", - "polkadot-client", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -7009,53 +6963,9 @@ dependencies = [ "try-runtime-cli", ] -[[package]] -name = "polkadot-client" -version = "0.9.43" -dependencies = [ - "async-trait", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "futures", - "kusama-runtime", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives", - "polkadot-node-core-parachains-inherent", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-common", - "rococo-runtime", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-service", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", - "westend-runtime", -] - [[package]] name = "polkadot-collator-protocol" -version = "0.9.43" +version = "1.0.0" dependencies = [ "always-assert", "assert_matches", @@ -7084,7 +6994,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.43" +version = "1.0.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -7095,7 +7005,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-channel", @@ -7128,7 +7038,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.43" +version = "1.0.0" dependencies = [ "criterion", "parity-scale-codec", @@ -7142,7 +7052,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-trait", @@ -7169,7 +7079,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.43" +version = "1.0.0" dependencies = [ "always-assert", "assert_matches", @@ -7198,7 +7108,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.43" +version = "1.0.0" dependencies = [ "futures", "parity-scale-codec", @@ -7217,7 +7127,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-trait", @@ -7256,7 +7166,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "bitvec", @@ -7269,6 +7179,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-erasure-coding", + "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -7285,7 +7196,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "bitvec", @@ -7311,7 +7222,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.43" +version = "1.0.0" dependencies = [ "futures", "polkadot-node-subsystem", @@ -7327,7 +7238,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-trait", @@ -7351,7 +7262,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.43" +version = "1.0.0" dependencies = [ "futures", "maplit", @@ -7370,7 +7281,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "futures", @@ -7391,7 +7302,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "fatality", @@ -7419,7 +7330,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.43" +version = "1.0.0" dependencies = [ "async-trait", "futures", @@ -7435,7 +7346,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bitvec", "fatality", @@ -7456,7 +7367,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.43" +version = "1.0.0" dependencies = [ "always-assert", "assert_matches", @@ -7467,6 +7378,9 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", + "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", @@ -7479,13 +7393,15 @@ dependencies = [ "sp-wasm-interface", "substrate-build-script-utils", "tempfile", + "test-parachain-adder", + "test-parachain-halt", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.43" +version = "1.0.0" dependencies = [ "futures", "futures-timer", @@ -7507,30 +7423,66 @@ dependencies = [ ] [[package]] -name = "polkadot-node-core-pvf-worker" -version = "0.9.43" +name = "polkadot-node-core-pvf-common" +version = "1.0.0" dependencies = [ "assert_matches", "cpu-time", "futures", + "landlock", "libc", "parity-scale-codec", - "polkadot-node-core-pvf", "polkadot-parachain", "polkadot-primitives", - "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", "sp-core", "sp-externalities", "sp-io", - "sp-maybe-compressed-blob", "sp-tracing", "substrate-build-script-utils", "tempfile", - "test-parachain-adder", - "test-parachain-halt", + "tokio", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-execute-worker" +version = "1.0.0" +dependencies = [ + "cpu-time", + "futures", + "parity-scale-codec", + "polkadot-node-core-pvf-common", + "polkadot-parachain", + "polkadot-primitives", + "rayon", + "sp-core", + "sp-maybe-compressed-blob", + "sp-tracing", + "tikv-jemalloc-ctl", + "tokio", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-prepare-worker" +version = "1.0.0" +dependencies = [ + "futures", + "libc", + "parity-scale-codec", + "polkadot-node-core-pvf-common", + "polkadot-parachain", + "polkadot-primitives", + "rayon", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sp-io", + "sp-maybe-compressed-blob", + "sp-tracing", "tikv-jemalloc-ctl", "tokio", "tracing-gum", @@ -7538,7 +7490,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.43" +version = "1.0.0" dependencies = [ "futures", "lru 0.9.0", @@ -7559,7 +7511,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.43" +version = "1.0.0" dependencies = [ "lazy_static", "log", @@ -7576,7 +7528,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_cmd", "bs58", @@ -7603,7 +7555,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.43" +version = "1.0.0" dependencies = [ "async-channel", "async-trait", @@ -7626,7 +7578,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bounded-vec", "futures", @@ -7648,7 +7600,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.43" +version = "1.0.0" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7657,7 +7609,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" -version = "0.9.43" +version = "1.0.0" dependencies = [ "async-trait", "futures", @@ -7675,7 +7627,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.43" +version = "1.0.0" dependencies = [ "async-trait", "derive_more", @@ -7697,7 +7649,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-trait", @@ -7738,7 +7690,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-trait", @@ -7764,7 +7716,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bounded-collections", "derive_more", @@ -7780,13 +7732,13 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.43" +version = "1.0.0" dependencies = [ "env_logger 0.9.0", "kusama-runtime", "log", "polkadot-erasure-coding", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-primitives", "polkadot-primitives", "quote", @@ -7797,7 +7749,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bitvec", "hex-literal 0.4.1", @@ -7822,7 +7774,7 @@ dependencies = [ [[package]] name = "polkadot-primitives-test-helpers" -version = "0.9.43" +version = "1.0.0" dependencies = [ "polkadot-primitives", "rand 0.8.5", @@ -7834,7 +7786,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.43" +version = "1.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -7865,7 +7817,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -7967,7 +7919,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -8018,7 +7970,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -8031,7 +7983,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bs58", "frame-benchmarking", @@ -8043,7 +7995,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "bitflags", @@ -8097,13 +8049,15 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-trait", "env_logger 0.9.0", + "frame-benchmarking", "frame-benchmarking-cli", "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "futures", "hex-literal 0.4.1", @@ -8117,14 +8071,16 @@ dependencies = [ "pallet-babe", "pallet-im-online", "pallet-staking", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-db", + "parity-scale-codec", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", - "polkadot-client", "polkadot-collator-protocol", + "polkadot-core-primitives", "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", @@ -8152,6 +8108,7 @@ dependencies = [ "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", + "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "polkadot-statement-distribution", @@ -8193,6 +8150,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-keyring", "sp-keystore", "sp-mmr-primitives", "sp-offchain", @@ -8203,6 +8161,8 @@ dependencies = [ "sp-timestamp", "sp-transaction-pool", "sp-trie", + "sp-version", + "sp-weights", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -8213,7 +8173,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.43" +version = "1.0.0" dependencies = [ "arrayvec 0.5.2", "assert_matches", @@ -8244,7 +8204,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.43" +version = "1.0.0" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8253,8 +8213,9 @@ dependencies = [ [[package]] name = "polkadot-test-client" -version = "0.9.43" +version = "1.0.0" dependencies = [ + "frame-benchmarking", "futures", "parity-scale-codec", "polkadot-node-subsystem", @@ -8263,6 +8224,7 @@ dependencies = [ "polkadot-test-service", "sc-block-builder", "sc-consensus", + "sc-offchain", "sc-service", "sp-api", "sp-blockchain", @@ -8270,6 +8232,7 @@ dependencies = [ "sp-consensus-babe", "sp-core", "sp-inherents", + "sp-io", "sp-keyring", "sp-runtime", "sp-state-machine", @@ -8279,7 +8242,7 @@ dependencies = [ [[package]] name = "polkadot-test-malus" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "async-trait", @@ -8292,7 +8255,8 @@ dependencies = [ "polkadot-node-core-backing", "polkadot-node-core-candidate-validation", "polkadot-node-core-dispute-coordinator", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -8307,7 +8271,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bitvec", "frame-election-provider-support", @@ -8372,9 +8336,8 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.43" +version = "1.0.0" dependencies = [ - "frame-benchmarking", "frame-system", "futures", "hex", @@ -8399,7 +8362,6 @@ dependencies = [ "sc-consensus", "sc-consensus-babe", "sc-consensus-grandpa", - "sc-executor", "sc-network", "sc-service", "sc-tracing", @@ -8426,7 +8388,7 @@ dependencies = [ [[package]] name = "polkadot-voter-bags" -version = "0.9.43" +version = "1.0.0" dependencies = [ "clap 4.2.5", "generate-bags", @@ -8632,20 +8594,20 @@ dependencies = [ [[package]] name = "proc-macro-warning" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e25495609acefcaeb5052edad8ac91017c9bc98fc38ef321ed524e50b68bac" +checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", ] [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" dependencies = [ "unicode-ident", ] @@ -8878,9 +8840,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -9119,7 +9081,7 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "remote-ext-tests-bags-list" -version = "0.9.43" +version = "1.0.0" dependencies = [ "clap 4.2.5", "frame-system", @@ -9160,13 +9122,11 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", - "hyper-tls", + "hyper-rustls 0.23.0", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite 0.2.9", @@ -9176,8 +9136,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.23.2", "tower-service", "url", "wasm-bindgen", @@ -9251,7 +9210,7 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.43" +version = "1.0.0" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -9345,7 +9304,7 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -9509,6 +9468,18 @@ dependencies = [ "webpki 0.22.0", ] +[[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 0.7.0", +] + [[package]] name = "rustls-native-certs" version = "0.6.1" @@ -9539,6 +9510,16 @@ dependencies = [ "base64 0.21.0", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.6" @@ -9583,7 +9564,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "sp-core", @@ -9594,7 +9575,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9602,14 +9583,13 @@ dependencies = [ "ip_network", "libp2p", "log", - "multihash 0.17.0", + "multihash", "parity-scale-codec", "prost 0.11.0", "prost-build", "rand 0.8.5", "sc-client-api", "sc-network", - "sc-network-common", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -9623,7 +9603,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "futures-timer", @@ -9646,7 +9626,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9661,7 +9641,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9680,7 +9660,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9691,7 +9671,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "chrono", @@ -9709,7 +9689,6 @@ dependencies = [ "sc-client-db", "sc-keystore", "sc-network", - "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -9731,7 +9710,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "fnv", "futures", @@ -9758,7 +9737,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hash-db", "kvdb", @@ -9784,7 +9763,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9809,7 +9788,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "fork-tree", @@ -9824,7 +9803,6 @@ dependencies = [ "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-keystore", "sc-telemetry", "scale-info", "sp-api", @@ -9845,7 +9823,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "jsonrpsee", @@ -9867,7 +9845,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -9879,9 +9857,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-consensus", - "sc-keystore", "sc-network", - "sc-network-common", "sc-network-gossip", "sc-network-sync", "sc-utils", @@ -9903,7 +9879,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "jsonrpsee", @@ -9922,7 +9898,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9935,7 +9911,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ahash 0.8.2", "array-bytes", @@ -9975,7 +9951,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "finality-grandpa", "futures", @@ -9995,7 +9971,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -10018,13 +9994,13 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmtime", + "schnellru", "sp-api", "sp-core", "sp-externalities", @@ -10040,7 +10016,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -10052,13 +10028,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "once_cell", "rustix 0.36.7", "sc-allocator", "sc-executor-common", @@ -10070,7 +10045,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "futures", @@ -10086,7 +10061,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -10100,7 +10075,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -10115,37 +10090,33 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "parking_lot 0.12.1", + "partial_sort", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-client-api", - "sc-consensus", "sc-network-common", - "sc-peerset", "sc-utils", "serde", "serde_json", "smallvec", - "snow", "sp-arithmetic", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", + "wasm-timer", "zeroize", ] [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-channel", "cid", @@ -10156,7 +10127,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", "sp-blockchain", "sp-runtime", "thiserror", @@ -10166,45 +10136,33 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "array-bytes", "async-trait", "bitflags", - "bytes", "futures", - "futures-timer", "libp2p-identity", "parity-scale-codec", "prost-build", "sc-consensus", - "sc-peerset", - "sc-utils", - "serde", - "smallvec", - "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", - "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ahash 0.8.2", "futures", "futures-timer", "libp2p", "log", - "lru 0.8.1", "sc-network", "sc-network-common", - "sc-peerset", + "schnellru", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -10213,7 +10171,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -10225,8 +10183,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", - "sc-peerset", "sp-blockchain", "sp-core", "sp-runtime", @@ -10236,7 +10192,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -10246,7 +10202,6 @@ dependencies = [ "futures-timer", "libp2p", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "prost 0.11.0", @@ -10255,8 +10210,8 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", + "schnellru", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -10271,17 +10226,15 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "futures", "libp2p", "log", "parity-scale-codec", - "pin-project", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", "sp-consensus", "sp-runtime", @@ -10291,7 +10244,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "bytes", @@ -10299,7 +10252,7 @@ dependencies = [ "futures", "futures-timer", "hyper", - "hyper-rustls", + "hyper-rustls 0.24.0", "libp2p", "num_cpus", "once_cell", @@ -10308,8 +10261,6 @@ dependencies = [ "rand 0.8.5", "sc-client-api", "sc-network", - "sc-network-common", - "sc-peerset", "sc-utils", "sp-api", "sp-core", @@ -10319,26 +10270,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "sc-peerset" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" -dependencies = [ - "futures", - "libp2p-identity", - "log", - "parking_lot 0.12.1", - "partial_sort", - "sc-utils", - "serde_json", - "sp-arithmetic", - "wasm-timer", -] - [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10347,7 +10282,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "jsonrpsee", @@ -10378,7 +10313,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10397,7 +10332,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "http", "jsonrpsee", @@ -10412,7 +10347,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "futures", @@ -10438,7 +10373,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "directories", @@ -10469,7 +10404,6 @@ dependencies = [ "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", - "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -10504,7 +10438,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "parity-scale-codec", @@ -10515,14 +10449,12 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "clap 4.2.5", "fs4", - "futures", "log", "sc-client-db", - "sc-utils", "sp-core", "thiserror", "tokio", @@ -10531,7 +10463,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10550,7 +10482,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "libc", @@ -10569,7 +10501,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "chrono", "futures", @@ -10588,7 +10520,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "atty", @@ -10596,12 +10528,10 @@ dependencies = [ "lazy_static", "libc", "log", - "once_cell", "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", - "sc-rpc-server", "sc-tracing-proc-macro", "serde", "sp-api", @@ -10619,7 +10549,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10630,14 +10560,13 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", "futures-timer", "linked-hash-map", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", @@ -10657,13 +10586,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", "log", + "parity-scale-codec", "serde", "sp-blockchain", + "sp-core", "sp-runtime", "thiserror", ] @@ -10671,7 +10602,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-channel", "futures", @@ -10813,9 +10744,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" dependencies = [ "base16ct 0.2.0", - "der 0.7.1", + "der 0.7.7", "generic-array 0.14.6", - "pkcs8 0.10.1", + "pkcs8 0.10.2", "subtle", "zeroize", ] @@ -10902,18 +10833,18 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", @@ -11101,9 +11032,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.6", "rand_core 0.6.4", @@ -11142,7 +11073,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.43" +version = "1.0.0" dependencies = [ "enumn", "parity-scale-codec", @@ -11219,7 +11150,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hash-db", "log", @@ -11239,11 +11170,11 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "blake2", - "expander 1.0.0", + "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", @@ -11252,8 +11183,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "23.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11265,8 +11196,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "16.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "integer-sqrt", "num-traits", @@ -11280,7 +11211,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11293,9 +11224,8 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -11305,13 +11235,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "log", - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", + "schnellru", "sp-api", "sp-consensus", "sp-database", @@ -11323,7 +11253,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -11338,14 +11268,13 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-inherents", "sp-runtime", @@ -11356,7 +11285,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11364,11 +11293,9 @@ dependencies = [ "serde", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-keystore", "sp-runtime", "sp-std", "sp-timestamp", @@ -11377,7 +11304,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "lazy_static", "parity-scale-codec", @@ -11396,7 +11323,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "finality-grandpa", "log", @@ -11414,7 +11341,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11425,8 +11352,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "21.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "bitflags", @@ -11469,24 +11396,22 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +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", "sha3", - "sp-std", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "9.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "proc-macro2", "quote", "sp-core-hashing", "syn 2.0.16", @@ -11495,7 +11420,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11503,8 +11428,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro2", "quote", @@ -11513,8 +11438,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "0.19.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "environmental", "parity-scale-codec", @@ -11525,13 +11450,12 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", "sp-runtime", "sp-std", "thiserror", @@ -11539,13 +11463,12 @@ dependencies = [ [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "23.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "bytes", "ed25519", "ed25519-dalek", - "futures", "libsecp256k1", "log", "parity-scale-codec", @@ -11565,8 +11488,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "24.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "lazy_static", "sp-core", @@ -11576,13 +11499,11 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "0.27.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "futures", "parity-scale-codec", "parking_lot 0.12.1", - "serde", "sp-core", "sp-externalities", "thiserror", @@ -11591,7 +11512,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "thiserror", "zstd 0.12.3+zstd.1.5.2", @@ -11600,7 +11521,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -11611,7 +11532,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11629,7 +11550,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11643,7 +11564,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-core", @@ -11652,8 +11573,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "backtrace", "lazy_static", @@ -11663,7 +11584,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "rustc-hash", "serde", @@ -11672,8 +11593,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "24.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "either", "hash256-std-hasher", @@ -11694,8 +11615,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "17.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11712,8 +11633,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "11.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "proc-macro-crate", @@ -11725,7 +11646,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11739,8 +11660,9 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -11751,8 +11673,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "0.28.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hash-db", "log", @@ -11767,14 +11689,14 @@ dependencies = [ "sp-trie", "thiserror", "tracing", + "trie-db", ] [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "log", "parity-scale-codec", "scale-info", "sp-api", @@ -11789,13 +11711,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "13.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11808,11 +11730,9 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", - "futures-timer", - "log", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -11822,8 +11742,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "10.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-std", @@ -11835,7 +11755,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-runtime", @@ -11844,10 +11764,9 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", - "log", "parity-scale-codec", "scale-info", "sp-core", @@ -11859,8 +11778,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "22.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ahash 0.8.2", "hash-db", @@ -11882,8 +11801,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "22.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11899,8 +11818,8 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "8.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11910,22 +11829,21 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "14.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-std", - "wasmi", "wasmtime", ] [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +version = "20.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11966,12 +11884,12 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.1", + "der 0.7.7", ] [[package]] @@ -11997,7 +11915,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staking-miner" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_cmd", "clap 4.2.5", @@ -12166,15 +12084,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" -dependencies = [ - "platforms 2.0.0", -] +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -12193,7 +12108,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hyper", "log", @@ -12205,7 +12120,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "jsonrpsee", @@ -12218,14 +12133,12 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", - "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", - "scale-info", "serde", "sp-core", "sp-runtime", @@ -12237,7 +12150,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-trait", @@ -12263,7 +12176,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "substrate-test-utils-derive", @@ -12273,7 +12186,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12284,12 +12197,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "filetime", + "parity-wasm", "sp-maybe-compressed-blob", "strum", "tempfile", @@ -12315,11 +12229,70 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "sval" -version = "1.0.0-alpha.5" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" +checksum = "8b031320a434d3e9477ccf9b5756d57d4272937b8d22cb88af80b7633a1b78b1" + +[[package]] +name = "sval_buffer" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf7e9412af26b342f3f2cc5cc4122b0105e9d16eb76046cd14ed10106cf6028" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ef628e8a77a46ed3338db8d1b08af77495123cc229453084e47cd716d403cf" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dc09e9364c2045ab5fa38f7b04d077b3359d30c4c2b3ec4bae67a358bd64326" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ada6f627e38cbb8860283649509d87bc4a5771141daa41c78fd31f2b9485888d" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_ref" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703ca1942a984bd0d9b5a4c0a65ab8b4b794038d080af4eb303c71bc6bf22d7c" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830926cd0581f7c3e5d51efae4d35c6b6fc4db583842652891ba2f1bed8db046" dependencies = [ "serde", + "sval", + "sval_buffer", + "sval_fmt", ] [[package]] @@ -12443,7 +12416,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-parachain-adder" -version = "0.9.43" +version = "1.0.0" dependencies = [ "dlmalloc", "parity-scale-codec", @@ -12456,7 +12429,7 @@ dependencies = [ [[package]] name = "test-parachain-adder-collator" -version = "0.9.43" +version = "1.0.0" dependencies = [ "clap 4.2.5", "futures", @@ -12464,7 +12437,7 @@ dependencies = [ "log", "parity-scale-codec", "polkadot-cli", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-parachain", @@ -12482,7 +12455,7 @@ dependencies = [ [[package]] name = "test-parachain-halt" -version = "0.9.43" +version = "1.0.0" dependencies = [ "rustversion", "substrate-wasm-builder", @@ -12490,7 +12463,7 @@ dependencies = [ [[package]] name = "test-parachain-undying" -version = "0.9.43" +version = "1.0.0" dependencies = [ "dlmalloc", "log", @@ -12504,7 +12477,7 @@ dependencies = [ [[package]] name = "test-parachain-undying-collator" -version = "0.9.43" +version = "1.0.0" dependencies = [ "clap 4.2.5", "futures", @@ -12512,7 +12485,7 @@ dependencies = [ "log", "parity-scale-codec", "polkadot-cli", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-parachain", @@ -12530,7 +12503,7 @@ dependencies = [ [[package]] name = "test-parachains" -version = "0.9.43" +version = "1.0.0" dependencies = [ "parity-scale-codec", "sp-core", @@ -12541,7 +12514,7 @@ dependencies = [ [[package]] name = "test-runtime-constants" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -12768,16 +12741,6 @@ dependencies = [ "syn 2.0.16", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-retry" version = "0.3.0" @@ -12800,6 +12763,16 @@ dependencies = [ "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", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.9" @@ -12969,7 +12942,7 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.43" +version = "1.0.0" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -12979,7 +12952,7 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "expander 2.0.0", @@ -13053,9 +13026,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d75c77ea43f2ad8ea9d9c58de49dfc9c3995bdef32b503df7883ff054e7f1" +checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" dependencies = [ "hash-db", "hashbrown 0.13.2", @@ -13128,7 +13101,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#7c195bfa7d90c91144bc128aabdac0b108a8a441" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "clap 4.2.5", @@ -13139,7 +13112,6 @@ dependencies = [ "parity-scale-codec", "sc-cli", "sc-executor", - "sc-service", "serde", "serde_json", "sp-api", @@ -13359,16 +13331,38 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b9f3feef403a50d4d67e9741a6d8fc688bcbb4e4f31bd4aab72cc690284394" dependencies = [ - "ctor", "erased-serde", "serde", "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b24f4146b6f3361e91cbf527d1fb35e9376c3c0cef72ca5ec5af6d640fad7d" +dependencies = [ "sval", - "version_check", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", ] [[package]] @@ -13584,39 +13578,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" -dependencies = [ - "parity-wasm", - "wasmi-validation", - "wasmi_core", -] - -[[package]] -name = "wasmi-validation" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" -dependencies = [ - "parity-wasm", -] - -[[package]] -name = "wasmi_core" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" -dependencies = [ - "downcast-rs", - "libm 0.2.1", - "memory_units", - "num-rational", - "num-traits", -] - [[package]] name = "wasmparser" version = "0.102.0" @@ -14084,7 +14045,7 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -14182,7 +14143,7 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -14581,7 +14542,7 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.43" +version = "1.0.0" dependencies = [ "bounded-collections", "derivative", @@ -14599,7 +14560,7 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.43" +version = "1.0.0" dependencies = [ "assert_matches", "frame-support", @@ -14626,7 +14587,7 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.43" +version = "1.0.0" dependencies = [ "environmental", "frame-benchmarking", @@ -14645,7 +14606,7 @@ dependencies = [ [[package]] name = "xcm-executor-integration-tests" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -14665,7 +14626,7 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.43" +version = "1.0.0" dependencies = [ "Inflector", "proc-macro2", @@ -14675,7 +14636,7 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "parity-scale-codec", @@ -14692,7 +14653,7 @@ dependencies = [ [[package]] name = "xcm-simulator-example" -version = "0.9.43" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -14719,7 +14680,7 @@ dependencies = [ [[package]] name = "xcm-simulator-fuzzer" -version = "0.9.43" +version = "1.0.0" dependencies = [ "arbitrary", "frame-support", @@ -14795,7 +14756,7 @@ dependencies = [ [[package]] name = "zombienet-backchannel" -version = "0.9.43" +version = "1.0.0" dependencies = [ "futures-util", "lazy_static", diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 3c0644c10a..942d1755ac 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.43"; + version = "1.0.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - hash = "sha256-h+9b+KQgdYowHYGr0nPsqibcwOPmBVo9tKi/uEbLhqo="; + hash = "sha256-izm0rpLzwlhpp3dciQ1zj1boWxhgGnNMG5ceZoZQGEE="; # 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. @@ -34,11 +34,24 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "binary-merkle-tree-4.0.0-dev" = "sha256-/8bGqnM/yqtCgVWkIaVEySZSV3XGYuiA3JuyHYTp2lw="; + "binary-merkle-tree-4.0.0-dev" = "sha256-J09SHQVOLGStMGONdreI5QZlk+uNNKzWRZpGiNJ+lrk="; "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 + + mkdir -p $FAST_UNSTAKE_DOCIFY_DIR + cp -r $FAST_UNSTAKE_DIR/src $FAST_UNSTAKE_DOCIFY_DIR + ''; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix index 897968e250..d91da1db8f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/default.nix @@ -42,8 +42,8 @@ let pinData = lib.importJSON ./pin.json; version = pinData.version; - sha256 = pinData.sha256; - cargoSha256 = pinData.cargoSha256; + hash = pinData.hash; + cargoHash = pinData.cargoHash; in rustPlatform.buildRustPackage rec { pname = "solana-validator"; @@ -53,11 +53,11 @@ rustPlatform.buildRustPackage rec { owner = "solana-labs"; repo = "solana"; rev = "v${version}"; - inherit sha256; + inherit hash; }; # partly inspired by https://github.com/obsidiansystems/solana-bridges/blob/develop/default.nix#L29 - inherit cargoSha256; + inherit cargoHash; cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json index 175cd79ad1..4747c3e934 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json +++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/pin.json @@ -1,5 +1,5 @@ { "version": "1.10.35", - "sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=", - "cargoSha256": "sha256-idlu9qkh2mrF6MxstRcvemKrtTGNY/InBnIDqRvDQPs" + "hash": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=", + "cargoHash": "sha256-idlu9qkh2mrF6MxstRcvemKrtTGNY/InBnIDqRvDQPs" } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh old mode 100644 new mode 100755 index ffd8b0010c..cb8aa43ac6 --- a/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh +++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana-validator/update.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell -#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep +#! nix-shell -i oil -p jq moreutils nix-prefetch-github gnused # TODO set to `verbose` or `extdebug` once implemented in oil shopt --set xtrace -# we need failures inside of command subs to get the correct cargoSha256 +# we need failures inside of command subs to get the correct cargoHash shopt --unset inherit_errexit const directory = $(dirname $0 | xargs realpath) @@ -11,23 +11,23 @@ const owner = "solana-labs" const repo = "solana" const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ jq -r '.tag_name') -const latest_version = $(echo $latest_rev | sd 'v' '') +const latest_version = $(echo ${latest_rev#v}) const current_version = $(jq -r '.version' $directory/pin.json) if ("$latest_version" === "$current_version") { echo "solana is already up-to-date" return 0 } else { const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev") - const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')" + const tarball_hash = $(echo $tarball_meta | jq -r '.hash') jq ".version = \"$latest_version\" | \ - .\"sha256\" = \"$tarball_hash\" | \ - .\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json + .\"hash\" = \"$tarball_hash\" | \ + .\"cargoHash\" = \"\"" $directory/pin.json | sponge $directory/pin.json - const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \ + const new_cargo_hash = $(nix-build -A solana-validator 2>&1 | \ tail -n 2 | \ head -n 1 | \ - sd '\s+got:\s+' '') + sed 's/\s*got:\s*//') - jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json + jq ".cargoHash = \"$new_cargo_hash\"" $directory/pin.json | sponge $directory/pin.json } 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 72b1c691c5..1ef5d436ff 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.11.0"; + version = "19.12.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU="; + sha256 = "sha256-WpzUEn3BuC2OxrsqYete595m6YWv27QXnTfW1F6CX9k="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix index 0c3a3d2395..ce7bdbfe89 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, boost +, boost179 , openssl , libsodium , libunwind @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + boost179 openssl libsodium libunwind diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix index 80cc3dbfeb..602025e60a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/taproot-assets/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "taproot-assets"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "taproot-assets"; rev = "v${version}"; - hash = "sha256-DOtCnPnS5Oq5B4xaYmNCXxMYJ9fhPZ11OfPKXH7eKUg="; + hash = "sha256-nTgIoYajpnlEvyXPcwXbm/jOfG+C83TTZiPmoB2kK24="; }; vendorHash = "sha256-fc++0M7Mnn1nJOkV2gzAVRQCp3vOqsO2OQNlOKaMmB4="; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix index 744b43f6f8..3a4d385f4f 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "greetd"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - sha256 = "sha256-20D6HanUeAc0S9czkNJFmhsrfEqodpafkHsmwKccrHQ="; + sha256 = "sha256-w68iKabVVIHB+ujCd5q+L4T6+Tfqedou3wXOuMGi6aw="; }; - cargoHash = "sha256-8nMQ81Y0DnPs9WmxNASlcjTEVw5lh+nZtZ7vmmBCu2g="; + cargoHash = "sha256-vn1ih4YXsltR1zdy7BzS3CSJO9Uewx/654lRTSkWV0k="; nativeBuildInputs = [ scdoc diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix index a520ad88d6..6cd336821c 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/regreet.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; + mainProgram = "regreet"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix new file mode 100644 index 0000000000..9973099b1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix @@ -0,0 +1,33 @@ +{ + fetchFromGitHub, + lib, + linux-pam, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "lemurs"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "coastalwhite"; + repo = "lemurs"; + rev = "v${version}"; + hash = "sha256-6mNSLEWafw8yDGnemOhEiK8FTrBC+6+PuhlbOXTGmN0="; + }; + + cargoHash = "sha256-nfUBC1HSs7PcIbD7MViJFkfFAPda83XbAupNeShfwOs="; + + # Fixes a lock issue + preConfigure = "cargo update --offline"; + + buildInputs = [ + linux-pam + ]; + + 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]; + }; +} 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 4f907cf67c..e71677c130 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -10,14 +10,17 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.2.1.20"; # "Android Studio Flamingo (2022.2.1) Patch 2" - sha256Hash = "sha256-X+ZuH4cHKfQtfvOF0kLk+QjQ5AR3pTEparczHEUk+uY="; + version = "2022.3.1.18"; # "Android Studio Giraffe (2022.3.1)" + sha256Hash = "sha256-JCFeEySmrJEYELLMGvstc1z3Rd+8BpGKQrjW+8a/dDM="; }; betaVersion = { - version = "2022.3.1.16"; # "Android Studio Giraffe (2022.3.1) Beta 5" - sha256Hash = "sha256-D+Hoa50fzvtO0/6DsExmGSDzcgDIT2Bg+HvI6mCle14="; + version = "2022.3.1.17"; # "Android Studio Giraffe (2022.3.1) RC 1" + sha256Hash = "sha256-Bpur9ytiwa0udiyYVxlfLT4M+ZcO5atQUQg/ForATP4="; + }; + latestVersion = { + version = "2023.1.1.14"; # Android Studio Hedgehog (2023.1.1) Canary 14 + sha256Hash = "sha256-MgZDUpRyM0XDfgqfYjtJJyG2CBaNB06PgtoJltDwNwk="; }; - latestVersion = betaVersion; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix b/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix index 9a5c3c2901..ff068b2593 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.4.4"; + version = "15.6.1"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-6XLKXw+e/310mCQxM/X/kzok562vGjEhmF1eLfakB4Q="; + sha256 = "sha256-a8zv5pVtS80J2PTrUiW8AA3rJ+rPAAzaaT5DVBLK5JE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix index 7ef81a4ebc..6ea90b0b8a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/edit/default.nix @@ -1,40 +1,53 @@ -{ lib, stdenv, fetchgit, unzip, pkg-config, ncurses, libX11, libXft, cwebbin }: +{ lib +, stdenv +, fetchgit +, cwebbin +, libX11 +, libXft +, ncurses +, pkg-config +, unzip +}: stdenv.mkDerivation { - pname = "edit-nightly"; - version = "20180228"; + pname = "edit"; + version = "unstable-2021-04-05"; src = fetchgit { url = "git://c9x.me/ed.git"; - rev = "77d96145b163d79186c722a7ffccfff57601157c"; - sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy"; + rev = "bc24e3d4f716b0afacef559f952c40f0be5a1c58"; + hash = "sha256-DzQ+3B96+UzQqL3lhn0DfYmZy2LOANtibj1e1iVR+Jo="; }; nativeBuildInputs = [ - unzip - pkg-config cwebbin + pkg-config + unzip ]; buildInputs = [ - ncurses libX11 libXft + ncurses ]; preBuild = '' - ctangle *.w + ctangle vicmd.w ''; installPhase = '' + runHook preInstall + install -Dm755 obj/edit -t $out/bin + + runHook postInstall ''; - meta = with lib; { + meta = { description = "A relaxing mix of Vi and ACME"; homepage = "https://c9x.me/edit"; - license = licenses.publicDomain; - maintainers = [ maintainers.vrthra ]; - platforms = platforms.all; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix index 9825ed0834..a81f582702 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix @@ -28,7 +28,7 @@ let pname = "tsc"; commit = version; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; recipe = writeText "recipe" '' (tsc @@ -44,7 +44,7 @@ let pname = "tsc-dyn"; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; postInstall = '' LIB=($out/lib/libtsc_dyn.*) @@ -55,7 +55,7 @@ let rm -r $out/lib ''; - inherit (srcMeta) cargoSha256; + inherit (srcMeta) cargoHash; }; in symlinkJoin { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json index 6aa6fee183..b3ac6a0306 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json @@ -3,8 +3,8 @@ "owner": "emacs-tree-sitter", "repo": "elisp-tree-sitter", "rev": "909717c685ff5a2327fa2ca8fb8a25216129361c", - "sha256": "LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=" + "hash": "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=" }, "version": "0.18.0", - "cargoSha256": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8=" + "cargoHash": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8=" } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py index 082602fcc4..77ef632ded 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py @@ -51,12 +51,12 @@ def get_src(tag_name: str) -> Dict[str, str]: ) src = json.loads(p.stdout) - fields = ["owner", "repo", "rev", "sha256"] + fields = ["owner", "repo", "rev", "hash"] return {f: src[f] for f in fields} -def get_cargo_sha256(drv_path: str): +def get_cargo_hash(drv_path: str): # Note: No check=True since we expect this command to fail p = subprocess.run(["nix-store", "-r", drv_path], stderr=subprocess.PIPE) @@ -74,7 +74,7 @@ def get_cargo_sha256(drv_path: str): if m: return m.group(1) - raise ValueError("Could not extract actual sha256 hash: ", stderr) + raise ValueError("Could not extract actual hash: ", stderr) if __name__ == "__main__": @@ -96,26 +96,26 @@ if __name__ == "__main__": drv_path = eval_drv( nixpkgs, """ - rustPlatform.buildRustPackage { + rustPlatform.buildRustPackage rec { pname = "tsc-dyn"; version = "%s"; nativeBuildInputs = [ clang ]; src = fetchFromGitHub (lib.importJSON %s); - sourceRoot = "source/core"; - cargoSha256 = lib.fakeSha256; + sourceRoot = "${src.name}/core"; + cargoHash = lib.fakeHash; } """ % (tag_name, f.name), ) - cargo_sha256 = get_cargo_sha256(drv_path) + cargo_hash = get_cargo_hash(drv_path) with open(join(cwd, "src.json"), mode="w") as f: json.dump( { "src": src, "version": tag_name, - "cargoSha256": cargo_sha256, + "cargoHash": cargo_hash, }, f, indent=2, diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix index 9eaa4d119e..440184d959 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix @@ -32,6 +32,7 @@ let matthewbauer ]; platforms = lib.platforms.all; + mainProgram = "emacs"; }; in { @@ -50,12 +51,12 @@ in emacs29 = import ./generic.nix { pname = "emacs"; - version = "29.0.92"; + version = "29.1-rc1"; variant = "mainline"; src = fetchFromSavannah { repo = "emacs"; - rev = "29.0.92"; - hash = "sha256-Vkry+2zYejZVwZKQlmQiAJnbjsj87DiIZ1ungooYd8A="; + rev = "29.1-rc1"; + hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU="; }; meta = mainlineMeta; diff --git a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix index 4f2b3f1eb3..4ecc511b65 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ frlan ]; platforms = platforms.all; + mainProgram = "geany"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix index f85bb9e5fd..4352b74f96 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix @@ -96,5 +96,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "gedit"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch new file mode 100644 index 0000000000..e525512fe4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch @@ -0,0 +1,17 @@ +--- a/plugins/remote-dev-server/bin/launcher.sh ++++ b/plugins/remote-dev-server/bin/launcher.sh +@@ -327,6 +327,8 @@ + REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS=1 + fi + ++REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS=0 ++ + if [ $REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS -eq 1 ]; then + SELFCONTAINED_LIBS="$REMOTE_DEV_SERVER_DIR/selfcontained/lib" + if [ ! -d "$SELFCONTAINED_LIBS" ]; then +@@ -568,3 +570,5 @@ + "$LAUNCHER" "$STARTER_COMMAND" "$PROJECT_PATH" "$@" + ;; + esac ++ ++unset REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index b78da5da3f..71bf0eaeb5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -46,7 +46,7 @@ let Enhancing productivity for every C and C++ developer on Linux, macOS and Windows. ''; - maintainers = with maintainers; [ edwtjo mic92 ]; + maintainers = with maintainers; [ edwtjo mic92 tymscar ]; }; }).overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ @@ -97,20 +97,20 @@ let }; }); - buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "DataSpell"; - meta = with lib; { - homepage = "https://www.jetbrains.com/dataspell/"; - inherit description license platforms; - longDescription = '' - DataSpell is a new IDE from JetBrains built for Data Scientists. - Mainly it integrates Jupyter notebooks in the IntelliJ platform. - ''; - maintainers = with maintainers; [ leona ]; - }; - }); + buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }: + (mkJetBrainsProduct { + inherit pname version src wmClass jdk buildNumber; + product = "DataSpell"; + meta = with lib; { + homepage = "https://www.jetbrains.com/dataspell/"; + inherit description license platforms; + longDescription = '' + DataSpell is a new IDE from JetBrains built for Data Scientists. + Mainly it integrates Jupyter notebooks in the IntelliJ platform. + ''; + maintainers = with maintainers; [ leona ]; + }; + }); buildGateway = { pname, version, src, license, description, wmClass, buildNumber, product, ... }: (mkJetBrainsProduct { @@ -132,6 +132,10 @@ let (mkJetBrainsProduct { inherit pname version src wmClass jdk buildNumber; product = "Goland"; + extraWrapperArgs = [ + # fortify source breaks build since delve compiles with -O0 + ''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"'' + ]; meta = with lib; { homepage = "https://www.jetbrains.com/go/"; inherit description license platforms; @@ -141,16 +145,13 @@ let The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language ''; - maintainers = [ ]; + maintainers = with maintainers; [ tymscar ]; }; }).overrideAttrs (attrs: { postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv - # fortify source breaks build since delve compiles with -O0 - wrapProgram $out/bin/goland \ - --prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" ''; }); @@ -172,7 +173,7 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov ]; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov tymscar ]; platforms = ideaPlatforms; }; }); @@ -207,7 +208,7 @@ let with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; - maintainers = with maintainers; [ dritter ]; + maintainers = with maintainers; [ dritter tymscar ]; }; }); @@ -232,7 +233,7 @@ let providing you almost everything you need for your comfortable and productive development! ''; - maintainers = with maintainers; [ genericnerdyusername ]; + maintainers = with maintainers; [ genericnerdyusername tymscar ]; }; }).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup { buildInputs = with python3.pkgs; [ python3 setuptools ]; @@ -286,7 +287,7 @@ let homepage = "https://www.jetbrains.com/ruby/"; inherit description license platforms; longDescription = description; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo tymscar ]; }; }); @@ -302,7 +303,7 @@ let and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code. ''; - maintainers = with maintainers; [ abaldeau ]; + maintainers = with maintainers; [ abaldeau tymscar ]; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix index 1c00e408ae..efc939d032 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix @@ -84,6 +84,10 @@ with stdenv; lib.makeOverridable mkDerivation (rec { patchelf --set-interpreter "$interpreter" bin/fsnotifier munge_size_hack bin/fsnotifier $target_size fi + + if [ -d "plugins/remote-dev-server" ]; then + patch -p1 < ${./JetbrainsRemoteDev.patch} + fi ''; installPhase = '' @@ -99,7 +103,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { jdk=${jdk.home} item=${desktopItem} - makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}" \ + wrapProgram "$out/$pname/bin/${loName}.sh" \ --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 @@ -114,11 +118,14 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set ${hiName}_JDK "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} + ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname + echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh + chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh + ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server ln -s "$item/share/applications" $out/share runHook postInstall ''; - } // lib.optionalAttrs (!(meta.license.free or true)) { preferLocalBuild = true; }) diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix index 4f519aa55a..bf160e2aa3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/default.nix @@ -68,6 +68,8 @@ rec { # Only use if you know what youre doing raw = { inherit files byId byName; }; + tests = callPackage ./tests.nix {}; + addPlugins = ide: unprocessedPlugins: let @@ -98,14 +100,6 @@ rec { let pluginCmdsLines = map (plugin: "ln -s ${plugin} \"$out\"/${meta.mainProgram}/plugins/${baseNameOf plugin}") plugins; pluginCmds = builtins.concatStringsSep "\n" pluginCmdsLines; - extraBuildPhase = rec { - clion = '' - sed "s|${ide}|$out|" -i $out/bin/.clion-wrapped - ''; - goland = '' - sed "s|${ide}|$out|" -i $out/bin/.goland-wrapped - ''; - }; in '' cp -r ${ide} $out @@ -115,8 +109,10 @@ rec { do ln -s "$plugin" -t $out/${meta.mainProgram}/plugins/ done - sed "s|${ide.outPath}|$out|" -i $out/bin/${meta.mainProgram} + sed "s|${ide.outPath}|$out|" \ + -i $(realpath $out/bin/${meta.mainProgram}) \ + -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server) autoPatchelf $out/${meta.mainProgram}/bin - '' + (extraBuildPhase."${ide.meta.mainProgram}" or ""); + ''; }; } 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 a4504846d1..1b0f0472dd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,14 +17,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.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" }, "name": "ideavim" }, @@ -33,7 +32,7 @@ "idea-ultimate" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip" + "232.8660.185": "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip" }, "name": "python" }, @@ -43,7 +42,7 @@ "idea-ultimate" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip" + "232.8660.185": null }, "name": "kotlin" }, @@ -64,14 +63,13 @@ ], "builds": { "223.8836.1185": null, - "231.9011.35": null, - "231.9161.29": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip" }, "name": "ini" }, @@ -81,8 +79,8 @@ "phpstorm" ], "builds": { - "231.9161.47": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip" }, "name": "symfony-support" }, @@ -92,8 +90,8 @@ "phpstorm" ], "builds": { - "231.9161.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -105,9 +103,9 @@ "rider" ], "builds": { - "231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip" + "231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip", + "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" }, "name": "python-community-edition" }, @@ -128,14 +126,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip" }, "name": "rust" }, @@ -156,14 +153,13 @@ ], "builds": { "223.8836.1185": null, - "231.9011.35": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip" }, "name": "rust-beta" }, @@ -178,10 +174,10 @@ "webstorm" ], "builds": { - "231.9161.29": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip" + "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" }, "name": "ide-features-trainer" }, @@ -202,14 +198,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", + "232.8660.111": null, + "232.8660.143": null, + "232.8660.185": null, + "232.8660.186": null, + "232.8660.197": null }, "name": "nixidea" }, @@ -218,7 +213,7 @@ "idea-ultimate" ], "builds": { - "231.9225.16": "https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip" + "232.8660.185": "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip" }, "name": "go" }, @@ -239,17 +234,43 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.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" }, "name": "csv-editor" }, + "12062": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "webstorm" + ], + "builds": { + "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip", + "231.9225.18": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.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" + }, + "name": "vscode-keymap" + }, "12559": { "compatible": [ "clion", @@ -267,14 +288,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.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" }, "name": "eclipse-keymap" }, @@ -295,14 +315,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.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" }, "name": "visual-studio-keymap" }, @@ -323,14 +342,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9161.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9161.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9161.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9161.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "231.9225.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "231.9225.23": "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" }, "name": "darcula-pitch-black" }, @@ -350,15 +368,14 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "231.9225.18": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "231.9225.23": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip" }, "name": "github-copilot" }, @@ -379,14 +396,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9161.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9161.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9161.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9161.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "231.9225.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "231.9225.23": "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" }, "name": "netbeans-6-5-keymap" } @@ -394,28 +410,35 @@ "files": { "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip": "sha256-JC/NOICLHf1gc4wTarDPw7lYfGHOkCOlG194yt18xOA=", "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=", + "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=", + "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=", + "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip": "sha256-OqK3HmcksgNlrADv7Ld91VCW+uzTOVWtcXcRC60IKfw=", + "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=", "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=", + "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=", "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip": "sha256-b/SFrQX+pIV/R/Dd72EjqbbRgaSgppe3kv4aSxWr//Y=", + "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/347833/IdeaVim-2.3.0-signed.zip": "sha256-K4HQXGdvFhs7X25Kw+pljep/lqJ9lwewnGSEvbnNetE=", - "https://plugins.jetbrains.com/files/17718/360520/github-copilot-intellij-1.2.13.2776.zip": "sha256-9KTWE7rudLZwxCEv5QNu/9rxA0o0GdQK4+oqkzeOtyA=", + "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=", + "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip": "sha256-qsKmVhgh8FyZN4cWbt/UKQEnk+3ANR2U2+wo5sVZZf8=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/631/360005/python-231.9225.16.zip": "sha256-vin0+O9f4rY3FYqztzdIlyal5bvrvrt8Q8neDrXRmsU=", - "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip": "sha256-v2EB05au8mkC5VnoEILLJ3tesEeCWCYSNJ9RzfJZA1o=", - "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=", - "https://plugins.jetbrains.com/files/6981/360771/ini-231.9225.18.zip": "sha256-FHv/cELjKf3Jral2Cqc3QiE4bx1mm6jy42AsR27nt9g=", + "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip": "sha256-SqHA6I+mJeBH/Gjos+OiTayClesl5YBLqHvXIVL5o9k=", + "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip": "sha256-/HljUhlum/bmgw0sfhK+33AgxCJsT32uU/UjQIzIbKs=", + "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip": "sha256-ZJuLy0WM1OC6pjeEyBFDeOqbUz0gcUIgd71k4ggcCeA=", "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=", "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip": "sha256-77v4vSHULX2vC0NFMeo2HoOaD3i4WG7zVCmaPUHQJIE=", + "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip": "sha256-MD2HNM9ltLK/0KKB6Ly1qu3J8B8QD/8t0FjWEcalIkE=", "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", - "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip": "sha256-OuOUVUYHfg5JFLX2xAQ/VHaS8gUI0H7SZEdau8fbAAY=", - "https://plugins.jetbrains.com/files/8182/359429/intellij-rust-0.4.198.5409-231.zip": "sha256-kCS/fglqb4MD/sE+mGHchvQCUOdZiDrYtTAzn7XITkM=", - "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip": "sha256-N5woM9O9y+UequeWcjCLL93rjHDW0Tnvh8h3iLrwmjk=", + "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip": "sha256-PasY5Ep9vlbM5SAs/uB4j8b7F6dl8keeV/yLAuoTcZY=", + "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip": "sha256-8GSMckx4hHAfJBZbWcTuN85RROLaXTGix3a9QwZ5pSc=", + "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip": "sha256-uHitLtuxa6w7XL0kdGf1hPAah8OpsrUWBLxbUNf7Y9o=", + "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip": "sha256-qa7R+YfVWu/x5p8t28tDtRtMH6dZCGZzMXycpK+epQo=", + "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip": "sha256-SCxqar6a7Q6sOFuZWNXtLRiSd7/34ydhWpL8groKT0U=", "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=", - "https://plugins.jetbrains.com/files/9568/360002/go-plugin-231.9225.16.zip": "sha256-VZoavuQyHP7rJ3p/R+maoHetEt8bYP/eSnlfEgfFrFc=" + "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip": "sha256-MPeTPoSUvfjwdWifKxlYHmmVNr+nOD22Hp4srRQbG/o=" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix new file mode 100644 index 0000000000..6047d21f43 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix @@ -0,0 +1,26 @@ +{ jetbrains, writeText }: + +{ + # Check to see if the process for adding plugins is breaking anything, instead of the plugins themselves + default = + let + modify-ide = ide: jetbrains.plugins.addPlugins ide [ ]; + ides = with jetbrains; map modify-ide [ + clion + datagrip + dataspell + goland + idea-community + idea-ultimate + mps + phpstorm + pycharm-community + pycharm-professional + rider + ruby-mine + webstorm + ]; + paths = builtins.concatStringsSep " " ides; + in + writeText "jb-ides" paths; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json index 74a7147bb5..1024284a01 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.1.4", - "sha256": "03830bd8c32eca51d2cb54aafbb74ce46003eaab9601465876c84107c0a19a23", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.4.tar.gz", - "build_number": "231.9161.40" + "version": "2023.2", + "sha256": "45671bb8cf7b18bd6da2b519b950f28d315ad49d230494a08785e78219e43819", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.tar.gz", + "build_number": "232.8660.186" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.1.2", - "sha256": "57e8a79d69d9f34957fe7fa1307296396ab7c2b84bacffb6d86616cbcd596edd", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.tar.gz", - "build_number": "231.9011.35" + "version": "2023.2", + "sha256": "f8344dad4f502a215440fb7ccbc4c69acdd0b18f33d855f0d0d0d2bbe44a5f26", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.tar.gz", + "build_number": "232.8660.111" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "07158e00ef81c58c9b295c1777635069777f5f3f16d593b14429673b9699cfff", - "url": "https://download.jetbrains.com/python/dataspell-2023.1.4.tar.gz", - "build_number": "231.9225.14" + "version": "2023.2", + "sha256": "f8c486cb2e7cc2ce78fff173785f75c8c7461da622f81d3abe7017434e2bb4e4", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.tar.gz", + "build_number": "232.8660.202" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.1.3", - "sha256": "32d97c9935e4825d5f395e5039033121649838a3811e25301d70f32315a2e106", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.tar.gz", - "build_number": "231.9161.32" + "version": "2023.2", + "sha256": "8b4064670f42d1812cf44068dd989d518b46fd04a8bd4b6b5e8f84e9a44f58b2", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.tar.gz", + "build_number": "232.8660.185" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "ac8bd42b6dee2aedcfd05656b7f74969e6775f41c9d6614d3cc4946fbc8c346f", - "url": "https://download.jetbrains.com/go/goland-2023.1.4.tar.gz", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "17f1bbd9a46061fdd013d49a99859c1ca3ece1a3cc51cdcf2b46eae0432f2481", + "url": "https://download.jetbrains.com/go/goland-2023.2.tar.gz", + "build_number": "232.8660.185" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "9ea98c03b29903f7bde41f6a3c039621fff5d04015f37f9f21e04966d557ea90", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.tar.gz", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "b1a5c267ca86850764b0541bee0c27af7d2082e55516e95a0c8d30539571735c", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.tar.gz", + "build_number": "232.8660.185" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "b5b15e1bbc7d953715a2b3f5eb25b9bb26baa99bdbee2d11acc91339c725f73a", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.tar.gz", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "d398599557cc732fd1f58f38104d7cda35e326e4cd394245a8358e02fb8878b3", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.tar.gz", + "build_number": "232.8660.185" }, "mps": { "update-channel": "MPS RELEASE", @@ -67,109 +67,109 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.1.3", - "sha256": "c12c99b39615bd2d37eec93ed29faee2387294624eaed7fabd5c7cc8de9faf9f", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3.tar.gz", - "build_number": "231.9161.47", + "version": "2023.1.4", + "sha256": "7b44d704641c6015ce49e12e82c8866e9fdd8e8d421590235e536b3b1312b180", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.tar.gz", + "build_number": "231.9225.18", "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.1.4", - "sha256": "4def30bc442113605b907586ee087bc72e75fc63d826b9a9e16cd97dbb467309", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.tar.gz", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "64472ee39d244fbc2cc8aeade204d02a767c7ce66b2edaa26a8499eeef44f3d7", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.tar.gz", + "build_number": "232.8660.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "0f9beda16f7e90631e75954bf780669ab05621b69e9f91a9e41ed1ecd1ac26cf", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.tar.gz", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "95f1666c471a9d752c53ec0b776840552e023f6405a3b000ce6f1014125bfc83", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.tar.gz", + "build_number": "232.8660.197" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.1.3", - "sha256": "192be48828cb7515e8158cec8aa6ba4d320d3b65ebd09a921e85085143e9bd56", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.tar.gz", - "build_number": "231.9161.46" + "version": "2023.1.4", + "sha256": "0ff1916d0db4f081629e118da5418353e14d57bf2c0ec983db931d989becc683", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.tar.gz", + "build_number": "231.9225.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "b9b5d2a3c0c0517e1ef1363b2abe5ca41441343bc1c8999d1b8e6dff248027fb", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.tar.gz", - "build_number": "231.9225.12" + "version": "2023.2", + "sha256": "9da529bbc2c65503f1e01c85b745f676140c2263b9541fb1c5bae0d3b9329787", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.tar.gz", + "build_number": "232.8660.186" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2023.1.3", - "sha256": "1cef18a6d80e063b520dd8e9a0cf5b27a9cb05bbfa5b680e97c54a7cb435c9c6", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3.tar.gz", - "build_number": "231.9161.29" + "version": "2023.2", + "sha256": "cc97c8ba44560dea41de1c03fd6023a287c3dca6476c297f02a473af124c073f", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.tar.gz", + "build_number": "232.8660.143" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2023.1.4", - "sha256": "fdb801c7c42e87fa0db94b68192e09319583118461385e4133ce9cd01125cb41", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.4.dmg", - "build_number": "231.9161.40" + "version": "2023.2", + "sha256": "2f97bc578e0eb21f4cde2291dc78f19dac5839d84319ba780cc8c98fd9694108", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.dmg", + "build_number": "232.8660.186" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.1.2", - "sha256": "13302c2cda09fdf08025430cfb195d7cbf34ad0f66968091e5227a8ff71a7f79", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2.dmg", - "build_number": "231.9011.35" + "version": "2023.2", + "sha256": "0457a7503d4a1f0824777f5e27416831070b109be93c9c7bc465065c76631009", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.dmg", + "build_number": "232.8660.111" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.1.4", - "sha256": "c0c79501d88fc003707707b3410ab4378aaef44a9cebb220f5b1eaeb3db640e9", - "url": "https://download.jetbrains.com/python/dataspell-2023.1.4.dmg", - "build_number": "231.9225.14" + "version": "2023.2", + "sha256": "3f46033d82f23d558c9b1d0eb0d05a3bd1bcc6c320412e0dbadecdb326e9492a", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.dmg", + "build_number": "232.8660.202" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.1.3", - "sha256": "18d9bcce099d9f78ff4990f93c9ffc6819d7e789f4372659a3ea3bf0f1a2f85a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.dmg", - "build_number": "231.9161.32" + "version": "2023.2", + "sha256": "b5b3cbc4f339ff9ae255196fb32b1db86964ea8ce48dfe61c3d5976a5d831359", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.dmg", + "build_number": "232.8660.185" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.1.4", - "sha256": "ec4d8724ef0b3c1d597801d23622ea5625b65c260d43d9e670c2fc63f448ea45", - "url": "https://download.jetbrains.com/go/goland-2023.1.4.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "8dfde9eb0344c0c049c2c327ee5c92dff612bf2ac2574a04987b7f99ed91b47e", + "url": "https://download.jetbrains.com/go/goland-2023.2.dmg", + "build_number": "232.8660.185" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.1.4", - "sha256": "07dcc09078efea0a6c7d009ec79878d69534f2ca973f546ed469abbc4fec5088", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "ad46a72491b50a5bf5f4a3066e7fb969576dd5b4f4dc322b31f14f638d564e2e", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.dmg", + "build_number": "232.8660.185" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.1.4", - "sha256": "d039c8789724962fa264d55d47ac2e5efc2779fd082dcb6615ae15b2ca66ce91", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "5c60bbd9527b049777bf3ddd1de0f515688fff9e08d1eb09029082677f579151", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.dmg", + "build_number": "232.8660.185" }, "mps": { "update-channel": "MPS RELEASE", @@ -182,109 +182,109 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.1.3", - "sha256": "d181a8c9ff92f183f1ce68c1867de61b17e5a82f5b16ec472baa99f5a5f9ce83", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3.dmg", - "build_number": "231.9161.47", + "version": "2023.1.4", + "sha256": "4d3d9005772d2136e44f7774377fae053b690501800ea5e650d0f35882690fdd", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.dmg", + "build_number": "231.9225.18", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.1.4", - "sha256": "8474b4efea07381d4847b183c26a1d7f4bb80807d34ad5cd058e643b7f930d28", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "2de31d04ad6f199bac193975b6cba6904b8f074c9bc14ac7f14a0eaa6089324e", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.dmg", + "build_number": "232.8660.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.1.4", - "sha256": "04945795cdee1fb36a5c19c2846203bcc4bccba8939f58dd1265651578f9c4c6", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "5db02ef2b9086e2bbbc5ba94b9729b8ae5e328364a7c000d1cf3f4e85b92f404", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.dmg", + "build_number": "232.8660.197" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.1.3", - "sha256": "f7727c5f1b38352ca6ce7ad5ee410152b733bb72b98416d54b7b3e627fd6f2a9", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.dmg", - "build_number": "231.9161.46" + "version": "2023.1.4", + "sha256": "5f1fc9acebd587902908e310a97ff4e0fb12e6d840584618ffff6102d756d703", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.dmg", + "build_number": "231.9225.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.1.4", - "sha256": "4ade59a9d04cc4b5e0a4ed62c2c60e8ddba9717ae91a3e8cf53363d8f0a41e29", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4.dmg", - "build_number": "231.9225.12" + "version": "2023.2", + "sha256": "fc169ca55848e01ab6432babc358d93bf4e1dcc6f343e79fe27144912bed854c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.dmg", + "build_number": "232.8660.186" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.1.3", - "sha256": "ac8a4edbc2d846e2ac205ebf62ad0d883df5eac812b226b1b99c4f19764df005", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3.dmg", - "build_number": "231.9161.29" + "version": "2023.2", + "sha256": "daf4d9c0b27f305e063d128ed7a8a63cbfbe8ddfaadb4cb0b1484b9742235137", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.dmg", + "build_number": "232.8660.143" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "f3aa638dbf08df9763d557c02c5408be864442af25c7e4b0dce7889a800f3a49", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.4-aarch64.dmg", - "build_number": "231.9161.40" + "version": "2023.2", + "sha256": "c2b5ea78b6859f1ef56f32e040e0f9d3d9793198cfa2a8f73d21df2731ddedfd", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2-aarch64.dmg", + "build_number": "232.8660.186" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.1.2", - "sha256": "3af05578dd8c3b01a5b75e34b0944bccd307ce698e80fe238044762785920c90", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.2-aarch64.dmg", - "build_number": "231.9011.35" + "version": "2023.2", + "sha256": "51a9ba6f4448ffc10474522df6b5264972286599ee8165f9b961cd99c1c08bdd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2-aarch64.dmg", + "build_number": "232.8660.111" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "bd0166ea6dcc4de0115102af44da7a587f4bb00a60f9ff09b3da35f2b38370c3", - "url": "https://download.jetbrains.com/python/dataspell-2023.1.4-aarch64.dmg", - "build_number": "231.9225.14" + "version": "2023.2", + "sha256": "52e4e31b2dbc2ed29c547a01c025983b2c8af8b1d58ac8325694256e96fd2a21", + "url": "https://download.jetbrains.com/python/dataspell-2023.2-aarch64.dmg", + "build_number": "232.8660.202" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.1.3", - "sha256": "3564f680ff11ac66722e970491d37d3f1faeb09354095f2086bf0bf4a0897e5b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3-aarch64.dmg", - "build_number": "231.9161.32" + "version": "2023.2", + "sha256": "09b7e8a217ac69accf286dbbc46397b3a18e51775d1682c2eb2db255ed69d2dc", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "5b60eac7a22f6e37345efe9dbbd65e9176a6f1ec899f92bcecbcabb8f96b2ae4", - "url": "https://download.jetbrains.com/go/goland-2023.1.4-aarch64.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "0b48b7b62972ff6ff81c3e16adfe3824043c989d693bbd2a5b03145a80c4f72e", + "url": "https://download.jetbrains.com/go/goland-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "806d6edf7e4cf5636938522c4f64887ed9657b7628311573148d630bbd677228", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.4-aarch64.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "e7c52c2cf202841e729868f3cb73bf40b92cb3c3860e60d614a7daa63dd5ee25", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "a03b9357a0d54936df1631f75d11d2647bc89ca5c5baaa4af07a58ab729924cc", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.4-aarch64.dmg", - "build_number": "231.9225.16" + "version": "2023.2", + "sha256": "f6255dc42b1631a19fc02ec8879f70963c38273d7998a709b745cffcaf9c12c8", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2-aarch64.dmg", + "build_number": "232.8660.185" }, "mps": { "update-channel": "MPS RELEASE", @@ -297,51 +297,51 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.1.3", - "sha256": "49ca043ee6119ae31c5f3fd12aa085f22dc0117c95bf70fca8afe29960c1a546", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3-aarch64.dmg", - "build_number": "231.9161.47", + "version": "2023.1.4", + "sha256": "3285135fc4c529640ecfc5b451fa9b51d9df2a323915509cc6cbb3f25717c9e2", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4-aarch64.dmg", + "build_number": "231.9225.18", "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.1.4", - "sha256": "34bd9ea7434e73d4552a90b2b15ae93b7f4ee8df23690d7b74862d50d85207bf", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.4-aarch64.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "6c841fbe53bd4cfd97867757e02db496ac5a3f749f9c18b5afa20577ab62bab0", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2-aarch64.dmg", + "build_number": "232.8660.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "7c86ed350d71b2fef5f1992a377e7fe161c38a3de91bc1f3bad0d9aafbcde6a8", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.4-aarch64.dmg", - "build_number": "231.9225.15" + "version": "2023.2", + "sha256": "8c022d282d409079abaf7b611a61041f6022140804587d10d49a150457e35e83", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2-aarch64.dmg", + "build_number": "232.8660.197" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.1.3", - "sha256": "d8477d115836913063996abc43ecc531cf08b10f3fb8fc21f58d385743895337", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3-aarch64.dmg", - "build_number": "231.9161.46" + "version": "2023.1.4", + "sha256": "3995b3566fb64938931d6308891cc63d1a7743076d27cab4ebee1ed028d8f9a5", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4-aarch64.dmg", + "build_number": "231.9225.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "ddcb8bf654c24daa0365b9e734b9c6b6d0238303d0f8f540d6e1ce821539e59e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.4-aarch64.dmg", - "build_number": "231.9225.12" + "version": "2023.2", + "sha256": "b91405e6c187baea2ac2f1ee81b7fdf6c4e60f52629bf3afe5bbb679baa76af7", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2-aarch64.dmg", + "build_number": "232.8660.186" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.1.3", - "sha256": "c5cc29db9a12515892beed79e1970e628a816f78c629045795ea16c6e5629a2b", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3-aarch64.dmg", - "build_number": "231.9161.29" + "version": "2023.2", + "sha256": "aa98f5c6ae61f3571cdc4abbd277c770d0b4a790e7fe4d60e1095b192a00b5b0", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2-aarch64.dmg", + "build_number": "232.8660.143" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn index be5a54fb06..7162053d19 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn @@ -1 +1 @@ -{:deps {clojupyter/clojupyter {:mvn/version "0.3.3"}}} +{:deps {clojupyter/clojupyter {:mvn/version "0.3.6"}}} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix index 2be3bf7a33..99299e2715 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix @@ -31,8 +31,8 @@ inherit repos; artifactId = "data.json"; groupId = "org.clojure"; - sha512 = "b767973db8b5b36aeb5c55f082e020a5c3f657bee1eede018e68ccaa2c535005759bc8a162fce7bb63eee1c14c6f29ec1c6080978a08817189864cbd40f154fa"; - version = "2.3.1"; + sha512 = "04b7c0c90cb26d643a0b3e7e1ffa2d2d423e977c1454ee5ea7c2e75547ecbc113838df17b797902a975f5ea2184a81a45b605a4d82970805e2bbb02feebc578d"; + version = "2.4.0"; }; } @@ -42,8 +42,8 @@ inherit repos; artifactId = "clojure"; groupId = "org.clojure"; - sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b"; - version = "1.10.1"; + sha512 = "1925300a0fe4cc9fc3985910bb04ae65a19ce274dacc5ec76e708cfa87a7952a0a77282b083d0aebb2206afff619af73a57f0d661a3423601586f0829cc7956b"; + version = "1.11.1"; }; } @@ -64,8 +64,8 @@ inherit repos; artifactId = "clojupyter"; groupId = "clojupyter"; - sha512 = "d030ae69cdadecbcec9a052e4ad91ba4f47cdc4bb3fb780317f337af62d8c34d12ef05d132d6c9a4ce790008c979919c22162432c1b9bcf4e0a470020d585dbe"; - version = "0.3.3"; + sha512 = "9a4f001cbde7a4de2d27859b25e508ba649225acf9dabad4c1c274e86674e0dcde250a49cacd0767bb99f5b15a61e2f1c829fb2fe7b7dfc4b87681b7ae0b04ae"; + version = "0.3.6"; }; } @@ -86,8 +86,8 @@ inherit repos; artifactId = "tools.analyzer"; groupId = "org.clojure"; - sha512 = "e02d7baec926e0e0a7d9c71f09fee627fbde59ae7f3cbd4abcdf0533c8a87fba8c7cf4503df34bf33777063f4b6353a022552fd003fdbea9fad5752d53609bb8"; - version = "1.0.0"; + sha512 = "c51752a714848247b05c6f98b54276b4fe8fd44b3d970070b0f30cd755ac6656030fd8943a1ffd08279af8eeff160365be47791e48f05ac9cc2488b6e2dfe504"; + version = "1.1.0"; }; } @@ -130,8 +130,8 @@ inherit repos; artifactId = "core.specs.alpha"; groupId = "org.clojure"; - sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; - version = "0.2.44"; + sha512 = "f521f95b362a47bb35f7c85528c34537f905fb3dd24f2284201e445635a0df701b35d8419d53c6507cc78d3717c1f83cda35ea4c82abd8943cd2ab3de3fcad70"; + version = "0.2.62"; }; } @@ -152,8 +152,8 @@ inherit repos; artifactId = "jeromq"; groupId = "org.zeromq"; - sha512 = "0965b82a10136a656dfe48268008536a57b26be9190ff2f3d5dbf3fa298e21bc754e70b1e7fae1aca782d25c397c9ce8fa3832783665391142b31dc4a1bd0233"; - version = "0.5.1"; + sha512 = "bd502d345926160b1a09e45f60eb81254dc67d6d9d7b79e025c08018dd16a18d32ff85b2440c352d530e61c96cd3b2d88fee2a8a912b436015ed31039e308ff4"; + version = "0.5.2"; }; } @@ -163,8 +163,8 @@ inherit repos; artifactId = "spec.alpha"; groupId = "org.clojure"; - sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; - version = "0.2.176"; + sha512 = "ddfe4fa84622abd8ac56e2aa565a56e6bdc0bf330f377ff3e269ddc241bb9dbcac332c13502dfd4c09c2c08fe24d8d2e8cf3d04a1bc819ca5657b4e41feaa7c2"; + version = "0.3.218"; }; } @@ -174,8 +174,8 @@ inherit repos; artifactId = "pandect"; groupId = "pandect"; - sha512 = "8c265289f46a94cf2400f05223cdd3f9faee9a39e6ed5a55a3e89b09334a61e928c0f27e2db834edf3b544e2148a511bccf1ef73132bd9263659bed381abb59a"; - version = "0.6.1"; + sha512 = "6179967af34e1abbe0dda2bd0961f101d016df6b1ce5bf4bb823794b07ee551d245d09e957a9c47bc3a15d306cca80ad1b9b11be99e1b3feb245c26e1b9154a3"; + version = "1.0.2"; }; } @@ -185,8 +185,8 @@ inherit repos; artifactId = "tools.cli"; groupId = "org.clojure"; - sha512 = "9baf3fafe2e92b846404ef1bd897a4a335fe4bc1f78a2408ee93c09dc960a630f58a0e863b2d299624783f2851bb5d83f93fa627276d28d66c92764c46f27efe"; - version = "0.4.2"; + sha512 = "1d88aa03eb6a664bf2c0ce22c45e7296d54d716e29b11904115be80ea1661623cf3e81fc222d164047058239010eb678af92ffedc7c3006475cceb59f3b21265"; + version = "1.0.206"; }; } @@ -196,8 +196,8 @@ inherit repos; artifactId = "encore"; groupId = "com.taoensso"; - sha512 = "bb9510a88bca86f9cfc4a2e5c8a85782bc71d961a0a639735edafb61df130422488ee40d1db4cb6ad961e40acdb07259052937391c32f1e54c71f09dd63d33e5"; - version = "3.12.1"; + sha512 = "43dbec081c4ad7b21526371bc78844877d50dd08580c4c039c4dac7e854247a6b145bda835460863fa91d270e81783ddcdad3aaa1a902575be5b21ac0a95c7d0"; + version = "3.21.0"; }; } @@ -218,8 +218,8 @@ inherit repos; artifactId = "jcl-over-slf4j"; groupId = "org.slf4j"; - sha512 = "d9c08c3e4cb18b2d69ba8bcd4bbf3955dbc287e20141d244486f6237c36e8e2cf86ae48c295b5dd579219b5c7b1197658153f10fce73d155a4a1d4e6c7943952"; - version = "1.7.22"; + sha512 = "17aca766b01f136d39bda982a6046d01d296ee076d9628e9776256bd931bbd88437377d5f1cc196d75bd7fa1672dd131311dbf567b4c3a618dd538a6905fbb64"; + version = "2.0.3"; }; } @@ -229,8 +229,8 @@ inherit repos; artifactId = "tools.analyzer.jvm"; groupId = "org.clojure"; - sha512 = "ce9c7b51fa61c12c539f3c5c1c7fa1caf123497553d4e566c13895312faad2d2657fe6e54fe88110a6c87accb10c4c3b6ccfa87a035a7321da6c859da1d192d0"; - version = "1.1.0"; + sha512 = "36ad50a7a79c47dea16032fc4b927bd7b56b8bedcbd20cc9c1b9c85edede3a455369b8806509b56a48457dcd32e1f708f74228bce2b4492bd6ff6fc4f1219d56"; + version = "1.2.2"; }; } @@ -251,19 +251,8 @@ inherit repos; artifactId = "pedestal.log"; groupId = "io.pedestal"; - sha512 = "f6c4d8e1b202af9ef7950ec6d02b96f0e598e8d1f9ffffe8e5650e8ffdebd6c4919166aa83e34f47407870473024d28e7a49a2a0ad2b9af221514e42c518baae"; - version = "0.5.7"; - }; - } - - { - name = "org.clojure/tools.macro"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "tools.macro"; - groupId = "org.clojure"; - sha512 = "18fb889ec7f0c8f23084f01587582be3c1baaa475249c40cfa8edc78c75079807ed49f2fb714a5c79b16bcf233142abcf571b12fff4e29cd78850c0016d6b4b9"; - version = "0.1.1"; + sha512 = "229c6c73dc7ec39aee15f54ce81cf2b33301e444241f2dff2066b4c10ff47968f3caa95a8a918601e8f3e7563b34da6925e533615e7ce8b1f39bdb97ca082757"; + version = "0.5.10"; }; } @@ -273,19 +262,8 @@ inherit repos; artifactId = "jackson-dataformat-cbor"; groupId = "com.fasterxml.jackson.dataformat"; - sha512 = "575a00fec1760571403aaadbe0aa6c74f8bb01f40feae00741df6604e7c2bf199ac739a789bbd5d83af75ec6d9fcc55f5a1515b05aef33e0d3cc3046acad9e89"; - version = "2.10.2"; - }; - } - - { - name = "org.flatland/useful"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "useful"; - groupId = "org.flatland"; - sha512 = "b97c92692e36be3e4bdfe4a6b1f1ecb2729c960c25884d1cb12218d0b807789dc37120022b4dd0fd5daba1dd16f892ac134576f84ef301c23525ba55cb041e2d"; - version = "0.11.6"; + sha512 = "b6e16c43fb3e71f82f8e7dc558f53cbcc8fea31efa59f40d22220f6e40167cf32c150efa18a81f839008d6a042e201bf17d8fd52a4fecbe8f356454f2d6a6170"; + version = "2.13.3"; }; } @@ -339,8 +317,8 @@ inherit repos; artifactId = "pretty"; groupId = "io.aviso"; - sha512 = "512454e5296c54e2d2f3ddb3122e99edae3286b7e7f9a63dd453c96225b6aa5d0fb0972d58d7dac434b297f47a1f27d1b2021c126064af020f0c3040097226d6"; - version = "0.1.37"; + sha512 = "416433ae5c5773a3a12e7cff3f75a43f1a2d3f4454aad04d065c1e4e13627130f289dbb41355a5665236082b6535939fc4c40a2fddcc22a40d0d4ba290544bfb"; + version = "1.1.1"; }; } @@ -350,8 +328,8 @@ inherit repos; artifactId = "rewrite-clj"; groupId = "rewrite-clj"; - sha512 = "14018072e5c9466e8cafc08d68633f0d0a410ceb6631bd48cf7d67056e5bc972618f1b3f80ba00c4fdf88ad884fe58b636945ec6f053cbe14aee61ef173e12d3"; - version = "0.6.1"; + sha512 = "04850f7b29be722be6c01760705be43e1b5b93315baa096925ceac94835b58702913c45c8166dadf193fb8f5150ff2c5539ae3ec85c37331727e5d0accfefcca"; + version = "1.1.45"; }; } @@ -394,8 +372,8 @@ inherit repos; artifactId = "ordered"; groupId = "org.flatland"; - sha512 = "16ba9c232cefcf363c603af95343db3f86538e3829dce9fba9adce48c3bf2e80c24e4e30a4583750d124aeb9f1031cdbe93d08796366484495b1b22857de3045"; - version = "1.5.7"; + sha512 = "849f115d8dc22122577bb6c2af383663488a84125303ba90559f4f5d8538693a5797d95aca608e6844413b925ea6e12112f0cf2d3dcacfcc603b50d749f7a25e"; + version = "1.15.10"; }; } @@ -427,8 +405,8 @@ inherit repos; artifactId = "jackson-core"; groupId = "com.fasterxml.jackson.core"; - sha512 = "5055943790cea2c3abbacbe91e63634e6d2e977cd59b08ce102c0ee7d859995eb5d150d530da3848235b2b1b751a8df55cff2c33d43da695659248187ddf1bff"; - version = "2.10.2"; + sha512 = "d5337db908b2c56dcb911e3d1a5f671456c13f254fe8d2a620823bc15b2db6aaa8325a86b436b5d181f2584b533158fd14d140b98305ac252f8dfd9a627da859"; + version = "2.13.3"; }; } @@ -438,8 +416,8 @@ inherit repos; artifactId = "snakeyaml"; groupId = "org.yaml"; - sha512 = "b7ef491ded21c61260d6ad68b1541d0c753f01f3f065b66a31c8e4d8f5f6b5eff31e82a7cc68562567811cc0d540c980e8a42714574f50e7713b4799192f50f9"; - version = "1.19"; + sha512 = "4322e41c6fc5114521da21787ab313fa74bf8449ab0c23ec830627b8121504f70d4522e880aec64df227164729d40b2fbd9670e3a046dd5a5aabc1f71e91c16c"; + version = "1.25"; }; } @@ -449,8 +427,8 @@ inherit repos; artifactId = "asm"; groupId = "org.ow2.asm"; - sha512 = "40614e658138f2eb95bc26999545f996794c622c4d68efb9e10093743504c4b58bf22590767bc6bd93b77cdfb202c507144ba867bbc8b54d74fe7621cbc55e3a"; - version = "5.2"; + sha512 = "876eac7406e60ab8b9bd6cd3c221960eaa53febea176a88ae02f4fa92dbcfe80a3c764ba390d96b909c87269a30a69b1ee037a4c642c2f535df4ea2e0dd499f2"; + version = "9.2"; }; } @@ -460,8 +438,8 @@ inherit repos; artifactId = "jul-to-slf4j"; groupId = "org.slf4j"; - sha512 = "e76ee7ee3e1852be55c18ccb7a8f4a7005807da3cbd97f4b4895632fee92cc64785491d4f6384ae4ebd0f73a1ee4893dc1adf7119da056300f21eb2e7d3f233f"; - version = "1.7.14"; + sha512 = "152f153c42e5f69c95e3caeed5ab519e975d7ad79ac0199f31699646299b7ddab58068d5964fbd2170eed29966c3d8d1b00b0a1a4a6f698f9a9eb9c9b9d30dcb"; + version = "2.0.3"; }; } @@ -482,8 +460,8 @@ inherit repos; artifactId = "pedestal.interceptor"; groupId = "io.pedestal"; - sha512 = "9767bb8df4ec3d1ee1468c22afd64adc689bb0ae15e98dfc04ef98e65f237f67ded3ade9c1514d2e44e1dd56dbff6cafbc9795a5c57e166cb924f43175c3be83"; - version = "0.5.7"; + sha512 = "b6d99300e2c656fc63841449067d74893c63f884d282ff1af40510e5e53baac0f17ac869212e0023dc01d3766248ce28e93e32a57239926254e3af0240c82178"; + version = "0.5.10"; }; } @@ -504,19 +482,8 @@ inherit repos; artifactId = "omniconf"; groupId = "com.grammarly"; - sha512 = "f9b162b98676cb5073310309aac9678725cb4a7eec3fe00803b21ce4abcea3cc1c41df5e970105ed18352619dfab40c0736ae78e9206165f17b0094107b2594b"; - version = "0.3.2"; - }; - } - - { - name = "clj-tuple/clj-tuple"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clj-tuple"; - groupId = "clj-tuple"; - sha512 = "dd626944d0aba679a21b164ed0c77ea84449359361496cba810f83b9fdeab751e5889963888098ce4bf8afa112dbda0a46ed60348a9c01ad36a2e255deb7ab6d"; - version = "0.2.2"; + sha512 = "2b13138090c9706af014b7d22b316af5300f41bfc70ee1f604ee6d817f70ca6227951f673231830c81888db2c50533f9c53de3e314d725a60b8eee99718655af"; + version = "0.4.3"; }; } @@ -537,8 +504,8 @@ inherit repos; artifactId = "zprint"; groupId = "zprint"; - sha512 = "379b6f9228ec0b5ae1a24b0cce4c41e273534b456cf356ac67b7f72a7506345eddf7f7ac75c2c200864d5372c1fb0331d2b31bc22a21c496cafdfe839241e9f9"; - version = "0.4.15"; + sha512 = "2f29288a1d9dd7e76689b32616049af8ebc0e98f0994f1eae1c8e6e725084df23de11a4d6231d2712167ef4adfdfffe494cea2c11b6e752f81acd641381516eb"; + version = "1.2.4"; }; } @@ -625,8 +592,8 @@ inherit repos; artifactId = "slf4j-timbre"; groupId = "com.fzakaria"; - sha512 = "93ecc0e133a3f02f521cac125fd8842f94f2c284000b6b9f1cda7ef2841567bd674facea1f8c4e32da2321f414c1f2590ac58abf37f23347f6f551fcd9039339"; - version = "0.3.14"; + sha512 = "9a25ed545a7dac8fb74096ed531fa4362989a1ed68350e63f403a871fdf19ab582c6f2c1c8e08978a431d8da31d8226bf34f1d0263ac5f6a14955ff56fdf9e17"; + version = "0.3.21"; }; } @@ -636,8 +603,8 @@ inherit repos; artifactId = "clojure.java-time"; groupId = "clojure.java-time"; - sha512 = "a7111b5c78d7f920d74793d410f81c9ca3c9a8c4d652f132be55eb15f6d03a413cee1ae46bad6d3189c045d422a33c7320fbd02055c351779c379f75db48cbbd"; - version = "0.3.2"; + sha512 = "cd27eddad69554fcc443603bb69ab7dbe5d4cc937080f4b4d1ef3590e855faef2366dda77724da6c9b8941c340f8b5c5cb1345855f946718bd3ceb9c124a226a"; + version = "1.1.0"; }; } @@ -663,14 +630,25 @@ }; } + { + name = "borkdude/edamame"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "edamame"; + groupId = "borkdude"; + sha512 = "5f5f36a85521464e97c0ada94581b37d7ffc7d1b9adaf7b3b509447bc0d6cedf339f12ae75d6bf679b69f9e1b582d0ee1a995bfd039657b17ec9a85516700fbe"; + version = "0.0.19"; + }; + } + { name = "com.taoensso/timbre"; path = pkgs.fetchMavenArtifact { inherit repos; artifactId = "timbre"; groupId = "com.taoensso"; - sha512 = "2570f1d59d98034d8425598ab676f4c1e17f9da9926def2e142296377ddccf0fe3a894ba023114d614ca728c77c11d50927a709bfa896e9c5cce0854be31e32d"; - version = "5.1.2"; + sha512 = "8c88eea8f0a94a3fc14f450a03e76ce0573d31f6c301252d3f9afc177f87a03326966197e8508e766f3caab61ef356142c6dc002e07ed09771f341dd6b290edf"; + version = "5.2.1"; }; } @@ -680,8 +658,8 @@ inherit repos; artifactId = "java.jdbc"; groupId = "org.clojure"; - sha512 = "50c263853f0b88d4b46746bf8f5efb8536f38dde2a08c26e5d26c2bd3bd851c0c0f0814d7899019c3879de2667b3b432a23de091bd8f8cea3e28bd00f0b715cb"; - version = "0.7.9"; + sha512 = "19e37ee3a16ccfdeb299e72ee0ae64a557b20296dd9461bf2288d0507e1d915ad6fcc56e4aadd712340f5c21e2c764ed7d4ad074eb8e4c82dc6ba5fe96111930"; + version = "0.7.12"; }; } @@ -768,8 +746,8 @@ inherit repos; artifactId = "cheshire"; groupId = "cheshire"; - sha512 = "5b2a339f8d90951a80105729a080b841e0de671f576bfa164a78bccc08691d548cff6a7124224444f7b3a267c9aca69c18e347657f1d66e407167c9b5b8b52cb"; - version = "5.10.0"; + sha512 = "2262573047d194bba28b3d2ca4b00b12f8171d6f8f7f5449df35f10ab1ef5902a9ba2f9937399d6e4b54a78bda919fa205a22a44cde998019bc0cfc508e90f29"; + version = "5.11.0"; }; } @@ -801,8 +779,8 @@ inherit repos; artifactId = "tools.reader"; groupId = "org.clojure"; - sha512 = "03677c7eb85d294f878f13066bbd841e788ec1267285690e65c2eb342b02aecd028679509b7f1d192cf5631b0839a92abfe36e93237bf5e2544c14e6cebe7452"; - version = "1.3.3"; + sha512 = "3481259c7a1eac719db2921e60173686726a0c2b65879d51a64d516a37f6120db8ffbb74b8bd273404285d7b25143ab5c7ced37e7c0eaf4ab1e44586ccd3c651"; + version = "1.3.6"; }; } @@ -817,6 +795,17 @@ }; } + { + name = "org.babashka/sci"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "sci"; + groupId = "org.babashka"; + sha512 = "2897029dba4917facf93935229f1288d9e90973e8dbc8ff84448335452815274c23371ab643c35df0b1854ff6de1574c37880267fd0edd900039f5a1678d73c5"; + version = "0.3.4"; + }; + } + { name = "io.opentracing/opentracing-util"; path = pkgs.fetchMavenArtifact { @@ -845,8 +834,8 @@ inherit repos; artifactId = "nrepl"; groupId = "nrepl"; - sha512 = "663906ff1c8768c4a73fa9f32619da4c244cc86c93d86e8439eb8de81c79486be5a04140c1df6199ba475b3a3e7fd36304faef8b330672dd644945820cc6eb67"; - version = "0.8.3"; + sha512 = "92534555cc5fa45e8990b8566996fe784df368849e0938fbc7a89909ccbb62dd7d4fca9b7aa3c615702ec30f9962a460c500f6b60abc72661c5f4c66414fc395"; + version = "1.0.0"; }; } @@ -867,8 +856,8 @@ inherit repos; artifactId = "sqlite-jdbc"; groupId = "org.xerial"; - sha512 = "efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb"; - version = "3.25.2"; + sha512 = "f4c27027fe3cb7914aaf155a1afaa0c8b455e5d142b4e5f31d87bfe619c9949e1981ba7eed1f7a8a3cd27edba1321cc4cd74cf4321ae800e8a911b4d94e03930"; + version = "3.39.3.0"; }; } @@ -889,8 +878,8 @@ inherit repos; artifactId = "slf4j-api"; groupId = "org.slf4j"; - sha512 = "a944468440a883bb3bde1f78d39abe43a90b6091fd9f1a70430ac10ea91b308b2ef035e4836d68ba97afdba2b04f62edece204278aaa416276a5f8596f8688af"; - version = "1.7.26"; + sha512 = "cf50d5cc86404fefa49730da36147db5f6d65c8b06163bbf62311e6874c20ca46db02ab6bda27c9c1485a5c57fe63b89fd3000b8d838c429240ee95734f5901e"; + version = "2.0.3"; }; } @@ -911,8 +900,8 @@ inherit repos; artifactId = "test.check"; groupId = "org.clojure"; - sha512 = "ba7b5c915c1e7bd5e9e398f8cd9d74340ca3c4846483bae8f2191e40ea42bdd4d8019ec108c2bd64451f418abebed2258cf0ee5be597cc0bc8a02d772c6385ed"; - version = "0.10.0-RC1"; + sha512 = "b8d7a330b0b5514cd6a00c4382052fab51c3c9d3bc53133f8506791fa670e7c5ecd65094977ea5ced91f59623b0abd1ab8feeec96d63c5c6e459b265a655c577"; + version = "1.1.1"; }; } @@ -944,8 +933,8 @@ inherit repos; artifactId = "yaml"; groupId = "io.forward"; - sha512 = "561cfe0e92689b95008948a0a8aa839b9932ffd13791fdbd9ce55e0b0e3c895be6441ccd050b62ff671c747373fcba1199246c8bfb4206cb05584d06dea99b7c"; - version = "1.0.9"; + sha512 = "e2d3b7aea260346a1db44bcc3c363877d0ff2b327c4fd287759782949b1a498bc8019f06ddabee84443b96b07ea4765443f8190e04f5f903de049e2cc0fd63e9"; + version = "1.0.11"; }; } @@ -966,19 +955,8 @@ inherit repos; artifactId = "core.memoize"; groupId = "org.clojure"; - sha512 = "37308fcbbe64d0a2802917ef5a589075f81086d63e08c71a9a1b648b73dd362e5bdc8f756084fde1f4b1964ba82a6dc06b2119460281b7949a271d82e6a47a7e"; - version = "1.0.236"; - }; - } - - { - name = "camel-snake-kebab/camel-snake-kebab"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "camel-snake-kebab"; - groupId = "camel-snake-kebab"; - sha512 = "3108a207378e8b6199ae6c71517fcc65dde97d2bab67d533a618c7ff50ea8b849ead3880857d00629d6c269499384b564ed43b631e6b06f283af94e8cae89144"; - version = "0.4.0"; + sha512 = "67196537084b7cc34a01454d2a3b72de3fddce081b72d7a6dc1592d269a6c2728b79630bd2d52c1bf2d2f903c12add6f23df954c02ef8237f240d7394ccc3dde"; + version = "1.0.253"; }; } @@ -1010,8 +988,19 @@ inherit repos; artifactId = "data.priority-map"; groupId = "org.clojure"; - sha512 = "fb2d703468fb6d5f28c38f25e8e7acdaf02d2fa1ac23c14a9ff065873e88c9b74e155e73e5069436d674d7ef8547f01bc9777b7ae3b9dcde67cbd327d4a20c06"; - version = "1.0.0"; + sha512 = "bb8bc5dbfd3738c36b99a51880ac3f1381d6564e67601549ef5e7ae2b900e53cdcdfb8d0fa4bf32fb8ebc4de89d954bfa3ab7e8a1122bc34ee5073c7c707ac13"; + version = "1.1.0"; + }; + } + + { + name = "borkdude/sci.impl.reflector"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "sci.impl.reflector"; + groupId = "borkdude"; + sha512 = "c747fd347e6aba9578d105298b7c7402f53e8639d5c8e6dc83b127f3c413feeb1b9dead7405ac2c4345f02290902e8a2affbec749474481e9c9f19b3d049f18f"; + version = "0.0.1"; }; } @@ -1032,8 +1021,8 @@ inherit repos; artifactId = "log4j-over-slf4j"; groupId = "org.slf4j"; - sha512 = "d0a13ae82823b921b308c897ec9a11ef86cb1b52dd81343f856224c65851f70eae0890a88550daa3a4ed57e7e2c150018a3cdc2345924a4e489a88827fc639b6"; - version = "1.7.14"; + sha512 = "a1f90d8ea338660cc0e38073752cf32e46a042bc408477d841ba7ad69ad0d066bbbf9d4c399a34352d620ba9d2402c7a51574a88f314ddcc796c35adc99c37f4"; + version = "2.0.3"; }; } @@ -1043,19 +1032,8 @@ inherit repos; artifactId = "core.cache"; groupId = "org.clojure"; - sha512 = "6e4e126f23b20120c50a4dbefbe1b3b9bd98f0a7b8fa83affa267ff7f0de09542d2727243859a1ea346bda5b782d4ae0110f6c2b169c298261707a1fdadaedb0"; - version = "1.0.207"; - }; - } - - { - name = "rewrite-cljs/rewrite-cljs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "rewrite-cljs"; - groupId = "rewrite-cljs"; - sha512 = "d87c07d510247e1b13dcb505436b3a43d8bb9a4bfebbd2ae0430249d2c8a859032affe2b2a4cda8f987e983f584fd999a3f9b87944d44b8837cdf4e2560c5ab9"; - version = "0.4.4"; + sha512 = "0a07ceffc2fa3a536b23773eefc7ef5e1108913b93c3a5416116a6566de76dd5c218f3fb0cc19415cbaa8843838de310b76282f20bf1fc3467006c9ec373667e"; + version = "1.0.225"; }; } @@ -1065,8 +1043,8 @@ inherit repos; artifactId = "core.async"; groupId = "org.clojure"; - sha512 = "7c8640769a68256f5cf131ed2436713c3c63bba2c4167f3593a1671ef65931d67b9b43eccfa6e5a20467ca7c6f5efd9cbf58d6c14e035757714f71220a754d0b"; - version = "1.3.618"; + sha512 = "160a77da25382d7c257eee56cfe83538620576a331e025a2d672fc26d9f04e606666032395f3c2e26247c782544816a5862348f3a921b1ffffcd309c62ac64f5"; + version = "1.5.648"; }; } @@ -1076,8 +1054,8 @@ inherit repos; artifactId = "jackson-dataformat-smile"; groupId = "com.fasterxml.jackson.dataformat"; - sha512 = "8998346f7039df868f3387d219efa0c04fc022a948d098296f3d7ac3f7a9a82bde6ec4a8f83b11994ad50318b5aca37781faacb1f20a65ba2ecc6d6d6eb9468e"; - version = "2.10.2"; + sha512 = "4c1566aa4fac309de8fba08ea355165cf2a888b7bcec98e7035ac8acd7315e340415a10b8deec6497fc4eea5ba9319fc989676170d8c4c0d0bbc3d4f3cc4d681"; + version = "2.13.3"; }; } 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 cb814ddbc9..a9770a5c1b 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 @@ -42,7 +42,7 @@ rec { dontInstall = true; buildPhase = '' - convert ./libgui/src/icons/logo.png -resize ${size}x${size} $out + convert ./libgui/src/icons/octave/128x128/logo.png -resize ${size}x${size} $out ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix index c37a9e3bc7..7223d9e69a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # There appears to be a similar problem with metakernel's tests doCheck = false; - meta = with lib; { + meta = { description = "A Jupyter kernel for Octave."; homepage = "https://github.com/Calysto/octave_kernel"; - license = licenses.bsd3; - maintainers = with maintainers; [ thomasjm ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.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 081b038e23..d4dbb4d97c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { description = "Modern and intuitive terminal-based text editor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "micro"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index bd80496995..5b51f9563c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -75,5 +75,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ joachifm nequissimus ]; platforms = platforms.all; + mainProgram = "nano"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix index 7dfbebb95d..15b9d0ba80 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -4,6 +4,7 @@ , libvterm-neovim , tree-sitter , fetchurl +, buildPackages , treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; } , CoreServices , glibcLocales ? null, procps ? null @@ -15,22 +16,32 @@ }: let - neovimLuaEnv = lua.withPackages(ps: - (with ps; [ lpeg luabitop mpack ] - ++ lib.optionals doCheck [ - nvim-client luv coxpcall busted luafilesystem penlight inspect - ] - )); + requiredLuaPkgs = ps: (with ps; [ + lpeg + luabitop + mpack + ] ++ lib.optionals doCheck [ + nvim-client + luv + coxpcall + busted + luafilesystem + penlight + inspect + ] + ); + neovimLuaEnv = lua.withPackages requiredLuaPkgs; + neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs; codegenLua = - if lua.pkgs.isLuaJIT + if lua.luaOnBuild.pkgs.isLuaJIT then let deterministicLuajit = - lua.override { + lua.luaOnBuild.override { deterministicStringIds = true; self = deterministicLuajit; }; in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) - else lua; + else lua.luaOnBuild; pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); in @@ -99,6 +110,11 @@ in # nvim --version output retains compilation flags and references to build tools postPatch = '' substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + sed -i runtime/CMakeLists.txt \ + -e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" + sed -i src/nvim/po/CMakeLists.txt \ + -e "s|\$' -i src/cpp/core/include/core/Thread.hpp ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); diff --git a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix index 4ba505ff78..6a0156eedb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix @@ -15,17 +15,18 @@ , poppler_gi , webkitgtk_4_1 , librsvg +, libportal }: python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "55"; + version = "56"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-Mcl9kWeo4w/wW8crR58Yyqoh26w8/SmNrjmHps6DmRA="; + hash = "sha256-YCJu8EU+8RD09QNVT/RYF2ZJZ7cp+oawXThqTzg8ENQ="; }; format = "other"; @@ -48,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { poppler_gi webkitgtk_4_1 librsvg + libportal ]; propagatedBuildInputs = with python3.pkgs; [ @@ -56,6 +58,7 @@ python3.pkgs.buildPythonApplication rec { pdfminer-six pycairo pexpect + bibtexparser ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json index afb5f1ebf1..ab59232d85 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.165.9", + "version": "3.167.2", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-amd64.deb", - "hash": "sha512-DR2wxCi0RgEeAQWbegJv7Zhp6rtO2PWF7RceVNd2KBrLigsRZbRfLVsPLesprKexZoGIryhYvOksecpX51VdUA==" + "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==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.165.9/standard-notes-3.165.9-linux-arm64.deb", - "hash": "sha512-ACYzEHQgw4pPZNgOUSDihAFY1dJ91Tmw3y2Lf1iihiOVcGn4qt5XJS2BG0+/bEWZjp0iuBKsfrlfWfSi6c95Sg==" + "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==" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix index ff090dd325..8c74d8c5c8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix @@ -47,10 +47,10 @@ stdenv.mkDerivation { postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " + "${ghostscript}/bin:" + - (if aspell == null then "" else "${aspell}/bin:") + - (if tex == null then "" else "${tex}/bin:") + - (if netpbm == null then "" else "${lib.getBin netpbm}/bin:") + - (if imagemagick == null then "" else "${imagemagick}/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; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix index 35b06fde1f..97f51014d0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texstudio/default.nix @@ -1,19 +1,33 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg, - wrapQtAppsHook, poppler, zlib, pkg-config }: +{ stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip +, hunspell +, wrapQtAppsHook, poppler, zlib, pkg-config }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.5.2"; + version = "4.6.2"; src = fetchFromGitHub { - owner = "${pname}-org"; - repo = pname; - rev = version; - hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8="; + owner = "texstudio-org"; + repo = "texstudio"; + rev = finalAttrs.version; + hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho="; }; - nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; - buildInputs = [ qtbase qtscript qtsvg poppler zlib ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + pkg-config + ]; + buildInputs = [ + hunspell + poppler + qt5compat + qtbase + qtsvg + qttools + quazip + zlib + ]; meta = with lib; { description = "TeX and LaTeX editor"; @@ -28,4 +42,4 @@ mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ ajs124 cfouche ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix index a1ff1b8817..c2b82321d4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix @@ -1,53 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: - +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }: stdenv.mkDerivation rec { - version = "11.4"; + version = "12.0"; pname = "textadept"; - nativeBuildInputs = [ pkg-config unzip zip ]; - buildInputs = [ - gtk2 ncurses glib - ]; - - enableParallelBuilding = true; - src = fetchFromGitHub { name = "textadept11"; owner = "orbitalquark"; repo = "textadept"; rev = "textadept_${version}"; - sha256 = "sha256-1we2NC4N8oY4QmmqIIWGSpTBuLx3MEFkZK+BjmNEfD0="; + sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c="; }; - preConfigure = - lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: - "ln -s ${fetchurl params} $PWD/src/${name}" - ) (import ./deps.nix)) + '' + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ qtbase ]; - cd src - make deps - ''; - - postBuild = '' - make curses - ''; - - preInstall = '' - mkdir -p $out/share/applications - mkdir -p $out/share/pixmaps - ''; - - postInstall = '' - make curses install PREFIX=$out MAKECMDGOALS=curses - ''; - - makeFlags = [ - "PREFIX=$(out)" - "WGET=true" - "PIXMAPS_DIR=$(out)/share/pixmaps" - "GTK2=1" + cmakeFlags = [ + "CMAKE_INSTALL_PREFIX=build/install" ]; + preConfigure = '' + mkdir -p $PWD/build/_deps + + '' + + lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: + "ln -s ${fetchurl params} $PWD/build/_deps/${name}" + ) (import ./deps.nix)); + meta = with lib; { description = "An extensible text editor based on Scintilla with Lua scripting."; homepage = "http://foicica.com/textadept"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix index 1baac73df8..b0117f4022 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix @@ -1,39 +1,32 @@ { - "scintilla524.tgz" = { - url = "https://www.scintilla.org/scintilla524.tgz"; - sha256 = "sha256-Su8UiMmkOxcuBat2JWYEnhNdG5HKnV1fn1ClnJhazGY="; + "scintilla536.tgz" = { + url = "https://www.scintilla.org/scintilla536.tgz"; + sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ="; }; "lexilla510.tgz" = { url = "https://www.scintilla.org/lexilla510.tgz"; sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; }; - "9088723504b19f8611b66c119933a4dc7939d7b8.zip" = { - url = - "https://github.com/orbitalquark/scintillua/archive/9088723504b19f8611b66c119933a4dc7939d7b8.zip"; - sha256 = "sha256-V2t1kt6+SpZQvQSzLhh8n+WiAnA32SRVFnrbTaJrHRo="; + "scinterm_5.0.zip" = { + url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip"; + sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24="; }; - "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = { - url = - "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip"; - sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE="; + "scintillua_6.2.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip"; + sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik="; }; - "lua-5.4.4.tar.gz" = { - url = "http://www.lua.org/ftp/lua-5.4.4.tar.gz"; - sha256 = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E="; + "lua-5.4.6.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz"; + sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg="; }; - "lpeg-1.0.2.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; + "lpeg-1.1.0.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; + sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo="; }; "v1_8_0.zip" = { url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; }; - "444af9ca8a73151dbf759e6676d1035af469f01a.zip" = { - url = - "https://github.com/orbitalquark/gtdialog/archive/444af9ca8a73151dbf759e6676d1035af469f01a.zip"; - sha256 = "sha256-7AkX7OWXJtzKq3h4uJeLzHpf6mrsz67SXtPvmyA5xxg="; - }; "cdk-5.0-20200923.tgz" = { url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; @@ -42,4 +35,11 @@ url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz"; sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA="; }; + # lua-std-regex + "1.0.zip" = { + url = "https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip"; + sha256 = "sha256-W2hKHOfqYyo3qk+YvPJlzZfZ1wxZmMVphSlcaql+dOE="; + }; } + + diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix new file mode 100644 index 0000000000..c3605691ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchFromGitHub +, crystal +, vte +, libgit2 +, editorconfig-core-c +, gtksourceview4 +, wrapGAppsHook +, desktopToDarwinBundle +}: +crystal.buildCrystalPackage rec { + pname = "tijolo"; + version = "0.7.4"; + + src = fetchFromGitHub { + owner = "hugopl"; + repo = "tijolo"; + rev = "v${version}"; + hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo="; + }; + + nativeBuildInputs = [ wrapGAppsHook ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ]; + + buildTargets = [ "all" ]; + doCheck = false; + + shardsFile = ./shards.nix; + + installTargets = [ "install" "install-fonts"]; + doInstallCheck = false; + + meta = with lib; { + description = "Lightweight, keyboard-oriented IDE for the masses"; + homepage = "https://github.com/hugopl/tijolo"; + license = licenses.mit; + mainProgram = "tijolo"; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix new file mode 100644 index 0000000000..480251e777 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/tijolo/shards.nix @@ -0,0 +1,27 @@ +{ + compiled_license = { + url = "https://github.com/elorest/compiled_license.git"; + rev = "v1.2.2"; + sha256 = "1f412r6m31cc093lcw31m2rp5s3y7vh6q3wc3xh9b8vccvmj21p7"; + }; + fzy = { + url = "https://github.com/hugopl/fzy.git"; + rev = "v0.5.5"; + sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv"; + }; + gobject = { + url = "https://github.com/jhass/crystal-gobject.git"; + rev = "v0.10.0"; + sha256 = "02cc3486ifbffdbvgl75ylwn47gpfb2j0srz92jx5yz1d596x746"; + }; + toml = { + url = "https://github.com/crystal-community/toml.cr.git"; + rev = "v0.7.0"; + sha256 = "0vznx2irvx6m8w6chdf9ms72n2w0cf2m5cwh0cjmp1jz9y3xwv7z"; + }; + version_from_shard = { + url = "https://github.com/hugopl/version_from_shard.git"; + rev = "v1.2.5"; + sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index 728ab5eb54..24e9ea914b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -27,5 +27,6 @@ rec { license = licenses.vim; maintainers = with maintainers; [ das_j equirosa ]; platforms = platforms.unix; + mainProgram = "vim"; }; } 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 39b653fbfa..0402a7dacd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2023-05-20"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ec80f3d48dcbf19209ef51d6020838cda5a1d46e"; - sha256 = "0ahhs6ffdffap566k6p0f1yncziacwnygq3ndaarngqz29w6wl62"; + rev = "6134040ebedb7ab731e9b9d4b272c2ab55fb3af7"; + sha256 = "1dppzp2v99p94qw23ad35w53lnfs8yk6cpp29ywq78rmgdkjv77c"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -125,12 +125,12 @@ final: prev: Ionide-vim = buildVimPluginFrom2Nix { pname = "Ionide-vim"; - version = "2023-07-04"; + version = "2023-07-17"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "22a70da864c5c304c958561efb1ed5eb2ada780c"; - sha256 = "0ha8r4xkiiyisagmraqps2jv46bdjrm6hhcgr11cll3gk3rwh28f"; + rev = "8435bae84b26b602dbb68399661b3989915cc4d3"; + sha256 = "0bsy6mnnz24w35r6sn6gzjzbrkqm7v6wqpd8db7p7fika6l1kzm5"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-07-10"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "a38bf3001dc5576110cb0bbcacc262526ddf7bb9"; - sha256 = "1ng6dcnyccs43ikwp1pf6df520iaqa952lszadxm60mha4m2490r"; + rev = "9264c54ae96d1d56f029ad9b561326c7b991c53b"; + sha256 = "1lcq6gwh31w1fg2cw5bzihjalfvagr6gf86kprd83vpjzwvp3237"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-07-11"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "49af82180b22c3c2ff8d9d1e82a7ab1486cd052b"; - sha256 = "14lq3yjvxdmpsxp1n1qkcb2nvl23q0r157vizr5kkgy00v194ifd"; + rev = "8d51a3512fa318393df2bc092e458fd7d6c8e75b"; + sha256 = "0abffydl0h8nnxq5m0vicbi4cxcbfa34m13al7xx0plbk31q3iyd"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-07-10"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "bdba0106f6e33fffb8e2ffea0162ce5565b18840"; - sha256 = "0z02xxgnfxcpwc39fwqc47wdphgbxlcasksfj1p8lgrmw1q0p0kn"; + rev = "fba131b5ef7a54a8f8d71ef2a2e8d2263b87daac"; + sha256 = "138k6slpv8xxjl8sggqcgmly2byifwa9842y2w73hwc956fx9clr"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -377,12 +377,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-07-10"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "69cddda85747b77608a8f7a86111e812409475a8"; - sha256 = "135c0ilpq83cgcsc0gknyazzfv2pl0ll8crpa8gaxlb5g9vh8r70"; + rev = "3e96e1325f15acdf7e9f13f360c434222bfe6090"; + sha256 = "0qvjqmpfw6ljhsda2n5cb7vm3p3s38maiywy60s7nbnldl1l1d01"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-07-06"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "142a559acd70a4da190e36b1b05b9f1eec67acd0"; - sha256 = "1mvw668wq30zqlx1adyx9ikw86wkswaf0m22dczfh7i793457lnl"; + rev = "f09c2f69f7fe4d6adf64396a5daa2736714f67a0"; + sha256 = "0rvaxcrbfm846zzph76fmnzkqxkjh9gzbaslg6ffr3b25yfljx8q"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -502,8 +502,8 @@ final: prev: src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e22facd3a696f4690f888e16ddaba585c8173e4e"; - sha256 = "08zpnsvj1qbiz7c3n23hhbb7n24yzmamfajka2kyffl5fprgph0i"; + rev = "fb1f08c9f90e8b0c04b2f2c5d95d06288a14c5b2"; + sha256 = "1429srq5gkw37b4hb05cxp0lxjqgfawak3b8vbdphg79zr9imwn8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-06-27"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "29e5ffe35a2fa1ca5ba19eebfe7cdd0191c16e39"; - sha256 = "109asfm9g7cbcbac55syf19vgn2ifwbxgyy69v51xwyyxlgq2czl"; + rev = "b216892f0c1ce7bbe9efeeb6cf55b52a473f49c2"; + sha256 = "0df56hrqyv1vq19alnpv981fmrb68gx3127izp7pi974r4if87pa"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-06-09"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "9e33db324b8bb7a147bce9ea5496686ee859461d"; - sha256 = "0l5nwrdnb27a1sszivkzqf8q1isqkg07yh8p9f268m0433h8n0hf"; + rev = "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65"; + sha256 = "150hx42qpi25m6774f8y3di8lb7g3yca74q5l439v50prsxdh262"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -967,12 +967,12 @@ final: prev: base46 = buildVimPluginFrom2Nix { pname = "base46"; - version = "2023-05-06"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "bad87b034430b0241d03868c3802c2f1a4e0b4be"; - sha256 = "1nplnd4f5wzwkbbfw9nnpm3jdy0il4wbqh5gdnbh9xmldb3lf376"; + rev = "a88ada931feecc22dfdcaae00ff98f412b863f9a"; + sha256 = "1zqaqd2byzfqgy36jwjimcrvgs2wds9dx18kza41c3in9b9243rd"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1037,18 +1037,6 @@ final: prev: meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; - bitbake-vim = buildVimPluginFrom2Nix { - pname = "bitbake.vim"; - version = "2021-02-06"; - src = fetchFromGitHub { - owner = "sblumentritt"; - repo = "bitbake.vim"; - rev = "faddca1e8768b10c80ee85221fb51a560df5ba45"; - sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp"; - }; - meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; - }; - blamer-nvim = buildVimPluginFrom2Nix { pname = "blamer.nvim"; version = "2021-11-17"; @@ -1159,12 +1147,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-07-10"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "cd27a52ecdfed7f14a41b61b7976f155e3d593c7"; - sha256 = "0fcabl395y2qhnnabhakdkhk9f18vh9wkx1pmsdvkizs0hnhxlx3"; + rev = "99f0932365b34e22549ff58e1bea388465d15e99"; + sha256 = "17cs0kbgavjsnwjp7n3xbznba0zfpz5g6wgxa6d30070w9hjq91j"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1243,12 +1231,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2023-07-09"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "99e0d388e0cfc265d98a1eb228e7e8708bef5219"; - sha256 = "1a2dahpqm9nvpk58a8jppnmhdj22yd03a1b9a17nks174cvbjdkv"; + rev = "a12f2d375a06b0b10137462820efd5962425333e"; + sha256 = "02p1wfkc6d5ysgv05ifazk3yswikan3j16fdcc07mfjp2y2cs5vk"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1315,12 +1303,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-05-23"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "6d0bf36870d15c0c2284f4b6693a66552a6bf127"; - sha256 = "1rr3pyqg7hscs7chjy9mkb98g9vlc17zmfr6lx35vjbd3v7iblwv"; + rev = "b3b0eb798ecbdd16832fd38d4b07ba31ab4fe831"; + sha256 = "127sb5w8sv5ldx6vgzf7ynkw24wpvpdp7m192fh1qgymlnma8hsy"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1999,12 +1987,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2023-01-29"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043"; - sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy"; + rev = "9332d2ab1154dedc9dbcd3e1c873886abaf061a6"; + sha256 = "1aq1bz2pl6wfhxawkdwkrcvc18dgs0x3p5fwivfmnhaqislkx4lf"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2023,12 +2011,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-07-11"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "3803ab16cd1e3160edae55fc5dd5e78b1d71e5d4"; - sha256 = "09haj4j1d8gry6537g7mzllac2drwnb5kib6np4ml9sylr6x72lp"; + rev = "ddf848e8647e85774766ea8bdcd5a2258ea44006"; + sha256 = "0l0bp9d4z0i8yfbnrpydvagzk3q0wc82r5wp3kbqk195qzykflx3"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2083,12 +2071,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-12-16"; + version = "2023-07-14"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "23d2860931dcbcbdfb3543bed002e35d7b3b898b"; - sha256 = "0wqpyzggaxqplwi9w7ivndjkfisjv8f3lqw5dw7dps5zdk042svn"; + rev = "9a1343c396178dc55ccc1166bf1eb434b5c18c43"; + sha256 = "0qwkbf9yn7lwvihp3qdgd2kc85i6i3cca7spi2pcjsnf74bykqm8"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2251,12 +2239,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-06-11"; + version = "2023-07-11"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "31a1626273e2bab479b6b8416a137f9edaba7daa"; - sha256 = "1dcwp8sziahrgks2fdczvvfvnb7v9md2izpjw8r9cwvlx030g5lr"; + rev = "2482871cbe0d1b85d331465cf7f065d5d2a7e2ac"; + sha256 = "1jmlpf0k9zf6djblpphxlwsg6l0nhfxni67z8gzmawxg8a300kgg"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2275,12 +2263,12 @@ final: prev: context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype.vim"; - version = "2023-05-16"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "512db78eb08f284a71bdd83b3ff27026334a3ab2"; - sha256 = "1ab12rir32yhl42ih2zfp7w8f3spi765622xj87aha4jxir20i2f"; + rev = "7ff5b43fc8d5b274aa19ade5af11e9fa57577ed6"; + sha256 = "01pa0aaxyfpq86ff2v38z4fh2ppbglp5h76r9js4vrby0b4yjhks"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -2323,24 +2311,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-07-09"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "e6a2ec767a98a21ebe9b247d80e462544e3f9397"; - sha256 = "1rg3w4v6q1kl14jkfiamwmmq4a6spz7s5piznhdsn1j21d0l3b1f"; + rev = "2b27da78d6eb74fa9fd565e845e2381c51e59675"; + sha256 = "0mawmz0i4nny1vdvahfb0b6hymil5vc4sa5yhj38yqcnwzbndzzv"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-07-09"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "ac313e324861e353bf6ddf5286160d10cb202da3"; - sha256 = "107jsagw15ab7whjxaygmd2aqd3a3jkm6d6vz513r5b7jrhclcbh"; + rev = "dedb7387a50a797a7bd871d009cf711fbf00eb20"; + sha256 = "1p2xyrfp9gdasrh0chr5mf8n7l0z2qhg908578pkl4bjn1sl1q46"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2359,12 +2347,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-07-09"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "02cf0fc1fb5af0805d87c7c4ecb396ffe92b8dc2"; - sha256 = "057ym4bhfich5hfbnsx7lb82d1rrsa3a3nzblfzhvaipb6sn05by"; + rev = "8ad8815816657e6be07f6c47ae50f6e8a70e9a59"; + sha256 = "1i1264czx49qs30i788nr8ryawrlk8gnvyw3p7psb58p6mc6gsih"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2479,24 +2467,24 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2022-08-03"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "8b4a9523632049b3b373de1233bef346073b8982"; - sha256 = "0g7mymqgncnmc326xysx9rlhja5601b18sn4hbpr7p49sqqspyv4"; + rev = "7c972cb19c8544c681ca345c64ec39e04f4651cc"; + sha256 = "15li2j26xxa90z6ci675whljym2sc6br6jxs2x4in5m1gv3qj36x"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2023-06-05"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "0ba32c911178e6701d3f76d754c8138a7c7c2e6f"; - sha256 = "0qz1d0immg9wc9ccqkn2i558jpv0v96g8zn7kd26dc3j1j64lpd4"; + rev = "928302ec931caf0dcf21835cca284ccd2b192f7b"; + sha256 = "0chfg23ckqyz5gr44arfvvs2b3h34n3d0jhmhfzaw4ylspxfx548"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -2515,12 +2503,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-06-14"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "ab84915f7cfd7bc7a5bfe7409c3eccf8d09c162a"; - sha256 = "1bmi9hxchjs1s0d5gc02akyxzixq1f0k2hhr2jisj9xx8d0x8fjh"; + rev = "c17d3210b3dec8798b4fc82a11c542989251f85d"; + sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2611,24 +2599,24 @@ final: prev: denops-vim = buildVimPluginFrom2Nix { pname = "denops.vim"; - version = "2023-07-11"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "fece0a2b24655e42a3fd10dbbf2962d39b381e90"; - sha256 = "12yj3wzz6qhf71zlmkxfxaqny4iyqp885iwhnr509cmcg0nynac8"; + rev = "22e7ae3d712f190b3f46483e6b9dd50a99a9abbd"; + sha256 = "15aqkxwaky7d0s0q9wqyaaxflin45ibsxci3qj830javih41hrqb"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-07-04"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6a471522fa69ec2cabc5fdbb55f5224fe10460a8"; - sha256 = "1sm81lgwks2yakd4f511zxdn2gx817xw0qrn6jxhrkwhjy3zhgmh"; + rev = "dc0b9d36d841e66783e6e38c011db450ddbae0fb"; + sha256 = "14dipd0bcgz501g43d1gmlmw29br4aa79zajfnm3hh83kw3mhlww"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2841,12 +2829,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete.nvim"; - version = "2023-04-22"; + version = "2023-07-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "82db30626e411e99b0274b8d6c99bce561cb0394"; - sha256 = "0ras9hh57al5vap7ksp8rs3ih7fffswv8is39xfkks4jjwg4b1sf"; + rev = "b3a03b25ecabcca444827b312e10439f8836289f"; + sha256 = "0zbp5h0mf8v8hvxjr72p1nm91s20fn63ayx7h8zj2m55x8x7r8wg"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -2913,12 +2901,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-07-08"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "b0cc22f5708f6b2b4f873b44fbc5eb93020f4e0c"; - sha256 = "0hzpcwv02yvqxzf2ldhdx6icsffi93r24rjzpipm0b1i6bspg2mw"; + rev = "e91110d2a7f8e2f667666aba6ea089ff823f8748"; + sha256 = "1d19870i3nzb4fbz3vm6m3gdz0grh383fwkkiw36yrpaiz021nyj"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2961,36 +2949,36 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-07-10"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "608ebc389514674213a74f1d173c00f85bebc008"; - sha256 = "0h43r4zlh14pwxzm8d76xm68vaxwdpn6z56ybzzmv7vcr9kpgm50"; + rev = "948d237241b91389c8c2f109885b91cd2574b8bb"; + sha256 = "09cgyskfmqnp0gl1qbwfij8a6r6c0frgbj39zjx15frbhraygpdb"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-06-26"; + version = "2023-07-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "e6eff7a5a950a853c3903d906dbcea03f778db5f"; - sha256 = "180whgmdfgsv5xbnrk4jndisafv4v59vi8001ikq4k08wm3ah634"; + rev = "39611852fd7bbac117e939a26759bb37361f0c90"; + sha256 = "19j6c9byrxjiv067lc7s6f34854nnxwcla8vil6g41f67m3810k7"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-07-10"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "dd0a43d0bdd2918bef5ed7f42caacb1bbe5d7d92"; - sha256 = "0cwlwgi4s4iggss7d1jcn4jaw8idn60yrzpjxqm8h930aa6b2zks"; + rev = "90fc6aa051d31f22b512f967cd1485dc0d1cf32a"; + sha256 = "1dzkrf3qak2s5bagh6w5gvq9xqd11s0z3gaawjlqnq2dpfamccah"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3009,12 +2997,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-04-24"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "358cb6688ac577470a4eafcb53bdd63899dfc937"; - sha256 = "1jz3c5z4cdgi5a50c6wlhz23rapfqchm79n9f3mgc9ss1aisqv0y"; + rev = "4fead634946186a21ca7f406b213896e596fbd93"; + sha256 = "02xbjblsy384ld1002hc6mc9b9i9rxlsi692s8qp1sks0v0bjmag"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3033,12 +3021,12 @@ final: prev: edgy-nvim = buildVimPluginFrom2Nix { pname = "edgy.nvim"; - version = "2023-07-01"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "0d3b64f9159442cf9edcad451a0dd9fb7e31bc41"; - sha256 = "1w43qilfhacnmqr76lp2fkbawbndas180f5ab7h133rwgr64lc7p"; + rev = "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4"; + sha256 = "0s0h8s2wwg2niacp401j7l3c0knl44awf32clq15h1hcabqvvkn3"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3070,12 +3058,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-07-05"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "e0c713f86333faf0484543b4c50d14ce8d1de1d2"; - sha256 = "1nxydkvdypbb4q29sfq6axw1vc4554n02bmsv59h0kxlsyaa7hl1"; + rev = "0930654e8c83c6adbb479f75882ae5fd0caf9723"; + sha256 = "1w0367p2hrhknka2kald0c35bzmvdn1h3b8gvqrl6k3mpr4v8qal"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3143,36 +3131,36 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-05-19"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "1db527e770deb8cbb3b5b60d8921f80bd2a4c12c"; - sha256 = "0jg53zzgv417v8c079cay11nwy8mi6v5svdslcl4iq84cr7l5qfq"; + rev = "b8ef2d0bde98645250a8997393aefba38e8c6ff3"; + sha256 = "0q8jji19abfqmbd30iha2h0bf15k12az6wh2b9nlcdhjzki81cdl"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; executor-nvim = buildVimPluginFrom2Nix { pname = "executor.nvim"; - version = "2023-05-23"; + version = "2023-07-12"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "c1c8d69dceefbfa299c43c8b69433e2adcb0ed02"; - sha256 = "0wld79mrjwr6v13an9v6lx57yfdpad13x06gqxzhr5by0z404bdn"; + rev = "0fc98a2d05a0662af2d7c55899c79635bb05ac5a"; + sha256 = "0mh13s9v7mkkq2zh4wmq273gv0nf7p6rn4hiwnk3zw053g9jpvzi"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; eyeliner-nvim = buildVimPluginFrom2Nix { pname = "eyeliner.nvim"; - version = "2023-06-29"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "a6c05ed7f2a59640bd18ff0702694deda483a08e"; - sha256 = "1clla449ab1r71hwi9f96vf7l7ixqizvmh9vapcl7605p6iy6mny"; + rev = "70e1fb4f68bfdad2b9e2b53fcaf367ac86fc693f"; + sha256 = "071n0dk0cn4gw12xsg6klzflp1ihl9di60xs8kljh4zjdnc6b7l9"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3279,8 +3267,8 @@ final: prev: src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "f1c375ba68839eaa4a65efdf2aa078c0da0548fe"; - sha256 = "0bzlv846iz0dbvi166m5aj8ynxp86ba1ycwg0vjxawjcnkhvkdv4"; + rev = "90c22e47be057562ee9566bad313ad42d622c1d3"; + sha256 = "1ga6pxz89687km1mwisd4vfl1bpw6gg100v9xcfjks03zc1bywrp"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3324,36 +3312,36 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-07-07"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "a8da6ff212c1885ecde26af477207742959c67d7"; - sha256 = "1x7nrncpd9fj3mk74m1x0n1jzdyi6h5sw53mghd3ydyb4cqrg2pj"; + rev = "967117690bd677cb7b6a87f0bc0077d2c0be3a27"; + sha256 = "1rl7lgiwkrjay2zsf97xbp964iqxvqrqc31az6n59pw720rsqn6m"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-04-23"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "d92c93959e9ac52a00002d6fd64c2d2ca5dd7192"; - sha256 = "04p4cfvfb320bgsrhj9507z0s5hx1xi5fd0qs44qxws9aaqvx7c3"; + rev = "97228f78dfee042c18ecce0d788c91f59e770f31"; + sha256 = "0baab64zqj7z5rxb7cmy3k8xwbad1jmqzfljla2z9h3q83xff4a6"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2023-06-23"; + version = "2023-07-13"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "5c9a78b97f7f4301473ea5e37501b5b1d4da167b"; - sha256 = "1d8zjmynl3qjkv5r8rcf11185gwnrs72pl7xh0f0ckd08gl4ra0c"; + rev = "498b3a4864e697f1ed1145e518c4c78c776c55d8"; + sha256 = "0w56zv254hpw57zgwzaikj9ciyksvkbd0brynhgcaby8s6hhhgil"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3408,24 +3396,24 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-07-06"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "7850a771c4e773dc49d63081f508d004b416c13e"; - sha256 = "0vjnhsy0bm4xz9rpxda5n2yiy37yl8h90sh15lw04yc5rwcz88wi"; + rev = "561d85b16d8ca2938820a9c26b2fe74096d89c81"; + sha256 = "0n13m2vdqh75kr0rjlz5m29hcr9jyqxw78isn0gd7vclla1kkjw7"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2023-04-30"; + version = "2023-07-13"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "fa4f2729cc2909db599169f22d8e55632d4c8d59"; - sha256 = "0hv79gdg7cgqr3a8vw1ysc48f6i3b8xabbglxspm5mbpf22c8xbk"; + rev = "9bf2e7e294b00bac87c6123c889828ee08dc9b46"; + sha256 = "0hmlh6qcra7sfq0i989cxs5jmgk6774bljzvq9m17ybwj3imb14f"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3444,12 +3432,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-07-09"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "6e0afe3be0ba43ef03d495a529de8fb22721c0d0"; - sha256 = "1rzipwl5slmv56fb84yy2isxfqydjydx2ns8sxydkhkk0pz25wrp"; + rev = "bc38057e513458cb2486b6cd82d365fa294ee398"; + sha256 = "1l2czwjsskcywjvayx1wcg5538fs2pfp88shx14c9s5q4h0v247m"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3552,24 +3540,24 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-07-10"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "63bfdd54d1ba5af042a6be350aba4299b7a0f5a3"; - sha256 = "0l08xmgadwgjr37icv7cqxyfz8yb4fkb9hrv7760588yjkl6gdda"; + rev = "1bba731df46feb1751dca1632268aae41ed5ac15"; + sha256 = "08qv4zslrqrg67gbazk2sllcgx4hakl5fgrlcv7bd6r0djiv673y"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2023-06-09"; + version = "2023-07-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "1dcdb21db618055134cd611f4f5918f6d00a5df0"; - sha256 = "0655iypmf7nafrwhrj09v5cgwfsg8dnqgkrpxlb2z2b5wji79cx7"; + rev = "e0d131d95364edf940a70127fcb5748b86e6955e"; + sha256 = "04g1albh3f865vy7wp9zp4njpazf4haiynxpzy4j0x44wfnchl2j"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3720,12 +3708,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-07-10"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "48c3ae8ec74cb83f9570ceb0c5ab8217db7a2220"; - sha256 = "0v0il2wwgca58gv4jl70gwimnh0qy8swmlxqaw0yl0yj68pgv6ba"; + rev = "5d73da785a3c05fd63ac31769079db05169a6ec7"; + sha256 = "16xdc4nf9i39bi9diin5v3782gnlp0ln95aphydv2s7rcg88mdlj"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3744,12 +3732,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-06-12"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "3e7158ffaaa0fa1f7268df30ae40f24c07b840d1"; - sha256 = "14xnn7yj3949kj0q7a5dr18snjrhdpwlw6ka47j5xlq3wv28sfma"; + rev = "3d67c10c422b2d2800761f4f484305540d54450b"; + sha256 = "186zb2zh4njwy2rxfhmgq0bb3nyfiwf7d289k35qnzw0i7b21wkj"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3768,24 +3756,24 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-05-05"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "bbd0473d72a45094495ee5600b5577823543eefe"; - sha256 = "13l7xd71nnvm643pc15zvi5yc2hig2x6s8dfv7bz9ygf3q7wyzy4"; + rev = "0bd87753b052205d271a790b48a09882a9e79f35"; + sha256 = "1sgarwqc8l8gygz90f408cljpcqrw1gsyzvfg6afih90214nfk95"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-07-07"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "6550ddf5ce491d17af009c397aceb25310566eaa"; - sha256 = "01im6m0h7pa04dzh0daxkll5y1i7zf5kxlj01cribghl04zlhdxc"; + rev = "7e5602dd51a230581f43c42559d7acc2fbca23cf"; + sha256 = "1090n4rdgjfgzfabdmmi0rxd4xk1h2y5jmhy9z7ncs0qpplhnbq2"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3828,12 +3816,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2023-03-17"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "82ce83ae589be7a59e4ec5cfbbf82d9f5eb8bded"; - sha256 = "1hl8nlvp8rlycpkfwyl10lzd5ilxw33mfv1a39isrsa7l7ql75b9"; + rev = "84532db88f8ee272bcd1c07cda55884e23fd9087"; + sha256 = "0insrplfq6rwm9bgfj5adjk8c4mbvqhpzbd32lqq6bg4960m09vl"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3900,12 +3888,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-04-24"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "3fff63b0d6a425ad1076a260cd4f6da61d1632b1"; - sha256 = "0207p4qg6s31957jbfb0k5yabgadzn6wf3z43m5skvp5w1al5a2b"; + rev = "b17daceec6ed9a5fb46e0f293f2ac666c90e5459"; + sha256 = "16kg8plbav8vd97a3kix5043f538kkqiv29kmwq6aa971vjxyp9g"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -3983,12 +3971,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-07-09"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "b2e3ecdc3d94bf489126c040be27a8af80733453"; - sha256 = "1yhnib92inqs3ww00bwimidpbzfi17xiv2ifjyprpfyx1kk76h33"; + rev = "070f78dcf9fdb069ccb57e1b15bdfd7596a08bbd"; + sha256 = "1j0dg6xsksndzfksszpwrs6a9ldkzfm2v1blk1r5yzj5lyr6q9j5"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4029,14 +4017,26 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; + headlines-nvim = buildVimPluginFrom2Nix { + pname = "headlines.nvim"; + version = "2023-07-27"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "headlines.nvim"; + rev = "74a083a3c32a08be24f7dfcc6f448ecf47857f46"; + sha256 = "1ak7j159c0lv6pxiq4nld6svzx3465r6f1xwpawwrxlzhi5a14yz"; + }; + meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; + }; + heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-07-05"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "76136ccd93ed608e8109762f032cf1118981ebbd"; - sha256 = "09mqjrbzhfbfs6n1hg4dv5kfr1xbwbq5qhd8b52550bs6a43r9bg"; + rev = "1840fe27dbb38efa13c8af4614acafe6efa41988"; + sha256 = "1h4h4hkz9vkdh2hza1qp0xmiv1rkxzzq7aa4zrp82460z1ic3z1h"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4079,11 +4079,11 @@ final: prev: himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; - version = "2023-02-15"; + version = "2023-07-17"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "64fb17067cf5dbf5349726b9ed1b1b38065cdb82"; - sha256 = "13d5vs35bmzr4dj2anj2k7scmx647ddsyz941sjaajsyff37bvsv"; + rev = "479c49fd46899144d24b78dbd81d64cc0c05ffc7"; + sha256 = "0as0dxkf37pfqk878rq1d3dfdl2d724plabgs0cy3lkg20x389i4"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -4148,6 +4148,18 @@ final: prev: meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; + hover-nvim = buildVimPluginFrom2Nix { + pname = "hover.nvim"; + version = "2023-07-10"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "hover.nvim"; + rev = "c366d1b0f9d6612d25681d3fea0f9ea46fa54f4d"; + sha256 = "0vhr5a9nsww4xhniv86j05isfv94fwa5sz2ikkn6fnl7d743m1xr"; + }; + meta.homepage = "https://github.com/lewis6991/hover.nvim/"; + }; + html5-vim = buildVimPluginFrom2Nix { pname = "html5.vim"; version = "2020-08-22"; @@ -4306,12 +4318,12 @@ final: prev: indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2022-09-07"; + version = "2023-07-14"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "d15d63bf9c4a74a02470d4bc8ecce53df13e3a75"; - sha256 = "079r951hg2z2cjlb4sh8iz4pvivlinbvidpgq66ddlv4v5q5yg34"; + rev = "b96a75985736da969ac38b72a7716a8c57bdde98"; + sha256 = "0g5rvgn6919wbg4xpiwzkq6c1nhsg2lmxmqg3fj75fk71glcggcp"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -4402,12 +4414,12 @@ final: prev: iron-nvim = buildVimPluginFrom2Nix { pname = "iron.nvim"; - version = "2023-07-04"; + version = "2023-07-13"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "f603de5263be81782125a9c3010182f55b7d1dfc"; - sha256 = "04ss0jv0jliwab8mq7hdwz3m0y8scfp4y3irr3lhidfg9fcmwhs4"; + rev = "7f876ee3e1f4ea1e5284b1b697cdad5b256e8046"; + sha256 = "0yf7sykk6dvzmnzwphfmi3s3jmr9iab1aqszx6ir5915zy3wrwvl"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -4619,36 +4631,36 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-07-09"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "da8b00581a52f5f87ad2aba9f52171fda7491f18"; - sha256 = "1b2h6fzj54jwjqkqhd51lfw4mdqdiam9426zdxaic9nbjai7rjps"; + rev = "3ad55ae678876516156cca2f361c51f7952a924b"; + sha256 = "1yzdy9iqfx2aa7gd56lxqjmarpflnqqv0yyx9vcz5w9i7bg7dk1g"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2023-06-03"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "3466e48439601445e26c65635421625886f2d0c0"; - sha256 = "1w8qrgkvg7hivxlcr17l787gkyc0whi6iwgfl4chbcrll9ddj3r9"; + rev = "1578fa3db0a707393d690a2357e7de6a47081ce0"; + sha256 = "09kvwi51davqyvi0zhbkw5ri82z3g2ss4v66q6hs9n2ypm03hlvh"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2023-07-10"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "891294bb7b5e4068a954b29f93556c1acb05393d"; - sha256 = "1hx6shg720939zqdqh2f7liz6ais5wsch94xn230gcviqr06mjg8"; + rev = "b82d1e8d5f6f33bd89af95e795f6877a7a6cbf7c"; + sha256 = "0npa97h0d31p0sagkssc2gag239gssawjd0n0q3mxbhfs6jyayck"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4679,12 +4691,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-07-04"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "8facf2eb6a378fd7691dce8c8a7b2726823e2408"; - sha256 = "185zil8r41dz981qjmj241zri5iswfafqsx9racvsg87gcvysggn"; + rev = "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c"; + sha256 = "093fzf1bki2ll3lrqbnrw9w7i7aajbma4zq83c2nkxwi5gj5jqgl"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4871,12 +4883,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2023-06-05"; + version = "2023-07-12"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "959ac31dae906fb71181c2e75ace62ffb1fff8c8"; - sha256 = "1r4m1nifavshj1g17sxcxfw449jamfc4ffdpil44g9wr7rjwv0hj"; + rev = "969e95bd07ec315b5efc53af69c881278c2b74fa"; + sha256 = "1rrmsib2frr4x00kl07v9acva8wa75fbpvpwq8yvdyjy1zgmir7q"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -5027,12 +5039,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-06-20"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "de0e7d7c75cb032107d4a728aa0a63a61d8e5909"; - sha256 = "04x9hmshjfy11fsxjk51w0axafm05iiw3gja2jyj4mrh95lpzrwl"; + rev = "7bcbd67298237d4c7a958715bc99f25f20702c6e"; + sha256 = "0q61hfk3dsa6pgx25iqxz4r1r25mcizi0lbyvv88nn5fdvg8lv74"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5062,12 +5074,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-06-01"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "17ff7a405fea8376b015b8ea7910d2e59958bf68"; - sha256 = "1qgl3j9a0b3wf381q859xjw0pcfbfxxm0fsdhj7bgfdq11v2q60p"; + rev = "58d4e810801da74c29313da86075d6aea537501f"; + sha256 = "14v8mkv3q7l0pv63i3sgiv81bg5yfq927n94nrfz7nwfmg82rxxa"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5146,12 +5158,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-07-10"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "45a4e899ca8f54936fe32ead6bba65f2a8d42e12"; - sha256 = "00d3bdpx26n61yy3rq7z44wlpryiqpccjnv6kjrp9gjsydh4a471"; + rev = "e81cbe6004051c390721d8570a4a0541ceb0df10"; + sha256 = "1smr62hm7id8j2j7cra8rcjn9xwdpayak9cfgyx4hs58w5g8hvbj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5243,36 +5255,36 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-07-10"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "796008869e67ef27a5aa5ac44c08ce2a60b89f55"; - sha256 = "1l8nkjdl4k66yas0wrzddk83k7z73kcylqb0cv7h2v7f2d2y79ng"; + rev = "e86a4c84ff35240639643ffed56ee1c4d55f538e"; + sha256 = "00pv0yry8cj8w7y20r7ccla4482lh3dp9pd00k3lcycnbzj7k0s1"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPluginFrom2Nix { pname = "mason-tool-installer.nvim"; - version = "2023-06-12"; + version = "2023-07-13"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "49e3efe743d846d80da5a4757d4f7e563a96cb84"; - sha256 = "1g5aha7jjw36wl2ji1i4gwa623x8v6agyxdqv68k7dsbid6kqj3r"; + rev = "031903fefbf59371502092ef9e22cab9161d90ba"; + sha256 = "1za6shsh5ykdv9ivf971b3ckfxk25p8lsd9qdgrmm5bag6vih8cl"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-07-04"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "5ad3e113b0c3fde3caba8630599373046f6197e8"; - sha256 = "1mqbby4arzr136szh371p2ynwvpaf6glkzyb7s5sr547v7qmb29c"; + rev = "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f"; + sha256 = "1yvf5hml1nhglmfaa0da5mjmgxaysc8x8k1rk820vpj5f1bhl70p"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5291,12 +5303,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2023-07-06"; + version = "2023-07-11"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "c7631d373d3ae02ef502ec6b8620a8ff36ab922e"; - sha256 = "192xaw1k2sa5m92f046g6nbp4jw3yxb8xzzk33824h03adykblcl"; + rev = "1ecaa2d065a1ea308bd7702a77c2bf35ede8f536"; + sha256 = "04fd3rm4lzf29vpma2ylh19qcsms81qs6nlzwji8la3d78zr09n3"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5351,24 +5363,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-07-11"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "4766f80acf4df22385adb36bf3a166752848f179"; - sha256 = "0n2zx64489qgmrr2w1j83rpi9j759p4w6xqnga23sxbsxgvvj60r"; + rev = "aac602e097b99a06bc84e43356f080eb6256dd21"; + sha256 = "0waznhg7qbs50wqkfs0pk5ar92drlf35fgg7lclcjdq09gji64v0"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2023-04-18"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "726746ed02eab2eef137a7ecceda7214fbeeec41"; - sha256 = "1p8bpa7g349zhx7z78gyxrhfrhibihd9v7p4224qzddk0pd4ibkz"; + rev = "74573b63b9ef0583262b6bf6ef209eb7f3b06b94"; + sha256 = "040z12dxagbfsbkdwpsz6dk2vpak3z737ra5ipb1ljqsswgrj5f9"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -5423,12 +5435,12 @@ final: prev: monokai-pro-nvim = buildVimPluginFrom2Nix { pname = "monokai-pro.nvim"; - version = "2023-06-25"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "cb351c21a46e12df53e0650a5a1ee1b9d27b9a98"; - sha256 = "0hknggiy49h1zfi0yvnxz9xv5r3jnriz5jrp8nyc1m3zwirmrir3"; + rev = "cdad962b234580715bb3da4bf913c723280f9e5d"; + sha256 = "1i05xil5nc3rr9x0vxr9pnqwbsbp01k9rl8rbhi6kv3cx8gs2q6y"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5699,12 +5711,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-07-03"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da"; - sha256 = "1hq3gxqv5jsih4cj78y8shn5ncna3hi8mwzgkl2qjhy490vc7kpa"; + rev = "93fcf0a3056c60829c0a210fe35523cda7ef0369"; + sha256 = "1gyb0y0dalam3s7gj8179kkgpjkn05wv15gkjhy0r16b7xyfk6vh"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5735,24 +5747,24 @@ final: prev: neodark-vim = buildVimPluginFrom2Nix { pname = "neodark.vim"; - version = "2022-11-13"; + version = "2023-07-15"; src = fetchFromGitHub { owner = "KeitaNakamura"; repo = "neodark.vim"; - rev = "d11dc6e8b32aeb64a3abc5f7d94d5569070bb4bc"; - sha256 = "0fxf8qcj6kh7j9mdnx2ncpnnxg37nbf6gs11d0nw27ihqc92xx1c"; + rev = "2488bf42b197cb09f7807e35a58d3fe56ef1776b"; + sha256 = "0ihkhhkgqvsm67kx41mr8zrir5wkk43pnq4kd8nbl467m1k88nxa"; }; meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/"; }; neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-07-11"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "fed7f27480ac6bda777cb36f2d6737c8ccc580fe"; - sha256 = "19763byainb613r1xkk2grahbqxwvfiycg3ljz5cmmi9y82z7n2f"; + rev = "f57e5210d450b47aa02ea6d9e50a37414f570b4c"; + sha256 = "1mx41pwdrnxbzgwx478fcdp8v7qljh9z06jn5qs0706lsw05pkci"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5783,12 +5795,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-07-07"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "1b6edb56e8c754494be1564912d33e50ddd8a023"; - sha256 = "0qm74hapfq4lghka7ipkppxlan1c37gjf89wqslclj7q40cplm32"; + rev = "2118729749a5b500e6d52bfeac22559c5a0866cc"; + sha256 = "1qfh68md3wv5bchpip450fnmgwzxlylgb8kf5p7i8gkkzz7qdg3q"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -5843,12 +5855,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-07-09"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "c801ae5165423f4c70841e548208c74da86acf72"; - sha256 = "0gi9mmf24x8v97gg4f562pl9pn675lvwc2l1rdlrxk2w3ng28aad"; + rev = "e76f0cb6b3ae5e990052343ebb73a5c8d8cac783"; + sha256 = "194bawzni3psgzs2aljzdm7rgxv58psm30aakrnqy6rl11sackrc"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5891,12 +5903,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet.vim"; - version = "2022-11-01"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "b7c241fb5737c50bf09cf1e26298492c3fc0457a"; - sha256 = "11gbxkmbiiklqa8gzjm7dhg3xsv9k2wl131q6g18nwyrc5gaw8vb"; + rev = "efb2a615df2e6df9364087686dacca223fcfa16a"; + sha256 = "1yihgplpdgkn7dgsgwrw8q3pl0f7hj06wkpv5j5y834n5zrzm4n0"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -5915,12 +5927,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-06-15"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "e46eae5739c470aa011ee43108ea8a730736174e"; - sha256 = "0jwvasiv4y8dcg14h8b6n9fzma84bk0y3d8h5rydzg2351wk145m"; + rev = "bec7be0f13ee19c85561943fc5f7b8daa4f4d465"; + sha256 = "04w1ifxrxsyzyw0l4kv2sqnxjzv46j5v39l4d354042q5xcriw9c"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5975,36 +5987,36 @@ final: prev: neotest-go = buildVimPluginFrom2Nix { pname = "neotest-go"; - version = "2023-07-01"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-go"; - rev = "05535cb2cfe3ce5c960f65784896d40109572f89"; - sha256 = "0mg1cacs6hd2f0pgrggd94f88yaq99ic9xw3a3hiyywcx7apkz94"; + rev = "f2580cad67ef0181403cf65858ab638ffd3ede9f"; + sha256 = "0lvbqyqcz35964akcq5xmg69xw37jpf8202k27zy10f160swff8j"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-07-09"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "f7d028916583af59e554bbc7b01255f53b931417"; - sha256 = "1wwxfwa9vqphr9qkpg2y195dqdk5qy3apivmja5abb98kvp761xx"; + rev = "d936279cee9ba3547adc8aacb62accd900edc8d1"; + sha256 = "1mqmdmk22k4m176bp7hlkx594fjhplrq3mqgbzim9kxnaqp4m5wx"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-jest = buildVimPluginFrom2Nix { pname = "neotest-jest"; - version = "2023-04-16"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "22b1050dda3ebd401780ec4b8e193cf52523a4da"; - sha256 = "0vg433x68c9h0nzws6lwb4xcgqzm8ss5dkmi8df4fa55m2ll8iaw"; + rev = "e60280f53ef9f84fd827aecae1e2f732ba4326b1"; + sha256 = "1j4q8z3vpbcmgsmv2nvlr7dziqr4kl65prapqlr6zj0w30lr3gzn"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; @@ -6059,24 +6071,24 @@ final: prev: neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-06-30"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "f5569be7d462585576eb19282aab83887ba84a6c"; - sha256 = "174gj5kxvippr52qz4glij09dand627fy3q6l02fvfdir371q3sj"; + rev = "754431f0ba41d058ba5d6c2d59908836e18ac355"; + sha256 = "1jbd3i0zvjx7pknfg0xwk5g8742kpqbnk2z5vwnspwwf0y9ayk86"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; neotest-rust = buildVimPluginFrom2Nix { pname = "neotest-rust"; - version = "2023-07-01"; + version = "2023-07-17"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "6dce8963e5395adf079bf22e931dfce65d3fed25"; - sha256 = "0mg71ha951di5srw6g6whdpjjmbqrg47n2d5ana2q9svqmgrd0cc"; + rev = "d1dfe0f51f3a1def715d1fdd6918341176592c23"; + sha256 = "0iaxkp43q42zg08ggkp3n1p7y6dwfij3g9dm0d93wwgcg86ync53"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6275,12 +6287,12 @@ final: prev: nix-develop-nvim = buildVimPluginFrom2Nix { pname = "nix-develop.nvim"; - version = "2023-06-14"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "figsoda"; repo = "nix-develop.nvim"; - rev = "2453645ea621fd7265022628a44010fef9a64cea"; - sha256 = "1nxzxdahv1zr0kbnhf5sgw7657dha9m01xi2ij8fm8hp3ydvbypn"; + rev = "afea026f5c478c000a8af8de87f7b711676387ab"; + sha256 = "0nwjgr19pzdxd7yygz380b388qcfbzp9svs916kh0zayzi9yxc2k"; }; meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; }; @@ -6335,12 +6347,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-07-01"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "6c87c1d11c38180fb72bf8f45518a0a3e081afc1"; - sha256 = "0y0fwll3a421r0px9x2d8mq2nj00w6ahilwmrvmhvnazjgqd074j"; + rev = "894db25ec726d32047799d4d0a982b701bec453b"; + sha256 = "1vpdl0905vxxbcc354v4g2m2nrpc7fmzpn2yjwgmwz34wacvmik5"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6395,12 +6407,12 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-06-18"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "d146966a423e60699b084eeb28489fe3b6427599"; - sha256 = "0cg0771dai5gsch36qfandx3i48gq2zhifnmgwarl174af8f8mrq"; + rev = "9e3916e784660f55f47daa6f26053ad044db5d6a"; + sha256 = "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6431,12 +6443,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-07-08"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "720d71b546b8300bf3951c839f52db6cb83c3dc5"; - sha256 = "0byhs3711k9ji1vwvc2zgv75jvj7njfcmg47ipw28hl3nmhv3h67"; + rev = "0e27cb4b44fbba69f8646d1f88555737d2b6aedf"; + sha256 = "00a4wazmxmrnb2da0x4im4iwr0df0kh5jn73hclp517r73m3fi4w"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6479,24 +6491,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-06-18"; + version = "2023-07-14"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "e8f7dd7a72de3e7b6626c050a802000e69d53ff0"; - sha256 = "0lk78zvmf5cyyq4nmrzybi7dbpbwx499r0la4wza9h1gp4l7xvy7"; + rev = "ae5b41ce880a6d850055e262d6dfebd362bb276e"; + sha256 = "0bka3gy9all6axkdpbp0q5adspl6vrdws9my9gllszjndsjrdvvf"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-05-13"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "4f3aa29f49b38edb6db1c52cea57e64ce3de2373"; - sha256 = "0cl2f2xvl3sd0b0f6pmji9czcwyrgh0km9qji6pip6yhna4g7c0f"; + rev = "6247ca9aa9f34644dfa290a6df3f6feefb73eb97"; + sha256 = "0bfkhc046wwgrf02snvbx1p43xqhkhcr9b4r8w2nws4hlbzkdd4f"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -6515,12 +6527,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-06-24"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "3460a1ccf4dc92a52ed7fe2012f02a9194cd84d2"; - sha256 = "02z00d4ah393agcpp0ihzz19z2kgnqnz3l6vwrg9qgln5k21q5fq"; + rev = "65397976cec59a1e9892b93e3ab1ea987064b0dc"; + sha256 = "0yih7p37gm3ipx6vixb89iq7wwf85id8ff49hrs4v6y020s4sny5"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -6575,12 +6587,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-07-06"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "904dc18d017cdf5c7c52a6455fd2a8d6f9a8bc3b"; - sha256 = "1wbfa9g22d2hshl2v0ksg5xmjhrdclqqq7zf33d9pxxr4bp62xyp"; + rev = "c2842a51df781d357cd3408c411a7bec147b57ae"; + sha256 = "14nv3rvcy7fznxqdk2xbxfsjp8dg9kzv27zakpq352l4w9i4qfv0"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6647,12 +6659,12 @@ final: prev: nvim-coverage = buildVimPluginFrom2Nix { pname = "nvim-coverage"; - version = "2023-05-26"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "andythigpen"; repo = "nvim-coverage"; - rev = "8fcc71e01e93f305e334b59f902e545a70d0050f"; - sha256 = "0d62vpbf03pbq4rs4yxywnn7j9wb90bahv1cx2wm5w4q6jgdgpk3"; + rev = "4634dfb00961a86948518c7e6f85737c24364308"; + sha256 = "0ry8b5945spz00scab6xxs8va56yg17q1dd6g90k3zm9gvdi0r79"; }; meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; @@ -6671,24 +6683,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-07-09"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "3bde6f786057fa29d8356559b2ae3a52d9317fba"; - sha256 = "0mm3yhbidknz0rkbmsa32j4jnws9vfss8c6il833v0c4q7zm1jl5"; + rev = "2f28ea843bcdb378b171a66ddcd568516e431d55"; + sha256 = "12b72xhz3ha18xpcnc54s4ic19jg4i6v8dka8lxky6hymzw408ir"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-05-23"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "cdf604a5703838f65fdee7c198f6cb59b563ef6f"; - sha256 = "0iwwykp4ddw39blb8v3miw3l7xm0bsy6yzszb8pmli5cd6fgqf69"; + rev = "eab43d63cef832801a701812913e4d1d726725e5"; + sha256 = "1r3i3zx11apsihv66f10x363aigml4kfb178kdblxxffn014n728"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -6707,12 +6719,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-05-29"; + version = "2023-07-14"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "c020f660b02772f9f3d11f599fefad3268628a9e"; - sha256 = "0w64jq8g57g6wacrz1yx9mfjmmd82qfcpia818lfa4594z1amfg3"; + rev = "85b16ac2309d85c88577cd8ee1733ce52be8227e"; + sha256 = "04ylr1jcj7bbcsrsx2z84savkf1yqaisymq7gsnhvzmbpxxwb96g"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6743,12 +6755,12 @@ final: prev: nvim-fzf = buildVimPluginFrom2Nix { pname = "nvim-fzf"; - version = "2022-07-12"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "a8dc4bae4c1e1552e0233df796e512ab9ca65e44"; - sha256 = "0cyq5rq029hnk9p3qw6gfhxvqiz5m788i4w6n4xxb6wif642bd4l"; + rev = "45d14cd66c160b199b3c5cef0e7c81793dc2b1e0"; + sha256 = "1qv7k1nvh61sd24k0c1iayhv3xw9vx14ciqgdmfggl8d4cfvlg21"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; @@ -6767,12 +6779,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2023-07-10"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "48e18669eb7bb7d6e7cb3d86de1082924f5fddd2"; - sha256 = "1jmx7sr5am4xz2id93c1g6a4pnd0ni361469i15qj4n757n90f8r"; + rev = "571f25463a2a4c512b7c2617c976beb8190d2621"; + sha256 = "1wxy0nwzg72i586a1zq8q17rbl116njbrwnbyd2xn1g21887myhm"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -6791,24 +6803,24 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2023-07-01"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "60ee461c30953d2d1dc3895d01af995b24cc6788"; - sha256 = "09ikihpskymbawk5l4n4xc25dhmhywiwlsklimcwhj2bs4vngpa4"; + rev = "231547093a788b925b8fc36351ad422701c3a8c8"; + sha256 = "186bpqmb1w18zq5sgzy0xj1cs24sb5sqpm3rqsqyhjbybgcf56yn"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-07-07"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "67729d0c6218749937b9ec075650f336ad0a446b"; - sha256 = "0w286h8y3bzk19gc5rshccp005pg8vb7yv7c0s815c9dp7lbg1va"; + rev = "7e67fa948e32ad54f790023ae7ab0bac1a1d10fa"; + sha256 = "17r8adn2rw6b7914sk2i3407qj4ji8ph4b2dsjmfwrar6mixg411"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6863,24 +6875,24 @@ final: prev: nvim-lastplace = buildVimPluginFrom2Nix { pname = "nvim-lastplace"; - version = "2023-06-05"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "ethanholz"; repo = "nvim-lastplace"; - rev = "aeb0e0bd399288092729da89a9e51dda4ccbc9ec"; - sha256 = "16b14l4k9lwlhbjzqqj0dn4726jdfwa5iz0sd2a1akvwq5r83rm5"; + rev = "0bb6103c506315044872e0f84b1f736c4172bb20"; + sha256 = "0a5bplxsds8y054jbgcwd0j0hzj0knazdmir54byd2bm57l78qcf"; }; meta.homepage = "https://github.com/ethanholz/nvim-lastplace/"; }; nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2023-07-10"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "bb9ec720aa998252951627f811e8f39b76789e0a"; - sha256 = "03anzn14a8fc14wzv9m98f2flhn4lcn66g4c053r1bc9p54k21p0"; + rev = "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9"; + sha256 = "0i0lppncxz7nmd683sz79063nr9yds46lyhkkxjxj853mskjisii"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; @@ -6899,12 +6911,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-06-22"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "0b99416769e87231ce37aec64b4ed91feb43a98e"; - sha256 = "0skmm7j2js0idqprns1jhknqnfvm88xxx3k0z3il0n2fibnd7kf3"; + rev = "3db039fb36bba925f096a659fc4d1b4a93f7fb70"; + sha256 = "1kwy1rc2nd6krvy3n4dkyxl0a2dzfl3viyrfrbzypv321p60jyyf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6935,12 +6947,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-07-08"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "deade69789089c3da15237697156334fb3e943f0"; - sha256 = "09m1ix3wv3n7r5i5sakh3c7gh3zlvsnckjy4gkxhhpx5sdckw1h6"; + rev = "b6091272422bb0fbd729f7f5d17a56d37499c54f"; + sha256 = "1miar4bdf60s4gp55rc9918v0k33w2mnqym9b44mqkxzn2fbsrh2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6995,12 +7007,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-07-04"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "cd50bfeae9915b827289141ee9914b79fc8887aa"; - sha256 = "0rwzcq4lhq3qibn5p290yp3ly55cg0l64csw9y8xnjr73jc9l164"; + rev = "92e2085f08da4598c6ae0c19c332c5c04b33a2c5"; + sha256 = "1rv6lqr8pfa53v94l25srjmgjglxpvzxl8kxan03xyiayh5k5nbn"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7031,12 +7043,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-07-08"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "6e8850a524307814decc1b195a2c8a51482a9886"; - sha256 = "1js5vdjc9rs2gi0g7b2lkwxs9assnykbc9i2f144b3ky7yhiisbw"; + rev = "9c89730da6a05acfeb6a197e212dfadf5aa60ca0"; + sha256 = "1ginwysk4apjx2f045isidnzw863zrv272bdmzh247vi5za57c1k"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -7115,12 +7127,12 @@ final: prev: nvim-pqf = buildVimPluginFrom2Nix { pname = "nvim-pqf"; - version = "2023-06-20"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "nvim-pqf"; - rev = "90c7e33245e807eea85fadc6360a1d053406bc2c"; - sha256 = "1rcvp90ipsgv33if63a0fivfp5gi5qrgk6z8s7kycwdqkcf2fzrq"; + rev = "f0ab5ea8388af8e6c1a7f7cdc07292b07c02662d"; + sha256 = "14m36146n0bbc0dfwpdyj4bcszaj31qfr7vwk70lhd1gynbsc40g"; }; meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; @@ -7151,12 +7163,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-07-11"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "1c559f44cbde8a3637a48b6b5f44e201aff4e1cf"; - sha256 = "1nybh0n5g2sz0n4j974i173zv5byqly5k26km88kygxa3dzlmqx8"; + rev = "d83bf0bf21349d396f365f86a8126747cb72d89c"; + sha256 = "0miw0mw3s73iv7inwhqcndcw4v759d5kvl74yd49n6qn28y0cj86"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7187,24 +7199,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-07-09"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "6edac44e10b94b88bf3067fae937915172a3f825"; - sha256 = "1l954rr5ckf6dr3qcpiambd8ikhrs80i75x9sdvsw99ccrjdfgph"; + rev = "3ba6edeea1390457caaf73e96ab9c086ff6f90e9"; + sha256 = "1c949pvry9qzwrd5736llnqgp4111jrj2gvrkbg8chwm9jyh75a4"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPluginFrom2Nix { pname = "nvim-spider"; - version = "2023-06-11"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "04c6fc14d09823002dae486100745011fc3201ca"; - sha256 = "14310nzyjw7z83m7lqgbw2g0924ikwqi4h6cg9xcmh9ydflvn4dd"; + rev = "b268dfcdd00e75d8c3f3576da7f89dfe14cadeec"; + sha256 = "18ik049anbdcadj3myn5y78qz62x8amrdibr2avkrb0ay9bfvjaj"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7259,36 +7271,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-07-09"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "a708bd2413d467929b5019ec1bce7b1f428438bc"; - sha256 = "1ss2dy68144jsf5ynfmv2nik2yklb3qxb547qq9nd04l3wj8f5n9"; + rev = "273c1700eb68c27dce4e518efafc8144fd7ce4ab"; + sha256 = "1cs0nkjmmd8gqlwk68zqy9hr2s86hybacmqxvf7n69f8q3539g38"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-07-11"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "3af1220e18034eb2ce7d1c8e77055bc3bf3c1c36"; - sha256 = "0qbgh8hvnjb0dg8fqv9w5025sv2z8b9lwcgqpbdcsgqih2g6k84r"; + rev = "f09bcffe0c29a464db24ad8124dd1f0be3fe9ce5"; + sha256 = "07lkgkwnzibsx0syd1js4j5rgpxqb2vpkn0x37zb8x2dxzdfv0i8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-06-29"; + version = "2023-07-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "63f3ffc50b0afc59be1015153d00922498085be8"; - sha256 = "1jvsf80q8dxhdxbphrms755aj4ak58xacpzgs91v5jb5zjcvmsx9"; + rev = "6f8f788738b968f24a108ee599c5be0031f94f06"; + sha256 = "1a7gqxl2l5lhx282jd0hx0mc377scr8zv6xss7jsw55k6y4ad5h0"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7331,12 +7343,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-06-26"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "52f1f3280d9092bfaee5c45be5962fabee3d9654"; - sha256 = "1k0065mn4hb3ama3qxrln24rf7cqziysddvw4anxws85dan5x9sj"; + rev = "9e519b6146512c8e2e702faf8ac48420f4f5deec"; + sha256 = "1asdjyk9kp4aip9qc2q6ic2jkc8g3ilzjqvxqskjc2jq21fyscp9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7355,12 +7367,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2023-06-22"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "7f625207f225eea97ef7a6abe7611e556c396d2f"; - sha256 = "0rr0kqr4v2pf9r31sw5mk8xhrlp1nq8bhbmghi18gxxg2qc58p65"; + rev = "e9062e2dfb9854e6a927370f2d720de354c88524"; + sha256 = "198mh7n08824mxnqhxa74fvv0nlsy179qigjzla4fny5y3yxrjq0"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7379,11 +7391,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-07-09"; + version = "2023-07-12"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "d2ea7b31b805cf4b7a05d032d0ec9d356345d3df"; - sha256 = "1xa6khjjq6l9269dnhsgkiq18hjf52f4dp0n622x8bmmxifql9ja"; + rev = "b3120cd5ae9ca524af9cb602f41e12e301fa985f"; + sha256 = "0mjg0pkd8wv8cfar30lkyywdrd3g5lz36bbsfb7lrqi7kbksyzxv"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -7402,12 +7414,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-06-25"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9"; - sha256 = "1i40jzpx710amxm7hgy0ac8pda6bsmkm4r110z691c1l0i90ppwl"; + rev = "efbfed0567ef4bfac3ce630524a0f6c8451c5534"; + sha256 = "12hi19zdwflqqg81n35b696hqalbyxvskf7w8qzygcxg3830kl8n"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7450,12 +7462,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2023-07-07"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "e31cbf722290b640cbf80634792fcaa27dc7b699"; - sha256 = "02krpnqg1k0hnvrhrvk2z7lb1lg38w355xs63p4i34nrmnc5fygp"; + rev = "07f161a0252f7ad1cf22a1ba4a567b41d9aece97"; + sha256 = "086qy6zqjjnjml8msxi34zx79cvqfmnv4lgg8gz32m3gpllazvkp"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -7510,12 +7522,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-06-30"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "a5ff72a8da0df1042ee4c7705c301901062fa6d5"; - sha256 = "105ldc37iywalh82snfr3rk750hz7vszi01ipzbfzd8hqvwr930g"; + rev = "eaa20a6aee7c4df89d80ec8208de63ec2fa4d38a"; + sha256 = "0zyp32nb0xa882i6rjwgs94icpmwpww22g7v1laz0ldm4vkn0qlj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7547,36 +7559,36 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-06-12"; + version = "2023-07-13"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "462b45758ea94ff30ad48979268094590a6b7b7e"; - sha256 = "0m7alckgwnqzv9zycrvpisnx8bg2n8057j8lvqjmx4fagfnr8nmh"; + rev = "cae5fdf035ee92c407a29ee2ccfcff503d2be7f1"; + sha256 = "0vnsihlwq930hm8f8j6h4ixbk4rrrmqjlkw9q5nd3x38k899iz0x"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2023-05-02"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "4e983447f0442dba1629cdaeddfd137793d71d28"; - sha256 = "1vg5zfzyl9c93w9i3d4i22px558warma9gnpafgklrxkwq1hxq0h"; + rev = "57b77747694ea5676c3ca0eeaf9567dc499730c0"; + sha256 = "1yr3yywisqwdd3b7xbmcpc3dlq61mjcaspm30j2iqzs000ldbpxf"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-07-05"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "9454a13714cf771f6c61c2abb3094c0737d9d176"; - sha256 = "12nbm4p421jcj17az0vmk4cj44ixm0v2i2i6p74llpwn7bzdza3f"; + rev = "5b447b2d5937a66033084b05ced0f79bcf6e6f64"; + sha256 = "1czja1d558f303s9dbsr724a3vxgw0lhglzq4n614ljzwy2bwqx5"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7655,12 +7667,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-07-04"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6f73b461b9f887968d0f69ab3aee6b4ceebe3445"; - sha256 = "0j3sms9f50nrp4g3brvrnzfa2nnyw03ghc5vrhn5qp213b66bgl2"; + rev = "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b"; + sha256 = "1snqqrpck8wgkc67dzcy6y0y9n37sipkaq6fxxy1h71d8363vkwd"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7847,24 +7859,24 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-07-06"; + version = "2023-07-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "bda256fab0eb66a15e8190937e417e6a14ee5d72"; - sha256 = "1rsybpshyvzrfzn4dnbhqawn7inrmsfb84rmsklf781chzfjp49l"; + rev = "267282a9ce242bbb0c5dc31445b6d353bed978bb"; + sha256 = "10pw38dfzjrwzwkby9jmghafwwcph3az5z3h9c8v5kjh8iqls6x1"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; poimandres-nvim = buildVimPluginFrom2Nix { pname = "poimandres.nvim"; - version = "2023-02-17"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "olivercederborg"; repo = "poimandres.nvim"; - rev = "43ea31d1e19f7603697bb3272b233930d0292383"; - sha256 = "1q3xszkwlz008n9dh3q2agii6yjk45c47k38g3fj7ssgzmq56q21"; + rev = "6f281c8765fef5aa4d004532861b726b1f73721d"; + sha256 = "0qpv3mkchvyyixnwi771n8n2xw81sxpw4daycwbm3wfj9r7739cr"; }; meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/"; }; @@ -7930,6 +7942,18 @@ final: prev: meta.homepage = "https://github.com/sotte/presenting.vim/"; }; + preto = buildVimPluginFrom2Nix { + pname = "preto"; + version = "2023-02-10"; + src = fetchFromGitHub { + owner = "ewilazarus"; + repo = "preto"; + rev = "d7f5205ab63dcbfa80abbc18badd51aa0d9965b1"; + sha256 = "1l9s6linmjy7wlxsp4gipffnxakwvi1037phcnsr294c920d4dz5"; + }; + meta.homepage = "https://github.com/ewilazarus/preto/"; + }; + prev_indent = buildVimPluginFrom2Nix { pname = "prev_indent"; version = "2014-03-08"; @@ -8161,12 +8185,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-06-28"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "859289acc0fda13bf42834dbeef10b8c1148d444"; - sha256 = "0nipkn9yfgy3606kkaiyq6rvmasq4jmivdnhr102bl86xsccm4yw"; + rev = "5359e74291164fcaeaaecdea9ba753ad54eb53d0"; + sha256 = "1jskfd63n3r1slwhbv1qv239nd0mp3q7h4r9fardkc4xf7nsy1jb"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8209,12 +8233,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-07-11"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "80283b7e384a533ff8296a97362f7b1a1c1af83f"; - sha256 = "0a6vjc2dsj724nxi8szhhqx178ghif08qgib4g8lrvlix1lw56a8"; + rev = "22673c848768ff25517154a5aebfebc0c77d0b4f"; + sha256 = "1arfcrq4vh3hp4g8s6qib25cykn7v9ywfb8nv9mh8nivqryvmwvq"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8341,12 +8365,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-07-11"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "eda3a7014a948e36c330934c7d49c7d86b2fb71d"; - sha256 = "0rfasa1rzyrjid8nl0dzd7prj5ys0mg768znlsdhmn9wnh2lmnll"; + rev = "8a84a2ab739d0cb5eff461f2635a32bf9a0c508d"; + sha256 = "0x5kc8r6z8m7arhxv2nq723fzdn7c5xvmsxpp5jndvbk6nmh6n78"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -8473,12 +8497,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-06-28"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "3574508d9a48caeb8813bd58080024b8363589ce"; - sha256 = "0s53nxvcyjp90frcvlpfpl5sn9x28kqfiw80bj2j8dbhkmz395k7"; + rev = "7de5e1577800560b2a94c0618fdccc67b74fa620"; + sha256 = "1prq9q4mcy9035n8vganwgcmdxr7xpg8dscrracd4mrny5bhx20j"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8618,12 +8642,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-04-24"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a9b2a3e83ed4fa7a5541e41be9becaa7b436edcf"; - sha256 = "0zfgi04c42n1bf5l9zj4g5k60fnsp2njf12vkpfnq2vqdcj1563i"; + rev = "adb066ac5250556ccfca22f901c9710a735f23c2"; + sha256 = "081ccy3s94js343ywr24jwky3qrmk508vddm5vrhpdgrpni2z2zm"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -8750,12 +8774,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2023-06-25"; + version = "2023-07-12"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "95a700875530a1ad87232e472fab307ee2a553ba"; - sha256 = "0gpj66dwx7qf7gk6qp7sxabfykfq5b8qgzcwm097mv1kzxyp9fxl"; + rev = "4073ac528b5e552a6b4347cacca9899f74b98843"; + sha256 = "1sa4dmckx44l6dhmxwgs9nslwz752fhslr2y84zb7gdjqd9w3wmm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -8775,12 +8799,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2023-04-25"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "6545397ee8119c43f5717600a42ad4b44be0f572"; - sha256 = "1i71l565kmfqrl691ccs1p12v3rig00j4bvl9qg9fhwwxk61bcpx"; + rev = "cf2c61ff3448be41b264ee850eeac16cacd7e5a9"; + sha256 = "0gpdsnzwk9hvr2302rc62nxsvv895525q6iy7pzracjqlh29ljbq"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -8833,6 +8857,18 @@ final: prev: meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; + starrynight = buildVimPluginFrom2Nix { + pname = "starrynight"; + version = "2021-09-09"; + src = fetchFromGitHub { + owner = "josegamez82"; + repo = "starrynight"; + rev = "241a94cb0a206efc6fc5f403834c39baf7ad1176"; + sha256 = "1g2vvvvw1qg9ipfkpvijmkswa6rhh3rnizjmx1h5ghkvgxsr1ryl"; + }; + meta.homepage = "https://github.com/josegamez82/starrynight/"; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch.vim"; version = "2014-09-21"; @@ -8871,12 +8907,12 @@ final: prev: substitute-nvim = buildVimPluginFrom2Nix { pname = "substitute.nvim"; - version = "2023-07-03"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "7412aa56dedc3f507cddb02167a939e55b39a2cd"; - sha256 = "17pjl4sl62myfar9xv2axghyj0dfllzr611qzh14a2kgf1x326n6"; + rev = "89dbe55cccee36bcb5e2be8c2d92ff8716601734"; + sha256 = "01cwgkgf8kgi4x4flwwfaj4qgafvnzaiixn68im4279rm6m1ic6y"; }; meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; @@ -9016,12 +9052,12 @@ final: prev: tabline-nvim = buildVimPluginFrom2Nix { pname = "tabline.nvim"; - version = "2023-06-03"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "kdheepak"; repo = "tabline.nvim"; - rev = "1f77f520249d508eebff462e103ed699ecf5dc5f"; - sha256 = "1c5hpjv7w6r65kadrxywqbp21k527pzrpmqchyxcjjplc1gzq9p4"; + rev = "ff33d12a20d52daafa5393162cae4108faf8128b"; + sha256 = "0kcirs2b1398vwgdn045rfbpx6qrai7nxwsbwsvykwk7glmaa8vh"; }; meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; @@ -9209,12 +9245,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-07-01"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "e03ff55962417b69c85ef41424079bb0580546ba"; - sha256 = "1agwrhwb6w0qpcgcmffibnip61g6dqjzmchngb1a9fwxqvzrgfll"; + rev = "6c234e863444c246611ad7458185c771ad8cd6e6"; + sha256 = "05bd8yw22hp6lj732dhffq8wpy13qslwv2wf8rlmza2m7am4jfiy"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9340,6 +9376,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; + telescope-sg = buildVimPluginFrom2Nix { + pname = "telescope-sg"; + version = "2023-08-02"; + src = fetchFromGitHub { + owner = "Marskey"; + repo = "telescope-sg"; + rev = "df40e78ed1c1ba3cb3591a799c8e4292c88e1ff0"; + sha256 = "0mqqh15jl7y4i1ycb5lpw9fvad4qm03vw5x7paxw8h2yzi39qp0p"; + }; + meta.homepage = "https://github.com/Marskey/telescope-sg/"; + }; + telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols.nvim"; version = "2023-02-19"; @@ -9439,12 +9487,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-07-06"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "276362a8020c6e94c7a76d49aa00d4923b0c02f3"; - sha256 = "043rrifqhg5bsksqhfdc20f96i2s2xyd6qyga4918fr75sf8hmib"; + rev = "22735947d84d78f29436c203f0a4b8dc15dda204"; + sha256 = "09vy6kmqrnk503vxa7v9z526lv7p3h76fcpcacq1n2196hrjdrxx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9487,12 +9535,12 @@ final: prev: term-edit-nvim = buildVimPluginFrom2Nix { pname = "term-edit.nvim"; - version = "2023-05-28"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "3c2385d5d058720928a96e77c405466478fb711a"; - sha256 = "06qkld6i542p0hh2jxk80n5xfrf0jklg4b7vmkm6imvkcj705hdc"; + rev = "07bfebde433d3de5d3f53494417413d5a3f7292b"; + sha256 = "15mm09wqn83pnqp0k6js0j8g0v71bmf7wda64vbyicxc9xsrxn7q"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -9692,24 +9740,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-07-10"; + version = "2023-07-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "83aa231fa414a5dcb72aed97437446a6ca5a81f2"; - sha256 = "0dhbc9s9irzamlv7b8qdamixvh4nf1p7icszdbd8jwks9dfhm9mk"; + rev = "00c13dccc78c09fa5da4c5edda990a363e75035e"; + sha256 = "0fvz9rp8rr63pimhpzyx5a05qbgyzixbbglpvkd137bpvya2xigy"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-07-05"; + version = "2023-07-13"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "284667adfff02b9a0adc65968c553c6096b543b6"; - sha256 = "0r9scw1r8vd761pqf9zl2aly70xc04h8fqy17ra49p879sx254wd"; + rev = "1ee11019f8a81dac989ae1db1a013e3d582e2033"; + sha256 = "0ygrwps4riq37wxwzplw2jyxi7qc7yagypfd444vp0vklqnslvn7"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -9776,12 +9824,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-06-24"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "d99e2abd10808ef91738ce98a5c767e6a51df449"; - sha256 = "0j5ypv22qahic4lch0k3vssxwnbdngyx2b5h532yn4jkjlph5y0y"; + rev = "fc4bb22b1d2cd5eb46fe61a9f6d6416d742beb5c"; + sha256 = "0mhhjl4q45bn0i22jqri6v3rp24d7l3k2q72ggx5i1xinxls3ap5"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -9860,12 +9908,12 @@ final: prev: typst-vim = buildVimPluginFrom2Nix { pname = "typst.vim"; - version = "2023-07-02"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "5c1a933d6e8178d8d2596165b1709a7605b26d11"; - sha256 = "0pm56qlrj27y8krcjyiw17mpfb3ggl1898zj41fdb8zbhj36mj18"; + rev = "6a99324a138c2da69589a8ab2e49375774e43d77"; + sha256 = "085ksm9mp2w93vm22yabg1xgnjv4wd6yg3ivakqhghyk5x2qk9xy"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -9908,12 +9956,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-07-10"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "2db2ff26f1537d75e9c20e594344c4ea8459d344"; - sha256 = "13xl7winslmalasc01x69zdnhr1q6amzg7808hmc97vj770y85rm"; + rev = "3a2d7d78b310f6ddde939042fa04b553012d2c7b"; + sha256 = "10741mmqls1ys0cd7kab1cn7sjby8f9fhap57jh01nhjkkqbfz86"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10004,12 +10052,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-07-05"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "2d8b2d2003c01e1fada6ec23938f6f983540a2a5"; - sha256 = "1hrg0172p85q227x8w070jx5qglnl4wqm9n48hcg10wn9sncm6xw"; + rev = "830e7187949fb6b12cfa5c45acb98d3ffc320d5b"; + sha256 = "1q5039fcm1skpxxp01lqvcx0hh5hq331zxwcslva8v38wy195pqw"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10352,12 +10400,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-05-25"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "423fe9e2acbe64bd8637d0bedff132972d7603de"; - sha256 = "0cy78kd37q9nzk9f9f3k2aip1bvrcqra4ka02v2pnyr4a00iripj"; + rev = "e6bb8427dc2d2dc3583ed1bf5ff6a9682c854d32"; + sha256 = "0sbhpp8w1rdrh386j3q4n2zrwq1ipxb9107ddwlgs89nh5wbf4qv"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -10470,6 +10518,18 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; + vim-astro = buildVimPluginFrom2Nix { + pname = "vim-astro"; + version = "2022-08-25"; + src = fetchFromGitHub { + owner = "wuelnerdotexe"; + repo = "vim-astro"; + rev = "34732be5e9a5c28c2409f4490edf92d46d8b55a9"; + sha256 = "1ild33hxiphj0z8b4kpcad4rai7q7jd0lsmhpa30kfgmyj5kh90z"; + }; + meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/"; + }; + vim-asymptote = buildVimPluginFrom2Nix { pname = "vim-asymptote"; version = "2014-06-26"; @@ -10832,12 +10892,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2023-06-05"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "978be3a98e49e166b572c9618206061ed74603e4"; - sha256 = "0q7baxh2ckq0b0ycyyg7p0jq7b3wvlfgq8c69bd2dm5gdbijpq08"; + rev = "d05d1ab602048fc13fd8cc70cd722c083b0fd904"; + sha256 = "1v0117rahgs2ap650xcqv48xmw2yk5qiz6rfny7q0vz9pvy9p1s0"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -11000,12 +11060,12 @@ final: prev: vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2023-03-08"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "5687a7978bc80263cd03d0a667c2f56890cfb940"; - sha256 = "1bm5ay1c9jw34ax9bxivq9b3crfgizphfq40rd406jdyg72ahgbk"; + rev = "6cc65734bc7105d9677ca54e2255fcbc953ba6bf"; + sha256 = "1mjry4xiaxhjgzajsbmh4iph9hhxbwgdj3raaxlqzmmnyjsz03iy"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -11588,12 +11648,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-06-12"; + version = "2023-07-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "43f18ab9155c853a84ded560c6104e6300ad41da"; - sha256 = "0s9kyid27bvpqb44hirqvjp33lf7hihw7yj0s2kwv9aif0k6mbw0"; + rev = "b3b838d690f315a503ec4af8c634bdff3b200aaf"; + sha256 = "1y4jvrja0d77hsr24mb9bfgls5vy12r8g2bmsbsx40zvmwnlh294"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -11696,12 +11756,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2023-06-16"; + version = "2023-07-14"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "4a7ca061af2b199a9b97041270611439e8fa2b02"; - sha256 = "1pqn6g925i4a88d4n9hxjb9fwr7ib7mwslxhl3cphzk0986ncdjf"; + rev = "8a2f8199b689b93fe4391a8ba1d97dd84b86ebd6"; + sha256 = "1jxp27mmp84gkjll0h96q9zbh8gs1dsb46cvqnbqvag1p3laxxlq"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -12129,12 +12189,12 @@ final: prev: vim-isort = buildVimPluginFrom2Nix { pname = "vim-isort"; - version = "2020-08-14"; + version = "2023-07-12"; src = fetchFromGitHub { owner = "fisadev"; repo = "vim-isort"; - rev = "94b1f1202899aa0b6e2cc20e6d1f133eafe24331"; - sha256 = "16r2nsdapf3r0zjqwwbl0k8g2p81h9zs14b91dhskyvs0hvf7cfy"; + rev = "757c2c830ba0365167460c26f304f3472dfa2ce2"; + sha256 = "01la7hmf9z9iqv1n4lmsihsny6wsjzqa5c7prws88jkmryrvjxdb"; }; meta.homepage = "https://github.com/fisadev/vim-isort/"; }; @@ -12322,12 +12382,12 @@ final: prev: vim-just = buildVimPluginFrom2Nix { pname = "vim-just"; - version = "2023-07-09"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "ceabb579cf085cee5ebd361625c237cb565f5af3"; - sha256 = "04vs5zl8l5pvddk267jfkzlkghiddn5pqgjf2aw86yfaaxg6i8r4"; + rev = "2a94aecd8eb53e1147392da33df8ee4ea6e482d6"; + sha256 = "0n8vq3a4z9yl3xidg2gbclwwwjdd82kixqjjdm8z03d8vy59qg9r"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -12646,12 +12706,12 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2023-07-04"; + version = "2023-07-18"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "8c5a4d28a4d315db3d64cc2cd3859dbad675fb66"; - sha256 = "1xg0vsijcmp4sjsk2cz3379zyhrqs7fin15gsknzgpxwnmpjfg0v"; + rev = "00f8620cd53f569dca26594e9c94534f03fe16d6"; + sha256 = "0h0m7mmc5x15mpq3af3n95nqfzhhb2mnw0rbxpr0xizjc2hcpg9z"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -12695,12 +12755,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-07-11"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "3c4ccc489002fe72b5d2e2ffc4b3b5a7d3ab65d8"; - sha256 = "0mpvqlk8a7vms2j29mpfpkqa1pxsncqr7flsg6q6z3cdqcrgh1j2"; + rev = "0646093e07b1f89b16536cfb3dc4993e3f0ac653"; + sha256 = "117zdg6ibnnnpl03r6dhb71hm3dw6h0y2lxbkj8kl5b0gk8lapph"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -12947,12 +13007,12 @@ final: prev: vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2022-04-25"; + version = "2023-07-21"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee"; - sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av"; + rev = "b5da592a45418d02b116ebf686ee3786b419d80a"; + sha256 = "1lb6zxz577zmyjsrk47apvyik7hl3xbrls20fxx10qp4ksnjms0q"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -13221,6 +13281,18 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; + vim-paper = buildVimPluginFrom2Nix { + pname = "vim-paper"; + version = "2023-03-16"; + src = fetchFromGitHub { + owner = "yorickpeterse"; + repo = "vim-paper"; + rev = "47f6ca5452a718c2e3b95a9c75932d34b2a8f5ae"; + sha256 = "04wj853rlxm8bzzcasc1ib4npf8m81nwrqapxpmh7pv3hcg56k69"; + }; + meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; + }; + vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; version = "2022-11-29"; @@ -13871,12 +13943,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2023-06-23"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "a096a2969fcb807fd5c6a75d943c6227dd9e6a38"; - sha256 = "1jhkrir48kbdhd95659b7rmbavb75c05zqjvzz4f633i33j32bf3"; + rev = "99cc4af89014971ca65748b32128d15b008c979c"; + sha256 = "1sh5k3w3d81gnyvsfy70vygvvi3rsk8wbyh1n30k0fl6b30j4pb6"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -13955,12 +14027,12 @@ final: prev: vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2022-10-27"; + version = "2023-07-12"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "93395f5b56eb203e4c8346766f258ac94ea81702"; - sha256 = "0aylgy7k8k6f058z3zmz9vsmigff5f6lfjzciqyccksjaji9c0kr"; + rev = "29ec9167d4a609f74c130b46265aa17eb2736e6a"; + sha256 = "1n7y5i8zbr04n48n0l4k1xp76pgrbd2lx0pnj4278ply88hgfg9f"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -14256,12 +14328,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-07-10"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "155342d6c8137a8a5dfbdbfca2de831643b2e006"; - sha256 = "147vrnwal7l306l1r9cyd2hrdams0ghzb1fyf9c7yfihak2ag2jg"; + rev = "63d317c2f6c34e561987d4ab0aa003d8391c4033"; + sha256 = "0blxanzxlszxl5yyn21wix99slgbnsdib5bc88rngsvwvr4j265k"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14988,12 +15060,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-06-27"; + version = "2023-07-19"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "02c8da857bbb1b5fc2cf7dfbdda85ba1201a8d8c"; - sha256 = "1r4j4hilfrccrfpq08i24qdc7560lra3zvwd15y9371nkgbvrjqg"; + rev = "95791ba3eb2e7d60de7faa4d5c13280ade356a0b"; + sha256 = "1ss0aa2m7163yavqzxrjjr90fxbkik8mhilkwz1vjhb434wa8rnh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15001,12 +15073,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-07-05"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "bab96ed04dd951b22663b08c670ff33960fc6419"; - sha256 = "1mpy9wqdy3bpgsd1727pn2nxpjhhxlazfhcykccqcjnx2m1k00wa"; + rev = "877de3ba5de5f766e5bfa1c3fb0d2ecfcd18f868"; + sha256 = "1yyz90a84n6npa35ngb9hb8fv7ir89f1nv89c5ps59fxmdivh9sq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15121,12 +15193,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-06-19"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "d871f2b664afd5aed3dc1d1573bef2fb24ce0484"; - sha256 = "00078wm0j2d2yzfqr1lvc7iawkzznbfzf7gq3c0g497pzhvhgl2q"; + rev = "38b990f6eabf62014018b4aae70a97d7a6c2eb88"; + sha256 = "08j58jc3ja1hbg15raj2xg3ff3wyjf09i42qda84b1iq0klrlxnp"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -15157,12 +15229,12 @@ final: prev: wiki-vim = buildVimPluginFrom2Nix { pname = "wiki.vim"; - version = "2023-07-06"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "ba0dfb47cdd3018df2cc46ce045e93b5fbb394ca"; - sha256 = "0gchas7sfb602cmwwqfbzd7g65ph1vvj1rc2rq5b828ncqin7ww5"; + rev = "4bd7d1b21a0197f11b336cefb434132b5e595dcf"; + sha256 = "176v8idcjv32q4kywdrr5xqpj849ckcdlvqybv04mhd6wcnq3xzr"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -15181,12 +15253,12 @@ final: prev: wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire.vim"; - version = "2022-05-05"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "gcmt"; repo = "wildfire.vim"; - rev = "b371e2b1d938ae0e164146136051de164ecb9aa5"; - sha256 = "0lpv10330818aza0fv8adzswnq8jq47z043p6gqfn7b7h2visy5p"; + rev = "dfcf48aad2e80c63272df67a1b81e37cbc443412"; + sha256 = "1m8i737dayw1fs67k1lszgs5zgfqm8krr4scp287cackgvg1kznd"; }; meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; @@ -15324,6 +15396,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yescapsquit-vim = buildVimPluginFrom2Nix { + pname = "yescapsquit.vim"; + version = "2022-08-31"; + src = fetchFromGitHub { + owner = "lucasew"; + repo = "yescapsquit.vim"; + rev = "68290b5869bebe093ccc87ee80d15688ac2b104d"; + sha256 = "1wqxmrzg111ri9wiri73kyyms0bg7jnny3d86bvlr8c0wrd5c2vb"; + }; + meta.homepage = "https://github.com/lucasew/yescapsquit.vim/"; + }; + yuck-vim = buildVimPluginFrom2Nix { pname = "yuck.vim"; version = "2022-10-29"; @@ -15398,12 +15482,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2023-06-23"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "0c4f965468259ab6e47fd7c6b2127583a8860eb1"; - sha256 = "052jmw1pzqydg4icsq2s7vn66wyn2ki4lzpln2fzxx9r9hbwfi8m"; + rev = "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e"; + sha256 = "0m9p0055x6j5bz7whln7arz6w7cn02wq4rgs1ynczrvbqd68iji2"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -15446,12 +15530,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-07-11"; + version = "2023-07-26"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "3ffd2f511f3dc6c01258923d7170ccaf1445634b"; - sha256 = "0ry208p1lib2rnmfcph1k29lvm6cccnjvbbzmwrhjkp97m54ricl"; + rev = "737f60a3a25c79d9bb9574092f6c6c958a3d747a"; + sha256 = "0n2jwxzprgn4lryaivrfds78dri9h24q7ablf5lyfj6wcrmcqgk7"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15506,12 +15590,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-07-11"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "bed04d06547910b288f25c153b9bb181fecf52fa"; - sha256 = "1l8x8gp40kpz35rizr0lx003pdv7rv32gr5imvyhlcdvg88g72ls"; + rev = "557e6fd7fbca325a4bea582576fe36bec903367c"; + sha256 = "0cxg1ahl9la3m8cd3sb7s456kmvrxjjsf411imyfgl0rp7632bf5"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -15528,6 +15612,18 @@ final: prev: meta.homepage = "https://github.com/mattn/calendar-vim/"; }; + nightfly = buildVimPluginFrom2Nix { + pname = "nightfly"; + version = "2023-07-19"; + src = fetchFromGitHub { + owner = "bluz71"; + repo = "vim-nightfly-colors"; + rev = "cd68ec3c0a3ca2bf15072dd2040401ea4b89e79f"; + sha256 = "00nfpkpv0li3wgh926azp8xf1zvdh3zc6fx5aznplhs9j6xbdx21"; + }; + meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; + }; + nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; version = "2023-05-03"; @@ -15542,24 +15638,24 @@ final: prev: nvchad-extensions = buildVimPluginFrom2Nix { pname = "nvchad-extensions"; - version = "2023-07-11"; + version = "2023-07-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "extensions"; - rev = "0b8d75a10032d7f0cd0c6758e5f28195a0d62637"; - sha256 = "0b6jacncd3p5znxmwbivc05wbr8xc5pi9n69dvdzbsd9frickwp3"; + rev = "0bfeb74229ad973ce600088997ac8421980f79bb"; + sha256 = "1jh5728mwfpg9pzgd9pvb177ssdzfvs8bsms1mrjcjx7xj2iv33m"; }; meta.homepage = "https://github.com/nvchad/extensions/"; }; nvchad-ui = buildVimPluginFrom2Nix { pname = "nvchad-ui"; - version = "2023-06-18"; + version = "2023-07-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "53b0d0b0e2a30e730865110eb2128dcfee7b87f6"; - sha256 = "04vvklyiy9crg89flfmhkrf907d66j1pf050vzxbw2kida888lc5"; + rev = "47ef4046504e5562a3daf30db50b7d4a1552fcb5"; + sha256 = "1hx7i8z31avpfngqi21izl740p0ryhkf3ys1g76drnzqi6gan8d7"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -15590,12 +15686,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2023-06-21"; + version = "2023-07-22"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "932adb0d9351186db047302de021bb2976756a07"; - sha256 = "1kfq83vr483cizx14gghvckwnh44x20jbvqjac1y60fmk8b18plb"; + rev = "e10340767534b4988992de838d6c811db63b74db"; + sha256 = "1a58a3xdl3wvs54sbmyyjs6mps8icp7r0g287i3h5jam10vabw3n"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; 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 363193ff13..8c5562b8ba 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 @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=787bc6e"; + version = "0.0.0+rev=3446bac"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "787bc6e1ca23092821231f6096438343f728ee6f"; - hash = "sha256-PKjSNEy27Snu9B2eBZcOQYNXI/cnKhFdrBrePqcp7Rk="; + rev = "3446bac828d5db2a6cf60ab31813c02ab53547a7"; + hash = "sha256-E4mRE+CtuI/s3LlVcT/VFhFdFakRXvSr7/v4gaB4H+U="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -126,12 +126,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=a60f1dd"; + version = "0.0.0+rev=ad09589"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "a60f1ddef4702fc8a82a9bfc207d0cf453d748bb"; - hash = "sha256-7MNTbIQT+7ksV2vmrIZzBZM1BlCdGI7P0DYw0sP6hvU="; + rev = "ad095896dd223f1c22b85ac5ec84ab11fb732b07"; + hash = "sha256-0SqgOjsSFQkDeJMmF9mAgvbgnm9CCuFTYCUJo4zjCEU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -159,12 +159,12 @@ }; capnp = buildGrammar { language = "capnp"; - version = "0.0.0+rev=7d5fa4e"; + version = "0.0.0+rev=dc28c9f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; - rev = "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"; - hash = "sha256-K83xouIGsv9EDLp4MSH9i6JE/GlAT72i3eJa58vR2gs="; + rev = "dc28c9f4212809eab74d10996086297853eb34e5"; + hash = "sha256-4GcOBC5JJsfbdsIrQd33tSW2sz6ytjYGqWgFVFLH6sc="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; }; @@ -258,12 +258,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=0e7b7a0"; + version = "0.0.0+rev=f88bf81"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "0e7b7a02b6074859b51c1973eb6a8275b3315b1d"; - hash = "sha256-s5QRDs4W8TpB+kWtwXIvanP+Ii7hQgUI/yu0rvDUIg4="; + rev = "f88bf81238ec2842682e4d1dac0acf3b43b686e9"; + hash = "sha256-9GOzjjIA/RXNLGlFSyvir4cHAl075TSW10AsOlJec0k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -280,12 +280,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=c9ba632"; + version = "0.0.0+rev=2af3d43"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "c9ba632aa68d24f32d2f97e356795f45f85e6c55"; - hash = "sha256-2Wtkmlzhq+ShqFUnlofeFEN24toLaLD/O0/zSzbEZEE="; + rev = "2af3d43cd96dd3f3c3868095222c7f5e2462b3ab"; + hash = "sha256-ZwinNfhFM1u4qplHOFR8xKphtSjENS+o4u9RUgEnOHg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -403,12 +403,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=7be3905"; + version = "0.0.0+rev=2616034"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "7be390548a870ca9cb1bd7f59ac92457bbec7bf5"; - hash = "sha256-Id+c414ugW3PXOWx75ZMoN13qQdiyWs0cab9mNdT8/A="; + rev = "2616034f78ffa83ca6a521ebd7eee1868cb5c14c"; + hash = "sha256-KY/qeIKWaXUCpA7hbK3ptfCg/cXoISa6mNYB7a0XY18="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -436,14 +436,14 @@ }; elvish = buildGrammar { language = "elvish"; - version = "0.0.0+rev=f32711e"; + version = "0.0.0+rev=5e7210d"; src = fetchFromGitHub { - owner = "ckafi"; + owner = "elves"; repo = "tree-sitter-elvish"; - rev = "f32711e31e987fd5c2c002f3daba02f25c68672f"; - hash = "sha256-/3npcIfTH8w5ekLTb//ZCTxuSGhOXkUBaCq3WWcK2J4="; + rev = "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"; + hash = "sha256-POuQA2Ihi+qDYQ5Pv7hBAzHpPu/FcnuYscW4ItDOCZg="; }; - meta.homepage = "https://github.com/ckafi/tree-sitter-elvish"; + meta.homepage = "https://github.com/elves/tree-sitter-elvish"; }; embedded_template = buildGrammar { language = "embedded_template"; @@ -458,12 +458,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=5dba13d"; + version = "0.0.0+rev=7aa24fe"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "5dba13dcd531c19bf99829e2e0bb31f2e08e16fe"; - hash = "sha256-FH8DNE03k95ZsRwaiXHkaU9/cdWrWALCEdChN5ZPdog="; + rev = "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc"; + hash = "sha256-7rhwMBq5u5bVjyCE4j3f5tzY+9jL80Xd5hgkJjlqSr8="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -513,12 +513,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=31552ac"; + version = "0.0.0+rev=482bdb8"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "31552ac43ecaffa443a12ebea68cc526d334892f"; - hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM="; + rev = "482bdb8b8fb7305b928937379820aa6449e359a7"; + hash = "sha256-x2Cm1yUfhlkl8zgbQFPe/IxVNGpX050J3wjsqe7uOW8="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -590,12 +590,12 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "0.0.0+rev=577a075"; + version = "0.0.0+rev=19c716d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "577a075d46ea109905c5cb6179809df88da61ce9"; - hash = "sha256-gBfLmNf7aaqMY3yMF7svFuqif43BAmmY1yYkvVcNUhI="; + rev = "19c716d2f45eac9529703413dc12aa8c76d13adc"; + hash = "sha256-4fevdvH+Mi+MRURUcoDb9v511oaxBgP9U/OOODS/G+o="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; @@ -645,23 +645,23 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=53ca269"; + version = "0.0.0+rev=34e0657"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "53ca269cae2a47b1b75791e2bfe843baeb02e903"; - hash = "sha256-qDysihoyGlzAFvhnu6qOjNTIRT9ii/A1B1wNiZNlJs8="; + rev = "34e0657e37323874c6b67c718a0f83410c4602cf"; + hash = "sha256-tOIwOy0XmDpDPxLWXZQNqxgoycA03oaqbdp+PxJfn+0="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=7a4edcb"; + version = "0.0.0+rev=8c8007e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "7a4edcbc376302efa8d6ba7e235070ab7ee3c4c8"; - hash = "sha256-VvMsFU/HSccB7JetiuNj3O+K/vm6bmDwGWhozyec4Vc="; + rev = "8c8007eaee47702bb0291a3c7aeb004909baab4d"; + hash = "sha256-K8mvDoQXSXwyyYQuwEcV6RBTZFbn4OSi7R1nGoQkDQU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -722,12 +722,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=54c7da8"; + version = "0.0.0+rev=76e02db"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-groovy"; - rev = "54c7da8b167261e76c79513c0364a01836093526"; - hash = "sha256-83JIW+oOKbpqormWiNjU6uI2WAknVnUAXNFSAvdq83o="; + rev = "76e02db5866dd2b096512103ed4d8f630cc32980"; + hash = "sha256-H6Gp7MqGxU1oONq/w8p8pNR3Vhi68dvO+2aHw8anBTs="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; }; @@ -777,12 +777,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=becebeb"; + version = "0.0.0+rev=b553906"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "becebebd3509c02e871c99be55556269be1def1b"; - hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0="; + rev = "b5539065432c08e4118eb3ee7c94902fdda85708"; + hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -810,12 +810,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=ddb6082"; + version = "0.0.0+rev=20c40a3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "ddb608219fa99d56ed98de2d60f396f575cc6590"; - hash = "sha256-UQTXdrHg4OfHnRgSAoo2gGZenE35NOypNeqUCsc4zdM="; + rev = "20c40a3f1bb68c596f56bb0c0290008b9d4f58dd"; + hash = "sha256-mLcl73XNDjkKUvFixPjW4EAO9y++gpitu7e+oym/Mpc="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -832,12 +832,12 @@ }; hoon = buildGrammar { language = "hoon"; - version = "0.0.0+rev=89271df"; + version = "0.0.0+rev=dfa565f"; src = fetchFromGitHub { owner = "urbit-pilled"; repo = "tree-sitter-hoon"; - rev = "89271dfe18f20aa71cbe5ef813252a8f98901240"; - hash = "sha256-UdYucPGeAFexjSxx1RHMWPPJ7KFQs41c+Vi8BSM+Yj0="; + rev = "dfa565f87c8997d43cec725d41f023cc3577ca46"; + hash = "sha256-ogNgjvRRR0KevOlB1PH+cI+HHftq/JrS6pQuIwR5m2A="; }; meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; }; @@ -898,12 +898,12 @@ }; ispc = buildGrammar { language = "ispc"; - version = "0.0.0+rev=848e588"; + version = "0.0.0+rev=0bdbb03"; src = fetchFromGitHub { owner = "fab4100"; repo = "tree-sitter-ispc"; - rev = "848e58874ffa2f7e540a6ec01ab9652b26995f37"; - hash = "sha256-xHX7N3pJbU8c4apoDXEm2VXOn9NH9atG8YfwSMyhHZ4="; + rev = "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7"; + hash = "sha256-udsVK0FCbq6hFl0iLgWdTNbZdKps2avHk0SfJ/DIUxY="; }; meta.homepage = "https://github.com/fab4100/tree-sitter-ispc"; }; @@ -920,23 +920,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=c194ee5"; + version = "0.0.0+rev=6c8329e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "c194ee5e6ede5f26cf4799feead4a8f165dcf14d"; - hash = "sha256-PNR1XajfELQuwYvCHm8778TzeUlxb9D+HrVF26lQk2E="; + rev = "6c8329e2da78fae78e87c3c6f5788a2b005a4afc"; + hash = "sha256-pAo9hYhlLWjWB/n8nq/MzdMXbzOxcFzfrBCrj8xR/5g="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=5720b24"; + version = "0.0.0+rev=f772967"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "5720b249490b3c17245ba772f6be4a43edb4e3b7"; - hash = "sha256-rSkLSXdthOS9wzXsC8D1Z1P0vmOT+APzeesvlN7ta6U="; + rev = "f772967f7b7bc7c28f845be2420a38472b16a8ee"; + hash = "sha256-rfOAn5S8E2RunlRyY1aTs7j0r6UGKH+732xdpk/5524="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1008,12 +1008,12 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=784364c"; + version = "0.0.0+rev=d68ded9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "784364cb9185ef8dc245de4b0b51e3a22503419d"; - hash = "sha256-MPdDEVbIUsEQu84AB9k2Bhi3Oa47e9/tItGhKMfZLyU="; + rev = "d68ded9d5131878a2a06211ef0b47b72e70c6c08"; + hash = "sha256-vPmZ9oA4t2LtQng88UNWkngwmpf2JLRlPOx/PM5mi80="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -1151,47 +1151,47 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=936cc84"; + version = "0.0.0+rev=aaf7679"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "936cc84289f6de83c263ae8e659fb342867ceb16"; - hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM="; + rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; + hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=936cc84"; + version = "0.0.0+rev=aaf7679"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "936cc84289f6de83c263ae8e659fb342867ceb16"; - hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM="; + rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; + hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=676117e"; + version = "0.0.0+rev=1558d8f"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "676117eafa64afedc8380a921a77cd9f2244bc6b"; - hash = "sha256-VB+SO89WAAPh1wj4E1nuHLzNNixBQrF3HcUeqrqV5dk="; + rev = "1558d8fc85f7810fa567292ad2a7e64913fa78a1"; + hash = "sha256-3FKUGmMM3OeRXkS+izu5yrTgiewp5nHN2352t6sYurU="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; menhir = buildGrammar { language = "menhir"; - version = "0.0.0+rev=db7953a"; + version = "0.0.0+rev=be8866a"; src = fetchFromGitHub { owner = "Kerl13"; repo = "tree-sitter-menhir"; - rev = "db7953acb0d5551f207373c81fa07a57d7b085cb"; - hash = "sha256-w/ibFZ4bMPPRTgTJFLQrAzMecykJFcrjJjekKMXwqSI="; + rev = "be8866a6bcc2b563ab0de895af69daeffa88fe70"; + hash = "sha256-CQVEQurf8Ur5xnz+g7e1nck0a32o4oeMOT78thjx8MQ="; }; meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir"; }; @@ -1253,12 +1253,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=14b5361"; + version = "0.0.0+rev=66e3e9c"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "14b53610c9038500066c509b2e67de04775b97fe"; - hash = "sha256-FNq/+Voqg534Nnm7rnv2daPwc9uFxNi1ce0m091jmRk="; + rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7"; + hash = "sha256-+o+f1TlhcrcCB3TNw1RyCjVZ+37e11nL+GWBPo0Mxxg="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1275,47 +1275,47 @@ }; objc = buildGrammar { language = "objc"; - version = "0.0.0+rev=6d876af"; + version = "0.0.0+rev=77e28ae"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-objc"; - rev = "6d876afade2d5e70d394aaf994321c78297e3607"; - hash = "sha256-1LJ5pFslYqgPYoBptSw6SY7pt6syXJoxQUJ5KsybjSk="; + rev = "77e28aeaede824a5f4aa501fb5f3138ab1019b9f"; + hash = "sha256-lK0wy6cEf9RSD9G96ywkUFZrRTk1WYtkdNbI7OBGRtg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-objc"; }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=3ad4d79"; + version = "0.0.0+rev=694c577"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "3ad4d7988edf8b8a9780a1db7a5af657911dbfba"; - hash = "sha256-OOBrAiKdw9dCy5oLPDzta0gQEkeRxNrJWmZFlDoENjg="; + rev = "694c57718fd85d514f8b81176038e7a4cfabcaaf"; + hash = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=3ad4d79"; + version = "0.0.0+rev=694c577"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "3ad4d7988edf8b8a9780a1db7a5af657911dbfba"; - hash = "sha256-OOBrAiKdw9dCy5oLPDzta0gQEkeRxNrJWmZFlDoENjg="; + rev = "694c57718fd85d514f8b81176038e7a4cfabcaaf"; + hash = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocamllex = buildGrammar { language = "ocamllex"; - version = "0.0.0+rev=fab854a"; + version = "0.0.0+rev=c8f90e4"; src = fetchFromGitHub { owner = "atom-ocaml"; repo = "tree-sitter-ocamllex"; - rev = "fab854a2de25b2284582bf7ed7f9970d19988c73"; - hash = "sha256-UmBTzWgjgp0EKAfZEY0uJhvYLHzeNtrMGEUPogx3Op8="; + rev = "c8f90e42e1b9cf9e30b1669c386b8d9de992d201"; + hash = "sha256-cFzurSuO64PwOuJz1Fa0GTDZ2hnT0dHl4NwQhXWQWIw="; }; generate = true; meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex"; @@ -1377,12 +1377,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=60aa138"; + version = "0.0.0+rev=4a02376"; src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; - rev = "60aa138f9e1db15becad53070f4d5898b0e8a98c"; - hash = "sha256-GpgUSm/kFFXgJOSBVBxPQiMfykZUgxLdmQfDfJE3Jq8="; + rev = "4a023763f54dec0a6f986f5bd238af788a3f0584"; + hash = "sha256-8mLzXxkc8m69KOQtIT02MCKeTCuwERT3/Kegf48IEls="; }; meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; }; @@ -1399,12 +1399,12 @@ }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=2d20f39"; + version = "0.0.0+rev=915a527"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "2d20f39476348c2682761ce7251914031a7c013f"; - hash = "sha256-uJEUAMIJ/Bq0YhcQ78UxWcK4LM6qoum+Ett03qli+Os="; + rev = "915a527d5aafa81b31acf67fab31b0ac6b6319c0"; + hash = "sha256-DYNJ/i+VBuTOxuphJn4nklTLfV7GuNP1RCCuf5qAYR4="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; @@ -1463,6 +1463,17 @@ }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; + promql = buildGrammar { + language = "promql"; + version = "0.0.0+rev=4b6b9f3"; + src = fetchFromGitHub { + owner = "MichaHoffmann"; + repo = "tree-sitter-promql"; + rev = "4b6b9f399dc58e408c81da8d8fd7e66ab617eef3"; + hash = "sha256-CaNCxgKL/N6TUcO838iR09tFTYS/kWJLf8whQF/3hAg="; + }; + meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-promql"; + }; proto = buildGrammar { language = "proto"; version = "0.0.0+rev=42d82fa"; @@ -1487,34 +1498,34 @@ }; pug = buildGrammar { language = "pug"; - version = "0.0.0+rev=884e225"; + version = "0.0.0+rev=a7ff31a"; src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "884e225b5ecca5d885ae627275f16ef648acd42e"; - hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA="; + rev = "a7ff31a38908df9b9f34828d21d6ca5e12413e18"; + hash = "sha256-WDx2Y1LxuJJuAaeTxfqQrxRXxVd4Cn3niQeherh+5Uc="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; puppet = buildGrammar { language = "puppet"; - version = "0.0.0+rev=843868b"; + version = "0.0.0+rev=9ce9a5f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-puppet"; - rev = "843868bfb909b734bfb63778a5685fae4bf2a33f"; - hash = "sha256-6fJNADrLVsIoho9G8qCsMKNDB5a32gUntug7Nh8pKEg="; + rev = "9ce9a5f7d64528572aaa8d59459ba869e634086b"; + hash = "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=db1d218"; + version = "0.0.0+rev=7c8930b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "db1d218a4f8fb87145aabeb22ca3c35925c411fc"; - hash = "sha256-v0pWQzO8M9w0ngTUO5eGoTTcBbVu7tRgA993zGfoNwI="; + rev = "7c8930b6388b5590ebef248853f144185a9eda1d"; + hash = "sha256-6QXMocivEFGrmCFJdxz+z+FsAQ6MBd4kv7719gKO4Gg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1564,12 +1575,12 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=80efda5"; + version = "0.0.0+rev=c55f8b4"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "80efda55672d1293aa738f956c7ae384ecdc31b4"; - hash = "sha256-qUfyITSZRnSm4zZHfkM/Dm5AeFEFLcCtRrInx0Xs/tg="; + rev = "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"; + hash = "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -1597,12 +1608,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=e1cfca3"; + version = "0.0.0+rev=2354482"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "e1cfca3c79896ff79842f057ea13e529b66af636"; - hash = "sha256-lDsr3sLrLf6wXu/juIA+bTtv1SBo+Jgwqw/6yBAE0kg="; + rev = "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"; + hash = "sha256-X4iQ60LgiVsF0rtinVysX16d6yFjaSmwwndP2L5cuqw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -1628,6 +1639,17 @@ }; meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb"; }; + robot = buildGrammar { + language = "robot"; + version = "0.0.0+rev=51b82cf"; + src = fetchFromGitHub { + owner = "Hubro"; + repo = "tree-sitter-robot"; + rev = "51b82cfd0c824681b6a282663820a5ce54243e55"; + hash = "sha256-jRLP5LqA/Q3IosK0n5sLJ2SW/wXTo9ia1zpdnos/QN8="; + }; + meta.homepage = "https://github.com/Hubro/tree-sitter-robot"; + }; ron = buildGrammar { language = "ron"; version = "0.0.0+rev=ce6086b"; @@ -1683,6 +1705,18 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; + scfg = buildGrammar { + language = "scfg"; + version = "0.0.0+rev=6deae0c"; + src = fetchFromSourcehut { + owner = "~rockorager"; + repo = "tree-sitter-scfg"; + rev = "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"; + hash = "sha256-2ubRvjpvRJEBZXpM7ZIkWAwSZARCzP/klydQ6IVpCSk="; + }; + generate = true; + meta.homepage = "https://git.sr.ht/~rockorager/tree-sitter-scfg"; + }; scheme = buildGrammar { language = "scheme"; version = "0.0.0+rev=ca8af22"; @@ -1762,12 +1796,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=e08036e"; + version = "0.0.0+rev=9fc30c9"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "e08036ee4928b32fbebe55ac9336f81b7389e107"; - hash = "sha256-x3vngL+36kO60eEFN0jvTzh9sCvsYvrzrvfMg08JL4w="; + rev = "9fc30c949f29747d34c254677d039c9df3c521b4"; + hash = "sha256-EyZSbcjbPuaQGpi33YK+hpsod73yifk2hL+MCjn8R9M="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1828,12 +1862,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=56ecc99"; + version = "0.0.0+rev=29541ac"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "56ecc996e5765054fc25cdae5fbddfd75a64287b"; - hash = "sha256-GH0HpxAprOlOLv8zqsP1O0/RbIn93FfdgAHp56Pyw9g="; + rev = "29541ac9bbe2090de75d0b1e70360b85bbda1fef"; + hash = "sha256-jT7SdhxX5AlZP33oH7NISV+HvJwQwsXMXDWzHorgnIc="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1849,6 +1883,17 @@ }; meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc"; }; + systemtap = buildGrammar { + language = "systemtap"; + version = "0.0.0+rev=1af543a"; + src = fetchFromGitHub { + owner = "ok-ryoko"; + repo = "tree-sitter-systemtap"; + rev = "1af543a96d060b1f808982037bfc54cc02218edd"; + hash = "sha256-KCsISHv9yglW+63UY/9Dhb0yVz7Ha76EyHo65Si6SpY="; + }; + meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap"; + }; t32 = buildGrammar { language = "t32"; version = "0.0.0+rev=4e581fc"; @@ -1863,12 +1908,12 @@ }; tablegen = buildGrammar { language = "tablegen"; - version = "0.0.0+rev=e5e046e"; + version = "0.0.0+rev=300f6a4"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-tablegen"; - rev = "e5e046e1b221e25111175469f02f3cf336010857"; - hash = "sha256-qh5AWLinsSwfbui7b3Vk7DRW3GaS4Avaa0iLeMmMFtM="; + rev = "300f6a490e71f895e644ed2deec6920860a2e107"; + hash = "sha256-V4fEmiGPBAnZO+NAyA7FdlyjLSA0ByUfrCTbsdDOxc8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen"; }; @@ -1886,12 +1931,12 @@ }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=becebeb"; + version = "0.0.0+rev=b553906"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "becebebd3509c02e871c99be55556269be1def1b"; - hash = "sha256-GR2a+VuhZVMGmLW9Mg7bSALNsy0SyfG+YVaRz1qY6a0="; + rev = "b5539065432c08e4118eb3ee7c94902fdda85708"; + hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -1953,12 +1998,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=3429d8c"; + version = "0.0.0+rev=b1bf482"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772"; - hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U="; + rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; + hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1987,12 +2032,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=3429d8c"; + version = "0.0.0+rev=b1bf482"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772"; - hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U="; + rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; + hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2021,12 +2066,12 @@ }; uxntal = buildGrammar { language = "uxntal"; - version = "0.0.0+rev=14e4760"; + version = "0.0.0+rev=4c5ecd6"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-uxntal"; - rev = "14e47600afef0affffcbfbe1543381b1ac8fbc5c"; - hash = "sha256-SgBWJ8b/9kMkSDafx+6eSl+FS4Hkd1Ei2ALhTLL7yRk="; + rev = "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"; + hash = "sha256-vgeTsRJ3mlR02jXuucmXpszVOmusZwuV0xj/7sSs+WQ="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-uxntal"; }; @@ -2121,23 +2166,23 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=7cd38d6"; + version = "0.0.0+rev=9e3273e"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "7cd38d6895060b023353e04f7af099ec64add5d1"; - hash = "sha256-QzfeFzGhWJGD+l+MeKyedRpdZsH+dGKE7UxRmh2uMH0="; + rev = "9e3273e64bdd3f74d1514674286838f9075ee9e4"; + hash = "sha256-bBGunOcFPrHWLsP1ISgdFBNDIBbB0uhwxKAwmQZg7/k="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=755aef4"; + version = "0.0.0+rev=23712ef"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "755aef4e57da4a00da47e85b6aff976b007d500c"; - hash = "sha256-EbTNiwZwzPWxf8VNUWX82x/Jz4RFCE1LDuzXwYiYQLs="; + rev = "23712eff9768576bdd852cb9b989a9cd44af014a"; + hash = "sha256-IWqclJM3CKsgXIy3e6pUrd2iLfIu8QZT2k6eZXRpITA="; }; location = "libs/tree-sitter-wing"; generate = true; 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 45373a8abd..3007625285 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -149,6 +149,19 @@ self: super: { }; }; + # The GitHub repository returns 404, which breaks the update script + bitbake-vim = buildVimPluginFrom2Nix { + pname = "bitbake.vim"; + version = "2021-02-06"; + src = fetchFromGitHub { + owner = "sblumentritt"; + repo = "bitbake.vim"; + rev = "faddca1e8768b10c80ee85221fb51a560df5ba45"; + sha256 = "1hfly2vxhhvjdiwgfz58hr3523kf9z71i78vk168n3kdqp5vkwrp"; + }; + meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; + }; + chadtree = super.chadtree.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ pynvim-pp @@ -919,7 +932,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-IRp4avOvM2tz2oC1Cwr4W/d4i0pzawcZLP+c1+jnm+I="; + cargoHash = "sha256-bgroNNFRoKiySTC6Rldoy8Unepxd2OXwqcy3fA+CETs="; nativeBuildInputs = [ pkg-config ]; @@ -953,18 +966,23 @@ self: super: { sniprun = let - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "v${version}"; - hash = "sha256-H1PmjiNyUp+fTDqnfppFii+aDh8gPD/ALHFNWVXch3w="; + hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - cargoHash = "sha256-WXhH0zqGj/D83AoEfs0kPqW7UXIAkURTJ+/BKbuUvss="; + # Cargo.lock is outdated + preBuild = '' + cargo update --offline + ''; + + cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index 6a696afb0d..614363cffb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -26,6 +26,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +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" @@ -37,49 +52,58 @@ 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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" 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 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.45.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "async-trait" @@ -89,7 +113,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] @@ -121,9 +145,9 @@ 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 = "bitflags" @@ -133,9 +157,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "once_cell", @@ -155,9 +179,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 = "bytecount" @@ -200,13 +224,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", @@ -216,9 +240,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.1" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" dependencies = [ "clap_builder", "clap_derive", @@ -227,9 +251,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" dependencies = [ "anstream", "anstyle", @@ -240,21 +264,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.13", + "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 = "cli" @@ -283,16 +307,6 @@ dependencies = [ "utils", ] -[[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 = "color-eyre" version = "0.6.2" @@ -321,30 +335,21 @@ dependencies = [ ] [[package]] -name = "concolor-override" +name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[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", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -355,9 +360,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[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", "crossbeam-utils", @@ -396,50 +401,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.13", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - [[package]] name = "directories" version = "4.0.1" @@ -500,13 +461,13 @@ dependencies = [ [[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", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -623,7 +584,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] @@ -667,9 +628,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -701,7 +662,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -723,12 +684,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "grep-matcher", "log", "regex", - "regex-syntax", + "regex-syntax 0.6.29", "thread_local", ] @@ -749,9 +710,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -829,9 +790,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -853,9 +814,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", @@ -880,12 +841,11 @@ dependencies = [ [[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]] @@ -954,9 +914,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -971,14 +931,14 @@ checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1007,9 +967,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -1022,9 +982,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[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 = "libgit2-sys" @@ -1040,9 +1000,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -1050,20 +1010,11 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" @@ -1077,16 +1028,13 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "maple" -version = "0.1.44" +version = "0.1.45" dependencies = [ "built", "chrono", @@ -1106,6 +1054,7 @@ dependencies = [ "base64 0.13.1", "bytecount", "chrono", + "clap", "directories", "dumb_analyzer", "filter", @@ -1188,14 +1137,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1208,16 +1156,6 @@ dependencies = [ "winapi", ] -[[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" @@ -1254,9 +1192,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "overload" @@ -1321,9 +1259,9 @@ 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 = "printer" @@ -1340,18 +1278,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1400,13 +1338,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.2", ] [[package]] @@ -1422,12 +1360,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "reqwest" -version = "0.11.16" +name = "regex-syntax" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -1487,34 +1431,34 @@ 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 = "rustix" -version = "0.37.7" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -1523,7 +1467,17 @@ 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -1547,12 +1501,6 @@ 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" @@ -1574,29 +1522,29 @@ dependencies = [ [[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", + "syn", ] [[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", "ryu", @@ -1687,35 +1635,15 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" -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" @@ -1733,7 +1661,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] @@ -1759,9 +1687,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -1771,15 +1699,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.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -1801,9 +1729,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", @@ -1814,36 +1742,35 @@ dependencies = [ "signal-hook-registry", "socket2", "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", + "syn", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -1887,26 +1814,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.20", + "time 0.3.21", "tracing-subscriber", ] [[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", + "syn", ] [[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", @@ -1935,9 +1862,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -1969,9 +1896,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -2078,9 +2005,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2088,24 +2015,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -2115,9 +2042,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2125,28 +2052,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2211,21 +2138,6 @@ 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" 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 81e277fb99..4236cf79e1 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 @@ -11,13 +11,13 @@ }: let - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-3kPRntl5tHsITrEJaRRcidowcyMpXDTVV5jFN/GV8Sk="; + hash = "sha256-espFos1Mrxdq2p+qi0ooTWAV8EgV/lTx9KuP3GkMWos="; }; meta = with lib; { 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 72f09aa5a7..c44c338e82 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 @@ -85,7 +85,6 @@ https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, https://github.com/max397574/better-escape.nvim/,, https://github.com/LunarVim/bigfile.nvim/,, -https://github.com/sblumentritt/bitbake.vim/,, https://github.com/APZelos/blamer.nvim/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, https://github.com/blueballs-theme/blueballs-neovim/,, @@ -273,7 +272,7 @@ https://github.com/freddiehaddad/feline.nvim/,, https://github.com/bakpakin/fennel.vim/,, https://github.com/lambdalisue/fern.vim/,, https://github.com/wincent/ferret/,, -https://github.com/j-hui/fidget.nvim/,, +https://github.com/j-hui/fidget.nvim/,legacy, https://github.com/bogado/file-line/,, https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, @@ -337,6 +336,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, +https://github.com/lukas-reineke/headlines.nvim/,HEAD, https://github.com/rebelot/heirline.nvim/,, https://github.com/RaafatTurki/hex.nvim/,HEAD, https://github.com/Yggdroot/hiPairs/,, @@ -347,6 +347,7 @@ https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/phaazon/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, +https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, @@ -666,6 +667,7 @@ https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, +https://github.com/ewilazarus/preto/,HEAD, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, https://github.com/kevinhwang91/promise-async/,HEAD, @@ -742,6 +744,7 @@ https://github.com/chr4/sslsecure.vim/,, https://github.com/cshuaimin/ssr.nvim/,HEAD, https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, +https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, https://github.com/luukvbaal/statuscol.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, @@ -784,6 +787,7 @@ https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,, https://github.com/MrcJkb/telescope-manix/,HEAD, https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD, https://github.com/nvim-telescope/telescope-project.nvim/,, +https://github.com/Marskey/telescope-sg/,HEAD, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, @@ -885,6 +889,7 @@ https://github.com/ThePrimeagen/vim-apm/,, https://github.com/PeterRincker/vim-argumentative/,, https://github.com/FooSoft/vim-argwrap/,, https://github.com/haya14busa/vim-asterisk/,, +https://github.com/wuelnerdotexe/vim-astro/,HEAD, https://github.com/hura/vim-asymptote/,, https://github.com/907th/vim-auto-save/,, https://github.com/vim-autoformat/vim-autoformat/,, @@ -1090,6 +1095,7 @@ https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, https://github.com/nickel-lang/vim-nickel/,main, +https://github.com/bluz71/vim-nightfly-colors/,,nightfly https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, @@ -1114,6 +1120,7 @@ https://github.com/lambdalisue/vim-pager/,, https://github.com/vim-pandoc/vim-pandoc/,, https://github.com/vim-pandoc/vim-pandoc-after/,, https://github.com/vim-pandoc/vim-pandoc-syntax/,, +https://github.com/yorickpeterse/vim-paper/,HEAD, https://github.com/bhurlow/vim-parinfer/,, https://github.com/sickill/vim-pasta/,, https://github.com/tpope/vim-pathogen/,, @@ -1290,6 +1297,7 @@ https://github.com/tweekmonster/wstrip.vim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, https://github.com/folke/zen-mode.nvim/,, 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 804f3bb6e1..20e9dc56c4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -326,8 +326,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "1.0.6"; - sha256 = "sha256-/gpZtOO8MA/MJ1o9eG4qmPqhWRZ5E+elA9Rr/kpOprI="; + version = "2.1.1"; + sha256 = "sha256-UVZOpkOHbLiwA4VfTgXxuIU8EtJLnqRa5zUVha6xQJY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; @@ -449,6 +449,23 @@ let }; }; + batisteo.vscode-django = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "batisteo"; + name = "vscode-django"; + version = "1.10.0"; + sha256 = "sha256-vTaE3KhG5i2jGc5o33u76RUUFYaW4s4muHvph48HeQ4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/batisteo.vscode-django/changelog"; + description = "Django extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=batisteo.vscode-django"; + homepage = "https://github.com/vscode-django/vscode-django"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ azd325 ]; + }; + }; + bbenoist.nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; @@ -490,6 +507,22 @@ let }; }; + bierner.docs-view = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "docs-view"; + publisher = "bierner"; + version = "0.0.11"; + sha256 = "sha256-3njIL2SWGFp87cvQEemABJk2nXzwI1Il/WG3E0ZYZxw="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.docs-view/changelog"; + description = "A VSCode extension that displays documentation in the sidebar or panel"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.docs-view"; + homepage = "https://github.com/mattbierner/vscode-docs-view#readme"; + license = lib.licenses.mit; + }; + }; + bierner.emojisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "emojisense"; @@ -542,8 +575,8 @@ let mktplcRef = { name = "vscode-fish"; publisher = "bmalehorn"; - version = "1.0.33"; - sha256 = "sha256-ZQlG+HrjU4DFfpyiY8o0/ayDms6MGEObW8pV1Lmr5/Y="; + version = "1.0.35"; + sha256 = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY="; }; meta.license = lib.licenses.mit; }; @@ -667,8 +700,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.30.0"; - sha256 = "sha256-E/zgKNxKH05qzLkoyq66qBDbkNJ7liBvU+ZSxw825c0="; + version = "2023.32.0"; + sha256 = "sha256-phyPQqDgsYunF5FLqPevw8ZZG4Tw9qxjTOU4/kNGKU8="; }; meta = { license = lib.licenses.mit; @@ -1074,6 +1107,22 @@ let }; }; + dotenv.dotenv-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dotenv-vscode"; + publisher = "dotenv"; + version = "0.28.0"; + sha256 = "sha256-KiQgFvbfLsA/ADROoG6y6c/i0XHuTNH2AN+6mWEm0P8="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/dotenv.dotenv-vscode/changelog"; + description = "Official Dotenv extension for VSCode. Offers syntax highlighting, auto-cloaking, auto-completion, in-code secret peeking, and optionally dotenv-vault"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dotenv.dotenv-vscode"; + homepage = "https://github.com/dotenv-org/dotenv-vscode"; + license = lib.licenses.mit; + }; + }; + dotjoshjohnson.xml = buildVscodeMarketplaceExtension { mktplcRef = { name = "xml"; @@ -1112,8 +1161,8 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "13.4.0"; - sha256 = "sha256-CYI62sWPlJNRP2KIkg4vQutIMC6gaCxtTVoOWZIS8Lw="; + version = "14.1.1"; + sha256 = "sha256-eSN48IudpHYzT4u+S4b2I2pyEPyOwBCSL49awT/mzEE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1217,6 +1266,38 @@ let }; }; + emroussel.atomize-atom-one-dark-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "atomize-atom-one-dark-theme"; + publisher = "emroussel"; + version = "2.0.2"; + sha256 = "sha256-GwuFtBVj0Z2rHryst/7cegskvZIMPsrAH12+K942+JA="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/emroussel.atomize-atom-one-dark-theme/changelog"; + description = "A detailed and accurate Atom One Dark theme for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=emroussel.atomize-atom-one-dark-theme"; + homepage = "https://github.com/emroussel/atomize/blob/main/README.md"; + license = lib.licenses.mit; + }; + }; + + enkia.tokyo-night = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tokyo-night"; + publisher = "enkia"; + version = "1.0.0"; + sha256 = "sha256-/fM+aUDUzVJ6P38i+GrxhLv2eLJNa8OFkKsM4yPBy4c="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/enkia.tokyo-night/changelog"; + description = "A clean Visual Studio Code theme that celebrates the lights of Downtown Tokyo at night"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=enkia.tokyo-night"; + homepage = "https://github.com/enkia/tokyo-night-vscode-theme"; + license = lib.licenses.mit; + }; + }; + equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "vsc-material-theme"; @@ -1238,8 +1319,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.19.0"; - sha256 = "sha256-ymIlBzCcssj+J8hHOokVWUpxKTEkzkhNr80uCblhkFs="; + version = "10.1.0"; + sha256 = "sha256-SQuf15Jq84MKBVqK6UviK04uo7gQw9yuw/WEBEXcQAc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1559,8 +1640,8 @@ let # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they can require insider versions # of VS Code - version = "0.66.0"; - sha256 = "sha256-rhAFNX+/BoKkQeFlVdoHzA8UmZeQofq7+UPooWleYVw="; + version = "0.68.1"; + sha256 = "sha256-d60ZxWQLZa2skOB3Iv9K04aGNZA1d1A82N7zRaxAzlI="; }; meta = { license = lib.licenses.mit; }; }; @@ -1661,8 +1742,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.224"; - sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs="; + version = "0.0.226"; + sha256 = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs="; }; meta = { license = lib.licenses.mit; @@ -1886,8 +1967,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.2.1"; - sha256 = "sha256-yC4ybThMFA2ncGhp8BYD7IrwYiDU3226hewsRvJYKy4="; + version = "0.2.2"; + sha256 = "sha256-jwOM+6LnHyCkvhOTVSTUZvgx77jAg6hFCCpBqY8AxIg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -1895,7 +1976,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; homepage = "https://github.com/jnoortheen/vscode-nix-ide"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.SuperSandro2000 ]; + maintainers = [ ]; }; }; @@ -2275,8 +2356,8 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.13.0"; - sha256 = "sha256-KdLJ7QTi9jz+JbbQuhXqyE3WV9oF+wyC/9ZJ/XTFOYc="; + version = "0.14.0"; + sha256 = "sha256-T+bt6ku+zkqzP1gXNLcpjtFAevDRiSKnZaE7sM4pUOs="; }; meta = { description = "direnv support for Visual Studio Code"; @@ -2513,6 +2594,22 @@ let }; }; + mskelton.npm-outdated = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "npm-outdated"; + publisher = "mskelton"; + version = "2.2.0"; + sha256 = "sha256-kHItIlTW+PIVXrLgzdGAoPeR6sWKuKl/QyJ5+TIv3/E="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/mskelton.npm-outdated/changelog"; + description = "Shows which packages are outdated in an npm project"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mskelton.npm-outdated"; + homepage = "https://github.com/mskelton/vscode-npm-outdated"; + license = lib.licenses.isc; + }; + }; + mvllow.rose-pine = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "mvllow"; @@ -2682,8 +2779,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.25.0"; - sha256 = "sha256-/lD3i7ZdF/XOi7RduS3HIYHFXhkoW2+PJW249gQxcyk="; + version = "4.29.0"; + sha256 = "sha256-YqleqYSpZuhGFGkNo3FRLjiglxX+iUCJl69CRCY/oWM="; }; meta = { license = lib.licenses.mit; @@ -2937,8 +3034,8 @@ let mktplcRef = { name = "crates"; publisher = "serayuzgur"; - version = "0.5.10"; - sha256 = "1dbhd6xbawbnf9p090lpmn8i5gg1f7y8xk2whc9zhg4432kdv3vd"; + version = "0.6.0"; + sha256 = "080zd103vjrz86vllr1ricq2vi3hawn4534n492m7xdcry9l9dpc"; }; meta = { license = lib.licenses.mit; @@ -3217,8 +3314,8 @@ let mktplcRef = { name = "even-better-toml"; publisher = "tamasfe"; - version = "0.19.0"; - sha256 = "sha256-MqSQarNThbEf1wHDTf1yA46JMhWJN46b08c7tV6+1nU="; + version = "0.19.2"; + sha256 = "sha256-JKj6noi2dTe02PxX/kS117ZhW8u7Bhj4QowZQiJKP2E="; }; meta = { license = lib.licenses.mit; @@ -3353,20 +3450,36 @@ let mktplcRef = { name = "sort-lines"; publisher = "Tyriar"; - version = "1.9.1"; - sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb"; + version = "1.10.2"; + sha256 = "sha256-AI16YBmmfZ3k7OyUrh4wujhu7ptqAwfI5jBbAc6MhDk="; }; meta = { license = lib.licenses.mit; }; }; + unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-mdx"; + publisher = "unifiedjs"; + version = "1.4.0"; + sha256 = "sha256-qqqq0QKTR0ZCLdPltsnQh5eTqGOh9fV1OSOZMjj4xXg="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog"; + description = "VSCode language support for MDX"; + downloadPage = "https://github.com/mdx-js/mdx-analyzer"; + homepage = "https://github.com/mdx-js/mdx-analyzer#readme"; + license = lib.licenses.mit; + }; + }; + usernamehw.errorlens = buildVscodeMarketplaceExtension { mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.8.0"; - sha256 = "sha256-T2YTEbeC22/B5BlBBrBATLv95HQC5xGab+KnCMzI1vc="; + version = "3.12.0"; + sha256 = "sha256-G5+We49/f5UwYqoBovegRK+UOT6KPZo85cvoDjD1Mu4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; @@ -3616,6 +3729,21 @@ let }; }; + wmaurer.change-case = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "change-case"; + publisher = "wmaurer"; + version = "1.0.0"; + sha256 = "sha256-tN/jlG2PzuiCeERpgQvdqDoa3UgrUaM7fKHv6KFqujc="; + }; + meta = { + description = "A VSCode extension for quickly changing the case (camelCase, CONSTANT_CASE, snake_case, etc) of the current selection or current word"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=wmaurer.change-case"; + homepage = "https://github.com/wmaurer/vscode-change-case"; + license = lib.licenses.mit; + }; + }; + xadillax.viml = buildVscodeMarketplaceExtension { mktplcRef = { name = "viml"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index d479e7d1fd..5bfe648d14 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -97,6 +97,6 @@ buildVscodeMarketplaceExtension { meta = { description = "Use any remote machine with a SSH server as your development environment."; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.SuperSandro2000 lib.maintainers.tbenst ]; + maintainers = [ lib.maintainers.tbenst ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json index 167f92fbed..29f8c62b9a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.3.1426", + "version": "0.3.1607", "dependencies": { "anser": "^2.1.1", "d3": "^7.6.1", diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index dadb291aa5..77c589dbba 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -20,13 +20,13 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2023-03-06"; + releaseTag = "2023-07-31"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = releaseTag; - sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY="; + sha256 = "sha256-PWEdqI+iiHbx4dkIwWHZCGJuTpRfJI3MLSHf3gQEJt4="; }; build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; @@ -88,3 +88,4 @@ vscode-utils.buildVscodeExtension { platforms = lib.platforms.all; }; } + diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh index 03a71b557d..c6cce01e6d 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh @@ -24,7 +24,7 @@ if [[ $# -ne 1 ]]; then ) fi old_version=$(sed -nE 's/.*\bversion = "(.*)".*/\1/p' ./default.nix) -if grep -q 'cargoSha256 = ""' ./default.nix; then +if grep -q 'cargoHash = ""' ./default.nix; then old_version='broken' fi if [[ "$version" == "$old_version" ]]; then @@ -34,10 +34,10 @@ echo "$old_version -> $version" # update hashes sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" -srcHash=$(nix-prefetch-github vadimcn vscode-lldb --rev "v$version" | jq --raw-output .sha256) -sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile" +srcHash=$(nix-prefetch-github vadimcn vscode-lldb --rev "v$version" | jq --raw-output .hash) +sed -E 's#\bhash = ".*?"#hash = "'$srcHash'"#' --in-place "$nixFile" cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile" +sed -E 's#\bcargoHash = ".*?"#cargoHash = "'$cargoHash'"#' --in-place "$nixFile" pushd $TMPDIR curl -LO https://raw.githubusercontent.com/$owner/$repo/v${version}/package-lock.json diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 6d1c20c855..22a4025942 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -2,6 +2,7 @@ , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland +, libglvnd # Populate passthru.tests , tests @@ -42,7 +43,7 @@ let comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = "${executableName} %F"; - icon = "code"; + icon = "vs${executableName}"; startupNotify = true; startupWMClass = shortName; categories = [ "Utility" "TextEditor" "Development" "IDE" ]; @@ -51,7 +52,7 @@ let actions.new-empty-window = { name = "New Empty Window"; exec = "${executableName} --new-window %F"; - icon = "code"; + icon = "vs${executableName}"; }; }; @@ -61,7 +62,7 @@ let comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName + " --open-url %U"; - icon = "code"; + icon = "vs${executableName}"; startupNotify = true; categories = [ "Utility" "TextEditor" "Development" "IDE" ]; mimeTypes = [ "x-scheme-handler/vscode" ]; @@ -102,8 +103,9 @@ let ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" + # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages. mkdir -p "$out/share/pixmaps" - cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/code.png" + cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png" # Override the previously determined VSCODE_PATH with the one we know to be correct sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" @@ -113,6 +115,9 @@ let # The credentials should be stored in a secure keychain already, so the benefit of this is questionable # in the first place. rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt + + # Unbundle libglvnd as VSCode doesn't include libGLESv2.so.2 which is necessary for GPU acceleration + rm -rf $out/lib/vscode/libGLESv2.so '') + '' runHook postInstall ''; @@ -121,6 +126,7 @@ let gappsWrapperArgs+=( # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags ${lib.escapeShellArg commandLineArgs} ) diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 4fa4270d00..da75dff14d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -24,21 +24,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0xqcksnjdph81cc39qs1q0w6av2c3p3l64bws4iwndbxwvmrxqb0"; - x86_64-darwin = "1mh75kfrycm8rxs99z025sh9l9hry9rdp69njrb1p08dxrrslb45"; - aarch64-linux = "1755hiicbyq85bacn1cclnmg7k6xmgpgdiziar9rw14vp1kfid40"; - aarch64-darwin = "0498grcdlnm9kaxr61p3q46dp9q92i43wi6myfibky2nhqccad34"; - armv7l-linux = "04481jyvfdyq702x88raa5frspzya0158173blwcrmpgw8dda4fn"; + x86_64-linux = "05yl6v11ndayz081m3j6dhclj0hshsf0ism7z31hmq6qvfl1sw0k"; + x86_64-darwin = "16x1ppfi3n9gnxg2la2pzj67mlj507879hpqinhpz57dvys421h8"; + aarch64-linux = "0m5k9rm14isj9x1j3nw3zvcxxz523396id7yhi8bpncr4ac8a087"; + aarch64-darwin = "1kbhf3v71qhw4ql6pp8x5m68lgycjzxzm17c9ri0zn0b86ffp8d3"; + armv7l-linux = "07lp0schicpnzs52gfbi9y8zfkwxhh92zv29afzy6vxdlqvmrf21"; }.${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.80.1"; + version = "1.80.2"; pname = "vscode"; # This is used for VS Code - Remote SSH test - rev = "74f6148eb9ea00507ec113ec51c489d6ffb4b771"; + rev = "2ccd690cbff1569e4a83d7c43d45101f817401dc"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -62,7 +62,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1f5x53hsql8z54jv0wxgmx2j1fglvfs6ml7x6l5d58sh6wfkkpp1"; + sha256 = "1425bngv0n2xpd7yp9xbmxv95adr9vv0vzy1wvqvgpd8p6h05r7n"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index def268c8fa..45db0854ed 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,21 +15,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0y9gs7w330l8x21l2qr5ki46aqmz22v17kmaisj5z5lgyfqyyf97"; - x86_64-darwin = "1i1c0axlipp12b3y3sl6liq4cs7ybjflm8jnrwf9wrrvq7d911bn"; - aarch64-linux = "03894hcjsvskp3s1gl1cmnvy7s7x8iz4z6pz5wk7aayw0j03f3zh"; - aarch64-darwin = "0n59dpc18abq42y1sb5wdrbv9n8pwnyhlcsrjx41r9ykmfk8cvih"; - armv7l-linux = "0iiw5rdw2gsr5y45i00ri858ylm6q4jdk3vh7g0f0vv4csprx5c3"; + x86_64-linux = "0dynpi8l2102z8kbzgdm8qwbpzm7jxjqvz8a3x0vsikxbfwhsdmy"; + x86_64-darwin = "1z3vzwgcjj57xrw8mklhsdr8n9214rb4vj6jfnqv5nxpdgx4dw55"; + aarch64-linux = "0jiwp6i9q8c87pfkhvj45viqi2m5x5aq94skrvxa8wjbkyafvm1d"; + aarch64-darwin = "1as6zfrv2jymxspmc3m453vs61b7y1lh5qh34xr0ps8c4h6dbjas"; + armv7l-linux = "17yd3bb4z99q4r0d91grifrbr50wln1fkz0bjp4s4snqnj9q9gfk"; }.${system} or throwSystem; - sourceRoot = if stdenv.isDarwin then "" else "."; + sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; in callPackage ./generic.nix rec { inherit sourceRoot commandLineArgs useVSCodeRipgrep; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.80.0.23188"; + version = "1.80.2.23209"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix index 7cd5b4e267..bbe5fec19d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix @@ -83,7 +83,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { mkdir -p "$out/share/applications" mkdir -p "$out/share/pixmaps" - ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png" + ln -sT "${vscode}/share/pixmaps/vs${executableName}.png" "$out/share/pixmaps/vs${executableName}.png" ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag} diff --git a/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix index 8a58dd2455..8546b9c408 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/basiliskii/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "basiliskii"; version = "unstable-2022-09-30"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af"; sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM="; }; - sourceRoot = "source/BasiliskII/src/Unix"; + sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ SDL2 gtk2 mpfr ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ quag ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix index 3cd8411f51..4f0e97d55f 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "132"; + version = "133"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${finalAttrs.version}"; - hash = "sha256-0D7bOv934k1cuP6qNxo0uLp5tSEstI8wm0FEwu6TuUw="; + hash = "sha256-KCpHiIdid5h5CU2uyMOo+p5h50h3Ki5/4mUpdTAPKQA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix index 493b1dcb1b..d38865adc2 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-39"; + version = "2.0-45"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-+2V78G4SDFb6ZQDDorvT13yqnZw2JAObF+WGYMMGYHE="; + hash = "sha256-Bi2ws08e+6rNv83ypLrgB/KZWt95i7UkFrqhCr/0Zko="; }; patches = [ @@ -128,5 +128,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zhaofengli baduhai ]; + mainProgram = "cemu"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix index 3acf4a0760..37d995334a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix @@ -1,23 +1,32 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , SDL2 +, zlib }: stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "41"; + version = "43"; src = fetchFromGitHub { - owner = "commanderx16"; + owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-pnWqtSXQzUfQ8ADIXL9r2YjuBwHDQ2NAffAEFCN5Qzw="; + hash = "sha256-cZB7MRYlchD3zcBSWBIzyBiGHJobJvozkVT/7ftFkNg="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace '/bin/echo' 'echo' + ''; + dontConfigure = true; - buildInputs = [ SDL2 ]; + buildInputs = [ + SDL2 + zlib + ]; installPhase = '' runHook preInstall @@ -28,19 +37,20 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { - homepage = "https://www.commanderx16.com/forum/index.php?/home/"; - description = "The official emulator of CommanderX16 8-bit computer"; - license = licenses.bsd2; - maintainers = with maintainers; [ AndersonTorres ]; - mainProgram = "x16emu"; - inherit (SDL2.meta) platforms; - broken = with stdenv; isDarwin && isAarch64; - }; - passthru = { - # upstream project recommends emulator and rom to be synchronized; - # passing through the version is useful to ensure this + # upstream project recommends emulator and rom to be synchronized; passing + # through the version is useful to ensure this inherit (finalAttrs) version; }; + + meta = { + homepage = "https://cx16forum.com/"; + description = "The official emulator of CommanderX16 8-bit computer"; + changelog = "https://github.com/X16Community/x16-emulator/blob/r${finalAttrs.version}/RELEASES.md"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "x16emu"; + inherit (SDL2.meta) platforms; + broken = stdenv.isAarch64; # ofborg fails to compile it + }; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix index 202a212064..8c9c1d1b50 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , cc65 , python3 @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "41"; + version = "43"; src = fetchFromGitHub { - owner = "commanderx16"; + owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-kowdyUVi3hliqkL8VQo5dS3Dpxd4LQi5+5brkdnv0lE="; + hash = "sha256-LkGHfralxlishG1oyBojDnLMJ3c3KYp5YwJSZ2SIrbM="; }; nativeBuildInputs = [ @@ -22,11 +22,15 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - patchShebangs scripts/ + patchShebangs findsymbols scripts/ + substituteInPlace Makefile \ + --replace '/bin/echo' 'echo' ''; dontConfigure = true; + makeFlags = [ "PRERELEASE_VERSION=${finalAttrs.version}" ]; + installPhase = '' runHook preInstall @@ -36,18 +40,18 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { - homepage = "https://www.commanderx16.com/forum/index.php?/home/"; - description = "ROM file for CommanderX16 8-bit computer"; - license = licenses.bsd2; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (cc65.meta) platforms; - broken = with stdenv; isDarwin && isAarch64; - }; - passthru = { - # upstream project recommends emulator and rom to be synchronized; - # passing through the version is useful to ensure this + # upstream project recommends emulator and rom to be synchronized; passing + # through the version is useful to ensure this inherit (finalAttrs) version; }; + + meta = { + homepage = "https://github.com/X16Community/x16-rom"; + description = "ROM file for CommanderX16 8-bit computer"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (cc65.meta) platforms; + broken = stdenv.isDarwin && stdenv.isAarch64; + }; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix index 67950e0ed8..b147af8d02 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , callPackage , patchelf , unzip @@ -15,18 +16,18 @@ }: let - version = "2.7.4"; + version = "2.7.5"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - sha256 = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; + hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v${version}"; - sha256 = "sha256-BXTsBMlsymQHABWQCiv22Ia5jm2xv1jNy7Unwymtyp0="; + rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update + hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k="; }; in @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "sha256-9XMc7zmtPxlt3WgS93lUJNMFtUJ/llG9SFGtgdFqZEA="; + hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix index b2d887428a..90b86a16fa 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix @@ -1,12 +1,12 @@ { stdenv , craftos-pc -, grep +, gnugrep }: stdenv.mkDerivation { name = "craftos-pc-test-eval-hello-world"; meta.timeout = 60; - nativeBuildInputs = [ craftos-pc grep ]; + nativeBuildInputs = [ craftos-pc gnugrep ]; buildCommand = '' export HOME=$(pwd) mkdir $HOME/.local $HOME/.config diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix index ad5cf97401..af1cca9c27 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix @@ -1,11 +1,11 @@ { stdenv , craftos-pc -, grep +, gnugrep }: stdenv.mkDerivation { name = "craftos-pc-test-eval-periphemu"; meta.timeout = 60; - nativeBuildInputs = [ craftos-pc grep ]; + nativeBuildInputs = [ craftos-pc gnugrep ]; buildCommand = '' export HOME=$(pwd) mkdir $HOME/.local $HOME/.config diff --git a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix index 988ca79647..cc4d7265ce 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix @@ -227,5 +227,6 @@ in stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = with maintainers; [ zhaofengli ]; platforms = [ "x86_64-linux" ]; + mainProgram = "darling"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix index 852586cc69..4a6d229762 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix @@ -9,6 +9,7 @@ , graphicsmagick , libGL , libGLU +, OpenGL , libpng , makeDesktopItem }: @@ -32,10 +33,13 @@ stdenv.mkDerivation rec { SDL SDL_net SDL_sound + libpng + ] ++ (if stdenv.hostPlatform.isDarwin then [ + OpenGL + ] else [ libGL libGLU - libpng - ]; + ]); hardeningDisable = [ "format" ]; @@ -73,5 +77,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + mainProgram = "dosbox"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix index aa8192d3ec..170a3c30e5 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.edwtjo ]; license = lib.licenses.mit; platforms = lib.platforms.linux; + mainProgram = "emulationstation"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix index 656a1aed7e..6fe3e4455d 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.256"; + version = "0.257"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-rQ1GQks3Nni6ALxfiJzdkKUgbZrXaLu9vJtEDPjgP3Q="; + hash = "sha256-iBLHvdqIgF6XkJQX5hFLrP9KkTGWfVvTCs+DRJhsSp4="; }; outputs = [ "out" "tools" ]; @@ -196,5 +196,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.unix; broken = stdenv.isDarwin; + mainProgram = "mame"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix index 06ef3d9908..50389db2b4 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ artemist benley shamilton xfix ]; platforms = platforms.linux; + mainProgram = "melonDS"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix index 8537a05112..a52ee7ca30 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mgba/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; platforms = platforms.linux; + mainProgram = "mgba"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix index 82908a166d..ba8c69cfb3 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mupen64plus/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://www.mupen64plus.org/"; maintainers = [ maintainers.sander ]; platforms = [ "x86_64-linux" ]; + mainProgram = "mupen64plus"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix index fa55c2e963..b42a578639 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/nestopia/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ MP2E ]; + mainProgram = "nestopia"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix index 101fb829c6..b80c32bd9e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/pcsxr/default.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; + mainProgram = "pcsxr"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/py65/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/py65/default.nix deleted file mode 100644 index 66ba3cdf4b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/py65/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchPypi, buildPythonApplication }: - -buildPythonApplication rec { - pname = "py65"; - version = "1.1.0"; - format = "wheel"; - - src = fetchPypi { - inherit pname version format; - sha256 = "Q7rjiHJ/Ew985vut/8fVAf/wWYW5aBPSvNPm8A6g1zg="; - }; - - meta = with lib; { - homepage = "https://py65.readthedocs.io/"; - description = "Emulate 6502-based microcomputer systems in Python"; - longDescription = '' - Py65 includes a program called Py65Mon that functions as a machine - language monitor. This kind of program is sometimes also called a - debugger. Py65Mon provides a command line with many convenient commands - for interacting with the simulated 6502-based system. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index 63e03bc00a..a07d899ee7 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -360,6 +360,17 @@ in }; }; + dosbox-pure = mkLibretroCore { + core = "dosbox-pure"; + CXXFLAGS = "-std=gnu++11"; + hardeningDisable = [ "format" ]; + makefile = "Makefile"; + meta = { + description = "Port of DOSBox to libretro aiming for simplicity and ease of use."; + license = lib.licenses.gpl2Only; + }; + }; + eightyone = mkLibretroCore { core = "81"; src = getCoreSrc "eightyone"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix index ba1bfe28b2..2abbdb1c46 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix @@ -2,8 +2,6 @@ , stdenv , nixosTests , enableNvidiaCgToolkit ? false -, withAssets ? false -, withCoreInfo ? false , withGamemode ? stdenv.isLinux , withVulkan ? stdenv.isLinux , withWayland ? stdenv.isLinux @@ -61,10 +59,6 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - patches = [ - ./use-default-values-for-libretro_info_path-assets_directory.patch - ]; - nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++ lib.optional withWayland wayland ++ lib.optional (runtimeLibs != [ ]) makeWrapper; @@ -109,14 +103,8 @@ stdenv.mkDerivation rec { "--enable-systemmbedtls" "--disable-builtinzlib" "--disable-builtinflac" - ] ++ - lib.optionals withAssets [ "--disable-update_assets" - "--with-assets_dir=${retroarch-assets}/share" - ] ++ - lib.optionals withCoreInfo [ "--disable-update_core_info" - "--with-core_info_dir=${libretro-core-info}/share" ] ++ lib.optionals stdenv.isLinux [ "--enable-dbus" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json index 903708aabd..410e782d0a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json @@ -1,518 +1,524 @@ { "2048": { - "owner": "libretro", - "repo": "libretro-2048", - "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", - "sha256": "gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + "owner": "libretro", + "repo": "libretro-2048", + "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", + "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" }, "atari800": { "owner": "libretro", "repo": "libretro-atari800", "rev": "94033288b026fe699bc50703609807aa8075f4dd", - "sha256": "fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI=" + "hash": "sha256-fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI=" }, "beetle-gba": { "owner": "libretro", "repo": "beetle-gba-libretro", "rev": "38182572571a48cb58057cde64b915237c4e2d58", - "sha256": "4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=" + "hash": "sha256-4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=" }, "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", "rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae", - "sha256": "f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA=" + "hash": "sha256-f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA=" }, "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", "rev": "65460e3a9ad529f6901caf669abbda11f437ab55", - "sha256": "+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w=" + "hash": "sha256-+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w=" }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", "rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e", - "sha256": "uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA=" + "hash": "sha256-uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", "rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758", - "sha256": "xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY=" + "hash": "sha256-xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", "rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0", - "sha256": "yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI=" + "hash": "sha256-yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", "rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414", - "sha256": "RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM=" + "hash": "sha256-RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM=" }, "beetle-snes": { "owner": "libretro", "repo": "beetle-bsnes-libretro", "rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91", - "sha256": "zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0=" + "hash": "sha256-zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0=" }, "beetle-supafaust": { "owner": "libretro", "repo": "supafaust", "rev": "75c658cce454e58ae04ea252f53a31c60d61548e", - "sha256": "2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0=" + "hash": "sha256-2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0=" }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", "rev": "1ff2daa9377114d5394142f75f1c388b706567ed", - "sha256": "0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE=" + "hash": "sha256-0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", "rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313", - "sha256": "C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674=" + "hash": "sha256-C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", "rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701", - "sha256": "xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8=" + "hash": "sha256-xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8=" }, "blastem": { "owner": "libretro", "repo": "blastem", "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", - "sha256": "EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" + "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" }, "bluemsx": { "owner": "libretro", "repo": "bluemsx-libretro", "rev": "acf358be18644a9df0ed9602d63c2f73d4fe605a", - "sha256": "K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg=" + "hash": "sha256-K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg=" }, "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", "rev": "4da970a334ba4644cef72e560985ea3f31fa40f7", - "sha256": "Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI=" + "hash": "sha256-Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI=" }, "bsnes-hd": { "owner": "DerKoun", "repo": "bsnes-hd", "rev": "04821703aefdc909a4fd66d168433fcac06c2ba7", - "sha256": "QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU=" + "hash": "sha256-QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU=" }, "bsnes-mercury": { "owner": "libretro", "repo": "bsnes-mercury", "rev": "fb9a41fe9bc230a07c4506cad3cbf21d3fa635b4", - "sha256": "gBOxKSv3j229IVdtffqFV/zSSacEs8UsBERnQgdFw4Y=" + "hash": "sha256-gBOxKSv3j229IVdtffqFV/zSSacEs8UsBERnQgdFw4Y=" }, "citra": { "owner": "libretro", "repo": "citra", "rev": "d7e1612c17b1acb5d5eb68bb046820db49aeea5e", - "sha256": "u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", + "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", "fetchSubmodules": true }, "desmume": { "owner": "libretro", "repo": "desmume", "rev": "fbd368c8109f95650e1f81bca1facd6d4d8687d7", - "sha256": "7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ=" + "hash": "sha256-7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ=" }, "desmume2015": { "owner": "libretro", "repo": "desmume2015", "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893", - "sha256": "kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=" + "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=" }, "dolphin": { "owner": "libretro", "repo": "dolphin", "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", - "sha256": "9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" + "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" }, "dosbox": { "owner": "libretro", "repo": "dosbox-libretro", "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", - "sha256": "PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" + "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" + }, + "dosbox-pure": { + "owner": "schellingb", + "repo": "dosbox-pure", + "rev": "035e01e43623f83a9e71f362364fd74091379455", + "hash": "sha256-j7Or4yTK5l+ZVC5UFeym9sLx+88PRlofoBT1tMuf31A=" }, "eightyone": { "owner": "libretro", "repo": "81-libretro", "rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0", - "sha256": "Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA=" + "hash": "sha256-Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA=" }, "fbalpha2012": { "owner": "libretro", "repo": "fbalpha2012", "rev": "7f8860543a81ba79c0e1ce1aa219af44568c628a", - "sha256": "r1lH+CR+nVRCPkVo0XwLi35/ven/FEkNhWUTA6cUVxc=" + "hash": "sha256-r1lH+CR+nVRCPkVo0XwLi35/ven/FEkNhWUTA6cUVxc=" }, "fbneo": { "owner": "libretro", "repo": "fbneo", "rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5", - "sha256": "a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI=" + "hash": "sha256-a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", "rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2", - "sha256": "B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE=" + "hash": "sha256-B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE=" }, "flycast": { "owner": "libretro", "repo": "flycast", "rev": "4c293f306bc16a265c2d768af5d0cea138426054", - "sha256": "9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo=" + "hash": "sha256-9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo=" }, "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", "rev": "1360c9ff32b390383567774d01fbe5d6dfcadaa3", - "sha256": "LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg=" + "hash": "sha256-LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg=" }, "freeintv": { "owner": "libretro", "repo": "freeintv", "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", - "sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" + "hash": "sha256-ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" }, "fuse": { "owner": "libretro", "repo": "fuse-libretro", "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", - "sha256": "jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" }, "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", "rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d", - "sha256": "2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk=" + "hash": "sha256-2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk=" }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", "rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027", - "sha256": "4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI=" + "hash": "sha256-4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", "rev": "541adc9e1c6c9328c07058659594d6300ae0fa19", - "sha256": "2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA=" + "hash": "sha256-2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA=" }, "gw": { "owner": "libretro", "repo": "gw-libretro", "rev": "19a1cb3105ca4a82139fb4994e7995fd956f6f8d", - "sha256": "luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0=" + "hash": "sha256-luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0=" }, "handy": { "owner": "libretro", "repo": "libretro-handy", "rev": "63db085af671bad2929078c55434623b7d4632a1", - "sha256": "N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE=" + "hash": "sha256-N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE=" }, "hatari": { "owner": "libretro", "repo": "hatari", "rev": "1ebf0a0488580ef95c0b28f02223b31813c867c5", - "sha256": "i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao=" + "hash": "sha256-i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao=" }, "mame": { "owner": "libretro", "repo": "mame", "rev": "f7761a9902d59030882c58d4482446196e748c50", - "sha256": "g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g=" + "hash": "sha256-g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g=" }, "mame2000": { "owner": "libretro", "repo": "mame2000-libretro", "rev": "0208517404e841fce0c094f1a2776a0e1c6c101d", - "sha256": "WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ=" + "hash": "sha256-WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ=" }, "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", "rev": "b1cc49cf1d8bbef88b890e1c2a315a39d009171b", - "sha256": "bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA=" + "hash": "sha256-bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA=" }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", "rev": "0b9309d9d86aea2457df74709e997bea37899475", - "sha256": "US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0=" + "hash": "sha256-US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0=" }, "mame2010": { "owner": "libretro", "repo": "mame2010-libretro", "rev": "5f524dd5fca63ec1dcf5cca63885286109937587", - "sha256": "OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=" + "hash": "sha256-OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=" }, "mame2015": { "owner": "libretro", "repo": "mame2015-libretro", "rev": "2599c8aeaf84f62fe16ea00daa460a19298c121c", - "sha256": "TURTX0XrvqwqKG3O3aCttDAdicBdge5F1thVvYgEHaw=" + "hash": "sha256-TURTX0XrvqwqKG3O3aCttDAdicBdge5F1thVvYgEHaw=" }, "mame2016": { "owner": "libretro", "repo": "mame2016-libretro", "rev": "01058613a0109424c4e7211e49ed83ac950d3993", - "sha256": "IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" + "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" }, "melonds": { "owner": "libretro", "repo": "melonds", "rev": "0e1f06da626cbe67215c3f06f6bdf510dd4e4649", - "sha256": "ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM=" + "hash": "sha256-ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM=" }, "mesen": { "owner": "libretro", "repo": "mesen", "rev": "caa4e6f14373c40bd2805c600d1b476e7616444a", - "sha256": "cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU=" + "hash": "sha256-cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU=" }, "mesen-s": { "owner": "libretro", "repo": "mesen-s", "rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8", - "sha256": "/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=" + "hash": "sha256-/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=" }, "meteor": { "owner": "libretro", "repo": "meteor-libretro", "rev": "e533d300d0561564451bde55a2b73119c768453c", - "sha256": "zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=" + "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=" }, "mgba": { "owner": "libretro", "repo": "mgba", "rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad", - "sha256": "rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg=" + "hash": "sha256-rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", "rev": "5a63aadedc29655254d8fc7b4da3a325472e198b", - "sha256": "QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE=" + "hash": "sha256-QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE=" }, "neocd": { "owner": "libretro", "repo": "neocd_libretro", "rev": "2070f5258c9d3feee15962f9db8c8ef20072ece8", - "sha256": "X+lS1zW5oTzp7wwurM5xjVqIBwEOCIdj/NX/+33K2qg=" + "hash": "sha256-X+lS1zW5oTzp7wwurM5xjVqIBwEOCIdj/NX/+33K2qg=" }, "nestopia": { "owner": "libretro", "repo": "nestopia", "rev": "16b14865caf1effca030630e2fc73d2d4271fc53", - "sha256": "dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM=" + "hash": "sha256-dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM=" }, "np2kai": { "owner": "AZO234", "repo": "NP2kai", "rev": "6089943a80a45b6c18d765765f7f31d7a5c0d9c6", - "sha256": "tdF0Qb+smWAVoPmI0dd5s51cnYxMmqM36rQNMiEjU9A=", + "hash": "sha256-tdF0Qb+smWAVoPmI0dd5s51cnYxMmqM36rQNMiEjU9A=", "fetchSubmodules": true }, "nxengine": { "owner": "libretro", "repo": "nxengine-libretro", "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", - "sha256": "4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" + "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" }, "o2em": { "owner": "libretro", "repo": "libretro-o2em", "rev": "a2a12472fde910b6089ac3ca6de805bd58a9c999", - "sha256": "0cZYw3rrnaR+PfwReRXadLV8RVLblYqlZxJue6OZncg=" + "hash": "sha256-0cZYw3rrnaR+PfwReRXadLV8RVLblYqlZxJue6OZncg=" }, "opera": { "owner": "libretro", "repo": "opera-libretro", "rev": "8a49bb8877611037438aeb857cb182f41ee0e3a1", - "sha256": "oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM=" + "hash": "sha256-oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM=" }, "parallel-n64": { "owner": "libretro", "repo": "parallel-n64", "rev": "a03fdcba6b2e9993f050b50112f597ce2f44fa2c", - "sha256": "aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA=" + "hash": "sha256-aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA=" }, "pcsx2": { "owner": "libretro", "repo": "pcsx2", "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", - "sha256": "0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" + "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", "rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3", - "sha256": "727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U=" + "hash": "sha256-727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", "rev": "7ab066aab84f15388a53433ea273420bcf917e00", - "sha256": "NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=", + "hash": "sha256-NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", "rev": "b33834af08a4954f06be215eee80a72e7a378e91", - "sha256": "IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=", + "hash": "sha256-IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", "rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4", - "sha256": "GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=", + "hash": "sha256-GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=", "fetchSubmodules": true }, "prboom": { "owner": "libretro", "repo": "libretro-prboom", "rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582", - "sha256": "klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA=" + "hash": "sha256-klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA=" }, "prosystem": { "owner": "libretro", "repo": "prosystem-libretro", "rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b", - "sha256": "rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E=" + "hash": "sha256-rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E=" }, "puae": { "owner": "libretro", "repo": "libretro-uae", "rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76", - "sha256": "6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU=" + "hash": "sha256-6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU=" }, "quicknes": { "owner": "libretro", "repo": "QuickNES_Core", "rev": "75d501a87ec2074e8d2f7256fb0359513c263c29", - "sha256": "yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw=" + "hash": "sha256-yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw=" }, "sameboy": { "owner": "libretro", "repo": "sameboy", "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", - "sha256": "hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" + "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" }, "scummvm": { "owner": "libretro", "repo": "scummvm", "rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b", - "sha256": "9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM=" + "hash": "sha256-9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM=" }, "smsplus-gx": { "owner": "libretro", "repo": "smsplus-gx", "rev": "60af17ddb2231ba98f4ed1203e2a2f58d08ea088", - "sha256": "2SZR9BOTYLmtjEF4Bdl49H2pFNEIaU68VqlA7ll5TqU=" + "hash": "sha256-2SZR9BOTYLmtjEF4Bdl49H2pFNEIaU68VqlA7ll5TqU=" }, "snes9x": { "owner": "snes9xgit", "repo": "snes9x", "rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684", - "sha256": "1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo=" + "hash": "sha256-1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo=" }, "snes9x2002": { "owner": "libretro", "repo": "snes9x2002", "rev": "540baad622d9833bba7e0696193cb06f5f02f564", - "sha256": "WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=" + "hash": "sha256-WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=" }, "snes9x2005": { "owner": "libretro", "repo": "snes9x2005", "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", - "sha256": "zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" + "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" }, "snes9x2010": { "owner": "libretro", "repo": "snes9x2010", "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", - "sha256": "7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" + "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" }, "stella": { "owner": "stella-emu", "repo": "stella", "rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15", - "sha256": "9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4=" + "hash": "sha256-9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4=" }, "stella2014": { "owner": "libretro", "repo": "stella2014-libretro", "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f", - "sha256": "wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=" + "hash": "sha256-wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=" }, "swanstation": { "owner": "libretro", "repo": "swanstation", "rev": "e24f21196cdcd50321475c4366b51af245a6bbe6", - "sha256": "DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978=" + "hash": "sha256-DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978=" }, "tgbdual": { "owner": "libretro", "repo": "tgbdual-libretro", "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", - "sha256": "MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" + "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" }, "thepowdertoy": { "owner": "libretro", "repo": "ThePowderToy", "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243", - "sha256": "aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=" + "hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=" }, "tic80": { "owner": "libretro", "repo": "tic-80", "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", - "sha256": "RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", + "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", "fetchSubmodules": true }, "vba-m": { "owner": "libretro", "repo": "vbam-libretro", "rev": "640ce45325694d1dc574e90c95c55bc464368d7e", - "sha256": "aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM=" + "hash": "sha256-aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM=" }, "vba-next": { "owner": "libretro", "repo": "vba-next", "rev": "0c310082a6345790124e9348861b300bcccbeced", - "sha256": "RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78=" + "hash": "sha256-RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78=" }, "vecx": { "owner": "libretro", "repo": "libretro-vecx", "rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7", - "sha256": "2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM=" + "hash": "sha256-2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM=" }, "virtualjaguar": { "owner": "libretro", "repo": "virtualjaguar-libretro", "rev": "2cc06899b839639397b8b30384a191424b6f529d", - "sha256": "7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ=" + "hash": "sha256-7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ=" }, "yabause": { "owner": "libretro", "repo": "yabause", "rev": "4c96b96f7fbe07223627c469ff33376b2a634748", - "sha256": "7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=" + "hash": "sha256-7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=" } } 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 new file mode 100644 index 0000000000..92ba7f20c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix @@ -0,0 +1,28 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "retroarch-joypad-autoconfig"; + version = "1.15.0"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "retroarch-joypad-autoconfig"; + rev = "v${version}"; + hash = "sha256-/F2Y08uDA/pIIeLiLfOQfGVjX2pkuOqPourlx2RbZ28="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "Joypad autoconfig files"; + homepage = "https://www.libretro.com/"; + license = licenses.mit; + maintainers = with maintainers; teams.libretro.members ++ [ ]; + platforms = platforms.all; + }; +} 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 bd325e5739..a091958c38 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py @@ -36,6 +36,7 @@ CORES = { "desmume2015": {"repo": "desmume2015"}, "dolphin": {"repo": "dolphin"}, "dosbox": {"repo": "dosbox-libretro"}, + "dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"}, "eightyone": {"repo": "81-libretro"}, "fbalpha2012": {"repo": "fbalpha2012"}, "fbneo": {"repo": "fbneo"}, diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch deleted file mode 100644 index 7ef7f439ec..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/use-default-values-for-libretro_info_path-assets_directory.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6960855a0cdfd671d214030260b340a73878af52 Mon Sep 17 00:00:00 2001 -From: Thiago Kenji Okada -Date: Fri, 23 Dec 2022 21:42:15 +0000 -Subject: [PATCH] Use default values for libretro_info_path/assets_directories - ---- - configuration.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configuration.c b/configuration.c -index d9ab8370c4..15b575d8a2 100644 ---- a/configuration.c -+++ b/configuration.c -@@ -1483,7 +1483,7 @@ static struct config_path_setting *populate_settings_path( - SETTING_PATH("core_options_path", - settings->paths.path_core_options, false, NULL, true); - SETTING_PATH("libretro_info_path", -- settings->paths.path_libretro_info, false, NULL, true); -+ settings->paths.path_libretro_info, false, NULL, false); - SETTING_PATH("content_database_path", - settings->paths.path_content_database, false, NULL, true); - SETTING_PATH("cheat_database_path", -@@ -1539,7 +1539,7 @@ static struct config_path_setting *populate_settings_path( - SETTING_PATH("core_assets_directory", - settings->paths.directory_core_assets, true, NULL, true); - SETTING_PATH("assets_directory", -- settings->paths.directory_assets, true, NULL, true); -+ settings->paths.directory_assets, true, NULL, false); - SETTING_PATH("dynamic_wallpapers_directory", - settings->paths.directory_dynamic_wallpapers, true, NULL, true); - SETTING_PATH("thumbnails_directory", --- -2.38.1 - diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix index afef0bef8a..4698bbe5bb 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/wrapper.nix @@ -3,16 +3,28 @@ , makeWrapper , retroarch , symlinkJoin +, runCommand , cores ? [ ] +, settings ? { } }: let + settingsPath = runCommand "declarative-retroarch.cfg" + { + value = lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "${n} = \"${v}\"") settings); + passAsFile = [ "value" ]; + } + '' + cp "$valuePath" "$out" + ''; + # All cores should be located in the same path after symlinkJoin, # but let's be safe here coresPath = lib.lists.unique (map (c: c.libretroCore) cores); - wrapperArgs = lib.strings.escapeShellArgs - (lib.lists.flatten - (map (p: [ "--add-flags" "-L ${placeholder "out" + p}" ]) coresPath)); + wrapperArgs = lib.strings.escapeShellArgs ( + (lib.lists.flatten (map (p: [ "--add-flags" "-L ${placeholder "out" + p}" ]) coresPath)) + ++ [ "--add-flags" "--appendconfig=${settingsPath}" ] + ); in symlinkJoin { name = "retroarch-with-cores-${lib.getVersion retroarch}"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch deleted file mode 100644 index dccf06fc07..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9866ce8f538e1ab1f0902408b7575013b768f365 Mon Sep 17 00:00:00 2001 -From: Zane van Iperen -Date: Wed, 2 Feb 2022 23:41:59 +1000 -Subject: [PATCH] llvm/ExecutionEngine/IntelJITEvents: only use - ITTAPI_SOURCE_DIR - ---- - .../IntelJITEvents/CMakeLists.txt | 32 ++----------------- - 1 file changed, 2 insertions(+), 30 deletions(-) - -diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt -index 0c5017c3..d20c35f3 100644 ---- a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt -+++ b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt -@@ -1,34 +1,6 @@ - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - --if(NOT DEFINED ITTAPI_GIT_REPOSITORY) -- set(ITTAPI_GIT_REPOSITORY https://github.com/intel/ittapi.git) --endif() -- --if(NOT DEFINED ITTAPI_GIT_TAG) -- set(ITTAPI_GIT_TAG v3.18.12) --endif() -- --if(NOT DEFINED ITTAPI_SOURCE_DIR) -- set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR}) --endif() -- --if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi) -- execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY} -- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR} -- RESULT_VARIABLE GIT_CLONE_RESULT) -- if(NOT GIT_CLONE_RESULT EQUAL "0") -- message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}") -- endif() --endif() -- --execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG} -- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi -- RESULT_VARIABLE GIT_CHECKOUT_RESULT) --if(NOT GIT_CHECKOUT_RESULT EQUAL "0") -- message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi") --endif() -- --include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ ) -+include_directories( ${ITTAPI_SOURCE_DIR}/include/ ) - - if( HAVE_LIBDL ) - set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS}) -@@ -40,7 +12,7 @@ set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS}) - add_llvm_component_library(LLVMIntelJITEvents - IntelJITEventListener.cpp - jitprofiling.c -- ${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c -+ ${ITTAPI_SOURCE_DIR}/src/ittnotify/ittnotify_static.c - - LINK_LIBS ${LLVM_INTEL_JIT_LIBS} - --- -2.34.1 - diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix index b035c7b0d1..88b3ddbb17 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix @@ -1,24 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git -, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng -, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers -, sdl2Support ? true, SDL2 -, cubebSupport ? true, cubeb -, waylandSupport ? true, wayland +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, pkg-config +, git +, qtbase +, qtquickcontrols +, qtmultimedia +, openal +, glew +, vulkan-headers +, vulkan-loader +, libpng +, libSM +, ffmpeg +, libevdev +, libusb1 +, zlib +, curl +, wolfssl +, python3 +, pugixml +, flatbuffers +, llvm_16 +, cubeb +, faudioSupport ? true +, faudio +, SDL2 +, waylandSupport ? true +, wayland }: let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14840-842edbcbe"; - rpcs3Version = "0.0.27-14840-842edbcbe"; - rpcs3Revision = "842edbcbe795941981993c667c2d8a866126b5b0"; - rpcs3Sha256 = "1al4dx93f02k56k62dxjqqb46cwg0nkpjax1xnjc8v3bx4gsp6f6"; - - ittapi = fetchFromGitHub { - owner = "intel"; - repo = "ittapi"; - rev = "v3.18.12"; - sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; - }; + rpcs3GitVersion = "15409-fd6829f75"; + rpcs3Version = "0.0.28-15409-fd6829f75"; + rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c"; + rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk="; in stdenv.mkDerivation { pname = "rpcs3"; @@ -29,11 +48,9 @@ stdenv.mkDerivation { repo = "rpcs3"; rev = rpcs3Revision; fetchSubmodules = true; - sha256 = rpcs3Sha256; + hash = rpcs3Hash; }; - patches = [ ./0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch ]; - passthru.updateScript = ./update.sh; preConfigure = '' @@ -55,17 +72,20 @@ stdenv.mkDerivation { "-DUSE_SYSTEM_FAUDIO=ON" "-DUSE_SYSTEM_PUGIXML=ON" "-DUSE_SYSTEM_FLATBUFFERS=ON" + "-DUSE_SYSTEM_SDL=ON" + "-DWITH_LLVM=ON" + "-DBUILD_LLVM=OFF" "-DUSE_NATIVE_INSTRUCTIONS=OFF" - "-DITTAPI_SOURCE_DIR=${ittapi}" + "-DUSE_FAUDIO=${if faudioSupport then "ON" else "OFF"}" ]; nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; buildInputs = [ qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers - ] ++ lib.optional sdl2Support SDL2 - ++ lib.optionals cubebSupport cubeb.passthru.backendLibs + libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM + ] ++ cubeb.passthru.backendLibs + ++ lib.optionals faudioSupport [ faudio SDL2 ] ++ lib.optional waylandSupport wayland; postInstall = '' @@ -81,5 +101,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; license = licenses.gpl2Only; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "rpcs3"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh index 0c8477c528..1efecc7ec8 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh +++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert +#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix gnused jq nix-prefetch-git curl cacert set -eou pipefail @@ -48,12 +48,13 @@ final_ver="$major_ver-$git_ver" echo "INFO: Latest commit is $commit_sha" echo "INFO: Latest version is $final_ver" -nix_sha256=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256) -echo "INFO: SHA256 is $nix_sha256" +nix_hash=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256) +nix_hash=$(nix hash to-sri --type sha256 "$nix_hash") +echo "INFO: Hash is $nix_hash" sed -i -E \ -e "s/rpcs3GitVersion\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3GitVersion = \"${git_ver}\";/g" \ -e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \ -e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \ - -e "s/rpcs3Sha256\s*=\s*\"[a-z0-9]+\";$/rpcs3Sha256 = \"${nix_sha256}\";/g" \ + -e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \ "$ROOT/default.nix" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 0042c8f872..199edc8e91 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.960"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.968"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "ac2444f908bee5b5c1a13fe64e997315cea4b23c"; - sha256 = "0nv55x775lzbqa724ba2bpbkk6r7jbrgxgbir5bhyj0yz5ckl4v5"; + rev = "487261592eb9e9c31cacd08860f8894027bb1a07"; + sha256 = "002qgnh7xb9i9yqm4a3m9m7sbx1iz7ng8k5nnanlq897djs3hy0g"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix index 6cc70c819a..3a509ea5fc 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix @@ -133,7 +133,7 @@ (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; }) (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.3-build25"; sha256 = "190gqalpkhw1zb3pvb92dxrciyn1giznl125vxxx9gsy8a6cipka"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix index 82efe6b42a..34c2f72c7d 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/snes9x/default.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qknight xfix thiagokokada ]; platforms = platforms.unix; broken = (withGtk && stdenv.isDarwin); + mainProgram = "snes9x"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix new file mode 100644 index 0000000000..ce2518031b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/tamatool/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, fetchFromGitHub +, zip +, copyDesktopItems +, libpng +, SDL2 +, SDL2_image +, darwin + +# Optionally bundle a ROM file +, rom ? null +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tamatool"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "jcrona"; + repo = "tamatool"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VDmpIBuMWg3TwfCf9J6/bi/DaWip6ESAQWvGh2SH+A8="; + fetchSubmodules = true; + }; + + # * Point to the installed rom and res directory + # * Tell the user to use --rom instead of telling them to place the rom in the + # program directory (it's immutable!) + postPatch = '' + substituteInPlace src/tamatool.c \ + --replace '#define RES_PATH' "#define RES_PATH \"$out/share/tamatool/res\" //" \ + --replace '#define ROM_PATH' "#define ROM_PATH \"$out/share/tamatool/rom.bin\" //" \ + --replace '#define ROM_NOT_FOUND_MSG' '#define ROM_NOT_FOUND_MSG "You need to use the --rom option!" //' + ''; + + nativeBuildInputs = [ + zip + copyDesktopItems + ]; + + buildInputs = [ + libpng + SDL2 + SDL2_image + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + ]; + + makeFlags = [ + "-Clinux" + "VERSION=${finalAttrs.version}" + "CFLAGS+=-I${SDL2.dev}/include/SDL2" + "CFLAGS+=-I${SDL2_image}/include/SDL2" + "DIST_PATH=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + desktopItems = [ "linux/tamatool.desktop" ]; + + installPhase = '' + runHook preInstall + install -Dm755 linux/tamatool $out/bin/tamatool + mkdir -p $out/share/tamatool + cp -r res $out/share/tamatool/res + install -Dm644 linux/tamatool.png $out/share/icons/hicolor/128x126/apps/tamatool.png + ${lib.optionalString (rom != null) "install -Dm677 ${rom} $out/share/tamatool/rom.bin"} + runHook postInstall + ''; + + meta = with lib; { + description = "A cross-platform Tamagotchi P1 explorer"; + homepage = "https://github.com/jcrona/tamatool"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix index 935207321c..7151f5b0f9 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/uxn/default.nix @@ -2,25 +2,24 @@ , stdenv , fetchFromSourcehut , SDL2 +, unstableGitUpdater }: stdenv.mkDerivation { pname = "uxn"; - version = "unstable-2022-10-22"; + version = "unstable-2023-07-30"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "1b2049e238df96f32335edf1c6db35bd09f8b42d"; - hash = "sha256-lwms+qUelfpTC+i2m5b3dW7ww9298YMPFdPVsFrwcDQ="; + rev = "9ca8e9623d0ab1c299f08d3dd9d54098557f5749"; + hash = "sha256-K51YiLnBwFWgD3h3l2BhsvzhnHHolZPsjjUWJSe4sPQ="; }; buildInputs = [ SDL2 ]; - dontConfigure = true; - postPatch = '' sed -i -e 's|UXNEMU_LDFLAGS="$(brew.*$|UXNEMU_LDFLAGS="$(sdl2-config --cflags --libs)"|' build.sh ''; @@ -44,11 +43,13 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { homepage = "https://wiki.xxiivv.com/site/uxn.html"; description = "An assembler and emulator for the Uxn stack machine"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ AndersonTorres kototama ]; - platforms = with platforms; unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres kototama ]; + inherit (SDL2.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index e35428a5a0..1bfb35e76d 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "8.0.1"; + version = "8.0.2"; url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; - hash = "sha256-IgNfODa0+cOxlArZD5uePBvgkjQjbSqA2JMYBTXHW30="; + hash = "sha256-bsj7byxy1XbLEfUrL41Zr2RASAIVRlHRIrmEZtkdyEc="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.10"; + version = "8.13"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-xPNt1zwXbO+OcBbKQTnudvW0mKSv1+21F+FMDVOUc28="; + hash = "sha256-JuXTqD0lxUGMbA9USORD0gh2OiZDqrSw8a01KSKkwnU="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-4EHzverfPu4PoRvbeH/iaGqNoXk6XgneDpKOuMf9P1g="; + hash = "sha256-5upC+IWHBJE5DeFv96lD1hr4LYYaqAAzfxIroK9KlOY="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix index 28e7829a9c..311935b846 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix @@ -12,6 +12,7 @@ , libepoxy , libpcap , libsamplerate +, libslirp , makeDesktopItem , mesa , meson @@ -27,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.97"; + version = "0.7.110"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-Doyn+EHZ9nlYjufHnHARLXbyDjYIEGIHuLOXFHU5f3w="; + hash = "sha256-ztYjvQunjskPZUIntzX4GEh0nv0K6knVubYW+QlCCII="; fetchSubmodules = true; }; @@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libepoxy libpcap libsamplerate + libslirp mesa openssl vte @@ -131,5 +133,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ]; platforms = lib.platforms.linux; + mainProgram = "xemu"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix index 3fdd6db846..71306bdc43 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 676b9db8f8..45043fb4b4 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-06-22 +# Last updated: 2023-08-02 { compatList = { - rev = "2288f79cad3be4c2c3148435372958aebea33156"; + rev = "95617e06f8f19e3dcd76b694d6ba87408011cd4d"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1475"; - hash = "sha256:1948lqk89k7b48skcikjx3i3f8nwb6n6sh2bf00qqbchr8i27gpm"; + version = "1515"; + hash = "sha256:0w9kg2rq43x9khws2yx6p7qad4xw6vkd04adiw021hjv1scajrlm"; }; ea = { - version = "3702"; - distHash = "sha256:178mfg7rxr1372favkkizdcjv1ckfkzmjqfpw6ja3c5kv0psv19j"; - fullHash = "sha256:00ls667l8zaj8597saw6drd28x4k02iqh3l7rxjjxkcqny6qv6p8"; + version = "3788"; + distHash = "sha256:0w8jm51b2fwfbr5rmqdagjkay4kams2g12qqkqla6n696zn302jx"; + fullHash = "sha256:1fdv7645ijnl58749f4qa5ni7bag4chmm1c8gvji5408grfp0ldq"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch new file mode 100644 index 0000000000..7b77179e9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch @@ -0,0 +1,13 @@ +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 e5ee64c28a..178b7c7b5a 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.11.0"; + version = "1.13.0"; format = "pyproject"; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; rev = "v${version}"; - hash = "sha256-LhrMQFkvdkYra/6jQtMAooGy76qLYldHoxEGMPhde7Q="; + hash = "sha256-vYb4XWBdQ4HJzICXNiBXit4aVgjYA9SCX15MppVtTS8="; }; nativeBuildInputs = with python3.pkgs; [ 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 c4c2d9e652..f07309a8ad 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.10"; + version = "1.13"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kXnI8a1nGKBDc+isv9RYvputKk+/FHmM9j+G4UnI5Z4="; + sha256 = "sha256-Y9z3HT36Z1fwweOnniRgyNQX1cbrLSGGgB5UAxkq9mI="; }; buildInputs = [ libcap acl file readline ]; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock index 5352311025..508aad3853 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock @@ -323,7 +323,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "felix" -version = "2.5.0" +version = "2.6.0" dependencies = [ "chrono", "content_inspector", 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 2f1c250535..61d4ea25d9 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,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zz2kTbY+5ZUxIZmwfg6Lpk1ulfuNSRWeaTZOh7fWAvg="; + sha256 = "sha256-e/NJmlXo6x/NUWU/JlVDItQK4c2XDC4unNNE+BUI5OE="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix index 9895cc108e..a8635a4163 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/krusader/default.nix @@ -43,5 +43,6 @@ mkDerivation rec { description = "Norton/Total Commander clone for KDE"; license = licenses.gpl2Only; maintainers = with maintainers; [ sander turion ]; + mainProgram = "krusader"; }; } 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 a61b0980d8..65211bb543 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; + mainProgram = "mc"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix index 8882bf42a5..cf3b1352f4 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/mucommander/default.nix @@ -10,13 +10,13 @@ }: let - version = "1.2.0-1"; + version = "1.3.0-1"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; rev = version; - sha256 = "sha256-OrtC7E/8n9uEo7zgFHYQqXV3qLpdKtxwbwZfxoOqTqA="; + sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; }; postPatch = '' @@ -49,7 +49,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-T4UhEzkaYh237+ZsoQTv1RgqcAKY4dPc/3x+dEie4A8="; + outputHash = "sha256-9tCcUg7hDNbkZiQEWtVRsUUfms73aU+vt5tQsfknM+E="; }; in diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch new file mode 100644 index 0000000000..f1bf71e6b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch @@ -0,0 +1,15 @@ +diff --git a/src/nnn.c b/src/nnn.c +index b3c0f986..c74e1ec9 100644 +--- a/src/nnn.c ++++ b/src/nnn.c +@@ -508,9 +508,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX]; + static runstate g_state; + + /* Options to identify file MIME */ +-#if defined(__APPLE__) +-#define FILE_MIME_OPTS "-bIL" +-#elif !defined(__sun) /* no MIME option for 'file' */ ++#if !defined(__sun) /* no MIME option for 'file' */ + #define FILE_MIME_OPTS "-biL" + #endif + 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 4c3fab6484..eb3e943676 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # Nix-specific: ensure nnn passes correct arguments to the Nix file command on Darwin. + # 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"; @@ -74,5 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; + mainProgram = "nnn"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix index deb9a98a51..bfbe68d885 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/pcmanfm/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; + mainProgram = "pcmanfm"; }; } 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 e0b9954e1f..0fcfa61907 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 @@ -67,9 +67,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "portfolio-filemanager"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { 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 a192edb0b3..96d43dc8f2 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix @@ -55,5 +55,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ toonn magnetophon ]; + mainProgram = "ranger"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix index 0e82fbfa65..b4681ab697 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/xplorer/default.nix @@ -51,7 +51,7 @@ in rustPlatform.buildRustPackage { inherit version src pname; - sourceRoot = "source/src-tauri"; + sourceRoot = "${src.name}/src-tauri"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 3f8bf84282..fa90b95bd7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-12"; + version = "7.1.1-15"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI="; + hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests = { - version = testers.testVersion { package = imagemagick; }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix index 1662f65a91..b98e7a4fb4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix @@ -2,28 +2,30 @@ , rustPlatform , fetchFromGitHub , installShellFiles -, pkg-config -, openssl +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "artem"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "finefindus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T652cdKVZqoZ+EwXmTSs9x+ftjvWOELjy37trCP7V+0="; + hash = "sha256-liYZloaXN9doNyPO76iCaiZO9ZkNGBm+BxxNX87ZqBM="; }; - cargoSha256 = "sha256-2LXpvAbkpk2sJHZJvytwLYksZK4coVYyKvuNRiDK0Gg="; + cargoHash = "sha256-fTAuh4jbfNpFaEu1X0LwVA30ghQ6mh5/Afap7gUjzMc="; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ + installShellFiles + ]; - buildInputs = [ openssl ]; - - OPENSSL_NO_VENDOR = 1; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; checkFlags = [ # require internet access diff --git a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix index ab75938760..2a7e0e9ac0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -54,7 +54,7 @@ , breeze-icons , oxygen -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} }: @@ -151,5 +151,6 @@ mkDerivation rec { license = licenses.gpl2; homepage = "https://www.digikam.org"; platforms = platforms.linux; + mainProgram = "digikam"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix index 250ff2b32e..8e36e5b70d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/djv/default.nix @@ -56,7 +56,7 @@ let src = djvSrc; - sourceRoot = "source/etc/SuperBuild"; + sourceRoot = "${src.name}/etc/SuperBuild"; nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 5ca19d5b41..4859fee52f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.mit-feh; maintainers = with maintainers; [ viric willibutz globin ma27 ]; platforms = platforms.unix; + mainProgram = "feh"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix index c2eaac0f56..af16095a7d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2023-02-23"; + version = "2023-07-16"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-sPIXLZdtVK3phfMsZrU8o9qisOC5RKvHH19ECXMV0t0="; + sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/glabels-qt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/glabels-qt/default.nix new file mode 100644 index 0000000000..5715241fb7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/glabels-qt/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, cmake +, mkDerivation +, qttools +}: + +mkDerivation { + pname = "glabels-qt"; + version = "unstable-2021-02-06"; + + src = fetchFromGitHub { + owner = "jimevins"; + repo = "glabels-qt"; + rev = "glabels-3.99-master564"; + hash = "sha256-SdNOkjspqf6NuuIBZDsJneY6PNrIiP4HU46wDpBLt9Y="; + }; + + nativeBuildInputs = [ + cmake + qttools + ]; + + meta = with lib; { + description = "GLabels Label Designer (Qt/C++)"; + homepage = "https://github.com/jimevins/glabels-qt"; + license = licenses.gpl3Only; + maintainers = [ maintainers.matthewcroughan ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix index a5d71d6b9e..9cc53a9c52 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "v${version}"; - sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM="; + sha256 = "sLJ+Fk+ePrmJeSllGd30uEQ/uFDl5CIob//1cDLKZHg="; }; # needed for wrapGAppsHook to function diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix index 300e7f7bb5..b6c0472140 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04="; }; + separateDebugInfo = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ imagemagick pkg-config wayland-scanner ]; buildInputs = [ wayland wayland-protocols ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix index e37539ceee..0fa08c31c0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli ''; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; meta = with lib; { description = "Very customizable imageboard/booru downloader with powerful filenaming features"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 6444537cac..3e1e482bb3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -4,6 +4,7 @@ , boost , cairo , cmake +, desktopToDarwinBundle , fetchurl , gettext , ghostscript @@ -78,16 +79,15 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + (substituteAll { + # Fix path to ps2pdf binary + src = ./fix-ps2pdf-path.patch; + inherit ghostscript; + }) ]; postPatch = '' patchShebangs share/extensions - substituteInPlace share/extensions/eps_input.inx \ - --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf" - substituteInPlace share/extensions/ps_input.inx \ - --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf" - substituteInPlace share/extensions/ps_input.py \ - --replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'" patchShebangs share/templates patchShebangs man/fix-roff-punct @@ -107,7 +107,9 @@ stdenv.mkDerivation rec { ] ++ (with perlPackages; [ perl XMLParser - ]); + ]) ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle + ]; buildInputs = [ boehmgc @@ -157,6 +159,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.jtojnar ]; platforms = platforms.all; + mainProgram = "inkscape"; longDescription = '' Inkscape is a feature-rich vector graphics editor that edits files in the W3C SVG (Scalable Vector Graphics) file format. diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch new file mode 100644 index 0000000000..9cd8e4b34c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch @@ -0,0 +1,36 @@ +diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.inx inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/eps_input.inx +--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input.inx 2023-08-02 22:22:32.000000000 +0400 ++++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/eps_input.inx 2023-08-02 22:23:34.000000000 +0400 +@@ -3,7 +3,7 @@ + EPS Input + org.inkscape.input.eps + org.inkscape.input.pdf +- ps2pdf ++ @ghostscript@/bin/ps2pdf + true + +diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.inx inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.inx +--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.inx 2023-08-02 22:22:33.000000000 +0400 ++++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.inx 2023-08-02 22:24:00.000000000 +0400 +@@ -3,7 +3,7 @@ + PostScript Input + org.inkscape.input.postscript_input + org.inkscape.input.pdf +- ps2pdf ++ @ghostscript@/bin/ps2pdf + + +diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.py inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.py +--- inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.py 2023-08-02 22:22:32.000000000 +0400 ++++ inkscape-1.2.2_2022-12-01_b0a8486541/share/extensions/ps_input.py 2023-08-02 22:23:48.000000000 +0400 +@@ -79,7 +79,7 @@ + else: + try: + call( +- "ps2pdf", ++ "@ghostscript@/bin/ps2pdf", + crop, + "-dAutoRotatePages=/" + self.options.autorotate, + input_file, diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix index 01f17bb41b..834ab6198a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix @@ -17,19 +17,17 @@ , wrapQtAppsHook , zlib , withTeXLive ? true +, buildPackages }: stdenv.mkDerivation rec { pname = "ipe"; - version = "7.2.26"; + version = "7.2.27"; src = fetchurl { url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz"; - sha256 = "sha256-5J0AV5E6SlFrIBfwDZrbJnkDUoVZ0fDH669s2RQ1CqU="; + sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU="; }; - patches = [ - ./headers-lookup.patch - ]; nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ]; @@ -52,6 +50,7 @@ stdenv.mkDerivation rec { "-C src" "IPEPREFIX=${placeholder "out"}" "LUA_PACKAGE=lua" + "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc" "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch b/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch deleted file mode 100644 index a6adf1b164..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ipepresenter/Makefile b/src/ipepresenter/Makefile -index ae3664e..f4f74ff 100644 ---- a/src/ipepresenter/Makefile -+++ b/src/ipepresenter/Makefile -@@ -8,7 +8,7 @@ include ../common.mak - - TARGET = $(call exe_target,ipepresenter) - --CXXFLAGS += -I../include -I../ipecanvas -I../ipecairo \ -+CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo \ - $(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS) - LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipe \ - $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix index 008cfc5d2b..b444841f8f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -81,9 +81,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "komikku"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock b/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock index 7336065200..065f9705cd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock @@ -393,7 +393,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -1009,9 +1009,9 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -1077,9 +1077,9 @@ dependencies = [ [[package]] name = "exr" -version = "1.6.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7b44a196573e272e0cf0bcf130281c71e9a0c67062954b3323fd364bfdac9" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" dependencies = [ "bit_field", "flume", @@ -1266,7 +1266,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -1396,7 +1396,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -2026,7 +2026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.3", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -2577,9 +2577,9 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "nalgebra" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "matrixmultiply", @@ -2593,9 +2593,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", @@ -3024,7 +3024,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -3192,7 +3192,7 @@ dependencies = [ [[package]] name = "oculante" -version = "0.6.68" +version = "0.6.69" dependencies = [ "anyhow", "arboard", @@ -3230,7 +3230,7 @@ dependencies = [ "serde", "serde_json", "strum", - "strum_macros 0.25.1", + "strum_macros", "tiff 0.9.0", "tiny-skia 0.9.1", "turbojpeg", @@ -3316,7 +3316,7 @@ checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -3437,7 +3437,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -3481,7 +3481,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -3597,9 +3597,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -3816,9 +3816,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", @@ -3828,9 +3828,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" dependencies = [ "aho-corasick", "memchr", @@ -3839,9 +3839,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -4030,9 +4030,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.3" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ "bitflags 2.3.3", "errno", @@ -4043,9 +4043,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.3" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b19faa85ecb5197342b54f987b142fb3e30d0c90da40f80ef4fa9a726e6676ed" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", @@ -4196,22 +4196,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.167" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.167" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -4436,24 +4436,11 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", + "strum_macros", ] [[package]] @@ -4466,7 +4453,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -4502,9 +4489,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -4526,9 +4513,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" @@ -4576,7 +4563,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -5085,7 +5072,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", "wasm-bindgen-shared", ] @@ -5119,7 +5106,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5546,9 +5533,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9482fe6ceabdf32f3966bfdd350ba69256a97c30253dc616fe0005af24f164e" +checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" dependencies = [ "memchr", ] diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix index a58382b8de..5b758aaa1a 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.6.68"; + version = "0.6.69"; src = fetchFromGitHub { owner = "woelper"; repo = pname; rev = version; - hash = "sha256-afkRId4PuRKnnloFLh2rD+npcCCUqDngKcnWbEf+6vk="; + hash = "sha256-xiZyI4TGXtpMoiX6KartjOO+BgbUht22Kg1FIp39m/o="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix index 94c30fe0a3..37fcc0eb48 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openscad/default.nix @@ -109,5 +109,6 @@ mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ bjornfor raskin gebner ]; + mainProgram = "openscad"; }; } 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 61dca70c2a..131dd4457d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , qtsvg +, qtwayland , qttools , exiv2 , wrapQtAppsHook @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtsvg + qtwayland exiv2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix index 4cb2440cb8..0666501120 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pixelnuke/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libevent, glew, glfw }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "pixelnuke"; version = "unstable-2019-05-19"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40"; }; - sourceRoot = "source/pixelnuke"; + sourceRoot = "${finalAttrs.src.name}/pixelnuke"; buildInputs = [ libevent glew glfw ]; @@ -26,4 +26,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ mrVanDalo ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix index 65c02102f0..b8d2adc909 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/processing/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }: let - buildNumber = "1289"; + buildNumber = "1292"; vaqua = fetchurl { name = "VAqua9.jar"; url = "https://violetlib.org/release/vaqua/9/VAqua9.jar"; @@ -37,29 +37,32 @@ let sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM="; }; + arch = { + x86_64 = "amd64"; + }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; in stdenv.mkDerivation rec { pname = "processing"; - version = "4.1.1"; + version = "4.2"; src = fetchFromGitHub { owner = "processing"; repo = "processing4"; rev = "processing-${buildNumber}-${version}"; - sha256 = "sha256-OjTqANxzcW/RrAdqmVYAegrlLPu6w2pjzSyZyvUYIt4="; + sha256 = "sha256-wdluhrtliLN4T2dcmwvUWZhOARC3Lst7+hWWwZjafmU="; }; nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; - buildInputs = [ jdk javaPackages.jogl_2_3_2 ant rsync ffmpeg batik ]; + buildInputs = [ jdk javaPackages.jogl_2_4_0 ant rsync ffmpeg batik ]; dontWrapGApps = true; buildPhase = '' echo "tarring jdk" - tar --checkpoint=10000 -czf build/linux/jdk-17.0.5-amd64.tgz ${jdk} + tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-${arch}.tgz ${jdk} cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/ mkdir -p core/library - ln -s ${javaPackages.jogl_2_3_2}/share/java/* core/library/ + ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/ ln -s ${vaqua} app/lib/VAqua9.jar ln -s ${flatlaf} app/lib/flatlaf.jar ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar diff --git a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix b/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix index 11ddc7c7db..2dfc42c97a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "scantailor-advanced"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "vigri"; repo = "scantailor-advanced"; rev = "v${version}"; - sha256 = "sha256-4/QSjgHvRgIduS/AXbT7osRTdOdgR7On3CbjRnGbwHU="; + sha256 = "sha256-mvoCoYdRTgXW5t8yd9Y9TOl7D3RDVwcjUv2YDUWrtRI="; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 555770f7e1..f7ee044d42 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.32.1"; + version = "0.32.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SsRRdBatiqI7ROdcNL1uFrq3Nj+iCZG7CbrN+rP3Y84="; + sha256 = "sha256-pd5T6HMhbfj1mWyWgnvtlj1sY1TgReF5bf0ybGGIwmM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix index 52c3fa3bae..61fcb3a24b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/synfigstudio/default.nix @@ -39,7 +39,7 @@ let pname = "ETL"; inherit version src; - sourceRoot = "source/ETL"; + sourceRoot = "${src.name}/ETL"; nativeBuildInputs = [ pkg-config @@ -54,7 +54,7 @@ let pname = "synfig"; inherit version src; - sourceRoot = "source/synfig-core"; + sourceRoot = "${src.name}/synfig-core"; configureFlags = [ "--with-boost=${boost.dev}" @@ -89,7 +89,7 @@ stdenv.mkDerivation { pname = "synfigstudio"; inherit version src; - sourceRoot = "source/synfig-studio"; + sourceRoot = "${src.name}/synfig-studio"; postPatch = '' patchShebangs images/splash_screen_development.sh diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix index 614a9e844c..aa7f17b20c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ anselmschueler ]; platforms = lib.platforms.unix; + mainProgram = "tesseract"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix index 4b32cf8e8a..995f682d81 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-ZkO2CLSuuJcFJFBO4XS8Qec0CxxAJdzOGfFa2zy+4uI="; + hash = "sha256-ZY0HG1BpRQV7+RzdXUhKV6JRa/1RIYmCuhnYCZapG8w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix index 01601657c8..2752eaff87 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.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - sha256 = "sha256-zftvjH5hyWBpjRe5uQBDAqbThQaQFHz0UhzM5q8hSk8="; + hash = "sha256-hx7daXVarV4JdxZfwnTHsuxxijCRP17gkOjicI3EFlM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix index b02d35f93a..27957a5fa8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vpv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src/fuzzy-finder"; cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - sourceRoot = "source/src/fuzzy-finder"; + sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder"; hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI="; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index b36ac5968b..cd3b73b6b4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -6,9 +6,11 @@ , wrapGAppsHook , pkg-config +, alsa-lib , glib , gsettings-desktop-schemas , gtk3 +, gtksourceview4 , librsvg , libsndfile , libxml2 @@ -23,20 +25,23 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hn7IDnbrmK3V+iz8UqdmHRV2TS4MwYSgYtnH6igbGJ8="; + sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; buildInputs = - [ glib + [ + alsa-lib + glib gsettings-desktop-schemas gtk3 + gtksourceview4 librsvg libsndfile libxml2 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix new file mode 100644 index 0000000000..a2ecaec7c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, ninja +, opencv +, SDL2 +, gtk3 +, catch2_3 +, spdlog +, exiv2 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "xpano"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "krupkat"; + repo = pname; + rev = "v${version}"; + sha256 = "1f95spf7bbbdvbr4gqfyrs161049jj1wnkvf5wgsd0ga3vb15mcj"; + fetchSubmodules = true; + }; + + patches = [ + # force install desktop + icon files + ./skip_prefix_check.patch + ]; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + opencv + SDL2 + gtk3 + spdlog + # exiv2 # TODO: enable when 0.28.0 is available + ]; + + checkInputs = [ + catch2_3 + ]; + + doCheck = true; + + cmakeFlags = [ + "-DBUILD_TESTING=ON" + ]; + + meta = with lib; { + description = "A panorama stitching tool"; + homepage = "https://krupkat.github.io/xpano/"; + changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ krupkat ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xpano/skip_prefix_check.patch b/third_party/nixpkgs/pkgs/applications/graphics/xpano/skip_prefix_check.patch new file mode 100644 index 0000000000..496cbc718b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/xpano/skip_prefix_check.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,7 +167,6 @@ install(FILES + TYPE BIN + ) + +-if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") + install(FILES + "misc/build/linux/xpano.desktop" + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications" +@@ -184,7 +183,6 @@ if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*") + "misc/build/linux/cz.krupkat.Xpano.metainfo.xml" + DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo" + ) +-endif() + + install(DIRECTORY + "${CMAKE_SOURCE_DIR}/misc/assets" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix index 8b26c42b9c..b70c96ea8d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xv/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xv"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "vwSUKWr4Hffx04ATUI58m7UOS/lVTnIVDC3ZTWRwJMM="; + sha256 = "TXUcdrwtPNiS7z795RbzBXzNYRADeVtF5uz4aovLo/M="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix index 93e3f85639..7e9c80cd64 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix @@ -5,11 +5,21 @@ , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire -, wrapGAppsHook +, wrapGAppsHook, fetchpatch }: 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/logging/sosreport/default.nix b/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix index 8f4d06939f..b04a9835a8 100644 --- a/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix +++ b/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Unified tool for collecting system logs and other debug information"; homepage = "https://github.com/sosreport/sos"; license = licenses.gpl2Only; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } 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 cfcf1d7f89..7dbae3e43b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -61,6 +61,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = builtins.attrNames sources.${channel}; + mainProgram = "1password"; }; in if stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index e2c68adda5..4a05bc4e3a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -14,7 +14,7 @@ let pname = "1password-cli"; version = "2.19.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-z5+zCYYJxtzehBeilSWH/nPEOh8rXpwJDVL+SDansmY=" "zip"; + 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"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/acpic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/acpic/default.nix new file mode 100644 index 0000000000..6b37ef6b8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/acpic/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchPypi +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "acpic"; + version = "1.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version pname; + hash = "sha256-vQ9VxCNbOmqHIY3e1wq1wNJl5ywfU2tm62gDg3vKvcg="; + }; + + nativeBuildInputs = [ + python3Packages.pbr + ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Daemon extending acpid event handling capabilities."; + homepage = "https://github.com/psliwka/acpic"; + license = licenses.wtfpl; + maintainers = with maintainers; [ aacebedo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix index af42c194e6..0496bd1c22 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.33.0"; + version = "0.33.3"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-lkocuPlUYGFWWEMaz7Q/SWMFIGa2w+jNQ0u5EzcSz7M="; + sha256 = "sha256-3qBd1WgHn/sfEyNRPTX5viMX3lVZPfsG6x7GfNwkL3E="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix index 13d1554dcd..42f9feb421 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archivebox/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchFromGitHub , fetchPypi }: @@ -24,6 +25,16 @@ let ]; }; }); + django-extensions = super.django-extensions.overridePythonAttrs (old: rec { + version = "3.1.5"; + src = fetchFromGitHub { + inherit version; + owner = "django-extensions"; + repo = "django-extensions"; + rev = "e43f383dae3a35237e42f6acfe1207a8e7e7bdf5"; + hash = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM="; + }; + }); }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 525ab9788c..3ab0b19f63 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.26.4"; + version = "1.26.7"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - hash = "sha256-l/sPqXkr4rSMEbPi/ahl/74RYqNrjcb28v6/scDrh1w="; + hash = "sha256-i9hfmMp0pEqtIeKc1mcyINXetzD/33aM0utL8nomVcg="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix index dd5585c35b..199e89dc0b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ iammrinal0 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "authy"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix index 0261f983ac..7e366d19d5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.35.1"; + version = "1.44.1"; desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "sha256-b/ha+81TlffnvSENzaePvfFugcKJffvjRU7y+x60OuQ="; + sha256 = "sha256-6kEV331kt+/7/uWKZmTTkJX4P06CfxC8Ogq052qlUEg="; }; nativeBuildInputs = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ]; # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.215"; + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath diff --git a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix index 66ad4046d1..f068667948 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix @@ -49,5 +49,6 @@ mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.phryneas ]; platforms = lib.platforms.linux; + mainProgram = "barrier"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix index 1618bf746c..abf3f53e32 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ SlothOfAnarchy ]; platforms = platforms.linux; + mainProgram = "batsignal"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix index 8ec1490bdc..84d43f5eb9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { description = "Graphical tool to visualize binary data"; homepage = "https://github.com/sharkdp/binocle"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix index 7a667b1875..c6e4adf8a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bleachbit/default.nix @@ -65,5 +65,6 @@ python3Packages.buildPythonApplication rec { longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; maintainers = with maintainers; [ leonardoce mbprtpmnr ]; + mainProgram = "bleachbit"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 81b7a54a75..448eb14771 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -5,7 +5,7 @@ , openvdb, libXxf86vm, tbb, alembic , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} +, cudaSupport ? config.cudaSupport, cudaPackages ? { } , hipSupport ? false, hip # comes with a significantly larger closure size , colladaSupport ? true, opencollada , spaceNavSupport ? stdenv.isLinux, libspnav @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk="; }; - patches = lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ + ./draco.patch + ] ++ lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev @@ -165,6 +167,7 @@ stdenv.mkDerivation rec { mkdir $out/Applications mv $out/Blender.app $out/Applications '' + '' + mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext} buildPythonPath "$pythonPath" wrapProgram $blenderExecutable \ --prefix PATH : $program_PATH \ @@ -193,5 +196,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; broken = stdenv.isDarwin; maintainers = with maintainers; [ goibhniu veprbl ]; + mainProgram = "blender"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/draco.patch b/third_party/nixpkgs/pkgs/applications/misc/blender/draco.patch new file mode 100644 index 0000000000..2a856a0638 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/draco.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -898,11 +898,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF) + set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF) + set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID OFF) + +-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL) +- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now") +- set(WITH_DRACO OFF) +-endif() +- + # enable boost for cycles, audaspace or i18n + # otherwise if the user disabled + +--- a/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py ++++ b/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py +@@ -17,7 +17,7 @@ def dll_path() -> Path: + """ + lib_name = 'extern_draco' +- blender_root = Path(bpy.app.binary_path).parent ++ blender_root = Path(bpy.app.binary_path).parent.parent +- python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version)) ++ python_lib = Path('share/blender/{v[0]}.{v[1]}/python-ext/lib'.format(v=bpy.app.version)) + python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info) + + path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH') diff --git a/third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix new file mode 100644 index 0000000000..175b293c9d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/bloodhound/default.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, fetchzip +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libGL +, libappindicator-gtk3 +, libdrm +, libnotify +, libpulseaudio +, libuuid +, libxcb +, libxkbcommon +, libxshmfence +, mesa +, nspr +, nss +, pango +, systemd +, udev +, unzip +, xdg-utils +, xorg +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bloodhound"; + version = "4.3.1"; + + src = fetchzip { + url = "https://github.com/BloodHoundAD/BloodHound/releases/download/v${finalAttrs.version}/BloodHound-linux-x64.zip"; + hash = "sha256-gGfZ5Mj8rmz3dwKyOitRExkgOmSVDOqKpPxvGlE4izw="; + }; + + rpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libGL + libappindicator-gtk3 + libdrm + libnotify + libpulseaudio + libuuid + libxcb + libxkbcommon + mesa + nspr + nss + pango + systemd + stdenv.cc.cc.lib + udev + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxkbfile + xorg.libxshmfence + ]; + + buildInputs = [ + gtk3 # needed for GSETTINGS_SCHEMAS_PATH + ]; + + nativeBuildInputs = [ makeWrapper unzip ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,/lib/BloodHound} + mv * $out/lib/BloodHound + chmod +x $out/lib/BloodHound/BloodHound + + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + $out/lib/BloodHound/BloodHound --set-rpath ${finalAttrs.rpath}:$out/lib/BloodHound \ + --add-needed libudev.so # Needed to fix trace trap (core dump) + + makeWrapper $out/lib/BloodHound/BloodHound $out/bin/BloodHound \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ + --suffix PATH : ${lib.makeBinPath [xdg-utils]} \ + --append-flags "--in-process-gpu" # fix for sandbox issues + + runHook postInstall + ''; + + meta = with lib; { + description = "Active Directory reconnaissance and attack path management tool"; + homepage = "https://github.com/BloodHoundAD/BloodHound"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + changelog = "https://github.com/BloodHoundAD/BloodHound/releases/tag/v${finalAttrs.version}"; + downloadPage = "https://github.com/BloodHoundAD/BloodHound/releases"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ akechishiro ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "BloodHound"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix index 34f0f32361..64f0df2e4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -109,5 +109,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; maintainers = with maintainers; [ psydvl shamilton ]; platforms = platforms.linux; + mainProgram = "bottles"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix index 8df75b0cbd..3f9f2ec678 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/candle/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix new file mode 100644 index 0000000000..ad95480c64 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix @@ -0,0 +1,56 @@ +{ blueprint-compiler +, desktop-file-utils +, fetchFromGitHub +, gobject-introspection +, lib +, libadwaita +, meson +, ninja +, python3 +, stdenv +, wrapGAppsHook4 +}: +stdenv.mkDerivation (finalAttrs: { + pname = "cartridges"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "kra-mo"; + repo = "cartridges"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-jycTLKTHKhxd4t+3NB23Tf1oAvqiDHHsNmS6uLikgGA="; + }; + + buildInputs = [ + libadwaita + (python3.withPackages (p: with p; [ + pillow + pygobject3 + pyyaml + requests + ])) + ]; + + nativeBuildInputs = [ + blueprint-compiler + desktop-file-utils + gobject-introspection + meson + ninja + wrapGAppsHook4 + ]; + + meta = with lib; { + description = "A GTK4 + Libadwaita game launcher"; + longDescription = '' + A simple game launcher for all of your games. + It has support for importing games from Steam, Lutris, Heroic + and more with no login necessary. + You can sort and hide games or download cover art from SteamGridDB. + ''; + homepage = "https://apps.gnome.org/app/hu.kramo.Cartridges/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.getchoo ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/collision-shards.nix b/third_party/nixpkgs/pkgs/applications/misc/collision/collision-shards.nix new file mode 100644 index 0000000000..0c27255041 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/collision/collision-shards.nix @@ -0,0 +1,42 @@ +{ + gettext = { + url = "https://github.com/geopjr/gettext.cr.git"; + rev = "v1.0.0"; + sha256 = "1y27m4170rr4532j56grzhwbz8hj6z7j3zfkd0jnfwnsxclks1kc"; + }; + non-blocking-spawn = { + url = "https://github.com/geopjr/non-blocking-spawn.git"; + rev = "v1.0.5"; + sha256 = "139gr87zlw0k9kf6pf9k2d88aa9x3kcnfg34qpbqrwsrck7708za"; + }; + version_from_shard = { + url = "https://github.com/hugopl/version_from_shard.git"; + rev = "v1.2.5"; + sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; + }; + gio = { + url = "https://github.com/hugopl/gio.cr.git"; + rev = "v0.1.0"; + sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8"; + }; + gtk4 = { + url = "https://github.com/hugopl/gtk4.cr.git"; + rev = "v0.13.0"; + sha256 = "0xsrcsh5qvwm9l7cywxpw49rfv94mkkqcliws4zkhxgr9isnirbm"; + }; + harfbuzz = { + url = "https://github.com/hugopl/harfbuzz.cr.git"; + rev = "v0.1.0"; + sha256 = "1lcb778b4k34sqxg979fpl425bbzf2gikjf2m5aj6x1fzxn46jg0"; + }; + pango = { + url = "https://github.com/hugopl/pango.cr.git"; + rev = "v0.2.0"; + sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf"; + }; + libadwaita = { + url = "https://github.com/geopjr/libadwaita.cr.git"; + rev = "203737fc96bb48e1a710cb68e896d2c5b9c1a6e5"; + sha256 = "11c2knxncjnwg4cgppfllxwgli1hf6sjyyx4ii8rgmnbird6xcmh"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix new file mode 100644 index 0000000000..a77d0b34a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/collision/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, crystal +, wrapGAppsHook4 +, desktopToDarwinBundle +, gi-crystal +, gobject-introspection +, libadwaita +, openssl +, libxml2 +, pkg-config +}: +crystal.buildCrystalPackage rec { + pname = "Collision"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "GeopJr"; + repo = "Collision"; + rev = "v${version}"; + hash = "sha256-YNMtiMSzDqBlJJTUntRtL6oXg+IuyAobQ4FYcwOdOas="; + }; + patches = [ ./make.patch ]; + shardsFile = ./collision-shards.nix; + + # Crystal compiler has a strange issue with OpenSSL. The project will not compile due to + # main_module:(.text+0x6f0): undefined reference to `SSL_library_init' + # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/ + # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. + + nativeBuildInputs = [ wrapGAppsHook4 pkg-config gobject-introspection gi-crystal ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + buildInputs = [ libadwaita openssl libxml2 ]; + + buildTargets = ["bindings" "build"]; + + doCheck = false; + doInstallCheck = false; + + installTargets = ["desktop" "install"]; + + meta = with lib; { + description = "Check hashes for your files"; + homepage = "https://github.com/GeopJr/Collision"; + license = licenses.bsd2; + mainProgram = "collision"; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/collision/make.patch b/third_party/nixpkgs/pkgs/applications/misc/collision/make.patch new file mode 100644 index 0000000000..73872a7892 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/collision/make.patch @@ -0,0 +1,20 @@ +--- a/Makefile 2023-07-09 10:49:31.064190374 +0300 ++++ b/Makefile 2023-07-19 11:19:37.415480179 +0300 +@@ -6,7 +6,7 @@ + all: desktop bindings build + + bindings: +- ./bin/gi-crystal || $(CRYSTAL_LOCATION)shards install && ./bin/gi-crystal ++ gi-crystal + + build: + COLLISION_LOCALE_LOCATION="$(PREFIX)$(LOCALE_LOCATION)" $(CRYSTAL_LOCATION)shards build -Dpreview_mt --release --no-debug +@@ -43,7 +43,7 @@ + install -D -m 0644 data/dev.geopjr.Collision.desktop $(PREFIX)/share/applications/dev.geopjr.Collision.desktop + install -D -m 0644 data/icons/dev.geopjr.Collision.svg $(PREFIX)/share/icons/hicolor/scalable/apps/dev.geopjr.Collision.svg + install -D -m 0644 data/icons/dev.geopjr.Collision-symbolic.svg $(PREFIX)/share/icons/hicolor/symbolic/apps/dev.geopjr.Collision-symbolic.svg +- gtk-update-icon-cache $(PREFIX)/share/icons/hicolor ++ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor + glib-compile-schemas $(PREFIX)/share/glib-2.0/schemas/ + + uninstall: \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix b/third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix new file mode 100644 index 0000000000..77269ef853 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/confetty/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "confetty"; + version = "unstable-2022-11-05"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "confetty"; + rev = "6c6f1b5b605f78c3ed3bab2d2a1357c0dd794221"; + hash = "sha256-1BAszv9I2JDflWyHuAlbJo7+oI7BI/TL10uFIYa8mLk="; + }; + + vendorHash = "sha256-RymdnueY674Zd231O8CIw/TEIDaWDzc+AaI6yk9hFgc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Confetti in your TTY"; + homepage = "https://github.com/maaslalani/confetty"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix index ec177c0aa7..82d7267b04 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/confy/default.nix @@ -1,11 +1,11 @@ -{ appstream-glib +{ blueprint-compiler , desktop-file-utils -, fetchurl +, fetchFromSourcehut , gobject-introspection -, gtk3 +, gtk4 , lib +, libadwaita , libnotify -, libhandy , meson , ninja , pkg-config @@ -16,14 +16,17 @@ stdenv.mkDerivation rec { pname = "confy"; - version = "0.6.5"; + version = "0.7.0"; - src = fetchurl { - url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz"; - sha256 = "sha256-zfuwOZBSGQzJUc36M6C5wSHarLbPFqayQVFo+WbVo7k="; + src = fetchFromSourcehut { + owner = "~fabrixxm"; + repo = "confy"; + rev = version; + hash = "sha256-q8WASTNbiBuKb2tPQBmUL9ji60PRAPnYOTYxnUn0MAw="; }; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils meson ninja @@ -33,8 +36,8 @@ stdenv.mkDerivation rec { buildInputs = [ gobject-introspection - gtk3 - libhandy + gtk4 + libadwaita libnotify (python3.withPackages (ps: with ps; [ icalendar @@ -43,8 +46,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Remove executable bits so that meson runs the script with our Python interpreter - chmod -x build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py ''; meta = with lib; { 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 044ca97e34..a9c723d643 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.5"; + version = "2.10.7"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-sAjgG2f0rAWakPd2cZNGXkooIxQQM5OPHm11ahyY1WU="; + hash = "sha256-OVRl9yQKK3hJgRVV/W4Fl3LxdFpJs01Mo3pwxLg2RXg="; }; patches = [ 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 index 882e409026..65cfbdf1ac 100644 --- 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 @@ -1,11 +1,11 @@ diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp -index a73371b..b9d66ca 100644 +index 32cabfb..aab92ea 100644 --- i/src/settings/appsettings.cpp +++ w/src/settings/appsettings.cpp -@@ -75,7 +75,7 @@ void AppSettings::applyLocale(const QLocale &locale) +@@ -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, QStringLiteral("translations"), QStandardPaths::LocateDirectory)); + 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")); } diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 488b64185b..15dbb33118 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -40,7 +40,6 @@ mavenJdk17.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper - mavenJdk17 ]; buildInputs = [ @@ -136,5 +135,6 @@ mavenJdk17.buildMavenPackage rec { license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; + mainProgram = "dbeaver"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix index 8c04161844..be2fcdbe4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix @@ -70,9 +70,7 @@ python3.pkgs.buildPythonApplication rec { # handle setup hooks better strictDeps = false; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/dialect-app/dialect"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix index 71fba4e515..b53fab409b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ pSub globin ]; platforms = platforms.all; + mainProgram = "dmenu"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix index ec3024d48d..47dbaa62c3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; maintainers = with maintainers; [ domenkozar ]; + mainProgram = "dunst"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix index c485375137..36fa71b1d9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix @@ -63,5 +63,6 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.novoxd ]; + mainProgram = "dupeguru"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 00e53d3a82..4faa7a7eac 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.24.1"; + version = "1.24.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4="; + sha256 = "sha256-w0IqcvVbeYG9Ly8QzJIxgWIMeYQBf4Ogwi+eRLfD8kk="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix index 7fa2e4d891..0f02eeed17 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fontpreview/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.erictapen ]; + mainProgram = "fontpreview"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix index 5ee5d162fa..2f8d26af43 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -24,14 +24,14 @@ assert svgSupport -> enableCairo; stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = pname; rev = version; - hash = "sha256-Va/Rm35jqxDlIfQdrpZ41qrW8YzWmm1LWra76AW1xUw="; + hash = "sha256-X1P/ghX97KCQcrNk44Cy2IAGuZ8DDwHBWzh1AHLDvd4="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix b/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix new file mode 100644 index 0000000000..983b61b931 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, libvorbis +, ffmpeg +, libeb +, hunspell +, opencc +, xapian +, libzim +, lzo +, xz +, tomlplusplus +, fmt +, bzip2 +, libiconv +, libXtst +, qtbase +, qtsvg +, qtwebengine +, qttools +, qtwayland +, qt5compat +, qtmultimedia +, qtspeech +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "goldendict-ng"; + version = "23.07.23"; + + src = fetchFromGitHub { + owner = "xiaoyifang"; + repo = "goldendict-ng"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ZKbrO5L4KFmr2NsGDihRWBeW0OXHoPRwZGj6kt1Anc8="; + }; + + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; + buildInputs = [ + qtbase + qtsvg + qttools + qtwebengine + qt5compat + qtmultimedia + qtspeech + libvorbis + tomlplusplus + fmt + hunspell + xz + lzo + libXtst + bzip2 + libiconv + opencc + libeb + ffmpeg + xapian + libzim + ]; + + cmakeFlags = [ + "-DWITH_XAPIAN=ON" + "-DWITH_ZIM=ON" + "-DWITH_FFMPEG_PLAYER=ON" + "-DWITH_EPWING_SUPPORT=ON" + "-DUSE_SYSTEM_FMT=ON" + "-DUSE_SYSTEM_TOML=ON" + ]; + + meta = with lib; { + homepage = "https://xiaoyifang.github.io/goldendict-ng/"; + description = "Advanced multi-dictionary lookup program."; + platforms = platforms.linux; + 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 1222fefab0..6cee8ce5ec 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "goldendict"; repo = pname; - rev = "v${version}"; + rev = version; hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M="; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix index a8f5c91d1e..7c91181e06 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gtkradiant/default.nix @@ -61,6 +61,81 @@ let rev = 144; sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4="; }; + darkPlacesPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/trunk"; + rev = 57; + sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + }; + doom3Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Doom3Pack/trunk"; + rev = 56; + sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + }; + halfLifePack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/HalfLifePack/trunk"; + rev = 1; + sha256 = "sha256-CrbN3iOG89j71y4ZJ4gNZEA5CYxphLLGbZwv6Tbjui0="; + }; + her2Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Her2Pack/trunk"; + rev = 55; + sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + }; + jk2Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/JK2Pack/trunk"; + rev = 77; + sha256 = "sha256-3g/p9OC0j2va9CXXtsQf0lP6VJ1WyI5k2W9xNRwYjS8="; + }; + nexuizPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/NexuizPack/trunk"; + rev = 49; + sha256 = "sha256-nAV7rZKDgAxlEmu2RfBFNsHv9Xgas1IlDgioligvY+c="; + }; + preyPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/PreyPack/trunk"; + rev = 19; + sha256 = "sha256-wbKEnSaFO40HxhMsbYKy76MxXDvY9O1lTcr3M7fXxW0="; + }; + q2wPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/trunk"; + rev = 126; + sha256 = "sha256-Q6IyL2qUr+6ktP34oYkFqN5MeFxCXOkcjrPg5J95ftg="; + }; + q4Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q4Pack/trunk"; + rev = 54; + sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + }; + ravenPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/RavenPack/trunk"; + rev = 1; + sha256 = "sha256-bYRjCkdaznaO7+WDB6cgL3szTB+MXwt3IKH3L2rGjLs="; + }; + reactionPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/ReactionPack/trunk"; + rev = 69; + sha256 = "sha256-aXSM0ubyhgamLBzfNZ6RzRSdzKwfHWLt/6OS/i9mMVo="; + }; + sof2Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Sof2Pack/trunk"; + rev = 1; + sha256 = "sha256-EnGhYghXe6hU5vvdF+Z9geTiHDukBEr1+CQgunxxGic="; + }; + tremulousPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/TremulousPack/trunk"; + rev = 46; + sha256 = "sha256-NU+ynpqydFxdZSkh7Szm6DTqyMYVS+PU70Mp98ZjdOs="; + }; + ufoaiPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/trunk"; + rev = 69; + sha256 = "sha256-nAd7fFZJJ82rDPVlTiZkkTGXi5tw7BSKk+akFBXSWvY="; + }; + warsowPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/WarsowPack/trunk"; + rev = 53; + sha256 = "sha256-IQ12fEKnq0cJxef+ddvTXcwM8lQ8nlUoMJy81XJ7ANY="; + }; packs = runCommand "gtkradiant-packs" {} '' mkdir -p $out ln -s ${q3Pack} $out/Q3Pack @@ -74,30 +149,36 @@ let ln -s ${wolfPack} $out/WolfPack ln -s ${unvanquishedPack} $out/UnvanquishedPack ln -s ${q1Pack} $out/Q1Pack + ln -s ${darkPlacesPack} $out/DarkPlacesPack + ln -s ${doom3Pack} $out/Doom3Pack + ln -s ${halfLifePack} $out/HalfLifePack + ln -s ${her2Pack} $out/Her2Pack + ln -s ${jk2Pack} $out/JK2Pack + ln -s ${nexuizPack} $out/NexuizPack + ln -s ${preyPack} $out/PreyPack + ln -s ${q2wPack} $out/Q2WPack + ln -s ${q4Pack} $out/Q4Pack + ln -s ${ravenPack} $out/RavenPack + ln -s ${reactionPack} $out/ReactionPack + ln -s ${sof2Pack} $out/Sof2Pack + ln -s ${tremulousPack} $out/TermulousPack + ln -s ${ufoaiPack} $out/UFOAIPack + ln -s ${warsowPack} $out/WarsowPack ''; in stdenv.mkDerivation rec { pname = "gtkradiant"; - version = "unstable-2022-07-31"; + version = "unstable-2023-04-24"; src = fetchFromGitHub { owner = "TTimo"; repo = "GtkRadiant"; - rev = "5b498bfa01bde6c2c9eb60fb94cf04666e52d22d"; - sha256 = "sha256-407faeQnhxqbWgOUunQKj2JhHeqIzPPgrhz2K5O4CaM="; + rev = "ddbaf03d723a633d53fa442c2f802f7ad164dd6c"; + sha256 = "sha256-qI+KGx73AbM5PLFR2JDXKDbiqmU0gS/43rhjRKm/Gms="; }; - # patch paths so that .game settings are put into the user's home instead of the read-only /nix/store - postPatch = '' - substituteInPlace radiant/preferences.cpp \ - --replace 'gameFilePath += "games/";' 'gameFilePath = g_get_home_dir(); gameFilePath += "/.cache/radiant/games/";printf("gameFilePath: %s\\n", gameFilePath);' \ - --replace 'radCreateDirectory( gameFilePath );' 'if (g_mkdir_with_parents( gameFilePath, 0777 ) == -1) {radCreateDirectory( gameFilePath );};' \ - --replace 'strGamesPath = g_strAppPath.GetBuffer();' 'strGamesPath = g_get_home_dir();' \ - --replace 'strGamesPath += "games";' 'strGamesPath += "/.cache/radiant/games";' - ''; - nativeBuildInputs = let python = python3.withPackages (ps: with ps; [ @@ -113,7 +194,7 @@ stdenv.mkDerivation rec { test -e $(readlink $3) elif [ "$1" = update ]; then # verify existence - test -e $(readlink $3) + test -e $(readlink $2) else echo "$@" exit 1 @@ -145,8 +226,19 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/{bin,lib} cp -ar install $out/lib/gtkradiant + for pack in ${packs}/* ; do + name=$(basename "$pack") + if ! [ -e $out/lib/gtkradiant/installs/$name ]; then + ln -s $pack $out/lib/gtkradiant/installs/$name + fi + done - ln -s ../lib/gtkradiant/radiant.bin $out/bin/gtkradiant + cat >$out/bin/gtkradiant < ./subprojects/nvtop.wrap + cp -r --no-preserve=mode,ownership "${nvtop}" ./subprojects/nvtop-src + cd ./subprojects/nvtop-src + mkdir -p include/libdrm + for patchfile in $(ls ../packagefiles/nvtop*.patch); do + patch -p1 < $patchfile + 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 + ''; + + meta = with lib; { + description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; + homepage = "https://gitlab.com/mission-center-devs/mission-center"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ GaetanLepage ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock new file mode 100644 index 0000000000..7b99bafde5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock @@ -0,0 +1,522 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "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", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "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 = "clap" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[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 = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dlv-list" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +dependencies = [ + "const-random", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[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 = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.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 = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "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 = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[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.146" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "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 = "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.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proxy" +version = "0.2.5" +dependencies = [ + "clap", + "lazy_static", + "libc", + "num_cpus", + "rust-ini", + "sha2", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[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 = "rustix" +version = "0.37.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +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/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index 45fe2e1395..390bc01413 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 = "4909"; + version = "4910"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-B3G1xpDZtJqkjyufLwYnJQlXREvN6OrJEjHWWP05jDM="; + sha256 = "sha256-t4SyvDvwNdqKh95MRmHxlX6q84dN0y4ANPIXqS7ynBA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix index c9523581b0..d00b9103d8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -152,5 +152,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; + mainProgram = "mupdf"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch b/third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch new file mode 100644 index 0000000000..352f8a077a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/mya/argp.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 273968c..236e5fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,10 +3,6 @@ project(mya) + set(CMAKE_C_STANDARD 11 ) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall") + +-if(UNIX) +- set(LINUX TRUE) +-endif() +- + set(SRC_DIR src) + set(INC_DIR include) + +@@ -17,7 +13,8 @@ set_target_properties(mya PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DI + target_include_directories(mya PRIVATE ${INC_DIR}) + + set(LIBS curl json-c bsd) +-if(LINUX) +- list(APPEND LIBS) ++find_library(ARGP argp) ++if(ARGP) ++ list(APPEND LIBS argp) + endif() + target_link_libraries(mya ${LIBS}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/mya/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mya/default.nix new file mode 100644 index 0000000000..d33e6aecdf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/mya/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, curl +, json_c +, libbsd +, argp-standalone +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mya"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jmakhack"; + repo = "myanimelist-cli"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-EmdkPpYEUIk9hr6rbnixjvznKSEnTCSMZz/17BfHGCk="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + curl + json_c + libbsd + ] ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ + argp-standalone + ]; + + patches = [ + ./argp.patch + ]; + + installPhase = '' + runHook preInstall + + # Based on the upstream PKGBUILD + mkdir -p $out/share/doc/${finalAttrs.pname} + cp -a bin $out + cp $cmakeDir/README.md $out/share/doc/${finalAttrs.pname} + + runHook postInstall + ''; + + meta = with lib; { + description = "Minimalistic command line interface for fetching user anime data from MyAnimeList"; + longDescription = '' + Minimalistic command line interface for fetching user anime data from MyAnimeList. + + You have to run this with the MYANIMELIST_CLIENT_ID environ variable set. + Where to get one: . + Select the type `other`. + ''; + homepage = "https://github.com/jmakhack/myanimelist-cli"; + changelog = "https://github.com/jmakhack/myanimelist-cli/releases/tag/v${finalAttrs.version}"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + mainProgram = "mya"; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index 468818e4f8..ff9fb7c6b2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -46,11 +46,11 @@ let inherit (python3.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.33"; + version = "8.0.34"; src = fetchurl { url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc"; + sha256 = "sha256-ub/D6HRtXOvX+lai71t1UjMmMzBsz5ljCrJCuf9aq7U="; }; patches = [ @@ -196,5 +196,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "mysql-workbench"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix new file mode 100644 index 0000000000..55bd926fb7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/notesnook/default.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, appimageTools, fetchurl, undmg }: + +let + pname = "notesnook"; + version = "2.5.7"; + + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + suffix = { + x86_64-linux = "linux_x86_64.AppImage"; + x86_64-darwin = "mac_x64.dmg"; + aarch64-darwin = "mac_arm64.dmg"; + }.${system} or throwSystem; + + src = fetchurl { + url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; + hash = { + x86_64-linux = "sha256-M/59pjhuKF/MOMpT9/qrlThHO0V8e49cfiaWMkEWHNg="; + x86_64-darwin = "sha256-cluIizmweIMU6RIFxoEQ3DYChRVEuVLxrPjwfFfeq1w="; + aarch64-darwin = "sha256-cbBnKrb8poyDL1D+32UrOl3RXt8Msncw440qra9+Gs0="; + }.${system} or throwSystem; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; + + meta = with lib; { + description = "A fully open source & end-to-end encrypted note taking alternative to Evernote."; + longDescription = '' + Notesnook is a free (as in speech) & open source note taking app + focused on user privacy & ease of use. To ensure zero knowledge + principles, Notesnook encrypts everything on your device using + XChaCha20-Poly1305 & Argon2. + ''; + homepage = "https://notesnook.com"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ j0lol ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; + + linux = appimageTools.wrapType2 rec { + inherit pname version src meta; + + profile = '' + export LC_ALL=C.UTF-8 + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},${pname}} + install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/notesnook.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "Notesnook.app"; + + installPhase = '' + mkdir -p $out/Applications/Notesnook.app + cp -R . $out/Applications/Notesnook.app + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules new file mode 100644 index 0000000000..44644ba217 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules @@ -0,0 +1,4 @@ +# Nintendo Switch HOS +SUBSYSTEM=="usb", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="3000", MODE="0666" +# Nintendo Switch RCM +SUBSYSTEM=="usb", ATTRS{idVendor}=="0955", ATTRS{idProduct}=="7321", MODE="0666" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix new file mode 100644 index 0000000000..b86ae37363 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/default.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, fetchFromGitHub +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, maven +, jre +}: +let + pkgDescription = "All-in-one tool for managing Nintendo Switch homebrew"; + + selectSystem = attrs: + attrs.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + jreWithJavaFX = jre.override { enableJavaFX = true; }; +in +maven.buildMavenPackage rec { + pname = "ns-usbloader"; + version = "7.0"; + + src = fetchFromGitHub { + owner = "developersu"; + repo = "ns-usbloader"; + rev = "v${version}"; + sha256 = "sha256-x4zGwsDUVUHI4AUMPSqgnZVyZx+pWQA5xvtrFE8U3QU="; + }; + + patches = [ ./no-launch4j.patch ./make-deterministic.patch ]; + + # JavaFX pulls in architecture dependent jar dependencies. :( + # May be possible to unify these, but could lead to huge closure sizes. + mvnHash = selectSystem { + x86_64-linux = "sha256-vXZAlZOh9pXNF1RL78oQRal5pkXFRKDz/7SP9LibgiA="; + aarch64-linux = "sha256-xC+feb41EPi30gBrVR8usanVULI2Pt0knztzNagPQiw="; + }; + mvnParameters = "-DskipTests"; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar + + mkdir -p $out/bin + makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \ + --append-flags "-jar $out/share/java/ns-usbloader.jar" + + mkdir -p $out/lib/udev/rules.d + install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules + + mkdir -p $out/share/icons/hicolor + install -Dm644 target/classes/res/app_icon32x32.png $out/share/icons/hicolor/32x32/apps/ns-usbloader.png + install -Dm644 target/classes/res/app_icon48x48.png $out/share/icons/hicolor/48x48/apps/ns-usbloader.png + install -Dm644 target/classes/res/app_icon64x64.png $out/share/icons/hicolor/64x64/apps/ns-usbloader.png + install -Dm644 target/classes/res/app_icon128x128.png $out/share/icons/hicolor/128x128/apps/ns-usbloader.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "ns-usbloader"; + desktopName = "NS-USBLoader"; + comment = pkgDescription; + exec = "ns-usbloader"; + icon = "ns-usbloader"; + categories = [ "Game" ]; + terminal = false; + keywords = [ "nintendo" "switch" ]; + }) + ]; + + meta = with lib; { + description = pkgDescription; + homepage = "https://github.com/developersu/ns-usbloader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ soupglasses ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch new file mode 100644 index 0000000000..531f640b08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ns-usbloader/make-deterministic.patch @@ -0,0 +1,130 @@ +From 3f85e2754144bbf2805ba68d8c76b3dec3299f4d Mon Sep 17 00:00:00 2001 +From: Sofi +Date: Sat, 29 Jul 2023 11:16:38 +0200 +Subject: [PATCH] make deterministic + +--- + pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 57 insertions(+), 6 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 320d4f3..5a594e6 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -51,6 +51,7 @@ + yyyyMMdd.HHmmss + 19.0.2.1 + 11 ++ 2023-01-01T00:00:00Z + + + +@@ -166,7 +167,7 @@ + + + +- ${project.artifactId}-${project.version}-${maven.build.timestamp} ++ ${project.artifactId}-${project.version} + + + src/main/resources +@@ -193,26 +194,51 @@ + + org.apache.maven.plugins + maven-surefire-plugin +- 2.22.2 ++ 3.1.2 + + + org.apache.maven.plugins + maven-failsafe-plugin +- 2.22.2 ++ 3.1.2 + + + org.apache.maven.plugins + maven-compiler-plugin +- 3.10.1 ++ 3.11.0 + + 11 + + ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ 3.3.0 ++ ++ ++ enforce-versions ++ validate ++ ++ enforce ++ ++ ++ ++ ++ [3.2.5,) ++ ++ ++ [1.8,) ++ ++ ++ ++ ++ ++ ++ + + + org.apache.maven.plugins + maven-jar-plugin +- 3.1.2 ++ 3.3.0 + +- Launching error +- +- +- %PWD%/jdk +- 11.0.0 +- +- +- ${project.version}.0.0 +- ${project.version} +- NS multi-tool +- GNU General Public License v3, ${project.inceptionYear} ${project.organization.name}, Russia. +- ${project.version}.0.0 +- ${project.version} +- ${project.organization.name} +- ${project.name} +- ${project.name} +- ${project.name}.exe +- +- +- Startup error +- JDK not found +- JDK Version mismatch +- Launcher Error +- +- +- +- +- + + +- +\ No newline at end of file ++ +-- +2.41.0 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix index 067af7a081..cceaec612d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/numberstation/default.nix @@ -63,6 +63,6 @@ python3.pkgs.buildPythonApplication rec { description = "TOTP Authentication application for mobile"; homepage = "https://sr.ht/~martijnbraam/numberstation/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda tomfitzhenry ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix new file mode 100644 index 0000000000..943861a3d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, atk +, gdk-pixbuf +, gobject-introspection +, gtk-layer-shell +, gtk3 +, pango +, python310Packages +, wrapGAppsHook +}: + +python310Packages.buildPythonApplication rec { + pname = "nwg-displays"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "nwg-displays"; + rev = "v${version}"; + hash = "sha256-Y405ZeOSpc1aPKEzFdvlgJgpGAi9HUR+Hvx63uYdp88="; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + atk + gdk-pixbuf + gtk-layer-shell + pango + python310Packages.gst-python + python310Packages.i3ipc + python310Packages.pygobject3 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}"); + ''; + + # Upstream has no tests + doCheck = false; + + meta = { + homepage = "https://github.com/nwg-piotr/nwg-displays"; + description = "Output management utility for Sway and Hyprland"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ ]; + mainProgram = "nwg-displays"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index e96255271d..1fdc5dd43d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.3.5"; + version = "1.3.7"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let 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-bTIJwQqufzxq1/ZxR8rVYER82tl0pPMpKwDPr9Gz1Q4=" else "sha256-jhm6ziFaJnv4prPSfOnJ/EbIRTf9rnvzAJVxnVqmWE4="; + sha256 = if stdenv.isDarwin then "sha256-jHsrSYBHJBMyChGsgXHxH/S7wdI1CMonzid8WenNSmI=" else "sha256-8Qi12d4oZ2R6INYZH/qNUBDexft53uy9Uug7UoArwYw="; }; icon = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/misc/onthespot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onthespot/default.nix new file mode 100644 index 0000000000..642c765633 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/onthespot/default.nix @@ -0,0 +1,64 @@ +{ lib +, python3 +, fetchFromGitHub +, copyDesktopItems +, wrapQtAppsHook +, makeDesktopItem +}: + +python3.pkgs.buildPythonApplication rec { + pname = "onthespot"; + version = "0.5"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "casualsnek"; + repo = "onthespot"; + rev = "v${version}"; + hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg="; + }; + + nativeBuildInputs = with python3.pkgs; [ + copyDesktopItems + pythonRelaxDepsHook + wrapQtAppsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + charset-normalizer + defusedxml + librespot + music-tag + packaging + pillow + protobuf + pyogg + pyqt5 + pyqt5_sip + pyxdg + requests + setuptools + show-in-file-manager + urllib3 + zeroconf + ]; + + pythonRemoveDeps = [ + "PyQt5-Qt5" + "PyQt5-stubs" + ]; + + pythonRelaxDeps = true; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = { + description = " QT based Spotify music downloader written in Python"; + homepage = "https://github.com/casualsnek/onthespot"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ onny ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix index 45e9c381c7..4ce864bfde 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { postPatch = '' cp ${./Cargo.lock} Cargo.lock ''; - sourceRoot = "source/${cargoRoot}"; + sourceRoot = "${src.name}/${cargoRoot}"; sha256 = "sha256-01MWuUUirsgpoprMArRp3qxKNayPHTkYWk31nXcIC34="; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix index bd1664e85f..41d855cd33 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jonringer ]; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "openrgb"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix index 331d0ccc5e..759a929e49 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-hxGRBMePUVod0Nwz2ozkZ6vmV7Ev+KeUFVKQDEViFJw="; + hash = "sha256-1pkAIz6Zh0ArIDmRSLHTnIgySWdxrDx0amTkdZhY6vY="; }; - cargoHash = "sha256-Bn9dH+Iw825vuInip3KVx2zAPZixQ3vHkfoDFwPFzpk="; + cargoHash = "sha256-TKpPAzqwWBH2dlBNvU2kuqqOVu5WhSnSR3wW5FsW7yk="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index 4395cf7721..236a3190c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2023.05.08-7"; + version = "2023.06.04-13"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-V7qTi5NiZf+1voZSHfuAyfMeTeiYfs/CoOQ2zweKmaU="; + hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc="; fetchSubmodules = true; }; @@ -37,6 +37,9 @@ mkDerivation rec { # crude fix for https://github.com/organicmaps/organicmaps/issues/1862 echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh + + # TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345 + patchShebangs 3party/boost/tools/build/src/engine/build.sh ''; nativeBuildInputs = [ @@ -67,7 +70,6 @@ mkDerivation rec { passthru = { updateScript = nix-update-script { - attrPath = pname; extraArgs = [ "-vr" "(.*)-android" ]; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock new file mode 100644 index 0000000000..8c32ad4b65 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock @@ -0,0 +1,4830 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 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.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.1.1", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "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 = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +dependencies = [ + "memchr", + "regex-automata 0.3.3", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.1.1", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.6", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clap" +version = "4.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "clap_mangen" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f2e32b579dae093c2424a8b7e2bea09c89da01e1ce5065eb2f0a6f1cc15cc1f" +dependencies = [ + "clap", + "roff", +] + +[[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", + "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", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +dependencies = [ + "is-terminal", + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.27", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.27", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[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-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "embed-resource" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" +dependencies = [ + "cc", + "rustc_version", + "toml 0.7.6", + "vswhom", + "winreg 0.11.0", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[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.27", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.1.1", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.1.1", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.1.1", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.1.1", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.1.1", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.1.1", +] + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.1.1", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.1.1", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.9", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.9", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "indicatif" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "infer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" +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 = "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 = [ + "cfg-if", + "libc", + "rustc_version", + "to_method", + "winapi", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "treediff", +] + +[[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 = "kuchiki" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" +dependencies = [ + "cssparser", + "html5ever", + "matches", + "selectors", +] + +[[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 = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[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" +dependencies = [ + "serde", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +dependencies = [ + "log", + "phf 0.8.0", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "normpath" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "notify" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" +dependencies = [ + "bitflags 1.3.2", + "filetime", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" + +[[package]] +name = "objc2" +version = "0.3.0-beta.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef3a6024722b4230242a53e5b5759ce117548983696b8e4b7bc2fd1f8fce621e" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f8f7297b786454a87e392631e2b2754ed59a7b413effa8521225d93f46b2192" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "opener" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788" +dependencies = [ + "bstr", + "normpath", + "winapi", +] + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[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 = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owmods_cli" +version = "0.10.0" +dependencies = [ + "anyhow", + "clap", + "clap_complete", + "clap_mangen", + "colored", + "indicatif", + "log", + "owmods_core", + "tokio", +] + +[[package]] +name = "owmods_core" +version = "0.10.0" +dependencies = [ + "anyhow", + "directories", + "futures", + "glob", + "lazy_static", + "log", + "opener", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "tempfile", + "tokio", + "tokio-test", + "typeshare", + "uuid", + "version-compare 0.1.1", + "zip", +] + +[[package]] +name = "owmods_gui" +version = "0.10.0" +dependencies = [ + "anyhow", + "log", + "notify", + "opener", + "owmods_core", + "regex", + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-deep-link", + "tauri-plugin-window-state", + "time", + "tokio", + "typeshare", +] + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.1.1", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.1", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.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 = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plist" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +dependencies = [ + "base64 0.21.2", + "indexmap 1.9.3", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "portable-atomic" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", +] + +[[package]] +name = "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.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.10", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.10", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg 0.10.1", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "roff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +dependencies = [ + "log", + "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.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "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", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63ba2516aa6bf82e0b19ca8b50019d52df58455d3cf9bdaf6315225fdd0c560a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "401797fe7833d72109fedec6bfcbe67c0eed9b99772f26eb8afd261f0abc6fd3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "serde_json" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +dependencies = [ + "itoa 1.0.9", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.9", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" +dependencies = [ + "base64 0.21.2", + "chrono", + "hex", + "indexmap 1.9.3", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "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 = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +dependencies = [ + "cfg-expr 0.15.3", + "heck 0.4.1", + "pkg-config", + "toml 0.7.6", + "version-compare 0.1.1", +] + +[[package]] +name = "tao" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tar" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" + +[[package]] +name = "tauri" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" +dependencies = [ + "anyhow", + "base64 0.21.2", + "bytes", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.1", + "http", + "ignore", + "minisign-verify", + "objc", + "once_cell", + "open", + "os_info", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "reqwest", + "rfd", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "state", + "sys-locale", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b" +dependencies = [ + "anyhow", + "cargo_toml", + "heck 0.4.1", + "json-patch", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" +dependencies = [ + "base64 0.21.2", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin-deep-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33a3ae55bcfe692e5361edc4708bd9f415270cc02e1cdba8ab7768566208b4e2" +dependencies = [ + "dirs", + "interprocess", + "log", + "objc2", + "once_cell", + "tauri-utils", + "windows-sys 0.48.0", + "winreg 0.50.0", +] + +[[package]] +name = "tauri-plugin-window-state" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" +dependencies = [ + "bincode", + "bitflags 2.3.3", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769" +dependencies = [ + "gtk", + "http", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b" +dependencies = [ + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.4.1", + "html5ever", + "infer", + "json-patch", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows 0.39.0", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.6", +] + +[[package]] +name = "tempfile" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.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 = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +dependencies = [ + "itoa 1.0.9", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "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.27", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "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-test" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "treediff" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +dependencies = [ + "serde_json", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "typeshare" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44d1a2f454cb35fbe05b218c410792697e76bd868f48d3a418f2cd1a7d527d6" +dependencies = [ + "chrono", + "serde", + "serde_json", + "typeshare-annotation", +] + +[[package]] +name = "typeshare-annotation" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc670d0e358428857cc3b4bf504c691e572fccaec9542ff09212d3f13d74b7a9" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom 0.2.10", + "rand 0.8.5", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.27", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.1.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.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]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.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.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wry" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xtask" +version = "0.10.0" +dependencies = [ + "anyhow", + "clap", + "clap_complete", + "clap_mangen", + "regex", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", + "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", +] diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix new file mode 100644 index 0000000000..3a1c224c2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, installShellFiles +, zstd +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "owmods-cli"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "ow-mods"; + repo = "ow-mod-man"; + rev = "cli_v${version}"; + hash = "sha256-kumYLlp2LRqTQz23N9lriJJf7x2pPXbqqUvkiAhyMDY="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-window-state-0.1.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U="; + }; + }; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + zstd + ] ++ lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + buildAndTestSubdir = "owmods_cli"; + + postInstall = '' + cargo xtask dist_cli + installManPage man/man*/* + installShellCompletion --cmd owmods \ + dist/cli/completions/owmods.{bash,fish,zsh} + ''; + + meta = with lib; { + description = "CLI version of the mod manager for Outer Wilds Mod Loader"; + homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli"; + downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; + changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; + mainProgram = "owmods"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ locochoco ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index fa6b1f86e0..87847e32f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-1d+zox46h22ox9zC+SvN3w3LkpHmN1jpf/tDPD5D80s="; + sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/plots/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plots/default.nix new file mode 100644 index 0000000000..01a60baa2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/plots/default.nix @@ -0,0 +1,77 @@ +{ fetchFromGitHub +, gobject-introspection +, lib +, libadwaita +, python3 +, wrapGAppsHook +, lmmath +}: +python3.pkgs.buildPythonApplication rec { + pname = "plots"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "alexhuntley"; + repo = "Plots"; + rev = "v${version}"; + hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw="; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + libadwaita + (python3.withPackages (p: with p; [ + numpy + pygobject3 + lark + jinja2 + freetype-py + pyopengl + pycairo + pyglm + ])) + ]; + + nativeCheckInputs = [ + (python3.withPackages (p: with p; [ + pytest + ])) + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postInstall = '' + install -D ${lmmath}/share/fonts/opentype/latinmodern-math.otf -t $out/share/fonts/ + + install -D res/com.github.alexhuntley.Plots.metainfo.xml -t $out/share/metainfo/ + install -D res/com.github.alexhuntley.Plots.desktop -t $out/share/applications/ + install -D res/com.github.alexhuntley.Plots.svg -t $out/share/icons/hicolor/scalable/apps/ + install -D res/com.github.alexhuntley.Plots-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/ + + for lang_dir in help/*; do + lang=$(basename "$lang_dir") + install -D -t $out/share/help/$lang/plots/ $lang_dir/* + done + ''; + + meta = with lib; { + description = "Graph plotting app for GNOME"; + longDescription = '' + Plots is a graph plotting app for GNOME. + Plots makes it easy to visualise mathematical formulae. + In addition to basic arithmetic operations, it supports trigonometric, hyperbolic, exponential and logarithmic functions, as well as arbitrary sums and products. + It can display polar equations, and both implicit and explicit Cartesian equations. + ''; + homepage = "https://github.com/alexhuntley/Plots"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pop/default.nix new file mode 100644 index 0000000000..02ebcaa2fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/pop/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, installShellFiles, fetchFromGitHub }: + +buildGoModule rec { + pname = "pop"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = "pop"; + rev = "v${version}"; + hash = "sha256-ZGJkpa1EIw3tt1Ww2HFFoYsnnmnSAiv86XEB5TPf4/k="; + }; + + vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8="; + + GOWORK = "off"; + + nativeBuildInputs = [ + installShellFiles + ]; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + postInstall = '' + $out/bin/pop man > pop.1 + installManPage pop.1 + installShellCompletion --cmd pop \ + --bash <($out/bin/pop completion bash) \ + --fish <($out/bin/pop completion fish) \ + --zsh <($out/bin/pop completion zsh) + ''; + + meta = with lib; { + description = "Send emails from your terminal"; + homepage = "https://github.com/charmbracelet/pop"; + changelog = "https://github.com/charmbracelet/pop/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ caarlos0 maaslalani ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock index 7772f9927e..09971788db 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock @@ -2,21 +2,21 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.0.2" @@ -58,9 +58,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arboard" @@ -100,9 +100,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", @@ -164,6 +164,24 @@ 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", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "signal-hook", + "windows-sys 0.48.0", +] + [[package]] name = "async-recursion" version = "1.0.4" @@ -172,7 +190,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -183,13 +201,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -213,7 +231,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -239,6 +257,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.13.1" @@ -316,9 +349,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", "serde", @@ -378,7 +411,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -388,7 +421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml 0.7.4", + "toml 0.7.6", ] [[package]] @@ -425,9 +458,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" dependencies = [ "smallvec", "target-lexicon", @@ -562,21 +595,20 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ "bitflags", "core-foundation", - "foreign-types", "libc", ] [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -673,7 +705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -688,9 +720,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -698,27 +730,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -867,9 +899,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" @@ -894,13 +926,13 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "embed-resource" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" +checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" dependencies = [ "cc", "rustc_version", - "toml 0.7.4", + "toml 0.7.6", "vswhom", "winreg 0.11.0", ] @@ -950,9 +982,15 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -992,9 +1030,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exr" -version = "1.6.4" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" dependencies = [ "bit_field", "flume", @@ -1170,7 +1208,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -1250,7 +1288,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -1267,7 +1305,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -1281,7 +1319,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -1293,15 +1331,15 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", "x11", ] [[package]] name = "generator" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ "cc", "libc", @@ -1364,6 +1402,12 @@ dependencies = [ "weezl", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + [[package]] name = "gio" version = "0.15.12" @@ -1390,7 +1434,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", "winapi", ] @@ -1436,7 +1480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -1447,11 +1491,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", @@ -1466,7 +1510,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -1507,7 +1551,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -1526,9 +1570,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1536,7 +1580,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1558,6 +1602,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.3.3" @@ -1575,18 +1625,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" @@ -1616,7 +1657,7 @@ checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.6", + "itoa 1.0.9", ] [[package]] @@ -1650,9 +1691,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[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", @@ -1663,7 +1704,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.6", + "itoa 1.0.9", "pin-project-lite", "socket2", "tokio", @@ -1777,10 +1818,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] +[[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 = "infer" version = "0.12.0" @@ -1805,16 +1856,16 @@ 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", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "itoa" @@ -1824,9 +1875,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[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 = "javascriptcore-rs" @@ -1951,9 +2002,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libdbus-sys" @@ -2079,7 +2130,7 @@ 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]] @@ -2338,11 +2389,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", "libc", ] @@ -2406,6 +2457,15 @@ dependencies = [ "objc", ] +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -2424,9 +2484,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", "cfg-if", @@ -2445,7 +2505,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -2456,9 +2516,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", @@ -2520,7 +2580,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -2549,7 +2609,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -2571,7 +2631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -2674,29 +2734,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -2712,14 +2772,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ "base64 0.21.2", - "indexmap", + "indexmap 1.9.3", "line-wrap", - "quick-xml 0.28.2", + "quick-xml 0.29.0", "serde", "time", ] @@ -2774,7 +2834,7 @@ dependencies = [ "tauri-plugin-autostart", "tauri-plugin-single-instance", "tiny_http", - "toml 0.7.4", + "toml 0.7.6", "window-shadows", "windows 0.44.0", ] @@ -2833,9 +2893,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[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", ] @@ -2868,10 +2928,19 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.28" +name = "quick-xml" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] @@ -3016,13 +3085,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", ] [[package]] @@ -3034,6 +3104,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -3042,9 +3123,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -3110,6 +3191,12 @@ dependencies = [ "windows 0.37.0", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc_version" version = "0.4.0" @@ -3121,9 +3208,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags", "errno", @@ -3135,15 +3222,15 @@ dependencies = [ [[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 = "safemem" @@ -3162,11 +3249,11 @@ dependencies = [ [[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 0.48.0", ] [[package]] @@ -3177,21 +3264,21 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "screenshots" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9ad94ff24ed04a594f77ab87feb2aa12e9db3eed47321f71e01e75882c5b45" +source = "git+https://github.com/pot-app/screenshots-rs#f19fde2ced8306f2bb5113c11002f24d710c6914" dependencies = [ "anyhow", "core-graphics", "dbus", "display-info", "fxhash", + "percent-encoding", "png", "widestring", "windows 0.48.0", @@ -3224,7 +3311,7 @@ dependencies = [ [[package]] name = "selection" version = "0.1.0" -source = "git+https://github.com/pot-app/Selection#43845dc902d2e507f09914ded1481850f26b7332" +source = "git+https://github.com/pot-app/Selection#8b44b68fbfe614aff190610ec03d52b6f3b57f19" dependencies = [ "arboard", "enigo", @@ -3255,60 +3342,60 @@ 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" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[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", ] @@ -3320,21 +3407,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "serde_with" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" dependencies = [ "base64 0.21.2", "chrono", "hex", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "serde_with_macros", @@ -3343,14 +3430,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" +checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -3416,6 +3503,25 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "signal-hook" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + [[package]] name = "simd-adler32" version = "0.3.5" @@ -3439,9 +3545,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" @@ -3562,9 +3668,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -3586,14 +3692,14 @@ 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 0.15.2", + "cfg-expr 0.15.3", "heck 0.4.1", "pkg-config", - "toml 0.7.4", + "toml 0.7.6", "version-compare 0.1.1", ] @@ -3659,9 +3765,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" dependencies = [ "filetime", "libc", @@ -3670,15 +3776,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tauri" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc35893c7e08d9564a9206bd52182dce031b0d5132dc946b3e166e00d03f8cfe" +checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", "base64 0.21.2", @@ -3789,7 +3895,7 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#c4d2c8c693a8e0da627f4c845486dbe1b1e32c64" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1" dependencies = [ "auto-launch", "log", @@ -3802,7 +3908,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1" dependencies = [ "log", "serde", @@ -3890,14 +3996,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ "embed-resource", - "toml 0.7.4", + "toml 0.7.6", ] [[package]] name = "tauri-winrt-notification" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d70573554e7630c2ca3677ea78d5ae6b030aedee5f9bf33c15d644904fa698" +checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" dependencies = [ "quick-xml 0.23.1", "windows 0.39.0", @@ -3936,22 +4042,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[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.18", + "syn 2.0.26", ] [[package]] @@ -3977,11 +4083,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ - "itoa 1.0.6", + "itoa 1.0.9", "serde", "time-core", "time-macros", @@ -3995,9 +4101,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -4031,11 +4137,12 @@ 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", @@ -4080,9 +4187,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -4092,20 +4199,20 @@ 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.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -4132,13 +4239,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.18", + "syn 2.0.26", ] [[package]] @@ -4242,9 +4349,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" @@ -4281,9 +4388,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", ] @@ -4396,7 +4503,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", "wasm-bindgen-shared", ] @@ -4430,7 +4537,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4567,7 +4674,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.1.0", + "system-deps 6.1.1", ] [[package]] @@ -4714,7 +4821,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -4764,7 +4871,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.1", ] [[package]] @@ -4784,9 +4891,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -4949,9 +5056,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] @@ -5115,24 +5222,26 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" +checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" [[package]] name = "zbus" -version = "3.12.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" +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", @@ -5160,9 +5269,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.12.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5174,9 +5283,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.5.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" dependencies = [ "serde", "static_assertions", @@ -5205,9 +5314,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.13.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb36cd95352132911c9c99fdcc1635de5c2c139bd34cbcf6dfb8350ee8ff6a7" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" dependencies = [ "byteorder", "enumflags2", @@ -5219,9 +5328,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.13.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34951e1ac64f3a1443fe7181256b9ed6a811a1631917566c3d5ca718d8cf33" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5232,9 +5341,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix index cad203519f..941796315c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix @@ -23,16 +23,16 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "1.6.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-AiDQleRMuLExaVuiLvubebobDaK2YJTWjZ00F5UptuQ="; + hash = "sha256-v5yx8pE8+m+5CDy7X3CwitYhFQMX8Ynt8Y2k1lEZKpg="; }; - sourceRoot = "source/src-tauri"; + sourceRoot = "${src.name}/src-tauri"; postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ @@ -76,10 +76,11 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-single-instance-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U="; - "tauri-plugin-autostart-0.0.0" = "sha256-9eclolp+Gb8qF/KYIRiOoCJbMJLI8LyWLQu82npI7mQ="; + "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-85NUACRi7TjyMNKVz93G+W1EXKIVZZge/h/HtDwiW/Q="; + "selection-0.1.0" = "sha256-V4vixiyKqhpZeTXiFw0HKz5xr0zHd4DkC/hovJ8Y2a8="; + "screenshots-0.6.0" = "sha256-NHs7gqplg/eSUWYojayxeJtX7T4f8mt+akahi9LeukU="; }; }; 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 a9f23d238c..0e90ad933d 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.51.4"; + version = "0.60.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-eR8uYeScV6bxntc2bEwJC/VSH1bXendJ1FNJB0bC2i0="; + hash = "sha256-BsDel6F09HP5Oz2p0DDXKuS7Id5XPhZZxEzwu76vVwk="; # 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; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-dlTqBKyI2t3twxQ+mnn+LTWzM2+CnEa4X0K2yDAZsQA="; + vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix index e283f0d466..28969a777e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix @@ -30,6 +30,10 @@ let inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; }); }); }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix index 3b1bdca195..92949ad4a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qdirstat/default.nix @@ -53,5 +53,6 @@ mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "qdirstat"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix index 5f9958f2d5..d73c379387 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qsudo/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl"; }; - sourceRoot = "source/src-qt5"; + sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ qmake diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix index 02bae93229..0aac804502 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix @@ -31,5 +31,6 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ equirosa dit7ya ]; platforms = platforms.linux; + mainProgram = "rofi-rbw"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix new file mode 100644 index 0000000000..fedb03fa61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-screenshot/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, libnotify +, slop +, ffcast +, ffmpeg +, xclip +, rofi +, coreutils +, gnused +, procps +}: + +stdenv.mkDerivation rec { + pname = "rofi-screenshot"; + version = "2023-07-02"; + + src = fetchFromGitHub { + owner = "ceuk"; + repo = pname; + rev = "365cfa51c6c7deb072d98d7bfd68cf4038bf2737"; + hash = "sha256-M1cab+2pOjZ2dElMg0Y0ZrIxRE0VwymVwcElgzFrmVs="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/${pname} \ + --set PATH ${ + lib.makeBinPath [ + libnotify + slop + ffcast + ffmpeg + xclip + rofi + coreutils + gnused + procps + ] + } + ''; + + installPhase = '' + install -Dm755 ${pname} $out/bin/${pname} + ''; + + meta = { + description = + "Use rofi to perform various types of screenshots and screen captures"; + homepage = "https://github.com/ceuk/rofi-screenshot"; + maintainers = with lib.maintainers; [ zopieux ]; + platforms = lib.platforms.all; + license = lib.licenses.wtfpl; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix index a505ad13a1..edd0120341 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; + mainProgram = "rofi"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix index dfb096d654..1d7ef32cd3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix @@ -9,14 +9,14 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { pname = "rofi-wayland-unwrapped"; - version = "1.7.5+wayland1"; + version = "1.7.5+wayland2"; src = fetchFromGitHub { owner = "lbonn"; repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ="; + sha256 = "sha256-5pxDA/71PV4B5T3fzLKVC4U8Gt13vwy3xSDPDsSDAKU="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix new file mode 100644 index 0000000000..99f9a465e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchFromGitHub +, crystal +, wrapGAppsHook4 +, gobject-introspection +, desktopToDarwinBundle +, webkitgtk_6_0 +, sqlite +, gi-crystal +, libadwaita +, gtk4 +, pango +}: +let + gtk4' = gtk4.override { x11Support = true; }; + pango' = pango.override { withIntrospection = true; }; +in +crystal.buildCrystalPackage rec { + pname = "rtfm"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "hugopl"; + repo = "rtfm"; + rev = "v${version}"; + name = "rtfm"; + hash = "sha256-SmQq3hG94oV346dHtqTHC0xE4cWB3rspD3XXu+mSI8Q="; + }; + + patches = [ + # 1) fixed gi-crystal binding generator command + # 2) removed `-v` arg to `cp` command to prevent build failure due to stdout buffer overflow + # 3) added commands to build gschemas and update icon-cache + ./patches/make.patch + + # fixed docset path and gi libs directory names + ./patches/friendly-docs-path.patch + + # added chmod +w for copied docs to prevent error: + # `Error opening file with mode 'wb': '.../style.css': Permission denied` + ./patches/enable-write-permissions.patch + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "crystal run src/create_crystal_docset.cr" "crystal src/create_crystal_docset.cr ${crystal}/share/doc/crystal/api/" \ + --replace "crystal run src/create_gtk_docset.cr" "crystal src/create_gtk_docset.cr gtk-doc/" + ''; + + shardsFile = ./shards.nix; + + nativeBuildInputs = [ + wrapGAppsHook4 + gobject-introspection + gi-crystal + ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + + buildInputs = [ + webkitgtk_6_0 + sqlite + libadwaita + gtk4' + pango' + ]; + + buildTargets = [ "configure" "rtfm" "docsets" ]; + + preBuild = '' + mkdir gtk-doc/ + + for file in "${gtk4'.devdoc}"/share/doc/*; do + ln -s "$file" "gtk-doc/$(basename "$file")" + done + + for file in "${pango'.devdoc}"/share/doc/*; do + ln -s "$file" "gtk-doc/$(basename "$file")" + done + + for file in "${libadwaita.devdoc}"/share/doc/*; do + ln -s "$file" "gtk-doc/$(basename "$file")" + done + ''; + + meta = with lib; { + description = "Dash/docset reader with built in documentation for Crystal and GTK APIs"; + homepage = "https://github.com/hugopl/rtfm/"; + license = licenses.mit; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch new file mode 100644 index 0000000000..efdabce083 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch @@ -0,0 +1,10 @@ +--- a/src/doc2dash/doc_set_builder.cr 2023-07-19 14:00:06.864770147 +0300 ++++ b/src/doc2dash/doc_set_builder.cr 2023-07-19 13:59:35.440707740 +0300 +@@ -44,6 +44,7 @@ + real_dest = @html_dest.join(dest || source) + Dir.mkdir_p(Path.new(real_dest).dirname) + File.copy(original, real_dest) ++ File.chmod(real_dest, 0o600) + dest || source + end + diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch new file mode 100644 index 0000000000..cecbeb750b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch @@ -0,0 +1,11 @@ +--- a/src/create_gtk_docset.cr 2023-07-17 14:28:04.882620660 +0300 ++++ b/src/create_gtk_docset.cr 2023-07-17 14:27:09.660643747 +0300 +@@ -136,7 +136,7 @@ + end + + def find_modules : Array(Path) +- basedir = Path.new("/usr/share/doc") ++ basedir = Path.new(ARGV[0]? || "gtk-docs") + MODULES.compact_map do |mod| + print "#{mod.ljust(20, '.')}" + mod_dir = basedir.join(mod) diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/make.patch b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/make.patch new file mode 100644 index 0000000000..503faf5245 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/patches/make.patch @@ -0,0 +1,30 @@ +--- a/Makefile 2023-07-17 17:18:28.000000000 +0300 ++++ b/Makefile 2023-07-19 12:13:44.627168135 +0300 +@@ -4,8 +4,7 @@ + all: configure .WAIT rtfm docsets + + configure: +- shards install +- ./bin/gi-crystal ++ gi-crystal + + rtfm: + shards build --release -s rtfm +@@ -29,13 +28,15 @@ + install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml + # docsets + mkdir -p $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ +- cp -rv data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ +- cp -rv data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ ++ cp -r data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ ++ cp -r data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ + # License + install -D -m0644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/rtfm/LICENSE + # Changelog + install -D -m0644 CHANGELOG.md $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md + gzip -9fn $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md ++ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor ++ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas + + uninstall: + rm -f $(DESTDIR)$(PREFIX)/bin/rtfm \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix b/third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix new file mode 100644 index 0000000000..f6882397d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rtfm/shards.nix @@ -0,0 +1,42 @@ +{ + db = { + url = "https://github.com/crystal-lang/crystal-db.git"; + rev = "v0.12.0"; + sha256 = "1in8w2dz7nlhqgc9l6b3pi6f944m29nhbg3p5j40qzvsrr8lqaj7"; + }; + fzy = { + url = "https://github.com/hugopl/fzy.git"; + rev = "v0.5.5"; + sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv"; + }; + gio = { + url = "https://github.com/hugopl/gio.cr.git"; + rev = "v0.1.0"; + sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8"; + }; + gtk4 = { + url = "https://github.com/hugopl/gtk4.cr.git"; + rev = "v0.15.0"; + sha256 = "100j5k4sfc2dpj3nplzjcaxw1bwy3hsy5cw93asg00kda9h8dbb1"; + }; + harfbuzz = { + url = "https://github.com/hugopl/harfbuzz.cr.git"; + rev = "v0.2.0"; + sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694"; + }; + libadwaita = { + url = "https://github.com/geopjr/libadwaita.cr.git"; + rev = "23ce21d6400af7563ede0b53deea6d1f77436985"; + sha256 = "09jz6r0yp4qsm47qcknzgkjxavr5j3dkxf2yjbw0jkaz1an58pfw"; + }; + pango = { + url = "https://github.com/hugopl/pango.cr.git"; + rev = "v0.2.0"; + sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf"; + }; + sqlite3 = { + url = "https://github.com/crystal-lang/crystal-sqlite3.git"; + rev = "v0.20.0"; + sha256 = "0mqy6rc26i0sf2fdllbbzdhbd1d35npmpqqjz0b1n1vrzrm6fg05"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix index 387f54e215..6c839f65d9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/safeeyes/default.nix @@ -7,6 +7,8 @@ , libnotify , wlrctl , gtk3 +, safeeyes +, testers , xprintidle , xprop , wrapGAppsHook @@ -16,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.5"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I="; + hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; }; nativeBuildInputs = [ @@ -49,7 +51,7 @@ buildPythonApplication rec { postInstall = '' mkdir -p $out/share/applications cp -r safeeyes/platform/icons $out/share/icons/ - cp safeeyes/platform/safeeyes.desktop $out/share/applications/safeeyes.desktop + cp safeeyes/platform/io.github.slgobinath.SafeEyes.desktop $out/share/applications/io.github.slgobinath.SafeEyes.desktop ''; preFixup = '' @@ -61,11 +63,14 @@ buildPythonApplication rec { doCheck = false; # no tests + passthru.tests.version = testers.testVersion { package = safeeyes; }; + meta = with lib; { homepage = "http://slgobinath.github.io/SafeEyes"; description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo"; license = licenses.gpl3; maintainers = with maintainers; [ srghma ]; platforms = platforms.linux; + mainProgram = "safeeyes"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix b/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix index 5b1332a91d..0f4f39d74c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/shipments/default.nix @@ -1,5 +1,5 @@ { desktop-file-utils -, fetchurl +, fetchFromSourcehut , gobject-introspection , gtk3 , lib @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { pname = "shipments"; version = "0.3.0"; - src = fetchurl { - url = "https://git.sr.ht/~martijnbraam/shipments/archive/${version}.tar.gz"; - sha256 = "1znybldx21wjnb8qy6q9p52pi6lfz81743xgrnjmvjji4spwaipf"; + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = "shipments"; + rev = version; + hash = "sha256-8wX1s5mPCdMINIQP4m5q5StKqxY6CGBBxIxyQAvU7Pc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix index ad849bf699..24d0253aaf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/theironrobin/siglo"; changelog = "https://github.com/theironrobin/siglo/tags/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix new file mode 100644 index 0000000000..81e54007b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +, makeWrapper +}: + +let + pythonEnv = (python3.withPackages (ps: with ps; [ + pyside6 + py65 + qdarkstyle + ])); +in +stdenv.mkDerivation (finalAttrs: { + pname = "smb3-foundry"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "mchlnix"; + repo = "SMB3-Foundry"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-iqqIyGp/sqWgShxk52omVcn7Q3WL2hK8sTLH4dashLE="; + }; + + patches = [ ./fix-relative-dirs.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/app + cp -R smb3parse foundry scribe data doc VERSION smb3-foundry.py smb3-scribe.py $out/app + + makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-foundry \ + --add-flags "$out/app/smb3-foundry.py" + makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-scribe \ + --add-flags "$out/app/smb3-scribe.py" + + runHook postInstall + ''; + + 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}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +}) 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 new file mode 100644 index 0000000000..d49ddde897 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch @@ -0,0 +1,34 @@ +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/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix index de787ca669..be0d29ee50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-2LD1vMmQvibcnAgBwjfSBJysTnUGptGzPHfi/7tZ0hg="; + hash = "sha256-MdPZ9uLQYwgZ6xXWinzFg5A2gJ3ihTS9CbEmXnaNEkI="; }; outputs = [ "out" "udev" ]; @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { pyudev pyyaml xlib + hid-parser ]; # the -cli symlink is just to maintain compabilility with older versions where diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix index 990aedbc71..0073c4a0f8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -2,11 +2,9 @@ stdenv.mkDerivation { pname = "spacenav-cube-example"; - version = libspnav.version; + inherit (libspnav) version src; - src = libspnav.src; - - sourceRoot = "source/examples/cube"; + sourceRoot = "${libspnav.src.name}/examples/cube"; buildInputs = [ libX11 mesa_glu libspnav ]; 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 9713be07e5..3f77420a56 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.20.3"; + version = "2.22.1"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-1Auvx2KZ97iD9EDm6QQdgS5YF9smw4dTvXF1IXtYrSI="; + hash = "sha256-EbTmxnUk2taAKWPNuoVcKybKgdvPegFjz/ImTIabZ7Q="; }; - vendorHash = "sha256-61j3HVDe6AbXpdmxhQQctv4C2hNBK/rWvZeC+KtISKY="; + vendorHash = "sha256-Ypu3AKnjh2lDh43t1GZMJo7ZyEDyNbPWvoePLp+WQdI="; ldflags = [ "-s -w" @@ -38,5 +38,6 @@ buildGoModule rec { homepage = "https://github.com/spicetify/spicetify-cli/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonringer mdarocha ]; + mainProgram = "spicetify-cli"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix index f3dc8e136a..062f106369 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ssw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ssw"; - version = "0.6"; + version = "0.8"; src = fetchurl { url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz"; - sha256 = "08ck9l697xg8vpya5h07raq837i4pqxjqzx30vhscq4xpps2b8kj"; + sha256 = "sha256-hYnYKY/PO1hQ0JaLBIAaT0D68FVVRPbMnZVLAWLplUs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix index 1bc2c2b6c9..6831cea6c4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -44,7 +44,7 @@ let src = subsurfaceSrc; - sourceRoot = "source/libdivecomputer"; + sourceRoot = "${subsurfaceSrc.name}/libdivecomputer"; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 96e77baf30..65c80cc81f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -70,7 +70,8 @@ mkDerivation rec { cmakeFlags = [ "-DAUTOSTART_EXEC_PATH=${autostartExecPath}" # See https://github.com/Martchus/syncthingtray/issues/42 - "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5" + "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}" + "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"] ++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"] ++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"] diff --git a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1002fb13ae..fe39f3afb7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-73D24g3jvPPregR/bLSpWzSGQRlhjp2/0kHuDDSqSBY="; + sha256 = "sha256-fjuX/fOQMdJvqpZCfyUkYS/NRPFymAvMrD3/+ntwXGc="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-AGWrMMJ5FihIVc7HvzpsL1Vmi/fvuFowX+ijgwGRJCo="; + cargoHash = "sha256-Cav2W8iUq1GYUOnXb/ECwwKQ8uzQRW/7r5EzV7IS2Nc="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; 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 6ae3ede11b..7a280285ac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix @@ -6,10 +6,10 @@ rec { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - sha256 = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA="; + hash = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA="; }; - yarnSha256 = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE="; + yarnHash = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE="; meta = with lib; { homepage = "https://tandoor.dev/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix index 887cdb8760..829def809d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix @@ -66,7 +66,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { django-storages django-tables2 django-webpack-loader - django_treebeard + django-treebeard djangorestframework drf-writable-nested gunicorn diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix index 98da59a1d2..dd6380449d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { yarnOfflineCache = fetchYarnDeps { yarnLock = "${common.src}/vue/yarn.lock"; - sha256 = common.yarnSha256; + hash = common.yarnHash; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh index 49b6d5f98a..63021d76f6 100755 --- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh +++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/update.sh @@ -23,7 +23,7 @@ fi package_src="https://raw.githubusercontent.com/TandoorRecipes/recipes/$version" -src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .sha256) +src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .hash) tmpdir=$(mktemp -d) trap 'rm -rf "$tmpdir"' EXIT @@ -34,9 +34,8 @@ yarn_hash=$(prefetch-yarn-deps yarn.lock) popd # Use friendlier hashes -src_hash=$(nix hash to-sri --type sha256 "$src_hash") yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix -sed -i -E -e "s#sha256 = \".*\"#sha256 = \"$src_hash\"#" common.nix -sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix +sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix diff --git a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix index 56f4c43624..2ec1097338 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.5"; + version = "3.5.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-uMq/iqPAbjR85wkgqUS1pk2BL/eatNFpyKcagjN5rJ4="; + hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix b/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix index bfb20c5ccb..5d704acb23 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.1.2"; + version = "24.1.3"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU="; + sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index dcddaab34d..35d56e8be7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.8"; + version = "0.14.9"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8q/dL1Pv25TkL7PESybgIu+0lR0cr6qrK6ItE/r9pbI="; + hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA="; }; - cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk="; + cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix index 131cb0f22a..ac50a46fde 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tint2/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitLab +, fetchpatch , pkg-config , cmake , gettext @@ -24,15 +25,25 @@ stdenv.mkDerivation rec { pname = "tint2"; - version = "17.0.2"; + version = "17.1.3"; src = fetchFromGitLab { - owner = "o9000"; + owner = "nick87720z"; repo = "tint2"; rev = version; - sha256 = "sha256-SqpAjclwu3HN07LAZgvXGzjMK6G+nYLDdl90o1+9aog="; + hash = "sha256-9sEe/Gnj+FWLPbWBtfL1YlNNC12j7/KjQ40xdkaFJVQ="; }; + patches = [ + # Fix crashes with glib >= 2.76 + # https://patchespromptly.com/glib2/ + # https://gitlab.com/nick87720z/tint2/-/issues/4 + (fetchpatch { + url = "https://gitlab.com/nick87720z/tint2/uploads/7de4501a4fa4fffa5ba8bb0fa3d19f78/glib.patch"; + hash = "sha256-K547KYlRkVl1s2THi3ZCRuM447EFJwTqUEBjKQnV8Sc="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake @@ -72,7 +83,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://gitlab.com/o9000/tint2"; + homepage = "https://gitlab.com/nick87720z/tint2"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix index 14d3cd8f0c..3d85939b37 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -2,19 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.36.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-gEQA9PASSKAMqulOaK8ynBXX7BdptY1uwdS1tOf3/Jc="; + sha256 = "sha256-gT9xKFanQhptt46nkdzYsZ6Vu0Nab0oRsvEHVRNf8DQ="; }; nativeCheckInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; - [ requests beautifulsoup4 future wcwidth urwid psycopg2 ]; + [ requests beautifulsoup4 future wcwidth urwid psycopg2 tomlkit ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix index 6337249813..59917a4604 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/transifex-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.7"; + version = "1.6.10"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-5166P44HSRKQ0pCh1BCPd1ZUryh/IBDumcnLYA+CSBY="; + sha256 = "sha256-76nmlZFLon9EquM7tQ/PReM1rxkzh7x1rNdaP3n4KKg="; }; - vendorSha256 = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; + vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; ldflags = [ "-s" "-w" "-X 'github.com/transifex/cli/internal/txlib.Version=${version}'" diff --git a/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix b/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix index 9a93edb30f..83db22260d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, ninja, git, pandoc, pkg-config -, libGL, libGLU, freeimage +{ lib, stdenv, fetchFromGitHub, writeText +, cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip +, libGL, libGLU, freeimage, freetype, assimp , catch2, fmt, glew, miniz, tinyxml-2, xorg , qtbase, wrapQtAppsHook , copyDesktopItems, makeDesktopItem @@ -8,38 +8,88 @@ stdenv.mkDerivation rec { pname = "TrenchBroom"; - version = "2022.1"; + version = "2023.1"; src = fetchFromGitHub { owner = "TrenchBroom"; repo = "TrenchBroom"; rev = "v${version}"; - sha256 = "sha256-FNpYBfKnY9foPq1+21+382KKXieHksr3tCox251iJn4="; + sha256 = "sha256-62xcFKSqxPS+J54+kLo/hewM+Wu/rVBGD8oiECDCJpA="; fetchSubmodules = true; }; + # Manually simulate a vcpkg installation so that it can link the libraries + # properly. + postUnpack = + let + vcpkg_target = "x64-linux"; + + vcpkg_pkgs = [ + "assimp" + "catch2" + "fmt" + "freeimage" + "freetype" + "glew" + "miniz" + "tinyxml2" + ]; + + updates_vcpkg_file = writeText "update_vcpkg_trenchbroom" ( + lib.concatMapStringsSep "\n" (name: '' + Package : ${name} + Architecture : ${vcpkg_target} + Version : 1.0 + Status : is installed + '') vcpkg_pkgs); + 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 + ${lib.concatMapStrings (name: '' + touch $VCPKG_ROOT/installed/vcpkg/info/${name}_1.0_${vcpkg_target}.list + '') vcpkg_pkgs} + + ln -s ${assimp.lib}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${catch2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${fmt}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${freeimage}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${freetype}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${glew.out}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ''; postPatch = '' substituteInPlace common/src/Version.h.in \ --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \ --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \ --subst-var-by GIT_DESCRIBE v${version} + substituteInPlace app/CMakeLists.txt \ + --replace 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")' ''; - nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ]; + nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ]; buildInputs = [ - libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 - xorg.libSM + libGL libGLU xorg.libXxf86vm xorg.libSM + freeimage freetype qtbase catch2 fmt + glew miniz tinyxml-2 assimp ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; QT_QPA_PLATFORM = "offscreen"; cmakeFlags = [ + "-DCMAKE_MAKE_PROGRAM=ninja" + "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake" + "-DVCPKG_MANIFEST_INSTALL=OFF" # https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780 "-DCMAKE_PREFIX_PATH=cmake/packages" ]; ninjaFlags = [ "TrenchBroom" ]; - preBuild = "export HOME=$(mktemp -d)"; postInstall = '' pushd $out/share/TrenchBroom/icons @@ -71,5 +121,6 @@ stdenv.mkDerivation rec { description = "Level editor for Quake-engine based games"; license = licenses.gpl3Only; maintainers = with maintainers; [ astro ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix index c30fc4beaa..f970fe3776 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 = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-46oqQaDYFxpSjqFdP2V0aBP1S6BDG+hSO/V76WwCzAQ="; + sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U="; }; - cargoHash = "sha256-Kol7pCHq91zOE9boRatv12pgh/rfra5snUe3HNho1DU="; + cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix index af2e089a54..5b97307abc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix @@ -19,18 +19,19 @@ , libsoup_3 , libsecret , libwebp +, libspelling , gst_all_1 , nix-update-script }: stdenv.mkDerivation rec { pname = "tuba"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-PSEPpJn/lYpeI6AN2AY73NpOcDkMm0zNqeSdELn5HvY="; + hash = "sha256-sLdkSIevz2spL+Q5sS+ugqEbqJTXrLxmszzijtKvY6k="; }; nativeBuildInputs = [ @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { libadwaita libsecret libwebp + libspelling ] ++ (with gst_all_1; [ gstreamer gst-libav @@ -64,9 +66,7 @@ stdenv.mkDerivation rec { ]); passthru = { - updateScript = nix-update-script { - attrPath = "tuba"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/typer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/typer/default.nix new file mode 100644 index 0000000000..ebd274125e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/typer/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "typer"; + version = "unstable-2023-02-08"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "typer"; + rev = "02aa80b3be8a6c2c9d08d9a56b3fe784adf00933"; + hash = "sha256-J3wTqWxHEQz1AAt7DfUmpgc7wmfILBtyHuDrmqN96fI="; + }; + + vendorHash = "sha256-t4zim6WhqGAf1zHmmbJbpVvQcE/aoNL7ZLdjU7f3rp8="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Typing test in your terminal"; + homepage = "https://github.com/maaslalani/typer"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix new file mode 100644 index 0000000000..d91d8c3ecb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, typioca +}: + +buildGoModule rec { + pname = "typioca"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "bloznelis"; + repo = "typioca"; + rev = version; + hash = "sha256-gSHJkMyRgJ58kccQAh1bJNveirDaqGjlhrzgvEX5c8o="; + }; + + vendorHash = "sha256-umtBvcfQoMQdWmQIAReeOkhRq+pelZzPvFsTq5ZwPXU="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/bloznelis/typioca/cmd.Version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = typioca; + }; + }; + + meta = with lib; { + description = "Cozy typing speed tester in terminal"; + homepage = "https://github.com/bloznelis/typioca"; + changelog = "https://github.com/bloznelis/typioca/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix index 726c749d60..6b95a9b973 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -1,30 +1,42 @@ { lib -, python3Packages , fetchFromGitHub +, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.10"; + version = "1.0.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; - rev = version; - hash = "sha256-lCOOVAdsr5LajBGY7XUi4J5pJqm5rOH5IMKhA6fju5w="; + rev = "refs/tags/${version}"; + hash = "sha256-IvCdc4f784hBM+TEa0zIACz/1/FUnEpGxHUGiS85tt8="; }; - propagatedBuildInputs = [ - python3Packages.urwid + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = with python3.pkgs; [ + hatchling + hatch-vcs ]; - doCheck = false; # No tests available + propagatedBuildInputs = with python3.pkgs; [ + urwid + ]; - pythonImportsCheck = [ "urlscan" ]; + # No tests available + doCheck = false; + + pythonImportsCheck = [ + "urlscan" + ]; meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; homepage = "https://github.com/firecat53/urlscan"; + changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix index 047622e545..1b8f78cd61 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-06-11"; + version = "unstable-2023-07-31"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "e6a121efa7eb7b432517d610de4deea6dfa876b0"; + rev = "698f39b496957d50c68437f16e74a7ac41eb5147"; fetchSubmodules = true; - hash = "sha256-8X4Yu8VY5ehptJN1KtsCuoECtEZNLZMzOvU91j8UmDk="; + hash = "sha256-AdW6oMRVIgat8XlH342PEwe6BfkzKVLSadGOTLGwzwo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix index 90b776d212..c8991cf2ac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-d7oHPe1R0KZaVTTxmed27VZ2PphiQfy7CXYhVKHWUhE="; + hash = "sha256-JKhijruaRjdMEbsIrcu2swSCb/nTxwIG/F9c2eGncnQ="; }; - vendorHash = "sha256-jrXdbxH5hJrd5yyVsTOeIYJciJ6wVTydkD6aSuWYKPQ="; + vendorHash = "sha256-IpybcyW4up9QVV7fJCh+2Lrpi571tfravN17vh/G1bQ="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix index 4755ce24b7..0a803a4bfd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix @@ -1,25 +1,27 @@ -{lib, fetchgit, rustPlatform}: - -let - repoUrl = "https://codeberg.org/explosion-mental/wallust"; -in rustPlatform.buildRustPackage rec { +{ lib +, fetchFromGitea +, rustPlatform +}: +rustPlatform.buildRustPackage rec { pname = "wallust"; - version = "2.4.1"; + version = "2.5.1"; - src = fetchgit { - url = "${repoUrl}.git"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "explosion-mental"; + repo = pname; rev = version; - sha256 = "sha256-7zSUyj8Zzk8rsDe7ukPaV02HH7VQ+yjh+wM5TZzJxSA="; + hash = "sha256-v72ddWKK2TMHKeBihYjMoJvKXiPe/yqJtdh8VQzjmVU="; }; - cargoSha256 = "sha256-toqt5vqEsflhqFargEcCXrb6ab748mn6k6/RH5d/3RA="; + cargoSha256 = "sha256-jDs4KeVN3P+4/T1cW4KDxoY79jE3GXiwzxLrR2HybWw="; meta = with lib; { - description = "A better pywall"; - homepage = repoUrl; + description = "A better pywal"; + homepage = "https://codeberg.org/explosion-mental/wallust"; license = licenses.mit; - maintainers = with maintainers; [onemoresuza]; - downloadPage = "${repoUrl}/releases/tag/${version}"; + maintainers = with maintainers; [ onemoresuza ]; + downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}"; platforms = platforms.unix; mainProgram = "wallust"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 24c123325a..c4a764fec9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -48,13 +48,13 @@ let in stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.19"; + version = "0.9.20"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - hash = "sha256-55ZPqq/tJmF4sNdK72cgjXUWR4YtUfOrpePHn+E9T74="; + hash = "sha256-xLcoysnCPB9+jI5cZokWWIvXM5wo3eXOe/hXfuChBR4="; }; postUnpack = lib.optional cavaSupport '' @@ -142,5 +142,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ]; platforms = platforms.unix; homepage = "https://github.com/alexays/waybar"; + mainProgram = "waybar"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix index 0b76fb278d..e64426365e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ ]; platforms = with platforms; linux; + mainProgram = "wofi"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix new file mode 100644 index 0000000000..4e4a849881 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "wttrbar"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "bjesus"; + repo = "wttrbar"; + rev = version; + hash = "sha256-RQeRDu8x6OQAD7VYT7FwBfj8gxn1nj6hP60oCIiuAgg="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + + cargoHash = "sha256-hJCEA6m/iZuSjWRbbaoJ5ryG0z5U/IWhbEvNAohFyjg="; + + meta = { + description = "A simple but detailed weather indicator for Waybar using wttr.in"; + homepage = "https://github.com/bjesus/wttrbar"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + mainProgram = "wttrbar"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix index 899468fbb5..abb5d0b960 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , curl, db, libgeotiff , xorg, motif, pcre -, perl, proj, rastermagick, shapelib +, perl, proj, graphicsmagick, shapelib , libax25 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl db libgeotiff xorg.libXpm xorg.libXt motif pcre - perl proj rastermagick shapelib + perl proj graphicsmagick shapelib libax25 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index a27c76fde3..812ecfb16d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.19.3"; + version = "6.20.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-mvEmxN7spyQkavAcjW4bVt7xjtRTP77OwHzJ5UqsSoE="; + hash = "sha256-csJfmjKm/uAlINhijeqUsDVTemchlzWqJg/YHtmNlAk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix index f2696c36db..7d974bf87f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yambar/default.nix @@ -29,22 +29,23 @@ , x11Support ? true }: -let - inherit (lib) mesonEnable; -in assert (x11Support || waylandSupport); stdenv.mkDerivation (finalAttrs: { pname = "yambar"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; rev = finalAttrs.version; - hash = "sha256-0bgRnZYLGWJ9PE62i04hPBcgzWyd30DK7AUuejSgta4="; + hash = "sha256-+bNTEPGV5xaVXhsejyK+FCcJ9J06KS6x7/qo6P2DnZI="; }; + outputs = [ "out" "man" ]; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ bison flex @@ -76,16 +77,17 @@ stdenv.mkDerivation (finalAttrs: { xcbutilwm ]; + strictDeps = true; + mesonBuildType = "release"; mesonFlags = [ - (mesonEnable "backend-x11" x11Support) - (mesonEnable "backend-wayland" waylandSupport) + (lib.mesonEnable "backend-x11" x11Support) + (lib.mesonEnable "backend-wayland" waylandSupport) ]; - meta = with lib; { + meta = { homepage = "https://codeberg.org/dnkl/yambar"; - changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}"; description = "Modular status panel for X11 and Wayland"; longDescription = '' yambar is a lightweight and configurable status panel (bar, for short) for @@ -112,8 +114,9 @@ stdenv.mkDerivation (finalAttrs: { To summarize: a bar displays information provided by modules, using particles and decorations. How is configured by you. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix index 2c188d833a..e40f6a78c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -16,7 +16,7 @@ buildPythonApplication { pname = "yubioath-flutter-helper"; inherit src version meta; - sourceRoot = "source/helper"; + sourceRoot = "${src.name}/helper"; format = "pyproject"; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 586d9f95f1..79d386e349 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -1,41 +1,12 @@ -{ appimageTools -, lib -, fetchurl -, texlive -, pandoc -}: +{ callPackage, texlive }: -# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. -let - pname = "zettlr"; - version = "2.3.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk="; +builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) { + zettlr = { + version = "2.3.0"; + hash = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk="; }; - appimageContents = appimageTools.extractType2 { - inherit name src; - }; -in -appimageTools.wrapType2 rec { - inherit name src; - - multiArch = false; # no 32bit needed - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop - install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png - substituteInPlace $out/share/applications/Zettlr.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "A markdown editor for writing academic texts and taking notes"; - homepage = "https://www.zettlr.com"; - platforms = [ "x86_64-linux" ]; - license = licenses.gpl3; - maintainers = with maintainers; [ tfmoraes ]; + zettlr-beta = { + version = "3.0.0-beta.7"; + hash = "sha256-zIZaINE27bcjbs8yCGQ3UKAwStFdvhHD3Q1F93LrG4U="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix new file mode 100644 index 0000000000..4a8bcbd854 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix @@ -0,0 +1,42 @@ +{ pname +, version +, hash +, appimageTools +, lib +, fetchurl +, texlive +, pandoc +}: + +# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. +let + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; + inherit hash; + }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in +appimageTools.wrapType2 rec { + inherit name src; + + multiArch = false; # no 32bit needed + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop + install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png + substituteInPlace $out/share/applications/Zettlr.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A markdown editor for writing academic texts and taking notes"; + homepage = "https://www.zettlr.com"; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3; + maintainers = with maintainers; [ tfmoraes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index 88a683b2a3..8a13341b11 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.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-aeO1rjKYoO6KF+oe0FKIa8D3j6G01uyC79OvUg9Qpfk="; + hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY="; }; - vendorHash = "sha256-Rh3S7Qy89ctsKlFz0lNNs8pZ5lHG5yB//DQzffD6eL8="; + vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; 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 5f7d0b5ab3..5d9e4c838d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.52.130"; + version = "1.56.20"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-TKCAv1gGdAU9KDcrrREPgFjZOPNwTAfLrCh33DAf41U="; + sha256 = "sha256-ub44AI0Fu3V8SRhiBrQueJZaSdl4/cI6DQ3QYJfGseo="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix index 225e7a0e86..ee04f9ed04 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { pname = "browsh"; - sourceRoot = "source/interfacer"; + sourceRoot = "${src.name}/interfacer"; src = fetchFromGitHub { owner = "browsh-org"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md index 4c93daee4a..c5a537147c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md @@ -17,9 +17,9 @@ Hydra). We use these channels for testing and to fix build errors in advance so that `chromium` updates are trivial and can be merged fast. - `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via - Chromium's `upstream-info.json` + Chromium's `upstream-info.nix` - `ungoogled-chromium`: @squalus - - `chromedriver`: Updated via Chromium's `upstream-info.json` and not built + - `chromedriver`: Updated via Chromium's `upstream-info.nix` and not built from source. # Upstream links @@ -35,9 +35,9 @@ # Updating Chromium Simply run `./pkgs/applications/networking/browsers/chromium/update.py` to -update `upstream-info.json`. After updates it is important to test at least +update `upstream-info.nix`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which -reuses `upstream-info.json`). +reuses `upstream-info.nix`). Note: Due to the script downloading many large tarballs it might be necessary to adjust the available tmpfs size (it defaults to 10% of the @@ -75,7 +75,7 @@ All updates are considered security critical and should be ported to the stable channel ASAP. When there is a new stable release the old one should receive security updates for roughly one month. After that it is important to mark Chromium as insecure (see 69e4ae56c4b for an example; it is important that the -tested job still succeeds and that all browsers that use `upstream-info.json` +tested job still succeeds and that all browsers that use `upstream-info.nix` are marked as insecure). ## Major version updates diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index 7678d87ccf..1e203fc12e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -6,7 +6,7 @@ mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; - buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; + buildTargets = [ "run_mksnapshot_default" "chrome_sandbox" "chrome" ]; outputs = ["out" "sandbox"]; @@ -86,7 +86,7 @@ mkChromiumDerivation (base: rec { else "https://www.chromium.org/"; maintainers = with lib.maintainers; if ungoogled then [ squalus primeos michaeladler networkexception ] - else [ primeos thefloweringash ]; + else [ primeos thefloweringash networkexception ]; license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; mainProgram = "chromium"; 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 36e2593996..f555ab2893 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch +, buildPackages +, pkgsBuildBuild +, pkgsBuildTarget # Channel data: , channel, upstream-info # Helper functions: @@ -8,8 +11,10 @@ , ninja, pkg-config , python3, perl , which -, llvmPackages +, llvmPackages_attrName , rustc +, libuuid +, overrideCC # postPatch: , pkgsBuildHost # configurePhase: @@ -116,6 +121,33 @@ let inherit (upstream-info.deps.ungoogled-patches) rev sha256; }; + # There currently isn't a (much) more concise way to get a stdenv + # that uses lld as its linker without bootstrapping pkgsLLVM; see + # https://github.com/NixOS/nixpkgs/issues/142901 + buildPlatformLlvmStdenv = + let + llvmPackages = pkgsBuildBuild.${llvmPackages_attrName}; + in + overrideCC llvmPackages.stdenv + (llvmPackages.stdenv.cc.override { + inherit (llvmPackages) bintools; + }); + + chromiumRosettaStone = { + cpu = platform: + let name = platform.parsed.cpu.name; + in ({ "x86_64" = "x64"; + "i686" = "x86"; + "arm" = "arm"; + "aarch64" = "arm64"; + }.${platform.parsed.cpu.name} + or (throw "no chromium Rosetta Stone entry for cpu: ${name}")); + os = platform: + if platform.isLinux + then "linux" + else throw "no chromium Rosetta Stone entry for os: ${platform.config}"; + }; + base = rec { pname = "${packageName}-unwrapped"; inherit (upstream-info) version; @@ -130,16 +162,35 @@ let ninja pkg-config python3WithPackages perl which - llvmPackages.bintools + buildPackages.${llvmPackages_attrName}.bintools bison gperf ]; + depsBuildBuild = [ + buildPlatformLlvmStdenv + buildPlatformLlvmStdenv.cc + pkg-config + libuuid + libpng # needed for "host/generate_colors_info" + ] + # When cross-compiling, chromium builds a huge proportion of its + # components for both the `buildPlatform` (which it calls + # `host`) as well as for the `hostPlatform` -- easily more than + # half of the dependencies are needed here. To avoid having to + # maintain a separate list of buildPlatform-dependencies, we + # simply throw in the kitchen sink. + ++ buildInputs + ; + buildInputs = [ (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libcap - xdg-utils minizip libwebp + ] ++ lib.optionals (!xdg-utils.meta.broken) [ + xdg-utils + ] ++ [ + minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 nasm @@ -162,6 +213,7 @@ let ++ lib.optional pulseSupport libpulseaudio; patches = [ + ./cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: @@ -225,6 +277,7 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' + '' + lib.optionalString (!xdg-utils.meta.broken) '' sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc @@ -268,9 +321,27 @@ let # weaken or disable security measures like sandboxing or ASLR): is_official_build = true; disable_fieldtrial_testing_config = true; + + # note: chromium calls buildPlatform "host" and calls hostPlatform "target" + host_cpu = chromiumRosettaStone.cpu stdenv.buildPlatform; + host_os = chromiumRosettaStone.os stdenv.buildPlatform; + target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform; + v8_target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform; + target_os = chromiumRosettaStone.os stdenv.hostPlatform; + # Build Chromium using the system toolchain (for Linux distributions): + # + # What you would expect to be caled "target_toolchain" is + # actually called either "default_toolchain" or "custom_toolchain", + # depending on which part of the codebase you are in; see: + # https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44 custom_toolchain = "//build/toolchain/linux/unbundle:default"; - host_toolchain = "//build/toolchain/linux/unbundle:default"; + host_toolchain = "//build/toolchain/linux/unbundle:host"; + v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host"; + + host_pkg_config = "${pkgsBuildBuild.pkg-config}/bin/pkg-config"; + pkg_config = "${pkgsBuildHost.pkg-config}/bin/${stdenv.cc.targetPrefix}pkg-config"; + # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; # Because we use a different toolchain / compiler version: @@ -304,16 +375,18 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; - clang_base_path = "${llvmPackages.stdenv.cc}"; + clang_base_path = "${pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc}"; use_qt = false; # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): use_system_libffi = true; - } // lib.optionalAttrs (chromiumVersionAtLeast "115") { # 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}"; + } // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) { + # https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html + arm_control_flow_integrity = "none"; } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; @@ -343,6 +416,11 @@ let # our Clang is always older than Chromium's and the build logs have a size # of approx. 25 MB without this option (and this saves e.g. 66 %). env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + env.BUILD_CC = "$CC_FOR_BUILD"; + env.BUILD_CXX = "$CXX_FOR_BUILD"; + env.BUILD_AR = "$AR_FOR_BUILD"; + env.BUILD_NM = "$NM_FOR_BUILD"; + env.BUILD_READELF = "$READELF_FOR_BUILD"; buildPhase = let buildCommand = target: '' @@ -375,7 +453,12 @@ let gn = gnChromium; }; }; - }; + } + # overwrite `version` with the exact same `version` from the same source, + # except it internally points to `upstream-info.nix` for + # `builtins.unsafeGetAttrPos`, which is used by ofborg to decide + # which maintainers need to be pinged. + // builtins.removeAttrs upstream-info (builtins.filter (e: e != "version") (builtins.attrNames upstream-info)); # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/cross-compile.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/cross-compile.patch new file mode 100644 index 0000000000..7df73299bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/cross-compile.patch @@ -0,0 +1,31 @@ +diff --git a/build/toolchain/linux/unbundle/BUILD.gn b/build/toolchain/linux/unbundle/BUILD.gn +index a091491236bb1..d36fd4e652fbf 100644 +--- a/build/toolchain/linux/unbundle/BUILD.gn ++++ b/build/toolchain/linux/unbundle/BUILD.gn +@@ -9,6 +9,7 @@ gcc_toolchain("default") { + cxx = getenv("CXX") + ar = getenv("AR") + nm = getenv("NM") ++ readelf = getenv("READELF") + ld = cxx + + extra_cflags = getenv("CFLAGS") +@@ -27,6 +28,7 @@ gcc_toolchain("host") { + cxx = getenv("BUILD_CXX") + ar = getenv("BUILD_AR") + nm = getenv("BUILD_NM") ++ readelf = getenv("BUILD_READELF") + ld = cxx + + extra_cflags = getenv("BUILD_CFLAGS") +@@ -35,7 +37,8 @@ gcc_toolchain("host") { + extra_ldflags = getenv("BUILD_LDFLAGS") + + toolchain_args = { +- current_cpu = current_cpu +- current_os = current_os ++ current_cpu = host_cpu ++ current_os = host_os ++ v8_current_cpu = target_cpu + } + } 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 3b4826930e..6419fa6a14 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -16,17 +16,23 @@ , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" +, pkgsBuildTarget +, pkgsBuildBuild +, pkgs }: let - llvmPackages = llvmPackages_16; - stdenv = llvmPackages.stdenv; + # Sometimes we access `llvmPackages` via `pkgs`, and other times + # via `pkgsFooBar`, so a string (attrname) is the only way to have + # a single point of control over the LLVM version used. + llvmPackages_attrName = "llvmPackages_16"; + stdenv = pkgs.${llvmPackages_attrName}.stdenv; - upstream-info = (lib.importJSON ./upstream-info.json).${channel}; + upstream-info = (import ./upstream-info.nix).${channel}; # Helper functions for changes that depend on specific versions: warnObsoleteVersionConditional = min-version: result: - let ungoogled-version = (lib.importJSON ./upstream-info.json).ungoogled-chromium.version; + let ungoogled-version = (import ./upstream-info.nix).ungoogled-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." @@ -42,7 +48,7 @@ let callPackage = newScope chromium; chromium = rec { - inherit stdenv llvmPackages upstream-info; + inherit stdenv llvmPackages_attrName upstream-info; mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; @@ -60,7 +66,12 @@ let inherit channel chromiumVersionAtLeast enableWideVine ungoogled; }; - ungoogled-chromium = callPackage ./ungoogled.nix {}; + # ungoogled-chromium is, contrary to its name, not a build of + # chromium. It is a patched copy of chromium's *source code*. + # Therefore, it needs to come from buildPackages, because it + # contains python scripts which get /nix/store/.../bin/python3 + # patched into their shebangs. + ungoogled-chromium = pkgsBuildBuild.callPackage ./ungoogled.nix {}; }; pkgSuffix = if channel == "dev" then "unstable" else @@ -71,10 +82,10 @@ let # Use the latest stable Chrome version if necessary: version = if chromium.upstream-info.sha256bin64 != null then chromium.upstream-info.version - else (lib.importJSON ./upstream-info.json).stable.version; + else (import ./upstream-info.nix).stable.version; sha256 = if chromium.upstream-info.sha256bin64 != null then chromium.upstream-info.sha256bin64 - else (lib.importJSON ./upstream-info.json).stable.sha256bin64; + else (import ./upstream-info.nix).stable.sha256bin64; in fetchurl { urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ "https://dl.google.com/linux/chrome/deb/pool/main/g" @@ -135,14 +146,10 @@ let }; }; - suffix = if (channel == "stable" || channel == "ungoogled-chromium") - then "" - else "-" + channel; + suffix = lib.optionalString (channel != "stable" && channel != "ungoogled-chromium") ("-" + channel); sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; - version = chromium.browser.version; - # We want users to be able to enableWideVine without rebuilding all of # chromium, so we have a separate derivation here that copies chromium # and adds the unfree WidevineCdm. @@ -159,7 +166,7 @@ let in stdenv.mkDerivation { pname = lib.optionalString ungoogled "ungoogled-" + "chromium${suffix}"; - inherit version; + inherit (chromium.browser) version; nativeBuildInputs = [ makeWrapper ed @@ -213,8 +220,10 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + '' + lib.optionalString (!xdg-utils.meta.broken) '' # Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used): export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin" + '' + '' . w @@ -238,3 +247,9 @@ in stdenv.mkDerivation { inherit chromeSrc sandboxExecutableName; }; } +# the following is a complicated and long-winded variant of +# `inherit (chromium.browser) version`, with the added benefit +# that it keeps the pointer to upstream-info.nix for +# builtins.unsafeGetAttrPos, which is what ofborg uses to +# decide which maintainers need to be pinged. +// builtins.removeAttrs chromium.browser (builtins.filter (e: e != "version") (builtins.attrNames chromium.browser)) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index 380d33c124..b8af11ee61 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -1,8 +1,8 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix nix-prefetch-git +#! nix-shell -i python -p python3 nix nixfmt nix-prefetch-git """This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium -via upstream-info.json.""" +via upstream-info.nix.""" # Usage: ./update.py [--commit] import base64 @@ -23,16 +23,23 @@ RELEASES_URL = 'https://versionhistory.googleapis.com/v1/chrome/platforms/linux/ DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' -JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' +PIN_PATH = dirname(abspath(__file__)) + '/upstream-info.nix' UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml' COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py' -def load_json(path): - """Loads the given JSON file.""" - with open(path, 'r') as f: - return json.load(f) +def load_as_json(path): + """Loads the given nix file as JSON.""" + out = subprocess.check_output(['nix-instantiate', '--eval', '--strict', '--json', path]) + return json.loads(out) +def save_dict_as_nix(path, input): + """Saves the given dict/JSON as nix file.""" + json_string = json.dumps(input) + nix = subprocess.check_output(['nix-instantiate', '--eval', '--expr', '{ json }: builtins.fromJSON json', '--argstr', 'json', json_string]) + formatted = subprocess.check_output(['nixfmt'], input=nix) + with open(path, 'w') as out: + out.write(formatted.decode()) def nix_prefetch_url(url, algo='sha256'): """Prefetches the content of the given URL.""" @@ -160,7 +167,7 @@ def print_updates(channels_old, channels_new): channels = {} -last_channels = load_json(JSON_PATH) +last_channels = load_as_json(PIN_PATH) print(f'GET {RELEASES_URL}', file=sys.stderr) @@ -225,9 +232,7 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit': version_new = sorted_channels[channel_name]['version'] if LooseVersion(version_old) < LooseVersion(version_new): last_channels[channel_name] = sorted_channels[channel_name] - with open(JSON_PATH, 'w') as out: - json.dump(last_channels, out, indent=2) - out.write('\n') + save_dict_as_nix(PIN_PATH, last_channels) attr_name = channel_name_to_attr_name(channel_name) commit_message = f'{attr_name}: {version_old} -> {version_new}' if channel_name == 'stable': @@ -238,7 +243,5 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit': subprocess.run(['git', 'add', JSON_PATH], check=True) subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) else: - with open(JSON_PATH, 'w') as out: - json.dump(sorted_channels, out, indent=2) - out.write('\n') + save_dict_as_nix(PIN_PATH, sorted_channels) print_updates(last_channels, sorted_channels) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json deleted file mode 100644 index beb0c15037..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "stable": { - "version": "114.0.5735.198", - "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9", - "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92", - "deps": { - "gn": { - "version": "2023-04-19", - "url": "https://gn.googlesource.com/gn", - "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" - } - }, - "chromedriver": { - "version": "114.0.5735.90", - "sha256_linux": "0i3g79c4vdi5mys295lpzmmh0pgxhh14mjmz9amhq5rrn7w7wy57", - "sha256_darwin": "0l0nzx64vrr2wggwdyrcv0xbv79avr431cppprl4dg62b39wkgba", - "sha256_darwin_aarch64": "0z549y1w855ljia5w8sf9w6398pnn89y28pg26ygqad888b3msql" - } - }, - "beta": { - "version": "115.0.5790.40", - "sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58", - "sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw", - "deps": { - "gn": { - "version": "2023-05-19", - "url": "https://gn.googlesource.com/gn", - "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7", - "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a" - } - } - }, - "dev": { - "version": "116.0.5845.14", - "sha256": "1b8ak0yg7ymz0siw81g47fdl12bj7f7gdw2nd5wlgj3h0g0b0675", - "sha256bin64": "1hnis5m5l6ygihmwsy6qk12lz6gjcndfdnssb3l9pd7v3qwfpkp2", - "deps": { - "gn": { - "version": "2023-06-09", - "url": "https://gn.googlesource.com/gn", - "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d", - "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw" - } - } - }, - "ungoogled-chromium": { - "version": "114.0.5735.198", - "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9", - "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92", - "deps": { - "gn": { - "version": "2023-04-19", - "url": "https://gn.googlesource.com/gn", - "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" - }, - "ungoogled-patches": { - "rev": "114.0.5735.198-1", - "sha256": "1zda5c7n43zviwj3n2r2zbhmylkrfy54hggq8cisbdrhhfn96vii" - } - } - } -} 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 new file mode 100644 index 0000000000..5bf8819390 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -0,0 +1,65 @@ +{ + beta = { + deps = { + gn = { + rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; + sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; + url = "https://gn.googlesource.com/gn"; + version = "2023-06-09"; + }; + }; + sha256 = "0r5m2bcrh2zpl2m8wnzyl4afh8s0dh2m2fnfjf50li94694vy4jz"; + sha256bin64 = "047wsszg4c23vxq93a335iymiqpy7lw5izzz4f0zk1a4sijafd59"; + version = "116.0.5845.50"; + }; + dev = { + deps = { + gn = { + rev = "fae280eabe5d31accc53100137459ece19a7a295"; + sha256 = "02javy4jsllwl4mxl2zmg964jvzw800w6gbmr5z6jdkip24fw0kj"; + url = "https://gn.googlesource.com/gn"; + version = "2023-07-12"; + }; + }; + sha256 = "0pyf3k58m26lkc6v6mqpwvhyaj6bbyywl4c17cxb5zmzc1zmc5ia"; + sha256bin64 = "10w5dm68aaffgdq0xqi4ans2w7byisqqld09pz5vpk350gy16fjh"; + version = "117.0.5897.3"; + }; + stable = { + chromedriver = { + sha256_darwin = "1c41cb7zh13ny4xvpwy7703cnjrkmqxd3n8zpja7n6a38mi8mgsk"; + sha256_darwin_aarch64 = + "1kliszw10jnnlhzi8jrdzjq0r7vfn6ksk1spsh2rfn2hmghccv2d"; + sha256_linux = "1797qmb213anvp9lmrkj6wmfdwkdfswmshmk1816zankw5dl883j"; + version = "115.0.5790.98"; + }; + deps = { + gn = { + rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7"; + sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"; + url = "https://gn.googlesource.com/gn"; + version = "2023-05-19"; + }; + }; + sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79"; + sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3"; + version = "115.0.5790.110"; + }; + ungoogled-chromium = { + deps = { + gn = { + rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7"; + sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"; + url = "https://gn.googlesource.com/gn"; + version = "2023-05-19"; + }; + ungoogled-patches = { + rev = "115.0.5790.110-1"; + sha256 = "1jahy4jl5bnnzl6433hln0dj3b39v5zqd90n8zf7ss45wqrff91b"; + }; + }; + sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79"; + sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3"; + version = "115.0.5790.110"; + }; +} 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 3acd530adf..5a09f83355 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,1015 @@ { - version = "116.0b5"; + version = "117.0b2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ach/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ach/firefox-117.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b8bac9ac088136ab2bfbb66213e80a1a64382d2bd3110ceee75c7b981a512f11"; + sha256 = "5be5960dbfd290917b99836883dd79bed96b7ce64587745d3a7a5c4d96127356"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/af/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/af/firefox-117.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "09b7bba8b9610932af18899fe8968e0f1014df20e59cca1d138e0c3fc3cf99b1"; + sha256 = "cb6c501f6e1fe74b6d46ff3de00cca7a9565d687a2938ed290969fb1e8e40310"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/an/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/an/firefox-117.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5b6675e769b9ddd103bc7d00a13e7a03bec39968eac11204ef9aa15bb68553da"; + sha256 = "a66c37468d2fbf6622e0caae6b5cd373750f7cfb5b5d95390c2678214312b1fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ar/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ar/firefox-117.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f063ee602d56123449011f85de0a0267962dd79071647b92b38d448e56641724"; + sha256 = "24585670af81ce2bd7003c1f14c7915737d60deacb97fe8f7912832a8221c9de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ast/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ast/firefox-117.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f366cce66b6b7e94ef19d76bf67d9fba9535fc237cb3bb5f6158b1567faf4602"; + sha256 = "0acfcee87d21cdaadce5f6c335f60f40361e64241790c8629ca438a2590518d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/az/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/az/firefox-117.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "f2b7e8d9f2effac569a6cb520a9e6326544561ad6f9c1a5daa0a257be0b76b3f"; + sha256 = "1a40539754405f69a0c3d9cf7a76e4e0481f16f85c05f5cec2a0fc3089904cf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/be/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/be/firefox-117.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "732cfccf574e88d47d23a7e8b5db53c913634c0507298cec05df75f63424beb5"; + sha256 = "89803701e298fbb09cdacd910f318e8dfb3b47096246ca9e8e162d8eb3599310"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/bg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/bg/firefox-117.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "568c48f5a1eba778cffc11469b2f9b72bba33f11b56ac82a6d4247ca1af361a9"; + sha256 = "af4c65bc9ebc1a4529bd6f6834fa6d5566805e424f11c2da3db07427f622be06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/bn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/bn/firefox-117.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "455f7f5e2f35a61a6e9ae47274eec2445cd03c9e92806152b513a2c6825c67ee"; + sha256 = "e663d1a80f1367b5b6941af98a980825e28b15cb287c1e33a508157dc2abbf11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/br/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/br/firefox-117.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "542d4532bae454153625fd2de741df976a47122cd6144930cef5871d5908d57f"; + sha256 = "40aa6681094ace0423f1970b7812bfb8bd9fcbf3feaa485cb23ff21a7fcb5f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/bs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/bs/firefox-117.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "f9cfcbec96bad8db2b9d8e0c2850295efad8710bcd250157bdbdbb3d648c3de6"; + sha256 = "b12da3d20a65b99a3c43ce358d059d9e071a4be699f65452436b28d286deac39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ca-valencia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ca-valencia/firefox-117.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "583638798cf0211905b568fba95aa2a6bb83124b9855bcc1f1fb41938e1a3760"; + sha256 = "d3fbd579d56f2f11e291917b4454d22caec38f7ad1cdffdf4346e1801d89d9b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ca/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ca/firefox-117.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f909cc40dbdde4e53d76b0eee067386b9c125c2121c30c2071970cb964efe636"; + sha256 = "28e0e6dc86dd3824fa6b4703e4cc72c9ef492105763469ee66d9524ecf08a143"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/cak/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/cak/firefox-117.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c4fde652605aa213c7d4b6104739861456c34c9e51203623684982d94771f843"; + sha256 = "cd99652388e4d141dedd64f0af899d8cdf9a6927501505f6e610ee1e33e07542"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/cs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/cs/firefox-117.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "faf850d13389f2de6a084a976d55ac43cd8860bd8c01a703ba424f4eaf769640"; + sha256 = "f10daf296e60e96e05e00c49b559f3b765b073f743ba3bb53d14f2d5496f2fd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/cy/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/cy/firefox-117.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "99e0331f9de6a5629b3ace5408c8c8704c5db46047e08362cf6cb3fd739302bb"; + sha256 = "d49fa5e6174cae11dcaaddb55ce441c0edfc87453c256579e84072dab997b7e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/da/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/da/firefox-117.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "19cb46d2383c9a1ba5af6d3a45ad1b6f3a4824f5b5539596b1210e4405633bbe"; + sha256 = "dc4289ec28b16734125f51143ed1264a2977a038b9ccb12565909ddf7bba9e40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/de/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/de/firefox-117.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "01db84b20e3b26dc59cacc75e28c36d1b2a999cf74bec57d514fcd28cea81a1f"; + sha256 = "cae9b5a538432ca4d9d3f8069f14e2062e1b23d0c3d2265d413d3346e9a8c2c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/dsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/dsb/firefox-117.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "6d6ac324be1e86dc3c327fbe9eca7a9bd07e8610f0758e7491f8e072e65d6d92"; + sha256 = "bf636d5851fe7a2fa695fbe7082d0780b9d0bc3ac2690b65c09cc5d15ffed275"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/el/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/el/firefox-117.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "552f376006b17bd3b03bf7b47c905319d91c35592990fedbd459ead8029b7c96"; + sha256 = "b94b8c113f9c849f3466c50f2f608d54b0ecd5dbc75390184bac509d6763127f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/en-CA/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/en-CA/firefox-117.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9865827f4c325cabfb8860d550a1cf1242a1fe9ccf66b835b97f7e47e36d9d16"; + sha256 = "4b8a4164aa503056b7190f557aa4e4c8a54d871d40a34505af5ebb27b78bf8f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/en-GB/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/en-GB/firefox-117.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "7b326d8895889be3c6cf13e34856daff7255a022135f2c8a4bea662220afd34d"; + sha256 = "7218f7c616b1f1d44e897c3a136e9d95783ae656bfe529ecd98b39f758f9d35f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/en-US/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/en-US/firefox-117.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "7e8193678b097704dab2f0d15701aac927444c51a4855c46046f5cab2c40f33d"; + sha256 = "f29362399cb7f700e66ccf9d29c173f26ed73bdd0c8135e198212a9627789f93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/eo/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/eo/firefox-117.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "5031c4fa734615a0aab4c1193dd9116fb8de37c75ebb3b974216c1dbe6612801"; + sha256 = "350de0dd1eb551cd35ec7a218ba261d11e932044439d178fe24661f560a5a93d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-AR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-AR/firefox-117.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7113657bdd0b8fc8aa76be6cddd99976213a80c02566c5d8ca49a90a163036e6"; + sha256 = "3ae2e20e5be67601ab20921b9e1b8a53972881261f3aa288a5f1fd7d0f20159c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-CL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-CL/firefox-117.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "2164ef71ad9490706e23996ac523cbe63a0471f7185dbd0c8fcfefef288694ef"; + sha256 = "c241e3d71c44c8329fbeedc225bbd9ea35addeb75b6f76002ac60ac93884a45a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-ES/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-ES/firefox-117.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5369884a490e329390ae5dff662a71a405e870110f26e8d9767144c087e717b8"; + sha256 = "05e4daa4351b6927bf300cf3cd95cf25ef749a8ae217be83f88937a18913ef24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/es-MX/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/es-MX/firefox-117.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "bbcfc6e7be3b94e132eb2142de0259e765a5708e3848cfd84bc079b5cffcd98e"; + sha256 = "1e8bbef69e2e870765d6d32a17f7c81dec5f2683a979fb9a2185bac0982c0e4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/et/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/et/firefox-117.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2c6b545653a37f4b5730952c1d6fb57cab447eadeca6b63e01443e4d7cc13bd1"; + sha256 = "2fbf2abd087dde63ee5c51ba4344c397d74aa2a6c082174b4abb5d390162b020"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/eu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/eu/firefox-117.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "85ceb4d6f92edd628f1668b58f422000bef90a7d0492abc1822d39b61f262b4d"; + sha256 = "97dfe7170990cc9e1605ed73f86cb2fdccf6ce896b83eca4277bc54d25fab570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fa/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fa/firefox-117.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "08c1e4f78416b47d88e84860c8a75c4c504543064666de8fdfba223f6b14765b"; + sha256 = "d694934c93c4c75bc65a0aa969fc544f2a3c2f9534847ae161998f000243ad1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ff/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ff/firefox-117.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e1c9e68ecd22532f7b8f7437723e88e890bdddb6a505d752ac21597eb3f6799b"; + sha256 = "4480f7787c613d2cdfa63ea0afa76be4d7f8fd5976257e7c8e3ee83df2810fed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fi/firefox-117.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "7f7959a9644d285c260eb3d78e6757aa705188e915c438a09da3a5eb83ac6fa8"; + sha256 = "8005177aaf38c1ddcdf70c4145bb3b2af333c851adce36b399c133331cb53e59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fr/firefox-117.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e54bbce7f261babf234e726753b4bd828ca04ede00391effef17b7673d3a9112"; + sha256 = "69a5a997e57e01ca402b78a7ba58f65a54de771a2a83912a964788699538c97b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fur/firefox-117.0b2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "1339cdebb9a69815039b746a605d6553f16608da1e0b6bdb0e7412b9951f4e18"; + sha256 = "90bbde6112b8293f1bd4441d2def3c1b7b079e64df3caf3c2cc2e9d5d0f8c367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/fy-NL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/fy-NL/firefox-117.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3986fe4ac24c3041e794af5e62dc5d66872f89ce6e3cb53c80461faa0f2f4b66"; + sha256 = "bdd94ae75e841544506a51f99bbeffe53f76d6cd4225f623594fed3589082e93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ga-IE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ga-IE/firefox-117.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "0994dfe19dddd8ff6293095dded1f23306c07bacb1a6955b3caf751bcf27ed66"; + sha256 = "d67b40a50dde8c0ebf4f395cd0575e1042aadfd68261bcb4fa31df6f9fe26f67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gd/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gd/firefox-117.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0454979081f2808a4db30a2ca676b0d86b6e5bed323d4d3931fcd8971fcdde7d"; + sha256 = "13290f13ef8df46fd26112060b61cafa18ff76ab0044b2cf1684d6de79f537bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gl/firefox-117.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f3a1900c967f51935d3f721093b75241ebb04e4c8734695492c78ea3a53482a5"; + sha256 = "7a9afc0af30899cd85ce1d396e892954ee80100993d5a52a16b25802df7491d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gn/firefox-117.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9f27a249f2f90be13eb25a652185c3d89f21c0a095a8ddf35310d5227b346d2a"; + sha256 = "a7be5a715851b6ba9440b7b243408a2e069386fcd6b07bcaa0ee52893fc89900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/gu-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/gu-IN/firefox-117.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c83e792af6a12b094611d9f17aff8ceea56344c27dfaa7a32aec6a9225f04ca7"; + sha256 = "5c75b3fc7671659907309ffa2596e921d47dae854a1107c5943b024014399bbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/he/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/he/firefox-117.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a142cb929a23c6e3a4d7f634eedd47fbe6c9679fbc91a4c1569ed3982e9b879d"; + sha256 = "92d9a6a76e24086509e5d663c689c0382fa4aca12c5761192949c3bd43ac90d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hi-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hi-IN/firefox-117.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6d7b7792105b4b8f45983a946f0a08ef1486badba65aec5b1ca70bac1979d027"; + sha256 = "738800efab05283a30d8c27eb18194dc4f23c3bc2f622371f6180ef252cc6082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hr/firefox-117.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "93b52787ecae1daa409fe48812421b291ab9e7d9e7c5ceb0e0783866c14bdf57"; + sha256 = "6454c78a8f2a98a9b63c6ab756abb26e3a95670de8b11f8f5064bd74910aaad8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hsb/firefox-117.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "69071ce119d25f42bce8ad2be667ade0da17087af4a6d43bf1fce7e5808e407a"; + sha256 = "2626e53b477cdca02108b8a8b89bb780f74523235af43f03ed66c89fd3adc2bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hu/firefox-117.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b4937186a57e2fe63b3c3384f7253aebaf5536da29c54ba6f1ad26ea6607d91d"; + sha256 = "b76dbdf3b029d2be0b5f9c27c1085f51d674f103f3d0d6268ee8cb655da416bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/hy-AM/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/hy-AM/firefox-117.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "89ca646029a2cdd53bb9b843d3b4177c1c18c7957f01fc802bc2a6f4969db890"; + sha256 = "e6df98bee2cfbcdaf0d3eb4d40c7fef4fa7bd8a40ae6a25fe69936f45982caa4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ia/firefox-117.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "be586de3a9b3bdc583adf6ad8bc934b63c5f991825b92f3a20877757a79f5ee2"; + sha256 = "95c882ca170917cc9cee44a6bbc62619e1e17fbda11fc91868e0c9755b945888"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/id/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/id/firefox-117.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "12f0379cb5def8d47e6939fcc350d016279cfa67c4a5e18ca5d5abc2f0b33d0b"; + sha256 = "32b2e51252020d5a488b6889d8d673b378af41c15151b5e6cc4f454aa1cbb55b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/is/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/is/firefox-117.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "250eccd6498dc2a2ff3f494eaee1b0c406bcbc3053dc08ccc497a07a34dd654c"; + sha256 = "260fda1ddd2734e6f43ec7d359853dd9b326d656c938b9350e52024df12841dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/it/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/it/firefox-117.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "16dbd81e2805b26134dd1de5ab5f808f8fac779069aba3ada1314bc7da31473b"; + sha256 = "acb76da212c0c3625123c618a396e1c1200b2639119a68f24aea9bb720aa15f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ja/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ja/firefox-117.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "33192987ce7480b829dc792504df487cd7ce9df9aeda5e9249e26f7dadd0bb70"; + sha256 = "aafd622bcf8bc95b4c0ec9e88dad3bc71ecfec2ff8cb1c128a55ae1d1b276c46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ka/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ka/firefox-117.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "232400d5760eaf56e9bf2607ffa13a705a469f86f60a46119bf17b8bcddd5626"; + sha256 = "a8ff510bbb825d0fa311d02d164f2490dfc4babab651145733375d0b5c777e44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/kab/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/kab/firefox-117.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "303bd4e2b25c75d530be41080740e90bf628820609a0c384229c4eadd34631f0"; + sha256 = "1bb2462dfa955cef8accdaf42684204194fb5cd572d865e519b578e7003ebfd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/kk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/kk/firefox-117.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "5519669e6f20469875cdb51571b5d9fd6b6e11918921a2797c2fdb4cfe8ec555"; + sha256 = "fcf985556aa7c8ce7a78701612de5c4efdb78a1503b886b07851873459d8ef0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/km/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/km/firefox-117.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6b09af241fa921b069229ce815910615ea58ff77a13e90c11a9898050e201db1"; + sha256 = "20ef1427e02a863eda9bd992a06654dfce6748c1c7bd4517f862b62d26935973"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/kn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/kn/firefox-117.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d3ab47b6737b3598166b993d319f08e4e2398ad7d9e785a97308e145c17d0421"; + sha256 = "0e3fc396498779eeb64fbe5ad024c3bf753c66aac67454130d38b50e8a549779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ko/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ko/firefox-117.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d82d5d1462a660c9b7752345efbb97ba9fd85bbbb5a07db3ff97af4d4828d91f"; + sha256 = "eae2ad60e64e820446fc262c12e457dc588a488124dd12a69954cd54718e0898"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/lij/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/lij/firefox-117.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9eb1268c3def8210ad43bdb816cd8177f90b3c05411748962ddb94d608e61911"; + sha256 = "cc94927ae0749e77874b1bed74245ee75cc9a745818f176461faaa4eec8f9550"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/lt/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/lt/firefox-117.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c55fa7f438b491e6710d0e1e45cabc36ce633978b020285e6b2c150afe70b8a7"; + sha256 = "06244073ade9edbea8d2afc209a17c1093b9256eb7069b8974f179c9a1461db6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/lv/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/lv/firefox-117.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "494a0f93d62c4f4edf1b4a1f0acc366c11ceb39ee36e10229f0dea4069a14c07"; + sha256 = "1f1135aeaf6a53c2bc17e5a8c6ce92e64a48c3e6e5b4fa5f182e3ed5049747eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/mk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/mk/firefox-117.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2d54ad1b167fcf29bd41eecda9b91b1f07c7e022a3cade1ca39833731414448d"; + sha256 = "b64978bae5ab9e2cf1c8bb756fee30f906c07e04406960564739f35761593923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/mr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/mr/firefox-117.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b646c4b81b1346e41630a3839f7b30f9ffbc0ea2fa185ddf141745e18fbf6fca"; + sha256 = "6e82be56f8a4f6bed894ecf654fcd4eef14c1635222ccfa81f57645e63e6bc6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ms/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ms/firefox-117.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "428cbc47808e33d6e83ce14030070deeeb86ab5b1a0bfdd69209d38a3d47a012"; + sha256 = "1935b6eb9a70b10ee103e614d811048849240f7d3411fc6c77d450516840cbdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/my/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/my/firefox-117.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "1ae9bd8d9b1af660886e3089d5861dd9cde61f2feb35b4db92e47d97da349ef3"; + sha256 = "08a4a0aeb9940ce968268c0dd798da4f8af5e18122ae117a9800a4c2693795ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/nb-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/nb-NO/firefox-117.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "751b6e20b84c23c496383b41577c822b86dc6ae0bcce70e01b92b5b9e704f969"; + sha256 = "3b47164175c0b489c882ae026f2fa3b194bcb66fbada68e26d77b90dda438061"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ne-NP/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ne-NP/firefox-117.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "cb44030ccbb421386b53782ef4a9b21b1647609c960b0582ddf6f6c1fcf5e7ae"; + sha256 = "9cfbec702d4ee33e337f520b791a71876bcfd34a987a6df6738b0581281912e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/nl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/nl/firefox-117.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0c25345450231b342ae76c6a062e370d10be1aa1758125825cec1a23ebf2bd77"; + sha256 = "2caa7e2cc44dfebe4d1bd275f3d1e1808714d839a8e88460f017e45628918e33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/nn-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/nn-NO/firefox-117.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f25a7fd74dd4cc31573b92532c807c4bdc5b81e4cfc9f9cdcf77e2bcc8cd021d"; + sha256 = "ff1eb7b00e33a1be9b14f5cc4d225e839c0c31dd18b1edb6a10af910ebf189d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/oc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/oc/firefox-117.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "388cdc2a98ffa8f1c74198a5dd521a49a14b76cc7ddbb82680281c2f6448a38c"; + sha256 = "80373bdb425ab51984a282043aae95b7b59b7d7d501324706a5e79701eb75e3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pa-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pa-IN/firefox-117.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f319c6e76b663c87065189bd76bd6a181f3e30cd8e58940136ff7caac1447370"; + sha256 = "0b9685da82df6610268aee5ebcb8667d457a60f3d4a6d3168a36398b0abf36a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pl/firefox-117.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "c5c30656e1e93c38683264d7d08fb54bd828389afb680d37ef95b8d10fde0df6"; + sha256 = "bb6957a8fc557c44eb328e0a6a822a2eb4ba04e97c31691e848d54485c86532b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pt-BR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pt-BR/firefox-117.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "71f10ef3b09135a9419252e7b3c000bd9cf3dde7a7b901a612b899ff2b60e562"; + sha256 = "65157df63022539277c6a820dc30ff4d1bc2b1bb7edff521d102dace291e4727"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/pt-PT/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/pt-PT/firefox-117.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "fd1a25d85f4293b73517cad84b9e49955547c2e063a5ee6b3388b012472dfd66"; + sha256 = "ca999f469f6166aede7977924a470957b1ba62b890dff090f558a53ccb420a83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/rm/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/rm/firefox-117.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "3229f6f3bc3e551cac971d85c2103c7dbab5912f85e4bd0fe5f25e80d6666915"; + sha256 = "d0b8acfb9aa211733a0236dc2644f3dc42916f986178d5dfac5e0a0080c68600"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ro/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ro/firefox-117.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "40fc13663d288ab0e17b6ae2a33fddc984eb997e72e9dc097e8192f8cc049ebe"; + sha256 = "454f255701b564573fc6e57a859afd42c247462d55a6e945289f41dae8776ef1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ru/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ru/firefox-117.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7496bd0225c462605f7c10076f2a494e632d9b850fa8c7c0c8add4e76ecfe796"; + sha256 = "ce9aedec07575cae626dd5a118b8374e4927431c7f5320a383b1f95ef30a7dbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sc/firefox-117.0b2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "e4548e1bfdd80da9b79251b3a52118dfd4df6d41e36c331efa3e1d7e52b92e1e"; + sha256 = "f45c8b9244c808042d0e766e3b35fdd5a8e29ac8f2ba09082aa98427da031db7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sco/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sco/firefox-117.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "68ab3f3cae893e3a7233efabcd345dc91817e0df265b7b1de9a4264b27650818"; + sha256 = "f0a7538119eb3cf677eb67dbbc5aabdc55689bee469187528b7916ec5f8e6218"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/si/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/si/firefox-117.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "7889bd3987008aaa6f0f94b62cf52cdf7f5b3cb3fc186aa494c18a26931bcffb"; + sha256 = "4c949aef6dce504d571bbb20d8c7f3da238252382ec53f8c9a6998fc6e7e6d74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sk/firefox-117.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "025018f5bac8047c4b92018c02b2294aa6e0b75f4c840520dd6e3317fde83027"; + sha256 = "fe9c97f52bfe99f7fbe99670528a47446c944de6a96324b7f736a9b06dcdca0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sl/firefox-117.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5f9a36094f528aaaad4b3d9d71226fda78678a97d9e404e9c881d11a8aca3ca0"; + sha256 = "1472efdd9536fcebe37959379844205fcf71fd18fe8bb4fdacdb310d89b3be12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/son/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/son/firefox-117.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "2c2abd89a8f10679fda89bcab8e4840776a7ed41174f651f6c85656e9b231ee4"; + sha256 = "8b39b9fda8b2a05f61413bd8da2850df9c85c6ecebe82b474d43895246f1f1b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sq/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sq/firefox-117.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ae820e6019eb546ca0762fea512324ad695b9542ae70969b6af1aa14fe74c7d6"; + sha256 = "c40a93aed7f359a284e415bec2471e8a2f9a85da1e05169425265aadf0ba3546"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sr/firefox-117.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "3571e800c5a8a8ee8cb6d278295685b6caf86cba9c05e2e938158cdf28bbfd2f"; + sha256 = "7165e5ade086f3cb1fac0903fd14194ccc3b9cae5fe6799c2044c1a77802daac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/sv-SE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/sv-SE/firefox-117.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "277883886d73b1955bd67c01095fa5ec2a5d56014f44d5a1ade74ecbf3243fec"; + sha256 = "2b5f4c1446b91cfe246a37a0c8b1fc85e40fd758d0f65986c0dcf159baab8172"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/szl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/szl/firefox-117.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "422f86906d958e4ad4eb6284247a34037ff42503f9939789975235d333abee57"; + sha256 = "37012de37ea595c6ffea426ad67c654b3f7eea380f25cf847f2448b671cfe53f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ta/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ta/firefox-117.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b6c4350809f2e243fc6e526ef4c78c813fe7502ab644fef207cd94633c94524a"; + sha256 = "49a427f4a02cd2f30bf3856b2c5f1e99248c1cf8746fb27b67b0eb72106b9ff0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/te/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/te/firefox-117.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "781652110e86636a1c07f7a21eb86cc168c5096f79e0c7237fc9fc7f145e1bf9"; + sha256 = "59ca40d50cb8f92be34cdbd42be87ecfe65c68b3ffe112bb61417701c402db0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/tg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/tg/firefox-117.0b2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "24fb993f0ac0a623a1be4dd479161d23162b2b66e36684fc5010480382449c6f"; + sha256 = "2631e84e399f9dcaefeef4ad1a7ecb0fc0d311725a00dbb0e87e3acff58cb485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/th/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/th/firefox-117.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "a44c5a6c33ecd1adc6874ed36a0178fae38da5a767424c963958a4551e23d8df"; + sha256 = "624c31fde2b5728710a654709bdae59135323a33a2b33e251feb2fe2f1f027f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/tl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/tl/firefox-117.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "ec3b8cc36c65a4402fdffa1f1e4e86d3e833f50cf1eb590a9305cb20801d380f"; + sha256 = "3884cbb7806642bc7698c0d0c7b6436e1facba8fef6470bdc4a2abf9fe0c2a31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/tr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/tr/firefox-117.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0b7ab6a6b2a0fe265d504045b326fcd8276f6a9efa01b212c5985eea5a4bcab7"; + sha256 = "9b1ab72c5c795652fcf1cd6105075114e7fb42becd4cbf5f0ff285a6310c2eb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/trs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/trs/firefox-117.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d881ed260e1ede9c6125b4d337e91012a4114f3c7a97d23691c71772f6bdc57f"; + sha256 = "acc69edc00fa835e54ac850b5140d0578b75f7af0257c20e0afc4ff68cf5e9fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/uk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/uk/firefox-117.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6b562d9ae8215993a28aff22b412d964c1460a417c129888979cc97b2e698478"; + sha256 = "972afc6d4c7f875f40185a9544a572acb2f8174a9bd828502dc779318b5fb1b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/ur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/ur/firefox-117.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "4f067e62f0d435f28c4c9cc2481629686485bd607fd4ef97ad7eb2f69a575adf"; + sha256 = "03e9ab51177e7f6d8f18e0e02a8d32c5124d9d7aebd12c6a59bbf561bbc7308f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/uz/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/uz/firefox-117.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "075b1ea1e9d2663e5355a61ea0923ae99ba410853cc1bd2935a126a529087860"; + sha256 = "583afcedbb8e89fae81c2af09db09bfb3006528595f7d4bb50c9d73a7fe9249b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/vi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/vi/firefox-117.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "29b4edc0db6fcbbc962fb71132ea40f3579756ac6ab66409c8f841165e98fb22"; + sha256 = "910895705c695c0950e4cff30587c3df8cc845e1b4766474701c0e4464592760"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/xh/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/xh/firefox-117.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "9d4ce8fe7e4e3387d8af06fd0a807884b30057c23dac4c5f0ab1e298314f9b7f"; + sha256 = "3253590a5dc23f74a88be28665066649c12451fefe94d7cf5d49fe541464238b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/zh-CN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/zh-CN/firefox-117.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "36f7d46e728fd35c972c400fc2bd64383a324cd321f005496ddfd801565d05cb"; + sha256 = "994205cbb71ccb6f95091fba03f89ba510579f2f53c56544269abd29d06165d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-x86_64/zh-TW/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-x86_64/zh-TW/firefox-117.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "f7fc92f3b13657167a88f3f8f4406c377631e306cd3b38bc2e5b260045d1ca1b"; + sha256 = "6b6744c78ce82fa3872d3b1123ab518acf68a0dba6629e6c995c363886a68c27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ach/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ach/firefox-117.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "db5b086a0e7e8ea1e82c9dc5aa97fa44f95c374e2f4f4e285e0f8ac74e6d457b"; + sha256 = "674f22adf82e4b501b4dcbc2dde0563c0017fb1fa47a514b96b06f6f8ea6f606"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/af/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/af/firefox-117.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "825394bc2c7abd603daba03dc98023e9d6ae6561afe52c98ef2fe331b8fba151"; + sha256 = "7e70bb2dbeb0e8eb11b6d7df82c9e1f7575c37c9265ade4f69eeb2ab16737e06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/an/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/an/firefox-117.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "907b73eaf12fc7d45b54559d47faf261aecf2d6ada435d41964875df5e63c7a8"; + sha256 = "5094902ef0b75c790d538dd32c06e7b30ae2a5f4ddc25b669557c5eeb438c06f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ar/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ar/firefox-117.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2b3be725f214bdc27763a33df8ff5dae328233f0bd470b07cb882436528b46ef"; + sha256 = "ddd97b5f9cc1d93c919c61a84c1bd4436ae6a932391e01838ac224240f982259"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ast/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ast/firefox-117.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "23cdefb62c37a1b87b8b549a40e0a9bfa4d07cd399fe6ed1ef3c9f904b59d744"; + sha256 = "7acff2731fd81c99b734c3c57a90a1145a1a8114b303758613be61335d6cf60b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/az/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/az/firefox-117.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "154e3802742ecee793a3df5307759210a74c6f2d50df1aa0ea0b5a03ef2d1a5c"; + sha256 = "c26f43ca801e67a22543310d78f30b47909f4c827c137110d516330d481c4fff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/be/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/be/firefox-117.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "596deb0ce71017805551f79bc0cb0486020c0934a588fed939dd08754f8e6f04"; + sha256 = "c70cf35c7752403f0094d74be0f666760a9131e6feb8777c5e6f254170387389"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/bg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/bg/firefox-117.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0305e6b265430cd052dc3873e5d94690ab63968d7293c80aad5971a82e3d9509"; + sha256 = "a58ff64c5772f58664fe3b817647a3838eba1a6643509d0eb6cae57c919638d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/bn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/bn/firefox-117.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8572aaef6049cd6c31e41dc27661d7521a7267c30602479a639e7fbd34609f46"; + sha256 = "e9ea1e2b4297b95c5a6f8a4b0c11401890aceac6fbe522a924ca40e804b66a55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/br/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/br/firefox-117.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9f5da7688f27dd1c31c4d79d5bb2417109f31d72e4622a57d3772ba6a3d2a49a"; + sha256 = "0ae9571cf34f2e15f9adfd6a166e63a4d887f5af290a325bf029184fbeda5623"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/bs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/bs/firefox-117.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e8fe2eb1b3e7d43990c93b5e183cc5383baa3bbefdb5897070c79a7cffbeaab5"; + sha256 = "391a8d56c2f62efab434b3a16dec3c80d03cc4dd4845cf4ca9a7a0e9efca8587"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ca-valencia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ca-valencia/firefox-117.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "cc397ed75c0681e1ae84769d32f78bb2dbb088f531c1da8fc576c0a97c1335a0"; + sha256 = "d57481627f38a1eefe1be4cae710ad22df3816f975e11ad82fea7d5b9502dac9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ca/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ca/firefox-117.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e151fe8c256bc55afb195aaf8c43ba8d10222b2253cd8f61a9a3211c11761809"; + sha256 = "3c88344b0625730372f05778fd1066c3041bec800aab99c39353f1b9213a5165"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/cak/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/cak/firefox-117.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "889a2dbd923d06e0ba8a06d337af85b64153dbaa486c28cfc72a6e83c099704b"; + sha256 = "15b3c545e978087d80b6dfe0ecca09743fcebda735eb9bcb580dccf33dcf7bfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/cs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/cs/firefox-117.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "969e13b31b2f3ca0b5be66beca0625ec8b1d67dc8b7724ff48e9efe13773f2a1"; + sha256 = "589803870d6061d4e37f757fe72d830a9b6f4b1126bd3fdebe2c0e6e14e9f453"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/cy/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/cy/firefox-117.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "98b7dec95803e858e7f57d8fbcb5b609d06650c8ce9d42a4c328b8dfe16e88fa"; + sha256 = "adae4600fc298dcd2539b81c89b3cd63e8e2cffc9b833bfbfaef2d5d71e9d7a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/da/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/da/firefox-117.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e005c9973fb21aff95f68f4eabc28af76c54458e1e49943d6fbf4dcac3f25dc8"; + sha256 = "34896888eb59964443097e9e94799838e118669195aa4a7a41476849fdae8483"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/de/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/de/firefox-117.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2c9ae6a06194c0c966131cf8d4b96426625cc9383fdb1876c1722516131e1bbe"; + sha256 = "f1a058188fa418c2afd252869fb2fef07ef4954543d4b0bdc181f606d7f72547"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/dsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/dsb/firefox-117.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "58c9920d3976dca9238ce0898529a11f89864334b2508707b42aeef0f42fc255"; + sha256 = "a040ee68da6570b58de852720a5d7e8662f1c896699a07fb217f868f4dd4fa86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/el/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/el/firefox-117.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8648756905fd48fbb71b0f6d988a6474412d789459342acffd16c821c86ff659"; + sha256 = "3f38ea8a360f28f25401de8088189f1df67027f9bd52f0e402c69dd4c8f71449"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/en-CA/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/en-CA/firefox-117.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "261147b2ef270422252c6088d85257754da46e925040ccd69a4a818f27604e69"; + sha256 = "59ef45a6128f219a76c728fec2f71e6293d0f2f76570793951180002da476d29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/en-GB/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/en-GB/firefox-117.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "aafacfa89cfca1efa8622d5f2eace4b5ccbcf081a54e27e6ef6292e6d829dc2d"; + sha256 = "de4aa5890062f508625b719888165860e37a63a004240dfd6cbe7f3adcbe8177"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/en-US/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/en-US/firefox-117.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "29201908690a260c3abc181f684d328917f5b013e550b046c064564cd66fcc69"; + sha256 = "100574a66d80a7b35f4f115378345aee7e2fc9a1cdaac0dd006c9a340a8e10e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/eo/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/eo/firefox-117.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "073c38c03fcd21f01e38b58086b5780fb5528e48206d9d56b18b79e0391fb03d"; + sha256 = "0b53003126529449b56579409cb78cc13843371f22ebde42644395896aaab746"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-AR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-AR/firefox-117.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "15453085e803f187c15e74e2be3117d3a1de9be136183b69c25a5dfe6cd37f28"; + sha256 = "3dc0055b2d636c1cdf93c4507f2aa9955786e7aea172135ed93c1e8728e78843"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-CL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-CL/firefox-117.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e743eee78da1b4d3be250c116a0e536cffd05c64f03f7c4d87ddd021bde30894"; + sha256 = "c292c78e9c51bf01b6acf0f4b1502e02790c8959ec1f4f43a253b15d8b543b80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-ES/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-ES/firefox-117.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3a6969ca3b7304674e3298d1aeda5dd7190e809b55e7271ea4893b36ac67db73"; + sha256 = "a400d50f129fd34df8d82505f1a243c4934e9a694790ad278f879110dc10112c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/es-MX/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/es-MX/firefox-117.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e8ac22797f6785e094eb30b0dbbc3ff2c8840b6bf1ded1c40b667767c12794d6"; + sha256 = "15b998c84010c6fb28fed96d6e88094e8d6007be271898328e576397222b25a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/et/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/et/firefox-117.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "820f46c0734b6cd4d58ffcf9abf57e80d8335229294409143b09a29b9513c811"; + sha256 = "df806c985e24e393fcec3db8c846e8f45a709f76dbb81cca257fff1bad4e118e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/eu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/eu/firefox-117.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3f5a29ff9da649acd7c5db57d6f97220210382f1482c729f676ea19a646d8a10"; + sha256 = "c940d060855caaf7a054369358c2d25e6a875c428f525c804c09d114f4166b7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fa/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fa/firefox-117.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "99d06e8373d3d700906593c0f15ad0f546f52af596a890efe60510f239988a01"; + sha256 = "6efc141ea385155609ec0852002e8abc0a2d66d949cbf211a30ccaf8c2f1e725"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ff/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ff/firefox-117.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "268e44bcdb7d156d5c6fb2fe9582fc016662e6dd65c8f219bfdb85a77627f06a"; + sha256 = "e6f34b243ff29097758ca1097523e7b0d5ea203585233246998e711ceb5ea426"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fi/firefox-117.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "df30b7607e35d7e8cff0f91ee7a344c3b3fbb39d83f1eaea855d6daf234ea88f"; + sha256 = "3ff8401e41192edb8acd7d3b073991d048a8a0851ea67dba74d23e994a5aac0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fr/firefox-117.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "eb0430164299a03f356ae2ec58c8863ddd73199e95d886fb2e3e2bfd47d8e234"; + sha256 = "0fc6a622b222d97cd73827d80c8d0f3bdd8f77c181588b905790384bd29f52ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fur/firefox-117.0b2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "81a5f3ede8d0f7b7d834b20cdbf468e43586b152a452ee628786df37ba2dc4cd"; + sha256 = "9de1abff2f0f5b3a90da277ba580f5868175672222312e6ce8d5bed2db91f38b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/fy-NL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/fy-NL/firefox-117.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d26a9cbee89f4e93ff123a88f96834bfbeec8dc16dc5093373c9f6182343a234"; + sha256 = "8f2aaac5148f0ac03204c9034df4b7fc5cdafc3c03c76f8a1e7bdccb7a4c0ee5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ga-IE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ga-IE/firefox-117.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "56c8ecbd5f59fe5bb627450dca2897c8e148df6fd21850c5dcda952750f3aa8a"; + sha256 = "22cae5d773b5276a74e71f5cacb936fe2c5a13182c6d7cfc2fbe57854e84e472"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gd/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gd/firefox-117.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5331c5f711a9095f592af78c8aa34081f288c782ce88f22c3713bba8314062d1"; + sha256 = "1b5e6d3e0f0e4112696e5aaf018d96f950990389b1fbe73797b7856aae59fb7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gl/firefox-117.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "161474bc0beb781168a036fb82ad1afd52200582b803a59737fe4c2e9d4452b3"; + sha256 = "92c373037b764e68f8b283a9720bf996e57b13c356fd918d2c26cab8fb9ccad9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gn/firefox-117.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "3ec03ac25e58e422c8403c10bdf6579d3a445bdc9bb460785821707d00ee4ce7"; + sha256 = "3c8584c884b18d991e9cf2a60cc882ac9b6c36c1a0e72c267a419f9294b538d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/gu-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/gu-IN/firefox-117.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "33c1e327690864514d4cd90dfa48d0b8a18ea3c9561670fdf08faaaca6330cf5"; + sha256 = "8b2298e67515d47fc1ec1fc5b7cefdf7df7665b507936cf267c4812fdfbd1dbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/he/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/he/firefox-117.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6a25383f22241ed689ede3d70bd5c229ff7f679218ec2555643d9cbb5e9fb11c"; + sha256 = "e47ffa5982e5054fc9d1fa2dd51ee123c329da1abbcfeedc151bd7174ed2d560"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hi-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hi-IN/firefox-117.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "6e00cb46b6b1ec655c6e32af90efe2219058ef2016320b43299515b5605ea0e9"; + sha256 = "4cd75bf57cc88872a31a70bef7d6f073cc3d49bf872faf911bdccb43abc38a67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hr/firefox-117.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "64e1957cbee9d5f68fe05af3a567ffd50ea705b77f769a67ccceaaefafee129e"; + sha256 = "9d21deb1383927bc0c5b478c03261f8dc3de36302ec8555cdf40b59428f081aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hsb/firefox-117.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "0ac388e1aebb0deed0ed5c05bd32f1909deeb67760be51135ccdea5fb7af8f23"; + sha256 = "1b83ee5a99608479b229a3e6f13d4a48e05fa0bd1c52af147a4bea4c7631b22e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hu/firefox-117.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c28c4916ae05e4f601cd5f1a761c1adb65d6e15bf7d83483bc8f995ff8f10a6d"; + sha256 = "8cac12a7f90eb3d5459ed40b832c963a832370b215a9cd020381a41f0b90db3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/hy-AM/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/hy-AM/firefox-117.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "d5c78b5c919dca4200780acf22e4957a02ab514ff1855f985b7cbd536f29d332"; + sha256 = "4c51a1feeaa828ccd2fbbcec5d5659e585d0eb85f19e2ac0dbc5083d754b3a1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ia/firefox-117.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "412e5bf0054df0a50cbb3d2c97b73500d3355669fabd4ead4b9ec72163b9f6ff"; + sha256 = "d012be5237056163fba871700859ef01516a40cab3a2af96093f606508710df7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/id/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/id/firefox-117.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b25b5cc3f1377f98a396f11428eb79c6fab804515984895dd3af250980744121"; + sha256 = "f170449bb6e4b3537540bccb3577189a3f56c3952101f287f864c1053b723452"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/is/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/is/firefox-117.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "cf144e944f95dee2fc7a176a615e3b4cd0405b7e3eba3aa4d1cdf16c93e31580"; + sha256 = "6583bd2c140859b350605226343c8a6819a954991eac47709b91a3aa1726bb14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/it/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/it/firefox-117.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b7e5cc1d2c22d11551bf5af8e9cb96a4df453de9fead864aa8483ed5cf762f59"; + sha256 = "fdab4093b9517f62f4bfb6055d2ad999189c18307c3ad59ce0fd909612ea9417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ja/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ja/firefox-117.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e0437911c63ba8c6f0fba06eb80bfb177f612522c58d78355608a1cf6e4ae394"; + sha256 = "f9902c2a3b00ff4114549cbecf25960e54340b87115129b26a2a92b66b2c4f6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ka/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ka/firefox-117.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bc89dbfd296e968cc5dd9cef660495b62ffcc0c8952941baca4a32df19128aef"; + sha256 = "7634e8840a7a9c37ee094ca69cc6eb48a9c8b705ccc369464dcd454f6259d0b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/kab/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/kab/firefox-117.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7745a8bb9a99d18851aa05a8c3c735aaf2e4871eaf9a356b862ac7b92072ed68"; + sha256 = "206c0ee2dc8f56b07e62379077ed8721c3fef692b0acd7910f47cc4277c88535"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/kk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/kk/firefox-117.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "fe56296b7979219be58e8d5fb77a7f72e56c565a7e64541b94b538da25ae56d7"; + sha256 = "2f0f08f46a0053841398bed6ed2e3a4e6a49ffbe23843fc10dc783d86b8f5cae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/km/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/km/firefox-117.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "028416c32fc42132d8d886d290e498e0f2c787f3103f79c00937aa42309479b6"; + sha256 = "d0af015e51535b3bef8a46956108b5058947468ec528f1c051c79a1392709439"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/kn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/kn/firefox-117.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "8056ebbd41a40a43eb95220df98295bdabde914a37f25b88bc5dff606ea07287"; + sha256 = "a98a27e3173f7fd8ba7cffcfc7d470ff3b2983adfc1c90de2c16dc2de2c33609"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ko/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ko/firefox-117.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "75e56b5b8b9f7f627fdb3dc9c3b564b9e0616ff2b4f49deae0f2ff54a5982f78"; + sha256 = "03b30da223ecd953c22d43b99780056ce5d12a08dd4c1bf32ff85dec6527a78b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/lij/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/lij/firefox-117.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "4c2f47091b172efde0088fbb6025fbf2d9613521496741d6277b747dd5611919"; + sha256 = "bc492610a2549b1dab72a8de64eb1b0d3b68ddf73ad9d7926e2c263958de86c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/lt/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/lt/firefox-117.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "425b64cf349ec8d11f58ee4107eb3cc320041312aa133c51229eda1fc1dd5216"; + sha256 = "f3019edb15fbc3372e6041775fe8330cad9040821c87213644518d59b3f29c2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/lv/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/lv/firefox-117.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "85704741c95de2fca144067e4f0f3d53051d05beb21e464d5e2c1922232d7c0c"; + sha256 = "d2a7818fe580a365b48d52205b63e2205ea5362200e029ef2822389f2b956d1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/mk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/mk/firefox-117.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6e57e96c7c5c5616836e8eb05b5d53c35a4b3ef51456096d32821f584352bf7f"; + sha256 = "59f72dbbf0be639e728b061bce1fdf07085d099722954f855ef2573d87e543e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/mr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/mr/firefox-117.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "bec6bdafe6bb92a8b8568945a779aafaa6e679eb69556eac525dc2885057cf02"; + sha256 = "4ec149737e5de4fcb6c4e46079f9762c6477e9c1dce653fd53f52ee25dd267e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ms/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ms/firefox-117.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9f73f9e02cb94711b9d234741304043497da10647e29314571a885759cf89a8d"; + sha256 = "485222774fd8d7291a2660dea3967f7956b0d0aa430704dce8f7cf5d34fe7612"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/my/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/my/firefox-117.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "50d9aed2759ad1ba9740652a50f55975a0d9be1db7d91508e7117cd49665dfad"; + sha256 = "fdcbd22170d70dc38fdad90c250f2fc0e61d12cffc9333140b4b663ad1b89a53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/nb-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/nb-NO/firefox-117.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "326ccd5dfa384372823714a8fbd534785813eb64ce9911866357c50bc560bb9b"; + sha256 = "3f5ce0a793b9ad6b4bbbbfd010620df1d087bc86c0fbd4f90beafa6b7da4e1d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ne-NP/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ne-NP/firefox-117.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d64d1c27b8fbff339bf9a455f80be09b5adc4b008d5bee342e3206704c14179a"; + sha256 = "e34dd0d396b66c807c97e64043a4991780a352295bd4030d4d40b145b3c24051"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/nl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/nl/firefox-117.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "615b44ed83f18a36f6b844e9d6d9ad8076b2139de26d9e40c14dd36590c7ebc9"; + sha256 = "7f82d807ff4a128d8823810330121627020e7e93994b0eb1340684d683b8af4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/nn-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/nn-NO/firefox-117.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a5e6b674dfccccd0746e99147843ef5a53518c09600b8463b725a7bf365aa83d"; + sha256 = "6dc01d88fc87f2bf918e95fc926b7e8ed2494d7f21bef84a8ed14d11d61ae12a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/oc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/oc/firefox-117.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "cc56bd1394cca429f3ab8dd876a52b08891211eb157aba5b1b3f7dcf7008af82"; + sha256 = "c8e1c4e9a4f4df353c6c9a197ad1ad962ea62b34027b282864c709da44897b23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pa-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pa-IN/firefox-117.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "aecfb4613310f8364fc8ad0fad130f72a4db62285d19892f764c7cce0ecd7eff"; + sha256 = "69e18994d6ee9eb305ae9a97cd20accec246f76c2a0a9b7636e6cca0b478fdd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pl/firefox-117.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "679374b0e2ccedd15bca6e69fbb91163360f8cfd355bbb041224a49d80fc8674"; + sha256 = "fdc634861c7a99cf5e10c0818f0c981718f0252b75265bc7594fa7e87933c6ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pt-BR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pt-BR/firefox-117.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a0a8e7d70d2a8c1dc35639ef6b762c447adc9aff82f45e4b98c662676b685796"; + sha256 = "ccb3fedc57e98dabfd29ce402cec8e67c956d0dc557d714011ff67d5754fe549"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/pt-PT/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/pt-PT/firefox-117.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "39da07221427c9345e97b0459d024cb6594b3114c6057ab9df19979a7f891599"; + sha256 = "a9614e9f15eca0576bbb81a4dcb80d9f38702a8743fe8e7c08683e9a4d57b3b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/rm/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/rm/firefox-117.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3733ba39b413218b34358be737a405fc36f73efcd2024092e419d671126b15f3"; + sha256 = "23926089dd676ad76ee83403d7cde7c21f08df2a3d90be6fbf210c0b4573e0c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ro/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ro/firefox-117.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "46fcfd2625461462b8f56a00b9888a62d8aff2ad3985a311794670064c4fe64d"; + sha256 = "1a158ee87a1eef61570dd07700538f29872cfb9ad852ceee6a150c0e34c8173b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ru/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ru/firefox-117.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "dab3ce08447c69f8a92a9c08ad747c41c9d97947b69aad10ac9ec8b73a2c7f3b"; + sha256 = "7e71f844fa1a48201991adef53011b294a2cdb664c096c112653fb2da240a3ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sc/firefox-117.0b2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "afd88e349383d140cec709208ea9432a497381ae3ff7a098c90f55649b57ece6"; + sha256 = "ec009d4e46a29a50bb00a9cb562f8f328eec245f7e51ee0d4ce01af056f4a9b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sco/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sco/firefox-117.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a5bb99b12b79554a5fd94c1f378c6181f3698c11da26b1493d00261e3286c3f1"; + sha256 = "fa5922982650314aa65a05d1efecdccaec2368789a814229c5426cda7a0ee595"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/si/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/si/firefox-117.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "ca5496f43520008d2b4b358ae55f217d429dc051978151b6d24d8bb397016ba7"; + sha256 = "79871205175807e178a70468b65ba072fc16706cc92a42d313000d1447871a07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sk/firefox-117.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6923c82110644f614d90a974ad61b08a23b3800cc98a19fba3679693cf795713"; + sha256 = "54b6b1160421cd0ab149f804c38367b4522789ce857c1899a442c9d49a9d5f3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sl/firefox-117.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b5c0c027a321fddb951fc35316ff3e339f32dcb79272ee8d63875a1e77d3e965"; + sha256 = "54a0791d3cefd2742f1705783706f2ee495d819b2846f153ac1d4115b900d0c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/son/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/son/firefox-117.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "296d422ea46dc41ba5fe32e5dfc82ac8769f4487d0386e316532fee3d8f39005"; + sha256 = "2b914478868dfeef412a88c925bcc7b12189ae562f0cf01bce39597b8210b677"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sq/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sq/firefox-117.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "eb89c11e801fd1089e7942285cacb4d0f675220b46bcf9f19bea6ca8f114d017"; + sha256 = "e60ee2e21762a43d30c2cb28b48edd406aae275519c1f2396e1bbbd711e917aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sr/firefox-117.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "61f2c8c752284ad5e64554d49e3054cb26032ce80b1fa92464cc5912b4834d02"; + sha256 = "58abe25c545849d105c205170f6ba4809e7f72084e9cd86547c454cc7440c93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/sv-SE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/sv-SE/firefox-117.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "fd2654d7e0136f9692d4b677d23feb1b8021deb90d66d22aeda242c58b434a29"; + sha256 = "f9e6c98031ceab6df21eb0cfcd62da23fa18483629d4b135016deda28dab67e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/szl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/szl/firefox-117.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "83d735c45c8f332db5875391fd70836e3fd24f4e726328b92ff2a3a319dd83e7"; + sha256 = "cc914145fd41190032b0b9737f95e3f6d6ed75247a1a431a7061d19ccefd5aad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ta/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ta/firefox-117.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8bdcfa9f9c640f01961bf4ce2e20e2b181c71e3c7a5958812e27c3996d7ed911"; + sha256 = "4322c978e5e1b4fb32d7d266e869ebf1653da89957d10e40b5e5598418cbc729"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/te/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/te/firefox-117.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e8b51b06401cc9cb4f8cb2acdb7b61d8dbed656da862e69358900d6e7493001c"; + sha256 = "9192e4559fff799821137f22874bed039ad1ec2013beef9bcbea980d8f3a3f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/tg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/tg/firefox-117.0b2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "0de057287c0c41686e7af64fbddbb06c7729f0047070dde2dc510207fc44121d"; + sha256 = "d889d72058830ef898f4599b237c00da1854592f985b9684907caacb2b374fe2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/th/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/th/firefox-117.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b2ab52574000fae3406d1b1a785abbfcac6929f36e7ceda3f6e94dbc9540c055"; + sha256 = "67f352a7c6259c9ef7c0afee8907a8ff6f5b1ae218f004348ff09d4077467175"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/tl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/tl/firefox-117.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "4e3c341c5a2f04f859c50747d948c2a61a577beb3a2a3b4af234c2ebd8ec77dd"; + sha256 = "e76bbf9f7d85990e4dc716b2aa162e92df7f9f12f42bda6e13dcbbf03b0f9fb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/tr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/tr/firefox-117.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c775637199e81daccfa60d25b1e16f3575a40d9980d7e5f0f5808b4ad8d6f079"; + sha256 = "e9641fe3eb7220835590328d34132c41f2e7da1c4eaf7e04f009d7f372247aed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/trs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/trs/firefox-117.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "4816338c59b95eea2cb2a4d16da7e2be647dc6a0fc7980b98e9af7de6f60eb6b"; + sha256 = "fa65898b94c5d9afec9f5929a4c895274eb00b3857bdfc739c90e5ce1763f755"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/uk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/uk/firefox-117.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "0819119ef6c4cf380d1a6d6bb67e5de13eed3c4eefcf815b084b73319f168d7e"; + sha256 = "37e8e5d812bca673c791fb155ac805e3f2d9bad75ac6b33d91c1046010d95005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/ur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/ur/firefox-117.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ab342a44f56ede8effa7c7f02a977330eab60f3daf6c6de05efcca1e85e1f787"; + sha256 = "16c7a777e9476ea136e39baae187934b28e88220a32cf0ef7116ef4a70a9160b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/uz/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/uz/firefox-117.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a99264fd7e873896ee59a125c92d53670b48e727956d970eac47cc87c6dd5e56"; + sha256 = "0c765d39bc39d454e5d919b85c524bcc52f9efe3109b05b65d33fd87e71065b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/vi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/vi/firefox-117.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "2336861991c33e273f4fd484155e5e9af2973bd70c417aacdcee813e70d500a0"; + sha256 = "e8d01f984d03960b5cea326e602bd1630d11a86be9fde837bde08db791340373"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/xh/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/xh/firefox-117.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d889e0676441ad7121645050aa0441b662c5fffa312f5d0902262d31dee64e9b"; + sha256 = "0824721f5a4cc3fd340ef2b9a174f0bbaa2f1513b4335ca6921feb72c8e365c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/zh-CN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/zh-CN/firefox-117.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b51e73e3780631a3d271c5c0c914aeab26cf42548a88fe38ac421bfa39379649"; + sha256 = "adce28bc5f1d91d5a11edbb7ccf1148a13c76486783be79471ff5f26a129d3e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0b5/linux-i686/zh-TW/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b2/linux-i686/zh-TW/firefox-117.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d80c354ff846e60d2176f68d5ef71424295b2ad0753aaf77a2e9444ccda48d60"; + sha256 = "bc0a79202b6566bf9371eeee509eef8025f27147b1aa8f685127123b2e8712f8"; } ]; } 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 9e6bb94a92..adb45c107a 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 = "116.0b5"; + version = "117.0b2"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ach/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ach/firefox-117.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "9bbb4940b939082c23bb7ab08c938a128f703c28d502aada9f0216cf0e4b1946"; + sha256 = "08d7bcf0f862c1d0b1ec98f1134333249c35b26460059cbf5ecd52af6ed5f267"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/af/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/af/firefox-117.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "8d1bfe44fb21e800e4985a95c9ce01f5a69c697abd6f8892804dde3f4b9d47ee"; + sha256 = "5286b8659461b869945abb10e851b4ed3f8bc203bc5497ff971658ed4f160e96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/an/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/an/firefox-117.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "17831e8c36aea42896df71579f9853fab03f87e64a5956f818b05b5b7cacb6e3"; + sha256 = "09a600d0bb529f879819e293730f3b74f63e2aa00a013ac0956f11b899eaef39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ar/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ar/firefox-117.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0fe4d6196254d6980e0f73e6b6d372a30b44f227a333333503bc5453122d50fd"; + sha256 = "06c56084f5875df288392c9b990ccb6b8af3245af9303ae852fc2172249bd61b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ast/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ast/firefox-117.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "57691d55d54d0ea31cee189c03e7e7d23ab7e72d23b05244238d0ec38e257e36"; + sha256 = "eba456e04f869eb03609ea5ec661daddabe5802ef10c758c31ab2486e43380a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/az/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/az/firefox-117.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0d613e0fd22a59f95105f6324e6ce6160de3d38c28e94ce4ba0e8aaf50d34fc7"; + sha256 = "36badebaaa2df83816611fb7e10002f9bb9b34c1c2333cfb08c96b6230f9b21e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/be/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/be/firefox-117.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "12987c844112f1d1db5341cbdb98f84fc44569a3017fa600a492c0e44ba864fc"; + sha256 = "244c6e9b810f89a3b620da7e5479973e97915c6b26bce6bf038d609504a9c629"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/bg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/bg/firefox-117.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a76964cfcde92d4f53b09c3f36cdb5ffbf427a0edf0c37f8c8c784c821e617b4"; + sha256 = "ec0e11eb1096823c407ea4cb20570408f62913d7ef6f9104c51885a8e9ec0478"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/bn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/bn/firefox-117.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "3e841d48991e9dd6c5d686bee196b29e10419a7d851181bf33a5f8fdfbb821e7"; + sha256 = "a4378e81a58d2a9399ac17b2a95a46d56b2131a646701676aaa359c899a4a121"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/br/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/br/firefox-117.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4136e8e0add6e062c707b7b37ff9bd1b509b095ee6a7736f8ffe118d0692092f"; + sha256 = "f4013ae885313e95db1b33f00731529e4dc7744cccf33b2c867e034e1b2b028c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/bs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/bs/firefox-117.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "67346962f0799b903b46bbcc830e3ac2ec718d554e09d97df6deeb5fb223461d"; + sha256 = "3b9aa6dede441bd95abc9790f62768c04658aaac75a4deb5a715f649b2884066"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ca-valencia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ca-valencia/firefox-117.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c1b5edce12aa15d3be46c48903f7cbf0f229f8a25f8eeaa2c7fe8b1e7688a7af"; + sha256 = "55e556bf325b58fa952cbf7f1c55bbc74e74dd6c35888d45d8d55986d011940e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ca/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ca/firefox-117.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "01d688c83a2c380cca544d4b201a6206854513e9a6473cbaddaf7a98d4b5c2c8"; + sha256 = "5e58df0160486795689a87469dfa4f3c358df54975159ddd3e9d023a596e8461"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/cak/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/cak/firefox-117.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "03fb4e7158a98ac51e81bfa49c46e615526abf5c778f7432c39c4b2affea9c3e"; + sha256 = "82c9ee334f146731f8ecdee8edceff83a0dce8ad7b6003c539fb127324094700"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/cs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/cs/firefox-117.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e8b46a90cf1e79915c48eb86dd521307cc6a690eb80cc60551e6619e3c82d2f7"; + sha256 = "b933100ee4056f5e4e56aef0ade2b03dcc8b70a04f6f09e839fa29d959ee9c80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/cy/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/cy/firefox-117.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "1359b57e63c93d12ceab4c0a9bbe34fdb10dd63ea4e1acb2880c25fa2f97b9ad"; + sha256 = "ac0c728c15e175731dffd7745de50720c8649abd5d49dc0fd9c48e544175f5bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/da/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/da/firefox-117.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6543dd8fd55c3c48a97841c0bfddefb4d89f5343af8fdb44be251027b254ed78"; + sha256 = "18dc59d522c75ce890e91d1521c4efe206248d1dcf015092709ad56cf6e0afd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/de/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/de/firefox-117.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6f741ea240ceda836a6eda5d6adf9f2752562b490b5cae1c4ddec161e8c00ad8"; + sha256 = "19139e401f30604f3b472a5603082a50bdecab8dbc8ac5c667c916a0b3fc5243"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/dsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/dsb/firefox-117.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5dd1b14a2bf861f579be41f4d0de2970ffdc99ab176d409164a1d406bcb9d4cb"; + sha256 = "720880f54637c4b23a4968b56620085e4224711e5cfa51e933d258bdbddb4a5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/el/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/el/firefox-117.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0b59041d0ad1a4bff0f9a596f9baa373d6c3195bd8e9026adc8cf83e228c5b09"; + sha256 = "35ac6d4585bc30fe72ea98f860b42e84d8ad361358645d5a50bd52d26af67b27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/en-CA/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/en-CA/firefox-117.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2a8826db1c76d4b87470916963be08e5796d75e39905d703cf773a06512a1f33"; + sha256 = "0e230f4b59482b0b050f6357d42bb687ec4a0da8baf48863710a8ca58bd64598"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/en-GB/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/en-GB/firefox-117.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a4275c8d1e7349c1caaf762d1f9ed988d28e243afb559d9ceeb4599e768570a7"; + sha256 = "f36eb33aa2e28b459824d3ab765a678cff5bd158c4dba64a196ee86213951f83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/en-US/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/en-US/firefox-117.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "dcdee4d1074af06ebd7f1d5381cfc3dce04fae9adad32a6017dfb58173a49857"; + sha256 = "c8faee63cdf678e606f71aff0862cbd495480fdbcb0ff335e0c57267fbbf6eb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/eo/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/eo/firefox-117.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "8353acec011db126b600b3d8fe00b19b906beaabc1b7b76a378307492b708808"; + sha256 = "d0762e9f11104abdbe6af659f1cf6cd1f96c61cf25fbf604332411004f14186b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-AR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-AR/firefox-117.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5450443e0d7b04f630fa271786594005292cee235cfd4024e3beea6084e1fae9"; + sha256 = "ae3344bd24c5640ff22ef2fb99001b891270917bcb916b10ab9cb6724bb9003b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-CL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-CL/firefox-117.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8f17c5a0e34518a867598f29390b9c46157a3d80f57cf49a577db8b7910cec10"; + sha256 = "b77a8ef75a27a8f3f640eac8d938b62415a3f95a80143abd84cbeeaa2b6bb772"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-ES/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-ES/firefox-117.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "732986fad6fa0b945d184fd3e337023da57aece055f1eebad004537e166e0183"; + sha256 = "8b0fd46297ea383ffa30d1c7b6cd18ba71c05a303d4786b2a533bb8bcbc3b694"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/es-MX/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/es-MX/firefox-117.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "978ee64f2a4d7b38f7bfd73a332b8c0595fd7003e55864e87f2ab72c7c1df3f4"; + sha256 = "5a66510acbe5db601368f8e0062c6c816316f1553afc709aab42941ee09b3509"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/et/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/et/firefox-117.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cac892189fbc4509319d38b1659dd3252dbafad89191a38e409f2231e7f94f59"; + sha256 = "33ce87dbffba3abffd6e6d742b9b0d3a6d9cbe5fb5fb63228204edd77106e0fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/eu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/eu/firefox-117.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3ea4a47e25963262e924cc05ea81c495c98df3a92c6f2917e0be428da98caf5d"; + sha256 = "646c6fb07b37581db321d4f3b5a8a37acdaa868e0eebb836583ed1172334868c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fa/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fa/firefox-117.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a3d7917f338c4cca2cc2f60cf67568956c304cd12ec88f031d54ff0e0d520775"; + sha256 = "8b509dc4d8d267feb76954f0641d2ce40835a3271dc9ce4773fefeff87918a44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ff/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ff/firefox-117.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "d0851545c5f9a3712f0f43c58efa16217d85866db9eae058e4872df2a1c25012"; + sha256 = "b5f320609aaf7915c119b9daac62b840d27b75ff3aa818cb5e544e108d32d2b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fi/firefox-117.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a3ca9dfffd544ca40b51a54110bcc1ee6c7e9ac0b2bfc639b044d348f02d1bfb"; + sha256 = "69acee03128734f92b24c4a0a2ed8259f0a5c738c2e6ac105b4b5c37fad6515e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fr/firefox-117.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "efaad8637c20badd49ebed750d35347e23122b1dc2950701d11c72dca19b48a7"; + sha256 = "8673ffec2d180bc5032d7843451f6674fce45eee124ad4f5dcba859766c10ad8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fur/firefox-117.0b2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a13936666cfd92972075814fe3d28b9772098c04e1316d5c4e18cfd51bff4e2f"; + sha256 = "44663b389e26b4299044a01bf446be2de2ba6aef49b5496a17e7f283844f9512"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/fy-NL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/fy-NL/firefox-117.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5a77f56fdf724fb4c1ba22031cde09b1162bed1687bd8731bcc4a2d181158db9"; + sha256 = "c4819443cb54e786efcac84ba34e9fe67fbb7cb6f269a7d72a253a9678507d55"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ga-IE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ga-IE/firefox-117.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "cf3f528c10925b6e2f7dc29af6d7482de3078a6f7a6558aec5bfa0a6fc208869"; + sha256 = "ba752c92e9aa842d227522a4ecc23cad14043f52d757f39ffdd83f2647da87be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gd/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gd/firefox-117.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1ac32ab45474be72375e60fb918d1e0e05660224b7fb2e9bd4ea3ee843586274"; + sha256 = "49a111b6eea9d357de2f1dca5607463622dcbdbde0bac512f792993641e4209d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gl/firefox-117.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "4e3ec830483236cbd9a8cb8a11073f9df86782eb7c9945e83e28ea4110fec17a"; + sha256 = "bd6b23e8cc8837cf48e29d6329814df0fe518c0cb8a562989802c17a2c7bf361"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gn/firefox-117.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0f7f99a5e476cc326aaaa1daa5c46acea01c251faa764e446b1fa54eb68fbc2d"; + sha256 = "075a90ce96d5225855e74bbbb81d3c97cf492c7999afda81e19c434b72a963da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/gu-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/gu-IN/firefox-117.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "9901b3fde114d69588e415ac6c9e5eafa112b5a07137add8f381ccdfe1871837"; + sha256 = "3dece4effb88aed44b97c56ff3c0ca5b0c791050daaea4c857d6eb0dd6280ae4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/he/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/he/firefox-117.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c510b05ea5e7c3e8fd9a0bb2407580c4c505e6fac4287ff342d98f89a33db8e1"; + sha256 = "e5a9f8e8d1762eb20ce8f9275c8d1d39b89898a6d4171666fa2547236653448f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hi-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hi-IN/firefox-117.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e2e9cd72cb878e5e4a9e1df380d63592981d93782b07345a3276675e0d4d9612"; + sha256 = "8ab570186883db665811166cbb6e54f3967bc135b434935c803e54ce33446305"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hr/firefox-117.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "71d79bb87a0bf0f1bc35fb5e649637c355f0f159d1d259e316dc6ffa634730b4"; + sha256 = "116f955b10213eb475e950ed667c22b2807805374c128b2c62c90a27c7b09faa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hsb/firefox-117.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b789306192759b7a8362c0e96218b672ff4aaa59284940d7be0d017d8d308364"; + sha256 = "0160a52f6ac8f4515f4b66a3cf7ff9fd8c1fb4423e334b765f56521d4cd8c921"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hu/firefox-117.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "68a4da300754165c7ba93e3273d90bd3d9863c457b25d6dc24113dcb9eefc68c"; + sha256 = "c3a33a833c678271db77ba68f8d470bacd985a36d32eb12805f06cc825f69efd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/hy-AM/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/hy-AM/firefox-117.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4ba2a4dd17eb4eb4e17a6fccc0b7e614727be2960491d54438283e233b544171"; + sha256 = "ea72903b2251bbc1e9563c0af655ee0a43133f6b8ad5dead51d73c2af1a46f10"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ia/firefox-117.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d5e8255fc4b2af1c5e96568434cacbe0c5472f367816cd8faf13b45c65b22633"; + sha256 = "5a7018c9366ba708b5e4183e0ea3632d9ada23017cdaa261254e9ba289e936a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/id/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/id/firefox-117.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ec930eeafe23b850fd01d43651cbd1f60f0eb8956163d3344813aff759fde5ff"; + sha256 = "3c61a962c2fac6f6a89cc7cdd2803de3f4937ff7084133c3104b8be0f37ef923"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/is/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/is/firefox-117.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e98564458a6dec775226cd74406eca684928db89a11012ceef8cdb1bd5e9240d"; + sha256 = "f3de4793e6745a98dddd58ada32031e807f146c0be08f797fbd7d4c105f0bd90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/it/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/it/firefox-117.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c2b88116a25894a3ae969c4868079c35998f26f9ace4f3ab59480c482d8616e5"; + sha256 = "afa74a3275d1c94cd9eff2a72f113a363c6a5f9d2b3b818fbf2d6ffcdea48359"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ja/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ja/firefox-117.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9bed9d4dcc76a47977d5e3f3950655a3e19f2ef59a321a049d5f0f872276bdb8"; + sha256 = "428af569236c9309c6c9604d9202c8d42520d8876b4c4b8f81ed393a4e94e95b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ka/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ka/firefox-117.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c2f91ac70e57a7687d6760712d9bc09df29ee9ec529e28019727eef165bc68c9"; + sha256 = "6c09fd719915bd08c77cbd7568e80dd365cf35f92286edc2aa250f13866abb5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/kab/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/kab/firefox-117.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "07470a1a7f911035b072d506d34807941bde1b44ef4be194283402e3485176ac"; + sha256 = "0bae08a35c4b568439d3083689e9b67670989bf4daa42b65a89df7a30f5d961f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/kk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/kk/firefox-117.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "54145722c779687f888cb7c46b2fc9f73eb66b52692af87076a9adfd4307b3a5"; + sha256 = "d57143735f3fcd0f93993fb8a095180f28325a585f24f217c949338d5724db24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/km/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/km/firefox-117.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "985252e7b7b0c6c46bd47e4262ea40aeda4617c111c5f387479f6b60f3afb8d3"; + sha256 = "11e19ead61e405a04a0ea90256c9980affed0a108c3cd2746e0f4a5aaaa625fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/kn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/kn/firefox-117.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f0521cb6d6b359f7e1f5102d0890aed881779ea3bce29f6c45111ecd63f9de3e"; + sha256 = "c30d4acb50a5b28d35447528fae40bf7ae56bdb606c8eb0de1d006bb11ea397b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ko/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ko/firefox-117.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4178338298ac6b210509594b19f71f71ca9abef831e301b357f746ddbcd12fc2"; + sha256 = "ae25dc8d290b3181aea7c59a5097f4356aedfda4e945ffd6d14d51e198464740"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/lij/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/lij/firefox-117.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "18ae0adefd8f0fcc1f92c2a2dec922c5db6bbee570e8d76902bb473272eb3cf6"; + sha256 = "0c7b229256c096462eb74ef70531fdae586a748174cb0bc3bcc00f8356ae7775"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/lt/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/lt/firefox-117.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2a725af3be4460d9c26e794e5a5c990a14c724b0d7c4831a140e32a4783d4f75"; + sha256 = "b68a443041b224a0ca8f7b6a3995d337594e880c9a85928b764dbc2aaec6891c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/lv/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/lv/firefox-117.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "51a081450b7278b78dfc42ee5f7f69a34c6c7c2857290fde920858178834eed4"; + sha256 = "24ad5a0c8a399e893b9b975b955a28b2d6aa5307ef71f0b58b427f4181212e9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/mk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/mk/firefox-117.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "61499e809c0c49563f113684fed133e0d768afd4d4131f7c98622bced65e77a2"; + sha256 = "d346538b834adc2f710be22cfa13661223c7a4e2a7a0c1cad9f4cd720dfb5811"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/mr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/mr/firefox-117.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e10507db2730ae374c4327df5f8f3636d75834aac26123a0fdf467a246102eea"; + sha256 = "7640d344039ffd36aadca3370ad1320ebb73f2cf3ce95f95d9100a3a3a22357d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ms/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ms/firefox-117.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "96b7d5c090e4ab79448a5a0a96805d8edd2448dccb26bb0a01bbe235ede1cdb7"; + sha256 = "b75c2aef50aab8dba0833afbc863f94e1e0995a8970d92f426da7ef41eb3936e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/my/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/my/firefox-117.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9fe9497421e76e64108fb0731c61dff275cd6c7f60c84eb5f2cf452bdbd1b937"; + sha256 = "cce53b1f34cd8f83756d657c8aac0eedab0b4ed12b278991c6c53e5407c6255f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/nb-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/nb-NO/firefox-117.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f29a33b95aaa0dc20d5a29ecc75b12ff86d390a7962ff08fc0b4bb040c21422d"; + sha256 = "42616b99958178ad4b4bfd1f6d5179e7ff85ae38c8c87f2d22b2dfbd09e35282"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ne-NP/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ne-NP/firefox-117.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ad43efbf81fb877940435da8b87ebf844502da60e5b5683dcadb8bf37d796d3f"; + sha256 = "d7c61ad37f7a4d1799640141a71d216b7aa286b70ce7e06357ac82a22887c06e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/nl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/nl/firefox-117.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "210d99944bb56d418f47ea7bf8880a4422ce0048ff7275b368ed16b5b9cf92f4"; + sha256 = "fa8324a01507d18c6b8cc2afeec5f9187a3970cdcda87794ad2145481c4eb451"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/nn-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/nn-NO/firefox-117.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "69c2cf3edb67e1cd22ce8776a2e45b57ec770f08edf0d4007b86b3dd5ab54f8e"; + sha256 = "f6af2df55301f16efb5f02f65bdcf43416951fad8763b61de7c776162344f2a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/oc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/oc/firefox-117.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "4cdc3d9833f6d813dffe9f65d5ca1f4deb4290fd5127282b5f74b936186e44c9"; + sha256 = "b52637ca1e87749f9963d292560da1ade938395b2d2888b617e363ef557c37c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pa-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pa-IN/firefox-117.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4425772fdb76f06696113b254162d1b12eb5daab5ca47ae8da6a427730b7c34a"; + sha256 = "ada654c1b96c24c176640610e2279e9aed18e01f9baeacd89f117590ed895593"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pl/firefox-117.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "60b5f5cd2a332252cb6deb181268783a1620b10b519fc03d09dc872b803a63cb"; + sha256 = "333b262dbbba9cd50ce779c92768bf9de3f9f392f1e8afef1f90c00f36c9aee9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pt-BR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pt-BR/firefox-117.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c34aa4b9328ecb50f147d11f36b40068ede5d8cc7f999bfe01e9cd4fe066646b"; + sha256 = "1022496db4b089a8fe9cfbfbc778d5744b7ffa3576567c8687400570b76c86fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/pt-PT/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/pt-PT/firefox-117.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f801f96207e13f32a4c92a8c3d81771593c867dc078a29c6621c680442cf8b1f"; + sha256 = "b60aca7910a7a0ed4433a70bd60dd435828aeb568f754dfc375ed718d43603e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/rm/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/rm/firefox-117.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "530f69183566b76738863ab1d35cfeea34388089caabb845835946cac6ea765f"; + sha256 = "d5099ca371ceeff83f81086719991021ae035cf30046be4eabf34f0dddc27d4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ro/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ro/firefox-117.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "21716632a24ea27d57573bacfac55051dd136decced8fdf5f4d117e86f014f05"; + sha256 = "1d6ec98e3227cf42da3de471cfb803ce011056b990b09efe45119c55e3ad5732"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ru/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ru/firefox-117.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d7fcaef1c71d07cf42b3e7bfc74f305ef75199451b25f573adba45535c49ee46"; + sha256 = "30e549d2da8109826629545b122669f874b34c72afc0d93c9e079e0db2c99bf5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sc/firefox-117.0b2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "6fd1c1647a8ae2586cda50403a564ad37b7fbfc3ced2c62ae2dec1934cab3a12"; + sha256 = "9f8e5fbbc3280a10ff09e2bc06320d6bb7a20563e0feb2ff1ab80c13f66ddf06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sco/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sco/firefox-117.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "ca4263b1d21ff1cce8bc43c503363447dc19724abae91c900e3c2632038b2908"; + sha256 = "c22696faeaad79093b74e8775085fb30aaaacc91aeb9ddc7656a06210e057148"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/si/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/si/firefox-117.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "051200eb96f21c795494b01b94a48d0331cd0c3bc4b9ced8b5e2342e126edae1"; + sha256 = "f0a7b1e28c0e6f0cff93053767f69afce01374169635674b5670a1b5c8fbf43b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sk/firefox-117.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "615a078479f73d61459d59756e58dacd712245f95510e226d93e26758de43eb4"; + sha256 = "4bd7119df5fd52d24ecd1f21746bb0b07584f99fd70985bc1ddc55062eaa69a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sl/firefox-117.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "06249e9b5254da179b924207f81819cd1f4abcc2956bd113e5362e728a531064"; + sha256 = "b70d91253e6aa44beb1ab1f1914c532aceea78dd4e173b7a1c95e71bf77b9ca0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/son/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/son/firefox-117.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ecc73e86bfd2e7b7d3344b1f6aacaab6a6d0e11d0bb9df468a5d9c76e5cf388d"; + sha256 = "62a0788982eba7010f7cdb8f7fcb335e2c3eb9194d65c3b9ad7b7324cae7264c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sq/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sq/firefox-117.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "be624e20ab9355b499dcb3861fb9edaf50ef5cf8e65c5dea511df18a1b25bacc"; + sha256 = "fb85d86840ad492c7aac3216e056807cccb8dc4722387d8dabe9198e4e3b9a6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sr/firefox-117.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9ec8b3ca6e3c8af537ed7e6a0ea08caeb76425a18e0de35a3e1f05250b5358d4"; + sha256 = "95335bdf009729705cb42fe64c64173480bb2e1cf57ba381588e24cb8f723f38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/sv-SE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/sv-SE/firefox-117.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3750ff90c0fb47e21c57ea6c84bdabfb1459f741aa1d82cc2a1fc969cd6d0438"; + sha256 = "1f0705e482088b4313339ec4e7ba5954026c0a90dfde5d3454de7ce39e32b220"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/szl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/szl/firefox-117.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ccd80051479f0b57c610b4bb9776f002d1e019a3b2c38188f21c14992caa5193"; + sha256 = "5a3ecd48184f50c93f87c092bc7f6947d581ec94bf13bd8b8bc54fe77ab05b90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ta/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ta/firefox-117.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "e6247aee65cf2dd3708d591f3674b1c33eb6d52261690e5bca10a22b66ced04a"; + sha256 = "4bc5df0b1f12f94441e807f2833aed96f6eea4ab1e0b3b8bc72f880ba21b89d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/te/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/te/firefox-117.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "20b5f9c1f14c82fb200b1be5eecfcc6dbed59459c7aff4c5a9f4ab5e19f9967b"; + sha256 = "dc84283879450653fc05be5b87c9bd5a7588f772ce093b1098b61dbb433d867f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/tg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/tg/firefox-117.0b2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "49bc2d4a95506ff6bad793f8afe31c2bddbfc6a732c37779891abc44c6e0d71f"; + sha256 = "7154dc9c9d7154f9bb2e65374fd9e6ff2354e8576b2ac43b74fc9e0fa3586b24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/th/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/th/firefox-117.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6910f36379df34ab1f97b8b6ebc25eb9dd9b83cbe857b453a4c71c702aac4481"; + sha256 = "dfc2bccf0b12875a9f41ab4c92e18c321758c5444eaff83d08371db75f1e00d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/tl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/tl/firefox-117.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "788b50ab7fb170b49cce6cbf2785204b25b23bd7120eb18c8ec29a15118b739f"; + sha256 = "77b8e0fde9d46a6ee93453961c0df3a884346e1c9382c583271459ef032df27e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/tr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/tr/firefox-117.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c1ff5a3d891bd88a8fa6f89b2f561600ff9221a77c6edd4d2d217f40a1953aaa"; + sha256 = "2d83edb71ac976a4800c562279148bd365096a6f1190b18e3655e31718a479d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/trs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/trs/firefox-117.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "56f819381a564e4de3ff5968aea21b71312e6381ab29a2739890844310b2cc7c"; + sha256 = "8178396de71e6b4748954cc4c18889f78490a076a9f665224fc075df995e659c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/uk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/uk/firefox-117.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8f6ba4cee9824470abb62f5610b3bdde1f4df6a15209a3ccc56af06f776280ec"; + sha256 = "bef3102ab0918d76865f73057d99670a339c60643d36a34bfa3d77d5d8b1b27d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/ur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/ur/firefox-117.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d2d5bd799a9bd1de740066128a281f8acaa70fcbd8f7d0ad1afe2e6ba451735e"; + sha256 = "b09154c22386174f157e73b7aae3717ae00e05c1496c267994f9c7944237026d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/uz/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/uz/firefox-117.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "52acacd060c7ee6dc80164885c74594e4ba066ee981f65110d085ff3aedeb57e"; + sha256 = "7f592d18df3f777ddca77a04cdcc03e81077ae6140d1e0817dd414e9cb875f03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/vi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/vi/firefox-117.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ee0d42e366670c54473814675a9ddf5feb56c340ac756dbdd873307ab0493b07"; + sha256 = "db0f4465154f2ded785a57c6f7e42c0ca09831002172155877ef7bd88150daa7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/xh/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/xh/firefox-117.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "f8e050a6c12488301a0a52ef6b617bcfc11353da6d7614b0badf521e91010971"; + sha256 = "10dcfedd7385b253c2c54e666312f989f2ecd4f89b8ccaa3c7a8af5448f64038"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/zh-CN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/zh-CN/firefox-117.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e98dfc8a86537636f608cd47b92002656e9641b93a5010ff91e4612adb9b1f47"; + sha256 = "7b9f108a01441f8061e5df76d639c5d3da0af01c279f8e13cad371ce4ebfda90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-x86_64/zh-TW/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-x86_64/zh-TW/firefox-117.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8f8a1e1ae1daae93bcd0d0aa33e14eb8475bacfa7332b6430614b5a608aaf546"; + sha256 = "88169d7b0162e26ce08385c7dfbbff4747fca56e468d20c5c6f18fecfb0b4519"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ach/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ach/firefox-117.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "d5ccd23f477053d2fd29536b096947448bda84bc8bd496f6d67ede2645003e38"; + sha256 = "79035da9cb12a3a1d5b95aedc49b4e35a1cd2c7bd2cf75192e4de8e893c82188"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/af/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/af/firefox-117.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3531a77ac162a13721060f5a1cf42a0412b00d3545be9361658499c875f65b5f"; + sha256 = "6a67f68914abcee485d0328714687209d67853a8fc73cc5627a9ea9a66ac063f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/an/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/an/firefox-117.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7213b9df3794d3882e5f7264e13525d170f7d3b6f6509e9ee6dd9aee5d3b40d5"; + sha256 = "8ceb7d9d06fc53a82f5d9348bd3fd7857c42417f6b8d04c3fafaac3cfb65da4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ar/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ar/firefox-117.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4092fbdf1a2c9984c0636932e3098c6685a50b4ccd47955d4c218b8e22a4ab88"; + sha256 = "d26458dbecfe2c5517ddf7c4edac4974a995f3235d1c3fdee471008532e2cdd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ast/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ast/firefox-117.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c5e12f623e0497ba9058c3346c54756c35ec986d9ad6ba8f318e9150911469a8"; + sha256 = "f2df64623e0adcc3a616c5591fcfee1a071f7278662550a440f81152abd25f93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/az/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/az/firefox-117.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "48afd4136bf550d0fbc54ab00fa60ecbdfcf9a5588d2b69eb178834843a3d199"; + sha256 = "0651ed1b61d8c21794b7fd01c71b001ad2281748a79e7b68c7cf99745bcf0f0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/be/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/be/firefox-117.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f68b8e8167a14e414a2c2829e9a8a9471fb53509f02276f12097964982ce6bdf"; + sha256 = "e3749e5e647dd70033d50f5a62280d72e34e5ba5878e0f74bf7039165ccb3dea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/bg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/bg/firefox-117.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "04a8f6a9f3ee83cb449e395248da7e49db5639026c40fa923722b25f6b487102"; + sha256 = "7a65b012cc02b4d30de1eb0a570a97826b1af9f9af8a330de22dd0f8b9c4b238"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/bn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/bn/firefox-117.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a0ca76eb610b85077a84a6b154e0cb789bca6763b9804e750e2dfada7ff294d3"; + sha256 = "4e99f11d18135dfa180773b1d1c3247710986f45e7401837a75d00c22e528501"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/br/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/br/firefox-117.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "35b8bc7b4d533b51ee3c5d36fc72625c981674859d71aa8fa4cc35117bf28fb6"; + sha256 = "ab7dbd47d454864726f7d62e29ace6820b2aa2542bbca1bb2c199ef48411fc2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/bs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/bs/firefox-117.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6100aa7629763300623f6c3880208897e7a12da9bab1bdc616b480ab7ad8f2fa"; + sha256 = "50b9b42ba59c6ed8d8cab57e4f40d4ffcc9813c61d55f7a1a2558f5c11bfac10"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ca-valencia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ca-valencia/firefox-117.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d389421bc508d6bdd0f56bb93dc5a5b2643e15597ce7ba6dd230c9b54d693425"; + sha256 = "974c1cf8c3c54b7b16b6c86a9c76998330d292fc4f98edde91d671c15a970d79"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ca/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ca/firefox-117.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "776219a92a9cbb3e58fb54cd1f5513a3a26cdec1935040062718b0b1893bc6f0"; + sha256 = "430ad9ec55366b8f701ae04c3e742c6e3a5a154f05ded686ebdbbd50e782da43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/cak/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/cak/firefox-117.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "be34c1f421d99257a3d05a82c48552a5f3aceaf54c0db6cc2137fb3972d29be1"; + sha256 = "83335010789e56a3562edc9070131ca78a1c8383d76a3a62f133ca1798e89158"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/cs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/cs/firefox-117.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8cc51892774938280fadfb5c98ab848d03310b6b8d0897f80d36b65519df05da"; + sha256 = "92530cf260c896214f37f6444b09cff55e7d11cc53f3b94e5c7fbd551e6db767"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/cy/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/cy/firefox-117.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "18b6c599d989abd0f9212d75e406237f417fe7160984ec8c4cbc4845d256e8bb"; + sha256 = "95a57db70e0f77ac171614fa01caa56fdca301b3c281a62be60f1321c9328036"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/da/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/da/firefox-117.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a3ce7852cc6ab16d6946921ebffa36465acbfe6f9f819dc9091e27f1d31884df"; + sha256 = "35b14d86d4d920e5e1e18cf41b852d68fd1de606c9a9d9ba0913d59f9d1085ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/de/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/de/firefox-117.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "99cba98a623de06364eb6d000eabfa853fc80b7599fb170763a8f626089b28dd"; + sha256 = "40ff8ac7953e38335cf158231ebcf7508595d9f27a2c6bb5068896a33c77a5ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/dsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/dsb/firefox-117.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "975c25e04aa35ab9724d0550bf98b2e4556f0a5af87ae77664f43d56354bdcbe"; + sha256 = "d087dc5a0953484d34effb02c4e6df0d34e2be8427f94eaf17b702f5f109a64b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/el/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/el/firefox-117.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ce33673dc2b2f0a65e54b620012b194f1a84a84f01bbb72166c2edb4d3ab12fe"; + sha256 = "5c44fd4f54f97f4f2dab34de311f69cd0040954791b6aaac4214e53bb8021221"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/en-CA/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/en-CA/firefox-117.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d064bb526f0750d32d2708e63c80e002ca6156f7fc20fee12692bdce16b0ef2d"; + sha256 = "0448a4f07259f0dae3a2df6e249ab7a5f76bb1a053fbac6056e75062c66ae5d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/en-GB/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/en-GB/firefox-117.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "be2c784aa7e8a48d8955f51cbddcca82e063454a75671c5896d7a80005c7e1b0"; + sha256 = "fbeb90596bd169e29e22849c2cb37f174a22a136f233895de00234461ad20fcf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/en-US/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/en-US/firefox-117.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ac8df5f2f46588f4daa2e4ffe9dff1ce9ca75283d6db6cae77b5d77a5e5640a2"; + sha256 = "1b765fdb1f632e934531c3508295b35b95325585d412cfc9d5f936297a608709"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/eo/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/eo/firefox-117.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "51a3b48855144ef476c4011e978fd01aed48ec84844dc673e46b76eeceb5366f"; + sha256 = "25d2e49d8ef84aa5c059942f413a72bc8dca6f636ac25d1a182df6e81318eace"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-AR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-AR/firefox-117.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "45febca3ece693d03ed1ce694d3741f10173593692aef6a54c2a9723a1b93e37"; + sha256 = "921625e533965984bb5e5c9ddfad9c55767a6f9bce6a7cd1603432d0fa060a50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-CL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-CL/firefox-117.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "441b1292248d7b8c5819dca9639dc0701cf6f456fa7dde0c5d74c677cb074bb0"; + sha256 = "2aaa814aa0266121c0ccfa4710dd519820dd895812531f619487bc570e7b11e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-ES/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-ES/firefox-117.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6007fae26404f2562d7bbb14f3e0dcc734a763ca444c2709ce8d2bfd5276447a"; + sha256 = "aec5d39fe3e8086f82df108fc17f22d814570a5a60a379eb51a31d333b4b3f9b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/es-MX/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/es-MX/firefox-117.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "aa5122e8685fababaf97cc3937261e0aef65b52c7a43a9d843d6cb0a264e753e"; + sha256 = "54410375256736369d539651682b89083af2d5ecd451c858deed5494f66890fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/et/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/et/firefox-117.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b8142f93a80ccb685063c41ce5fb18607cc270f25be21784d8c2e4a0045a5aff"; + sha256 = "27183ff7328757720f622aedd66069693a0becf55b41014d86fc29778278f2da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/eu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/eu/firefox-117.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1b4af468d79b052992d4c9500b13e43fbbbcebf73df3f669d771d452d9b39dd6"; + sha256 = "052896639d429b8a607295cf2b7970245eede725a466b5564668973a36495e0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fa/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fa/firefox-117.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b9c1a7c410e1f7262408ae273ae671b0ef95b3711151c76a6206a5f3def16faf"; + sha256 = "b59e34dfa242cdf5b6ea5efcd1386858988693abb031432f8624fb3d2915e9cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ff/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ff/firefox-117.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "944612ff8fed847a8548548faa58fecb2e6c39f7343a853e93a7a4bf18c1f2e2"; + sha256 = "29cb0ccfde16c3cfb2d02bc32ff2b943af40b65e9009d9cb238387245cda5911"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fi/firefox-117.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c88ce10e9646456a0160f175189aa0cb5b06a88a1bf14445f74e330bd48b08d1"; + sha256 = "31f2a91eb34ff04b8d9b1f8265074f6341ded0c5e4edbc16ee6529779fad2f36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fr/firefox-117.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "45c559bf2f31ec5f1cd6cc8df0bbc87a882aaf751dae5723d0fee9282d93c3f6"; + sha256 = "c75fc05c3aa6078c4f6852afb6f7bca3a4cc3919e79fd11f76e877df92dc28f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fur/firefox-117.0b2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "b675ea2673823fc6b27de90aa731d68d7e9046b246e448aecd776b09c5da988d"; + sha256 = "b52d2bd41427085033f69ddc9cf1188f78792c4bc09b7c65b6ba396b5a3e0384"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/fy-NL/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/fy-NL/firefox-117.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "07504da6c327f42384be1ed87176d781e0e9c6414801712ec534555e543b31f8"; + sha256 = "f8f70f092757e6ba18286b1024c1260e550fd953e2af30bbdcc9ba7b46f374f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ga-IE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ga-IE/firefox-117.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "404e47c18ad46935c6bc3a528bb99fedd27374247b2bf0b5304128b8dbfa6e1a"; + sha256 = "489a41ac49c7b1e90263cdbcafb9c479b0f169c75a615583afaa4446c28fd95a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gd/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gd/firefox-117.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "93cc4c9a9ec99c6f738a8acf6eeae71226fbdcdae136387d0c28648c372e6279"; + sha256 = "45f4b4b42a2341e1bbac25a1666213a5c9c8ef10b6266590d85246340ec6e3e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gl/firefox-117.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "9fcbbea723d39fb34fce0435121818982add249e456b2ed1f6a1b1652ff342c9"; + sha256 = "e141d86f5a078911b2a3a172da22907848d5fd5eaa946fdca0200713582b3c0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gn/firefox-117.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "f962fe0de779a95ce14d828a82ed336573781f83adde61db10abc4a686b6a2dc"; + sha256 = "5dc5d61472b1000c02f8bdd89e486a599313aeec6de8db7add1630be4165f7d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/gu-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/gu-IN/firefox-117.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6373fff69de803cc5a077ea45eff6ad2ca37caec1b8a9523a7f91d1924377ec9"; + sha256 = "10091e45534607d9bfcaf58281832f0e2e9ff6ed87d434a48db977ac800b92c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/he/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/he/firefox-117.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9f952724b440cf83cff675ec888910a6bff20233860b258001962cf6ff12e56d"; + sha256 = "688017dbf1460de4319cd0f7b1f9c0bfdc989caabbd22b1c975b5bb2f0bef302"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hi-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hi-IN/firefox-117.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7dba0c18877f3b74622e8812f01b3a562c0d0956f0d1f1e64cce3b4b044cd41b"; + sha256 = "83381f3a5fac2b0728805b975b214967e15c6457c7db519544a1efcdfd56f0f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hr/firefox-117.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e69297da941dcdea8ac900b170e0d59ccd432112f52608915cdd6695c70cabc1"; + sha256 = "b2e09455df9df0cfd71997c2967f514d20cffc837126f438c92f618e81e7adc1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hsb/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hsb/firefox-117.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e03ab81a6615f71cf31b20e2aa3fdb4ead8a0d7f7b9e61616f8e72d2d8709dd8"; + sha256 = "b5aeb522ade223ab1d303d939a1e74abaff81a052134d9e80d5767f91244f5e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hu/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hu/firefox-117.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ae3937ac22ab3db1de9a2f7117acaf3eae5bfc0dab8833e3bf4ef438fe2f8807"; + sha256 = "18c40b433149361a0d5b5aa44e5c18416e60a47059972cd745e46cc3e595c05c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/hy-AM/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/hy-AM/firefox-117.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "08928a362b5b7e29e11b676a17667d3fdc385551cdb84db11fc2d7b8bad79524"; + sha256 = "5a909fe0e143bda3e49e9c7214d3246512d28cdf6580ab86202979a7de637e3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ia/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ia/firefox-117.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "b48f4a080bbbe202ee75c3c0ec50de81b410a2545f37b40a458a41ad29dea131"; + sha256 = "4b20fcd2754601f3e9e026ce3b92d604114da2a7ce8f5166ee01a1ee1ee317e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/id/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/id/firefox-117.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "861770952348540b1417051571d1efd2cc4c63441d088e772bf1b3ab3cced327"; + sha256 = "996b0952cce4408a0ced116079442d71f7c605af4e18037b788ce3b75c74a3bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/is/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/is/firefox-117.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fe4e2cbf086372d9b98c25dbf8ec7a0797d2caeefe218363b35227c5b1e3616a"; + sha256 = "6e1f0d4bb1988a4b0e8736e554508302165cdd7b500302da621867833ca0c3e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/it/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/it/firefox-117.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c36758e897406dd7d9fabc6c4c0793d5f24ecc007dd542420106040de9a81c19"; + sha256 = "a5f873fd119efe83fcb32401d80528af47dda852f0b77b81b783e9228b14eafc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ja/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ja/firefox-117.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "09410a026f5c902ffb41c2b4138ad3fd975fe9a49e79174b8ccc6971d02f2570"; + sha256 = "95ddfd0e54d2970116e1d4f9ab75ed808859e41c2dc244de652deba637e82a94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ka/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ka/firefox-117.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1c34ab1ab3d784cb07ad7031654b574df610c03b7ff03bf401b9fec9db259685"; + sha256 = "30233b10193280739ccbe9208bcf4b61d7eccc3242f51bf73045ba470aa2d896"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/kab/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/kab/firefox-117.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1fb851a99d4acabacbe0c6bb6cc88d712e01620e94815c9407473351d4a81826"; + sha256 = "dc94fb2fea8e1a22d1373eee355556ffaf7f50fffa5c8702e541624e22c2ba50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/kk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/kk/firefox-117.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "67ac4003b2bb6ee5badb3c5da99b73074432be939a7cd419bd5efd6abbf3b8fb"; + sha256 = "47385fabe2ebab1ba71f4179044c4b92eedd4dfa356f3d9eee2a51c37672747d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/km/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/km/firefox-117.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "120d5643b12df4376dcf3d25d3f560a629c42e0b68c5294b90710b30663e9c14"; + sha256 = "17a863d642f6b41a0236478489e196e64a68d196ef135c2834144a863717ba1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/kn/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/kn/firefox-117.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c82cfc77e70b9a1305b6937c4e6ac8486e3326a10c0538a51d2c3db7998e5687"; + sha256 = "87b7878ae9241c4907bcd05fa025f5f92746dacc96e6045523773b6e42db255a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ko/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ko/firefox-117.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1e4e2c50c392b85e09cbfed6231cb75d4b5cc4f88118975b6bc7c1937f904ef3"; + sha256 = "9826065baffd40bbd79e9a030c4241e57fc586e1e46822dacceb2b73c30fa8bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/lij/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/lij/firefox-117.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "cd702b70546704302005ce139f4d8cfcee0f63a707890314d24a6cef411393f0"; + sha256 = "049ec63c52aa35bc848ac4b950a71b5376845f9364ea8f0bc12e964386239011"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/lt/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/lt/firefox-117.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0b739761d743e9ca0af510e7c9be3061810e2c88321245c15fb7c7de1800a185"; + sha256 = "c10aeb412b3b6bbd26efa0b2be9ca82233108ae228297ca2e197a74590806151"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/lv/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/lv/firefox-117.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "79c5f4f8a490a87048851420c03fe63976bbb4bea655d9d9f6865c32d6a06608"; + sha256 = "8166b56491d20000830b76678789c30d0d04894dedfdcedcf7a961e365318776"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/mk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/mk/firefox-117.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "46a00b6c16ebafe6c7f5f3bc3da6fa4dd12380d15c923ae409ed7c0e4dcc5906"; + sha256 = "a1b77b83cd8ece5547c77e4b3443e47dba6779e0cd1c7f01b79cd6a06736aeb1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/mr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/mr/firefox-117.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "303f6c94c47a43e7510d1d1f0d0f6ccf8d745991827949dc60150975f598678b"; + sha256 = "62f47b0839dc22a5d3e45835b35f8729d731b1ff5d2e95643dbdbe14cf66c6be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ms/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ms/firefox-117.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ab6895c7a6afb7713b5d2fedd12cfe1b58a8b026fbadf6652f4aa6d39dd0edea"; + sha256 = "e966f17f985e2cd5328d2f3d0dc2b487b9600e144f0c28669d3f55a970cfbcdb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/my/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/my/firefox-117.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "e867458bd09b47fb130263951acfa0e1060aeafea63e3bf992a94359db2b41c6"; + sha256 = "d8f29d2486c377f97d1cf3aa903459987084e8c3679f96a8e38b1db7903a97ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/nb-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/nb-NO/firefox-117.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "726830a51febadb78a9fffc1ea9b6a09e92c7341a5eca9f32b78f9beaa7b5821"; + sha256 = "83373b5fc11e0b310ab5d9b62d4f6a43514ac86e0f9b112c1c5e8dfed904e143"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ne-NP/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ne-NP/firefox-117.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d316311340d53f4061e7d721bde9156d1998ab80b7d4c3705eed084cc96bcae0"; + sha256 = "18b1d0cc4339579cef1d815a63e7f86029070f76956a0d6ac78248ad843d432d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/nl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/nl/firefox-117.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "fc4ae1f08cec773c2a46cebd18ce88aa6c21471123f79269e27340c7ebeed285"; + sha256 = "1c817fb50c5339046437ebdeb3f130c7e1866e3113972604a477c05bcc01f8ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/nn-NO/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/nn-NO/firefox-117.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "77a9d8683b1918a1f63e486bf3557999f9272130ffb050379ce91c1e1815d91d"; + sha256 = "ff1d726d05e4d763f68d91193c5a6ab34befdb29b95f28887ea6e4ca13d18dc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/oc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/oc/firefox-117.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "38a09ac3a8004c8720c16e6d9f466e0d590921cd03690e89392f7054dc4e6d44"; + sha256 = "6937a3bfb0c0309435622d40c57bdfc9f7dff534d82399c4df3815f54a87f034"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pa-IN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pa-IN/firefox-117.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "74ce7b2855153e594a10513db2823dd917af41c0706dbddc67dc76d37a8aff78"; + sha256 = "b27ce535e921b5ce90bf60b6b1dfba7e81f55fcc343aa96f9fe2e2f82e59413a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pl/firefox-117.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8115cc8993082713d0ffcfc154ac7e893c9bebe51a727959ba949cabc7414862"; + sha256 = "b1837eac3e813cd475d316bcf8a30b3b9f3ae4c32e12b74b1d28d8dc5adae8e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pt-BR/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pt-BR/firefox-117.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4a5928c7397c52bbf1f77e445aa9481aae76d18183252d00d38c69539c1a4421"; + sha256 = "cdbb6717a2aca4bb8e5e60f56654dd9fd2523f480aa1d7a0fea80b505d2b6cac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/pt-PT/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/pt-PT/firefox-117.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "07bcf3d965b96937895f9377334aa604b1d54ba10ce1a84f1477cea335912e85"; + sha256 = "776549ec4c919571584d8a6f08d46c321cc65272c5a190ada465623b6a1968a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/rm/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/rm/firefox-117.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "142ef46293b65eb916fdbcebacf53127350b7549e0073c82be83f8ae8ca7e2d1"; + sha256 = "03af9926fe76b65114b5e8531fce83bbfdc50208cb855226f27df1edaa2f05f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ro/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ro/firefox-117.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "237dc722c2217a528fb20e520a79192b1eff085babf954a3ddb98ce152fdfcf2"; + sha256 = "1f5503ef1d7d8c871d169dd0df1548fd2bf055a3abc791bd4927b9b8ac4608b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ru/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ru/firefox-117.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b7e954893adfa5a1099d55d3e6666908a9daf40b87056b8b0d9356b05209cdae"; + sha256 = "e0306bd225e30674a0d96c0c1891d71442652670142f5a23429db244f674f5ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sc/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sc/firefox-117.0b2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "76fbba366247140ed84223a8bce8b156a17468dfde8d1b5fd54bff3fb1408dc1"; + sha256 = "499b5d7dfb9c1e2bcf696d8713bb911276f4052e633160a3810966f8933402b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sco/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sco/firefox-117.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "d6fc67cd55209e22875aeb225bf82935d111cca77e00f41c4ba97dcbed156458"; + sha256 = "fcec3d3ec7d558bef968e9a32da0479636efd6af61e335a9b5f8a13298bf2750"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/si/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/si/firefox-117.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "3675f892cc5f0bfa98c8075df297651a4ba0d2f5c099208efa01b33f60fcc1c2"; + sha256 = "24913137ac7c5fb2a53cdc534a7fce099efa23e68ccf63ced90ee613653bbf38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sk/firefox-117.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "f217606f8f8ccfabdaa1a4c5a23af8fdd3eacf1502e4da6e28f8504a74a7e9da"; + sha256 = "c185014629889e9a64e3c3a03442463cb05a8355529c368d38c0e62f2536ba9a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sl/firefox-117.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c5a089bb04ba83c899b0fab4a81335474a1a0a24c75afcc5bef2864ae7af2c1c"; + sha256 = "a2ac927e578784ce1ff8992a56b98428b4e636412bf9aaa53172e5f94cb63719"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/son/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/son/firefox-117.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c73c98ef68e886e3f4ac01f7aa42992c6f9b75a18403c82c0bc54aa9d1630524"; + sha256 = "649cc48e25f371db9552da98fefe69234cb6424874547954a2c7210812db0831"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sq/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sq/firefox-117.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b7c7bcb08a3b81d266aedefb7de9566b2d11781c66dacf94e52c9c60474a2e13"; + sha256 = "1800e17cd1639e4d9ea083394bb847bfd61551fb4f08f7d021f48d641e03f60f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sr/firefox-117.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5c8a3db26ba7acd76dba7f9a4affa2fb932e76cd40becd9052444efd5f1eb7cf"; + sha256 = "133d85ed15c4f4f3b967f3d8a1959838169176f14143c3e074e0058572b626a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/sv-SE/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/sv-SE/firefox-117.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9796c48e19a4860bceb7cb3199ca0d3605522185cf6b5be1e8d5ed036bc523fd"; + sha256 = "96c617e8da39a91ac8a43f254d6408a14ea852184b02aa894e2aa30a72c47cd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/szl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/szl/firefox-117.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3d5b4cc385399b4b543f66c707c3d5fb2b6920f7d7344fdbb4aa5f34e5666c9a"; + sha256 = "5783038284e5780401d48fdb85af3b6a61c59900914696ddacf91d1cfff9fdfd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ta/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ta/firefox-117.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "34033dd438cff4740a366d91eadd0e34c2fe3e24fdd41b5dfeb10a2d425e7388"; + sha256 = "e36ad0b248d70f52f878395af2cab95ff67e54516f3973df008fd76bb1c5381e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/te/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/te/firefox-117.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d10fbb522c1032f4dbd9e46e597efdb6f8eab3d885b09ca355efbad415bbb7ba"; + sha256 = "c8b8fe6bcdb8c2181714732d95fb98268c411c9579e0b55f7dcea0dfa511620e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/tg/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/tg/firefox-117.0b2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "d793064e3de193e7ac8d2046be611211200d5079d20ddac293fd54dc040653db"; + sha256 = "5c3710584217a173bea7daf6405af811745f63089dcd7845a8e1a3bd3d5092f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/th/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/th/firefox-117.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d466b47233a8d3fc3d55aa2fcd08086811306f813a8118fb6235d1733a2d274e"; + sha256 = "33baf3f17a98df98a3ebc0536d11c0cbb93a458e9aa0af72523cb8a9f532ec32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/tl/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/tl/firefox-117.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d395cb79206236f8af0f17cfb76c332df6e49271b102de3fcdfbe6072c81b400"; + sha256 = "93461ffeaa90321e03cd37df29ad5705b3e54fdec426ba20b35dc8a635f2cd49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/tr/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/tr/firefox-117.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "ca3e8d335945d265b6fe1d86af58e0dbd4f6c046d5b308c32e13b398fdd1b54b"; + sha256 = "6740a84d601b1e9d495bff0901c90f8ce47ce88d31b7a08e46f83ba23effc6af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/trs/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/trs/firefox-117.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "eafacd352f3cc054499f87c6765a5b41c40229743849d689f69c14fe1975ed03"; + sha256 = "fd001d23f1fd7f42c521dc6f9d81c7b45fe586b77c66fdf4ae76d1c5dc7c8e52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/uk/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/uk/firefox-117.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c4d09799da087987c5de2aa5db90b9f7866fc345fe98820da77581aea1d45e38"; + sha256 = "cfa90e37906f3a489dc878ec39d327b0b35b781ec4ff7cd977e3c4e450bd184c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/ur/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/ur/firefox-117.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "75856c9b34b3117e10a403b6c1859e3c1d8faa6cad8cae345b22a4b31bd119a3"; + sha256 = "3dc51cf49836a17a8485708037b9d22535367792a2660c1e5259eb5ef5c8c0c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/uz/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/uz/firefox-117.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "26974ca448092c64b131d040ca6f88848695c25703610490c1d55b68d2be5546"; + sha256 = "a36be7db81dac21ad591eb9d47f5cf099e9213c4a5ff165f168d1ed733021504"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/vi/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/vi/firefox-117.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1bd77f418464127d9712ff09c9e9225d501615b83bc0bf9917e7bed4f4a52c73"; + sha256 = "05967a951bac6b44f8b3c476aec9fa16904988227e0a21929677c1b643a7f5ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/xh/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/xh/firefox-117.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "75575150eb9810d2201832f4af3319645cfff875dc37000e4939a42c3d697832"; + sha256 = "0c93e845d9e2db561e5bd159ce3635a1e06fc33eb54863969c236e091168dc70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/zh-CN/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/zh-CN/firefox-117.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ed111f3ebabaa3468ece986491afc5d2bcb40dbe63b5914e63842db5b62d4d64"; + sha256 = "ba741a532f2a7caf4b9ce8bd522f9487336e9fefca8d79ec5e3739fbbdd3bc55"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/116.0b5/linux-i686/zh-TW/firefox-116.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b2/linux-i686/zh-TW/firefox-117.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "cc93da69a1dbf2de7bd0a300209cffed7202b6602d90b535610029e6ace510a6"; + sha256 = "fa6a8f96b74c570cf192d41e34e4d07e22b1508a2cfed4406993f71cedf8c8e5"; } ]; } 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 2cf7b4aad2..1f12e2879a 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 = "115.0.2"; + version = "116.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ach/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ach/firefox-116.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "302fe9d08b11203f4ba89d6e6f155e2a4b43853fea7448a7fc9f28cf0296da34"; + sha256 = "f9f28023f1702d54225f33c6a6bded08a1d17871091ceb7829e000aaf5769485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/af/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/af/firefox-116.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0827786e7328aedca6bebf332abb5ced91443ca3c60b4c3d966bda5e377e2708"; + sha256 = "2936f804f0b40589aaf59b581e11d7296f27671fafffe2696845c22cdccdbb50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/an/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/an/firefox-116.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f790637836993199fa048bd6bee023cd044c6907799e41ae784e084adae39139"; + sha256 = "1572eade803d946b48070822434301ce4000fa348c9f01af3653e253473e0c50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ar/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ar/firefox-116.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "46fe2248d3c5f8c0932da85e1b6884a64dc49fe729c823b7a419b5d4ee352d47"; + sha256 = "5668b90b9ad9314cabff710cbd9864acd4f880411952591cfc2770821a7718db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ast/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ast/firefox-116.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0e1c20ae9e9ca4450b0c3d0f675805ac23bf9d98fcb2148622a7c1e4a5d5f57d"; + sha256 = "61865e18b800873881bd88b034480978378086f2bde9d0746aab91c04491cd45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/az/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/az/firefox-116.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "50da1e0c214723accf840b0547906550e2762a3e47dd3e7169d346f3864df196"; + sha256 = "485ce8e25658725b98f5596536eb34e832e21c8b995f9eb728f6b9bd3d7d68ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/be/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/be/firefox-116.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "67909a4d754ed3dd70e5af85d20cf1b42199ae606abc615cd303995b616f72ad"; + sha256 = "3af6a0fc179bd134fcb78241fe08bdd19cd17f56c53e5f6f4ba49607579b7f5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/bg/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/bg/firefox-116.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1027416f28408dd140b0f79ddda01b68e0af5deb5e6463fbe32acd37d09021c3"; + sha256 = "a5633fa78ceb33f1bcb3ea4745c809e018b7319140a8d3a9caf2ea10b9b48956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/bn/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/bn/firefox-116.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "6c0cc293180aafd4616789cb15e810220530e87d3e40646a88274a4a4b868920"; + sha256 = "221067f2f48985f302c1a20b0a7c0e7a2f9d3ad09e4b59b9cf93af4a39df591c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/br/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/br/firefox-116.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "14493fcac3a147bfaf31c8006131678904aa587389ba7d1349ce567be40ef46c"; + sha256 = "668cee2552f4d645bc92061e617184b801ceda90f6750a0713ed54955444add0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/bs/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/bs/firefox-116.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c3120522244a2ecb3eb0f3c35aea7f54e55bbee5f11caaa3cea1c496217122b3"; + sha256 = "a93be95fa0bc3611cfc44e1f3aebe923b98b77117fe9ac45fdfca2429e003616"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ca-valencia/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ca-valencia/firefox-116.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1d8f6a1b1511c4096e43ba6d49f4cb6ed1da6c399df2796f1cd4b7fd906d5d7f"; + sha256 = "85792291eb9fe516c511444630a5079421fdce76a8ebf9135bfb663dbafa9809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ca/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ca/firefox-116.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5f9862e85b3cf82d94f63aa0b69e0da202aa04db7d65020a38165a005ec891ea"; + sha256 = "283ca0073bc7f3e92862d0b7658dace4b82fbf5d9fa28ff0a0db589c27caba2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/cak/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/cak/firefox-116.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9bbc95a9d565a7b702d390dad8d559e6af0a3430226cdfa69f794d92bc1663c4"; + sha256 = "9c6eb2e5afe7b7d224e486c1614dafbb03c98418419df5d7cf52603fac86b1f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/cs/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/cs/firefox-116.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "57c12174db7ed92d74b656a0bffda46232eb0745839b0c0340e982e820c7d6e4"; + sha256 = "2a662ea061c338565ce7a41fb5129906fbfbefd211bc1478c8b5df2da31cd09b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/cy/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/cy/firefox-116.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "13046011508b3eddff5277ceb2eda99124a42f68e9f84b8cd9308dde4a0382bb"; + sha256 = "8ed1c5c290f15eee386cc50a4b55ba9e68195cced914830d0b5932dc5c360d70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/da/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/da/firefox-116.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7d6e13694aa921909a347a8fc3fbb39c4458d37b68bb3172f255d8e6022e458a"; + sha256 = "c7fb3d69577feb9ecf452561bca5acc48de0cfda3af9acd650eda02b0c42fab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/de/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/de/firefox-116.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3cc18f2396b90a51bc664b27620d624f68df8231bef397b5d7d7320d06d20e3b"; + sha256 = "a20d2e375059348e3132f68f9bf0adbc82d4a72555844c305a00952fd676461a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/dsb/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/dsb/firefox-116.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "132aa61d5e7315fa36f12c7b05b599526bd8860b4c53a6cee439a7cfef24a404"; + sha256 = "4ea38c4555ff2ec51c5fca580f907b3394de478fca190638163220c306d8a28b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/el/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/el/firefox-116.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7546666022300f1a5c302adac0e42600e9c81e1bb20d9e585f75dd9cf5de9f28"; + sha256 = "7bf38355cde909e73fd9e768bb434ac8e0cbd4c255630f883d7dbda727cd0c66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/en-CA/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/en-CA/firefox-116.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b0de5d07d411c341700b87c424f4b60f80f3dea1582fe232455bee78d1d87196"; + sha256 = "a642a2c33a8c2ae92b47799aefd20ee2131e63cc982264a93ac4428fc453abb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/en-GB/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/en-GB/firefox-116.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "990e2ce3a2e37b15c29e6fa94404f6a5dc228125c013e664284d21ecf871b19c"; + sha256 = "055f2b734363586c61561a57ecb476bd8f31b586ab5ecb77041c23fb1f13a15a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/en-US/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/en-US/firefox-116.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9e4fdf4f798df6a85c3f8e8b996f7998467ccc0f1a5d67ef8aadd27b6944ca0b"; + sha256 = "c689747d1dfa2b562f665ead7a82a5b399eb8f75b21aab11762f1093d90fea6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/eo/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/eo/firefox-116.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e824fc32bf53ef52a26363b8e56a2f6b1e0b9780214b0e6353aa35475f3393ae"; + sha256 = "035b78e5b5dc8202aa340d47a8922c1e2293eb297da9483df1ce482a46a707c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-AR/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-AR/firefox-116.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "85192f228e53ca814e8fb9f06a3756b9798e7a998be2770d0e52a8d959cdfbda"; + sha256 = "0017ae92eeab809311ded78ac062fa65f2a287f907823fe5c682d54418a4ef06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-CL/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-CL/firefox-116.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "bb186ff9d5715d81ffd573d76a4b17dd80d711633113a8ed3cde56eb7013779a"; + sha256 = "e30d470f0067f10e55c3b60d1c655fa3980cb1769f203f3b963944094f6c4786"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-ES/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-ES/firefox-116.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2e4912c8c3c997064f1b0e5a0b89f230366bf42bb0ab7b97ea7323d223463c3f"; + sha256 = "088d86a0a062e2090ef04253136e9f56afcbdc0cf50b69a9426add68ca2f7303"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/es-MX/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/es-MX/firefox-116.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e30aef804021cf070cf48ed3661d6822fa580b46f3171337deef461ce272644b"; + sha256 = "275c173dbf244a73a1007d4f1ce7a521fd6fd74315850911fc0119a938afa2ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/et/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/et/firefox-116.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fdefcd0764284f84df9167cd56d353cd9645fbbf206f06f6dfc2c0c3ac89f110"; + sha256 = "4667ed790999da65741eb458191152983a772e0a6c444591231e4b08d186c23d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/eu/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/eu/firefox-116.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e5d390ea3126ca3567ce19dc523575af8369d33a7e24bd6083f92a59e0d7336c"; + sha256 = "4bd83d219053b92a5fc33d2736f0e2a756cf71f497217d44bd86b2afeca6ae38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fa/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fa/firefox-116.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "1f8396309cb6f9969ba4612d00dcab1ddee9c8873d0fc69c8bb8527f88fdddda"; + sha256 = "069915d3dae6e9fa17ab1ea45d3333ee46026db80cc9e1bff576245c175e692e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ff/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ff/firefox-116.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b2f2eba85dece7a93409c9ab64699c5a090a64dd3306bd4f37cbe4f82cb8722f"; + sha256 = "e89f47a6dcde5a053b4cb7e345a8ad45383b89f270daf7e81c332a3c9d2e7c00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fi/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fi/firefox-116.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "42278f43094325831d7f554081d2913db2fe9a55e433d9e768383d8027bac56d"; + sha256 = "f37bf620ae7ebb6abe3aa372e4512fe5995d9ad9730b10f3e7e6c182d37b9017"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fr/firefox-116.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8e502f101012a049cdc657169c51895e3c6d055bc3332d638dcffc545bf07336"; + sha256 = "177d291f6696edc51672a70ef84747169ac5827cdbae15ee7d4540c95a607d2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fur/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fur/firefox-116.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "aea2b3f1fc397402ed1282e91170137757c61201c683401af04255551ffb91d3"; + sha256 = "d254b2d3eb99a1d4447b00cf74c2115703d997e8ea913d37353d84ac39b7ebd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/fy-NL/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/fy-NL/firefox-116.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2d2988cad321c0d19e801fb3c40268ab48973f491ec0eadd4a23b6f7e1a0a208"; + sha256 = "731e4708989bb25a8508672afcc249a4474a7eaa20f23be2e72b11f82ba32f91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ga-IE/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ga-IE/firefox-116.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ae28543b4e07225443706bde392f1b63b5a461ac47ed056b23316556d3c3d68d"; + sha256 = "66b5d0ea2c52c997b58fec04bb102598ba33dae1b5d4086e3a9db25b0e955d10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gd/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gd/firefox-116.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8d4e76b1b3d7398695042c44eac7d4db2dc40fb1d2da695bad571891030a6374"; + sha256 = "9b2452bf68f740323826ef420e09d211376b24aca2fe8375c69af18984e37ecb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gl/firefox-116.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "428bb7afa27e5ca9d998014288aa52a76076908f737d8949ae2835b24346865e"; + sha256 = "2b850b78a0c4ff25f600c15fceca0949dfecad1513be3f224649621b650ba4b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gn/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gn/firefox-116.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "effa04ae63a6f690614a7283d079c07d6b36b5db0ed1b329c33c59b9d3be1974"; + sha256 = "010c08f3e89a413acc09f4aa17e7324e6d02933cc76eb9c4283ce0ce3ec63838"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/gu-IN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/gu-IN/firefox-116.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3c5dd2ded0d043e24989c9f502a87f3df0956dfdd81e9715b84f49ffe3129be0"; + sha256 = "42472a5549c925eef91ead8c73172c5fc2b5171b93ae4e5f2177723c03f7b801"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/he/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/he/firefox-116.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4c7da88b859b0555c0c89c6d05e0f2e5bad4a79b0d5d6e3f702e14b6fc97f934"; + sha256 = "677a458b1233f7203f14825fe5cafdefa02f143264da45f63b8f6cf3f49158a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hi-IN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hi-IN/firefox-116.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6574f6f7a25573af9d2734e10869d32bb46e782ba2caf805818382eca794f568"; + sha256 = "10e74e64414f7c6c3800d30a77d1aabbff98e0b3e08a1620828979d6adcfcad1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hr/firefox-116.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5d476a4cdd1163d17a5a5c18bdf47e0d4b002bedc7aa7061c027a507ba5e6088"; + sha256 = "334ac4b63f9e1e41055adefb169c5a9b6117e54dfa665498fe03c3fcff6c8840"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hsb/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hsb/firefox-116.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6fe4bee14e063c905eec5de7001688477bebec8d20e0e7b9ea0e4c3722d1653d"; + sha256 = "12ddc0e9593068582edcdd60d75cb5a6bdf2050955a2c3c799021fc03d9615f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hu/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hu/firefox-116.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b68c14fbe0af354d9bb57a346b565405239bcad6ca45db243b8a99cf3bd06dcf"; + sha256 = "79d86bcbdcdc0f72fd0c2b53c14fa0455ec02b80039fcde1ee3238a1a26874b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/hy-AM/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/hy-AM/firefox-116.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "83594eb14bd0fd950e844379ac10909c4de8b1098ea087a76294779214e5be2a"; + sha256 = "e221de9758c8b124322b0ffd9b9bca39f69f3908a0135ebfb916cfb1dfb35bf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ia/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ia/firefox-116.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "4eae69bac6a0158d4bdf22b8f80c5748397ff9ecb49ec7c2a7d52bd5e85ffa2b"; + sha256 = "e7a2f9139228a529318040fe18084364c2610d5335e659ddc19cb48f4d2f223a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/id/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/id/firefox-116.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7431f1d88f53d837a10b0574381fbce14208f70ae3528e60d2b7bad7970db621"; + sha256 = "644e111edad13668c1c541bfaec46d4319a58420eb0d8f528a8247e39b859544"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/is/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/is/firefox-116.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f6ade01e395e1a4eb12a7e4dcc41e44e7c73e742b681cf1755b800b69d712c0b"; + sha256 = "11360ca9d9eae06323d9e73173791700cb981689d0bff68bf4095be709f110c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/it/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/it/firefox-116.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ae616c3898e15e778159dc9cd22773240573e13551a185aa4ab5a70bac5ca53a"; + sha256 = "c3afeee0d1edad4e80a377893ee9ca8c1f9c10d9c3b4db490e8dec29d0da5fe9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ja/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ja/firefox-116.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5189773aea731b8aa3d2df8b425048ef06d851a25de5d14c5dffbc08c506bdc4"; + sha256 = "4389b9eed95c22df1b3914184458d76daf5648ea681081412b4207864aaaae89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ka/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ka/firefox-116.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4b24a1051042ef2dbd0f8e036957ee4e19ba7dfe93fdea2110931d391d09bee5"; + sha256 = "d0cea36119a3840f9870ddbff2a6af3faed1826003ec4675cd522f049885d07b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/kab/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/kab/firefox-116.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ec6f553b9e80a03af6e61f4b154f72c40041fe36e7a0cdbef1da6975220923b8"; + sha256 = "0e62f892ffa423f342dc78af9e2ec950bcf86b4e4a954fa9b73cb39159be48d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/kk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/kk/firefox-116.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "031da024a01f366d7c94db5cc9dd0ce3642da97ae7e1dfed33259b965c31242b"; + sha256 = "2ec97db79fabda5ae1d345aabf494fb398cba1fd45d3198b94f8d48ce972d3da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/km/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/km/firefox-116.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "09cf778089949b552056cadc450224c7ef8ea3b612873999f43494e3b369db34"; + sha256 = "0e9192816ecb3f625b77063f5e0abb13a53057dfb91f179fef41d4fbfae42b30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/kn/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/kn/firefox-116.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8141f88f8ffb8a2bcbf044afaf95d8054f79ff3f059d863295c2ccc4595e1086"; + sha256 = "d1c08659b7d08d3cbf5c0b3c7be64ea98fbca50c3e222aeed311b15dfa5345f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ko/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ko/firefox-116.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "81522b564078d7a2a4fbc7d26811eace3da3a4d6eeb2eba2d8c1ec8959a7e924"; + sha256 = "51f948d0e2547ba1bbede5af396a60731f9170906410db612ed7585b8f0fb309"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/lij/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/lij/firefox-116.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "f58c4ebeb8382891958589c764a8f17258adfc29382b86b094b96a0989c8dc9e"; + sha256 = "e1926c02dfc7004057cc0d8a0ccd7eb7b9f66f330548253a056f515028758479"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/lt/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/lt/firefox-116.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "aa7d7c320a1465d7962e7dddb8b0e7faadb25225a7400bfcba2bea696037ff4b"; + sha256 = "6b3a0b932816785b0bd996b6242910f7874c9403bbd43780f02df60d6bd03a21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/lv/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/lv/firefox-116.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "90649d225591c53e9af212ad6d92d37d92d0e5f54ac3a487e26cd7912251c7d1"; + sha256 = "a731bc339e153279bf5440c86b583fca21d2e02431c2194a06824951dae52944"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/mk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/mk/firefox-116.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1dad410c2d113fabbc40bbdfb7d64da2e4b761af266c3cc9cbb2152dbf670acd"; + sha256 = "667a027b9aec063dee06375420894cd44dd6a6eaeb23c10c0d9dad6541c92507"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/mr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/mr/firefox-116.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "ca9e7638dcbc0c6f0f7f41d54f7931cdcf69528b68057246e73c96e895519748"; + sha256 = "89c80aec3222608800eea7806365a04b2cc43fc529bc708dc17c805caf21c430"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ms/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ms/firefox-116.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "14c3e2b97839b67ac28219b5dabb3258bce256b4bcac86a74c9815e190dfccc4"; + sha256 = "990cfb919ed9939aba6ed558d89598b1a8eea1d74fd56d428d06fefec8909a05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/my/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/my/firefox-116.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "cdca6003923ec46cfa6131d2020d246303798eefdd2483110520d4b57e447977"; + sha256 = "294cb3be64d7b43fc8d51d5d97800ea162cd39646da87605afc36a181ffaef6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/nb-NO/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/nb-NO/firefox-116.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2fa55b23539b4e5364282ebabe33b34b7e0c84969c4958e5d20a4d10ebe24234"; + sha256 = "5536ba0a3eeaa80cd54e11b12d44ae6ac7441630a35ab1ead75a0d0a5f6ce8c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ne-NP/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ne-NP/firefox-116.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ec70f3903e6aa138222ff12b8d92de9aefc85666f733dd0463ec606d3ba16c15"; + sha256 = "029672dda24ec01565e2b9fb40ffabf803575a4f9328d1fea70517248a928b38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/nl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/nl/firefox-116.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2faee4ec227a4884ebb0c7b06609f9dff4fee311755ebfad97c6bb48469b1893"; + sha256 = "5e68a5c46646a6aad221ec997bdd1e2ba837ba41010ee7121991def0ed4da22b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/nn-NO/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/nn-NO/firefox-116.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8be68d60ba7e66c1db3dcc18bd6a8a15b5097c529e733447d9a63b417d177832"; + sha256 = "77284b5caffa342e759e846252fd0598ff7a9fa86f79e0ab7b5f3a647253ef81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/oc/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/oc/firefox-116.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "405ed291a7c60c30731c5173041a71bb8b6b25a173058ab722eff70f6d090ce2"; + sha256 = "dfaacd8319b2f8065b8e1924ad5ec420790c43af243cd1403f969a4ad3e250fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pa-IN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pa-IN/firefox-116.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7f4a756e572883fde7c41f87dc9c28a592950bf2c2d42a9c4946a87989d12285"; + sha256 = "9f0a6eca2dd5a8389416463aff7a61c728389255a93cf928b110c112fc7b73a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pl/firefox-116.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "892e8881f945467765f7c09baaae864b5d9a553969aaaa2de3c71de577163660"; + sha256 = "a3ad36159a690f51d4a75f474d315ecf0be0fc2fc4be07fa579ea9c07f5d7dba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pt-BR/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pt-BR/firefox-116.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "47e64cd39361137bb2048a5cd14b037566abbaf343a49dc26292ccf9c878557a"; + sha256 = "8e9f2ee744da1585af9e2cd95ad7fb8429b8a969c9d73eb5353c4f752566ed17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/pt-PT/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/pt-PT/firefox-116.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "94d0213411632150934cc70adfb5f6592e59ca01a02427ef8bf589ff2d9cbe8f"; + sha256 = "a2c7e6ffec70b39d235d172aa6512fb571af2a874d9999f4f5e4551855e418d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/rm/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/rm/firefox-116.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c90d864f61269b7ab1b16b008063dbafaa72cfe6293fb36dd5728361597b5529"; + sha256 = "394b29f4f35775a6b701cb99960c41024b3379ad22b780e3dff841b8cdaaa4c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ro/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ro/firefox-116.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "213e3d58d40582f89698f02be2d0ce3b8e89f28c94e6aa85b5226e4ddf03fd62"; + sha256 = "fc7ef54c87bba2c698f62fe4af111b52b3a11368232bf354d41316f950e982ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ru/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ru/firefox-116.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5148cb7630e2d94151e4c4789e9a9afaf07a1549c48b4a118266d48e724a3869"; + sha256 = "6bf8f6870ca514d25eb309dc98f1807f18aba7cba9348d4d4043fdae7ddb2242"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sc/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sc/firefox-116.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "e5beeff5a45a97c3716956eb639e89ca8415b7c378202bac9bb8d3bf9cbcc0bf"; + sha256 = "a6892d7ed01d8333491dc3f96309838e02cbb4a4af6e2c46b12f9e1a487ea493"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sco/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sco/firefox-116.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "68bee3df088b3529aac46e8a4abeb5446dba9c8d60f850b984bcd7ce82eb66ad"; + sha256 = "8dc34d7b8c42eac485db88f88522d1c900562be0ec504132a77de7a9005dc0da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/si/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/si/firefox-116.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8b0ac50083decdffff58f619905e48b1a32d1a2f3c3d8dc5a0055c2fcbcf4247"; + sha256 = "f3d7fb18dc07e1dcb6e15646bd6e878d4ab9d856ce5186b04cff14f990c98316"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sk/firefox-116.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7d04acb8d2279472d9bcdbf500c5c468e807ce126397a7d313de6cea3b4607d3"; + sha256 = "33be656e28f7fd3f841b8c627e1bb76c2defd8c24456ac8c151b56c2e87bdc4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sl/firefox-116.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "56d6fdb0157f5aed3dfaa10e1efff1cf5417bf4e6e5377752678ba05be33f30b"; + sha256 = "e6a639a07ba1313df86b304495c9d945335f8a81ff00369f59ea4d393b8f3927"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/son/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/son/firefox-116.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ecbd99bfbd6776fb188c184e4fd570053bd2bd89186719eec4eb9d2e2966718f"; + sha256 = "33c6d2bd9071a4f60112a216e103717140e7eeb98610801977e28dcc442f6375"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sq/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sq/firefox-116.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f1cf0ec8220118d4a0c069fb63afd17790ca6a49929c6dba38189e4a5ee32cd5"; + sha256 = "8fc1aba927ac52469172e11f39209775e495e68a381dbaed9c8fc1b6635e77db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sr/firefox-116.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "794ca6b7e566325c46d9950ec8942ecbe08f51d7f30fd3f492c89660e2e7fc49"; + sha256 = "b2ae7b024e374f76879ef265239d184dcc06b35bd858fb3fb3773224bf076dfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/sv-SE/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/sv-SE/firefox-116.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "304fadd1706fb146553f9d9989a55fe6031f187310e40c5944dc68a0e41b1f3c"; + sha256 = "3247e74993817f0f2b9d8e687470bd7fa82a62bd4f74a43ca013f86c6ce1d70f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/szl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/szl/firefox-116.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "33cb4cb57a76fbd8e199ed3bb5fe97dbd48a71335370687d860503f730feaaad"; + sha256 = "bfb29ed24ead573e012fc052747aaf441ad7674fa4b76a15d8872d21741cf747"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ta/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ta/firefox-116.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "021fd6a6a235934faf6b167c4850ad36b55234e8748e48ccc401b7353f05624a"; + sha256 = "e5ddde0bfc7e3ba9b1f426f3dfae2994c5dac638be5437219815579dd68771b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/te/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/te/firefox-116.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "5a5071f9658c7815234c69b39f26e5a841fe8d6a5eb38c76dc0738537baacab0"; + sha256 = "6168da2cff453f171f6c9e056b1404b0e655dc0755ac89a1d4cbeff6557c2c42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/tg/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/tg/firefox-116.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "01c5e8438f1952ec497b7abfef38cdb11af6b08f2b28bdbe8d3332754c4934ab"; + sha256 = "77a07610b3bf87b4a79ab9947d60ba74c176df62ff531eba6d9a3fc0d7052011"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/th/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/th/firefox-116.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f31928d3326f0bf7c527fdb3377abdf7dda3bf829a1749c6977ff7c75c966141"; + sha256 = "ff736c6f62aa6c383196640c146a702b27ff97719980da36d28b125236a1c4d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/tl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/tl/firefox-116.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "11eaa8fbc495b3d9e5d33f4d02924160a2afa9e1ad53204b19c712b1e14614bb"; + sha256 = "998641b7fd1667850b79bca0d047389963768a0b0d7b021092cdcbc6c2c64d5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/tr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/tr/firefox-116.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "dbdfa6db945dc0e6459c27108486bbe664c3590cfcfea1c214da69a9ae0039c7"; + sha256 = "40e634567d96de2bd92e2ee29cdab988682a7e3ad6fb6cebe54b4ab437206ce9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/trs/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/trs/firefox-116.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "721af229f401c0b0ba06e2541a2979022b22eb0b6529b93209dee6be3d7206e9"; + sha256 = "5f53ed35784ed51a1e45cad719c2c132500c15d7351e961ff5e6701bcc78ef1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/uk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/uk/firefox-116.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "708e0bef8c2a83a06a760ee87f042bf42adac1bcc8ef47bc7a9a927b1db77738"; + sha256 = "1a3948ef2f7b205eb4a46be098ecaf8e36fbe909e292f5f7dc14ecf58b2e949d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/ur/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/ur/firefox-116.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a5d20dfdb211d1aa255dfd96d7fc4e76365c37dd0e9d0a239b27ed1fe70fca28"; + sha256 = "dc144ff4c139f57e5961cc8b224cb3e7e0d977a93471fae9137f17532afa5229"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/uz/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/uz/firefox-116.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "90a7e516882da1950f71d103efea4d4fc8c00e48f762d6643fb16ba0c94dd665"; + sha256 = "67bad242f01f97a1c593935c150cd4b46e6d91d6f29cf2ab7dc00341828ae7de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/vi/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/vi/firefox-116.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e3d01678239d31232e661cdaf078dd48d363a7853fc8012794b774d907abccb3"; + sha256 = "7e1522df37328c39941fcf5c005aa86458243747863151557cee090a2fd5b118"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xh/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xh/firefox-116.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d010cc1a09b9b4d55e56f87b8c29750b2edad38e447eba2b7f45df580e86ceaf"; + sha256 = "07727195ac9aaa89bcc81d2225cfde5c01f50957be040a16650987a48ce1f172"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/zh-CN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/zh-CN/firefox-116.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5b2d5d47449ad63624a8259a5142d92380eb18bc3276d637f8d7642c36d8d3f8"; + sha256 = "ce7f45abebfc69594836a03ab1caf960b39ed64aefc33090a07f687f613f0d3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/zh-TW/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/zh-TW/firefox-116.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "76a398f30834014992d8f803089285aca64a95a8f7b155686258af71137fe73e"; + sha256 = "1c0fe6b916b9953fa929a42f99177e2072fb8085856527d54f84aa7c42f6a088"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ach/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ach/firefox-116.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "e59ad1d2aa11bd75578d6eb52ca45ac580607f5bb0feed0f13ca93a17a15df75"; + sha256 = "b126cded350e4a06f34123da79d71687b4299abe829a35d6258bd41b66db9daa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/af/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/af/firefox-116.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a3315eeec8d4bb632d5961d4ff01bb1947d51df91aa1a42c5f84da011643c49e"; + sha256 = "dbe582443a9be366833f0c6a325ef0de50ca268d269acc59ddf26fc551d08441"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/an/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/an/firefox-116.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ab8ba05987c079122f71c08a3f5e02c40e576ff48a0cd63632b4eb7c29ffa274"; + sha256 = "bbeea98cbb3059373c37d407bf3b5ae2be39422771a54d98e7cf86e81514d0af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ar/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ar/firefox-116.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "36ab94565b865944bd9682ad96522367995f02c30c897a47765224f8aa8944eb"; + sha256 = "73916a69dee407700ef9318c3fcdb41528b7357ed48aa485ad8f2fe3e6744f16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ast/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ast/firefox-116.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1f83036e15fc7441199a8da4767c6a57d00264781cb771c1cb2b7048d2b90d33"; + sha256 = "4b60c751c6fa4bc9c805472ed8106e96fdd0b1cebd34573c8dac5a2002c60be9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/az/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/az/firefox-116.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "40fcff40316def0e74f97ff5e056fe78ee8e4aed3c40d902db8208d6724ac039"; + sha256 = "6d29b511b45885d63bf90f460fd2e3477c7256d895f77f4f1a6d8d9dc1615db5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/be/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/be/firefox-116.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d0cb66e4794b7c0ab52c5a92c130ebdc973a2a8e21cb54117388c937b9c0d0d7"; + sha256 = "d61ef5e3c54dbab254c2119ab523a20e10fe3fa90ff1d28fb3ca276a70e88573"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/bg/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/bg/firefox-116.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ba38a8d22cf25a1f42121d6f7cce05e6e45c4852a149e23016493a29e2da4a37"; + sha256 = "f9511754b2f225335d6fb11683e6a38557e2d490f86b59bd04992e94f0f5140e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/bn/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/bn/firefox-116.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8a88a8f45b45f0863759abd7e67a67cb6ab61013e7edf1557760b5e1c093a123"; + sha256 = "aaeef05084c67d31edf00bed8c382c02259c2126923fead97a21b54aa1336a6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/br/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/br/firefox-116.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "16956cb450c39614cebaf1674a85030858531dc40103b6ca73fe8be6d53123b5"; + sha256 = "bdf17c9efab7a3abdfc03d7916d9ffb059990528741db9c4fbd8d78a13650de1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/bs/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/bs/firefox-116.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "aacab86198a01c44cf302d31fced8754367be7db9457536b623b7a8c5c211233"; + sha256 = "3b54b2f8bc8872adef6d831874fb34ab3ccaddd7fc840585847ff7d755879c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ca-valencia/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ca-valencia/firefox-116.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "5947b3eeac086164555944f6b922189c55ae81fd012d58178ebb556337be83b5"; + sha256 = "5c77b600a34d4be2c57ac233662e3a1040d25774c07150e2969bca7cbe0ca25a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ca/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ca/firefox-116.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "269214867961d84ba78c05a11d43e01fcde296e29630be04c267c8cddc23b66a"; + sha256 = "a61d5f4c256301606a5d4ad8e6d78c7199daeb7a176fb8c47565f76179edd82f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/cak/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/cak/firefox-116.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1605994703e21caa768f66b436dc1703a55e09c8562ccdf7ef0c3a19fb3c15ed"; + sha256 = "6629ac7c563b28887f4b1a14edda03ffcd692a37add09e087f729027c5d712dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/cs/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/cs/firefox-116.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a527aad3e4d2821e35878157ad542f013fb7ddfae943c89ed74a1460b7ba7a48"; + sha256 = "b26584cb0fdb20bf6684682c6d43e2eb1efc7bc693749f7900ecd30161aec46f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/cy/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/cy/firefox-116.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c9b47f9a986105a11dd9f886a71d8182f811f1b54a2c7f68a53851fc536421b0"; + sha256 = "9b2721bcfe203f61a357d4c3ff1ea8985bc198a760132eca9f39089bc39990cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/da/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/da/firefox-116.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9d3cd3771bc4c639258905a2f47e315aaccf97bccc8c8e23bb749914a9545585"; + sha256 = "d17a776bf76ee1ab867deac9d26d60f3f6c3fabba627c971202f858ea505750d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/de/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/de/firefox-116.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b363031e84a09501e1bf594b7d71866ed9f4eb9cdb71986dcfa8c9bd3c73719b"; + sha256 = "161d86b84c03193f946e68b961220c5861861695002b8c25b84e82aba22f639b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/dsb/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/dsb/firefox-116.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "54670cb6af892d41e712ca947c5ab9e3e317cd747902f8654848e2fc72aec0ce"; + sha256 = "662c7dc86f45a743f70225d0b6bf80e360ef25df9ab41f474a1cea6f8cbfc604"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/el/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/el/firefox-116.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e2f0738dd5992c8c090ce4d8b822ac12fd5422121e83b530dac3530fc28cab0a"; + sha256 = "ee047283cc8ff68b60c83941681ee5fb8a0497ae9e75f23ddca8616c57bfd103"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/en-CA/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/en-CA/firefox-116.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "25120bdb06ab08273691368fb9d5716616106b2d16141ec4943a5dcc3286d193"; + sha256 = "38cbac9b43901fe44b073a6bb0444dad49ad673e3d8a23f345f68171295c3fa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/en-GB/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/en-GB/firefox-116.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "9b179858f6e9d9ca64fc37913874b1804f0e9b5d31d315b9e3fda544cc23bc83"; + sha256 = "74f6951f343f33a92ec69b21281d53ad2c6943eb1c4a2cecd48c97dad68af3df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/en-US/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/en-US/firefox-116.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8c67eedce5a3718dbf0db0c923fbdad496ce9a01b85a8391a0d4c0ca5823b26b"; + sha256 = "3d97e23cd7ef89cc3a393a4e0d4cfe4d76658557465ba8dba7be4671cd874257"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/eo/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/eo/firefox-116.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c574d5def88dccb4a380ecb3e9ebad6d38e8c9f2800058e9c1250c7cacb39d10"; + sha256 = "e0aa9118c2bf4a375b0ee7fd4dba620a07aa21c93d555f02c5fa35ba8a906791"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-AR/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-AR/firefox-116.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "313c28be7bb6a010230660538ffebd27ba15bd2abe8e431e534932bc76edfd3f"; + sha256 = "5bdd8cfd4f6b06c89a9530206b39c9c3896ed20ed16f2340f92d874f0f4c8c08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-CL/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-CL/firefox-116.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "79180412d5d8a59ce8f0062ee99aaaec12201abbb87046e16c11c024d03541fd"; + sha256 = "793f2c9b733849c567c6ca920230ab2b6f54c8913def829267007d0fd371ae72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-ES/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-ES/firefox-116.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "ea5cd5fc613c70448165ab403f8a452f99e141c7eb4fbfb682258ed8027555df"; + sha256 = "f314606efbb5874dc04e721a231649d7f2257abed6f6f3fcf50829817de3b5f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/es-MX/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/es-MX/firefox-116.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "40166caeecd8da26e8b3e6f4b18ca71b1791d1581c5848344561cfc8cd3b4236"; + sha256 = "31eb01a4982db142789a19d6adeac1f056c214158d3bb2e420c7754bb8776b07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/et/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/et/firefox-116.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "46a1340a46d50ae632682e6b451ce8b041937b05804f1106f67f369d9328c257"; + sha256 = "d799f76e43522ce3c9ec79603d5b8a33dfdcfcbc06b414f40aeee244ed62a7c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/eu/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/eu/firefox-116.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ae4d7ae11cc20d7af611c86a68b5ec3ac533a798861c2237f5234ca655c97916"; + sha256 = "9be4f2530108385b58e92bfd44c122c0c5a16653715051d2b71bdcd9f06b0778"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fa/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fa/firefox-116.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b14661b217c6c8e4f75c54c99712f30f71d6c0da1fb644bef462ef0ced3eb988"; + sha256 = "2f508958c449f4ee51ae95b223f1dda10ae51395e4c84663e39ccc19de2afe44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ff/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ff/firefox-116.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "29c1be0ab22fc99701420aedf6c3aabf46533b05d9d500f29872bc330445651a"; + sha256 = "72cf4196294f0e94b81b9c0634dd91987cc671c81dca12a4156caef4a73da7b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fi/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fi/firefox-116.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "45291bb40214e258293c8b09bd471d48e7ab85c33a6edba988235a4d1c565a87"; + sha256 = "0289e419019d1091ca2d60cb34babc24ac6ddc374b6d8c6d48c7301cc6aa0abe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fr/firefox-116.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6f0087e682cd7eded088c50ba74ce3d92c76fcd0efb0dbe3ec8bfd028448c257"; + sha256 = "242c01c05c7206ed60126b07b1d98f6e93af0cf43386e9db5d40bd22578f3bbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fur/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fur/firefox-116.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "a8ed142548916cdf3d16937c965836ec91545d08104767e885ff86609c215032"; + sha256 = "731dc68715afad1c2dbd4dd5b6d9dcc3f15203411548f3e96de0f5280dd77607"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/fy-NL/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/fy-NL/firefox-116.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "a9674ccd45f86155524b6ebd03521901be7b5d1651a2c9561c03052358a76259"; + sha256 = "fafdb4742dc844a66ee269b5fe4745a7069764d33772932001ef724b013c4392"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ga-IE/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ga-IE/firefox-116.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e9e8fba8a138909956ca10c8c13a22a43ad56331fb46edd77ef534bd8850ebae"; + sha256 = "f875d5c148f98498a2866a35384632b3f56f7af589ca66f5a0264fbb06e9428c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gd/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gd/firefox-116.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "66747bc30fd19d4d64156c7d4227e0d89d53f661868bf15666c5b6f347e5fe06"; + sha256 = "11c3bbcfd0e6f442b4c78846aa637412bb55b927b08f59837ec8f2bb97bc5b32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gl/firefox-116.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "eff745aecc2db4bf0fb3ab39c1bc92a097c927f2c4b58784e01712d2347a9c17"; + sha256 = "ea40980858d2ed594a98f6565ad89b129bc2c4d46e2149172bb0f51df659d4da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gn/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gn/firefox-116.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "94c113ab79716a7b6d3d2ae1170c84d234022f222f95a13dda1858cdf5825eea"; + sha256 = "0dd9fb270d3e95bc28bb1bca82272869570ec958927b049d717e9c5a9a9a193f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/gu-IN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/gu-IN/firefox-116.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "accacf11527107f0de50c46d5def7ba03f876a5da8a45219f7bfaae5f54bc6fe"; + sha256 = "f532fd824fd6bf0d7622e36a6ba39b546579c2afac764bedb4e919be4589c486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/he/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/he/firefox-116.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2f5ff9c7de5c025f31b6c4facb576b6acdf23c6a7121ae2302c5ff5b119a7341"; + sha256 = "898a7f44222aa6771c11bd23c6f23b7b001ad299a4b665a4c82b1fdd08275b5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hi-IN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hi-IN/firefox-116.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9fce9758b7045cfd49b45ba6ff21a7e80932a8efac8889f96b02830b10503874"; + sha256 = "2557dfda455bd0b9ca2a2ed27886e2786450fc4afddc7139e74204e677881569"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hr/firefox-116.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "57895c5b7affbae25eb5afbabe43a373e2a63260a78e6978694120339da825c1"; + sha256 = "41202b179ec34e20b29ae9fb592881c9514242f73d2826751da04a876d48fb88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hsb/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hsb/firefox-116.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "3df5f03b68b84418d0bca05fd7dc4ec20c4f25fe97cff5eacbc147e96e07e809"; + sha256 = "9ddd5b992c2b85105fb507fbc85d9b9003b23bff4e1533c4a964d1ac682eb91b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hu/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hu/firefox-116.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e2bbb73a37d853d2d2586b10b967086af6e9bbbd102527df1c598322a0e11efb"; + sha256 = "3003ec7f6aea0ac381ffaafbdcda53b66153e62651c1f33123162a78a567de42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/hy-AM/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/hy-AM/firefox-116.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b4ed9d9aa49c49bd3b5fa4594f838066a6ea49544f190fc3d14aab2f87e3a069"; + sha256 = "1df38bc677895c3040ee8f9a6a0ffa4bafd5d513a7a731452223c2cf08ecbd63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ia/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ia/firefox-116.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "89ae5729f02ed650a4f7c631afe8b707a1bb8ff61b513e71f557c8802612172f"; + sha256 = "03a3f41f74f4c0a72cec369de157b70427d5739daae1662cfe2c99fba586b4aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/id/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/id/firefox-116.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8dcb5d802648821da3f57703b6c9d05ea88935d9b540713190e8a98ec1989b4c"; + sha256 = "3c467edcb2bb7351e2ab95c7c4abbd1cb488cd99e3277bfe4b68d4f9d71d7832"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/is/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/is/firefox-116.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "541e2a5d22c80d16bbcae6d0908a6f0879cada842466f2cd5435e85fa0b76c4a"; + sha256 = "7c831648d0c9d702876ad9de4c470d64d23650c7cd822dd94656dfe098f62a50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/it/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/it/firefox-116.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f4c14eda917afc1529150eabcfec2646d1a6930c2d7e1ef28f9cc720bd4adca6"; + sha256 = "aacfc7503696f4f028bdef91720c67b2b35fef4422172bfdda745db076f102bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ja/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ja/firefox-116.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0f618a4f0446d68fd308be515e9d3bdd892fb6a44760172ed2ee5096a8b29906"; + sha256 = "72bbbf9c77817648b88ce65702f3c399a80c62fed4bd54ad4a97676015a1b06b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ka/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ka/firefox-116.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "89b42f36359f0abe302874b78d4f8f16d31dbb24f0180061f06b61034f8f675a"; + sha256 = "61c93af6cc729cf4cea2a62cdf379b22903fb9876fb7f6357c4aff084d6bb9c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/kab/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/kab/firefox-116.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "110ad6ebcbd40031af44a955a639aa1772ade4302d4fc6e128f4ecb45044767d"; + sha256 = "43df4b9ddd7e7e58cd2de8bcf0e612dc489c0e172667a6b2d1931d7e4341eb4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/kk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/kk/firefox-116.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "73c9be7ad237e2dfc56f779ace46262c4ada1a5ad82bfeb3b66532dc54f919fb"; + sha256 = "47898f9fe1b17a424733cc5eec1cb48a1b2de198d3c272f2aed8be05342ee74c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/km/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/km/firefox-116.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f4181188d02d583e28195f05dd662752b0da01c8dc3a9c4190caadcb213c8f1e"; + sha256 = "9f21abc634e60797e5869dbbc3a3f0efab58de05a8a7e51748d7d879361b1b49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/kn/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/kn/firefox-116.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f91edfa2a38100f0a0eb4a9ee461fb06c88d6eef57ef8e2dfc13a1060e2b6859"; + sha256 = "16e038a5d4941da4627d843435abd3e6e5478a6f69dc041de8e3a35657c82b24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ko/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ko/firefox-116.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d1537c34512065a33e0a4f720363652a2cbf4d4c84b10dba64d64e56b5b445d2"; + sha256 = "9d77cb5d87ce74e63b71946662be2f22dfbd348750eb6034309fc8a651957cbb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/lij/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/lij/firefox-116.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "0908a41031180d9f5dde1056f49b3d5479fb4bec43b6c9fbed8670ce779fa1d9"; + sha256 = "d13c0cb9b389e97d295dd8584ccb9097eb3d8dd36a0bf2413a99ae2ba21574c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/lt/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/lt/firefox-116.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "01b0b9f95e07bcc8868eaa1e3bd0b5822897490832d27453430ce07bb84c030b"; + sha256 = "941977d136f650c43ba1abd7a91ef4e2a30ecba312b32c2be15a70bb29e88f72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/lv/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/lv/firefox-116.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6434bd6669772a9332b9790e1a7f108c5e7d3676ac9711a06b7c3f92e37667f8"; + sha256 = "8b6c66e6c407094b2e9734c4d5c68c913e0c765938537f1a7380d2d2686d6a72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/mk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/mk/firefox-116.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0ebe5d9a101780e2d674ead35e7e02f78b4a4f2f17f3838cffaf64b1c8dd760e"; + sha256 = "a415aad48d4bb948d908f29675865b0aea98f0382871f98f2e021d290ea41383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/mr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/mr/firefox-116.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5854a21f094b5e5b768acbf3173adfcb05be007e91a3f26187ef15e28a55344b"; + sha256 = "217527cd028640dd698289c0363bd9e54731925de83480320b62e34fdbf6fc6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ms/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ms/firefox-116.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "de7a7d13471ed218cb56300e033849a121e8e3247980f20f403848376ba7e313"; + sha256 = "ed1c8e9d1a7f5e9d1cdfa64dfd5308fbcf659ee873e11f1011ffe7ad68eb68ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/my/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/my/firefox-116.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "e6f3b5993ee26d3e13acda0842250cb1df66c54855fa2706567cb0ebe6dff57e"; + sha256 = "b8ffef2f300ef5b3c4d579d18a1432aa2ff827dcd77bf1c0af2fc51428cf109d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/nb-NO/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/nb-NO/firefox-116.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2f4bdaf1cfd70099bc0061b12e0d571f727ea342b835cd6ce4ce18c7752109f8"; + sha256 = "5b2275d6bc84e0d5d44d8d1225d25a548712e39398b2d95d2b61235798b4d3a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ne-NP/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ne-NP/firefox-116.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "c958d4e7b0ec0efa2c9b6014db33c5e0c07956a25da8aba3e0d5fd06600b7317"; + sha256 = "ce93aaa6181af54c9187861145947b157a7073f5f85300de5cc815dcda91ca23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/nl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/nl/firefox-116.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ed2cf184d2092a08c10638328efd47cce0870615ccfae9fe2ea01b1ad95943bc"; + sha256 = "44fb66a3951c4d2d2185cac2bae68de9f8c33fbf51b755efb8eb8e65c8244e8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/nn-NO/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/nn-NO/firefox-116.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "53f61eea19c64781aef5484318f4f003a59543d9df25686f920b22e855eaac45"; + sha256 = "1f193335190eb2ec6197ebf40026e687f6572c49371dd9ad8f7c3ac5b4d044dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/oc/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/oc/firefox-116.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "486c724bb71666a18f73265f844a9b1480f1ed3e4b7cf850624a3800262c0896"; + sha256 = "af449593909a84a0bf75e3bbca2d5764e791f34d4e0e155b8163d02e95bdbe61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pa-IN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pa-IN/firefox-116.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "7f49438ed94a0470e9d4dc5c0ab6abe123f50e9a84857e803d399b2dd44e4b17"; + sha256 = "e0b6a81f200ab2481e0ee6b1a2c711e2494956ae0a1e48746f91a71e3948c521"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pl/firefox-116.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e61176b20af0cfda2cfd9dbeefb5a7107b9b00d8d93095f3dba5cf966ab37f66"; + sha256 = "fd7c475d0a9b1bd5d02fa2ac25c3a05805f69fdcbf583a09ab1c62a3f3c91ca4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pt-BR/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pt-BR/firefox-116.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9bbf433714d068835eb2191f967cd57ee6eaf00b8884c75bcb1b103b018c8482"; + sha256 = "552449ab9b20abb2bcaaf91d0bb1e20b2bc9fe87b4b0aea7a91b4204adae8a96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/pt-PT/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/pt-PT/firefox-116.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "330fcfbab5e5639d678e6b3587fc284685e75a20aba3b94172227060cfc5d652"; + sha256 = "bfdc36e8c4e88fc059cb60745dfd362f722fea9f7f36ce8c9ae59c098a0001b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/rm/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/rm/firefox-116.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c955e19cce4d468f16cc6f19dc462ec4b2bfc75331caf3ee64a105c18c549269"; + sha256 = "23bf9dcf37362d0fed86ad66c549c7fb316173248d9d21b2305d7ad74e65bf34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ro/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ro/firefox-116.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "05b1ff4f0474755672fbea5c4ad217c5d4a382e7d96ac4595bffaefdd831f0f5"; + sha256 = "c3d5de62719dc8a730cc14c46af8d595aff72660ec053c5b982d7d245db2f235"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ru/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ru/firefox-116.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f12964c16dd0caab6056dc134e760de11b2fae6d2c144570f4d4f81516a90bbd"; + sha256 = "5a9e4c850f9bb93d2f97004590f4da1ded42031f3212413ce5a419491e5a421e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sc/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sc/firefox-116.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "459cd663389eb7ffcc849f5f7dcfaed6674ab8426b15772bcc1981b764c8fffa"; + sha256 = "c2ebc9d0d3c7364de45ced4960a0a019a649a7591cc87fad570e38426c7660c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sco/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sco/firefox-116.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "ac310430b58a396f0df8bc49d92acb7343a4dd1b44c8b722577af7baec604acb"; + sha256 = "90cdf54c7c693cf50f47224dc6a91502bbcf7a613e9faea18d3a0b0a1a55a836"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/si/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/si/firefox-116.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "63350129c87bdafef37c627fb2a7f9ee300042cbbb754d211943a89e4a928edb"; + sha256 = "fe27c606dbd5cf843d449b23107811c1cc900d93926502d152804476559fc061"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sk/firefox-116.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5b12dbfdea4792fc1753d6719f1da10886e039ec56f0cd6c5a17b384958aeb19"; + sha256 = "70241a490bda80acda364de47ed926307e2bd79b183fdec0c7288168b5f35da4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sl/firefox-116.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "a086751406db10084ffc4b1a65bdca00bcabe9d31c6ac6060a0ec9a10be2d03e"; + sha256 = "3d5e2c53238f9c97ee3f6f7a57ea2fcb4c6b24d872ef5af7c88b5df1a974c68a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/son/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/son/firefox-116.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "23b78776d174b7ad5b7a2385ffbafa3e2727d799ce53b60287fdfd6d8bc2ad03"; + sha256 = "ee6449b80616c9fc2650ed47a9474de9f0cf9857973a82945f07c8f053548ce4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sq/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sq/firefox-116.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d1f23ac8a7879b142aed1c503f1edd9014a095fe34c6d2c321468ab6eff965a6"; + sha256 = "9304539492ce794f84f1d95f693c10235c0b87ed412d4dc22a307190fb68c212"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sr/firefox-116.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2c2900763e39b3fc2322431a782361090ee171b08476b972ebdafb669acd4f8e"; + sha256 = "2be7297624ef34ac0942c1af82701817691457de0ebac4354d2df649d4d69baa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/sv-SE/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/sv-SE/firefox-116.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "31a6ff5390b5522981601e3770a9181642fef490960e2f2ad462d0be021bac9b"; + sha256 = "42a9372113e8ff5edb79f52868dd5fb0ff0f6810a1764c143020ddc4e5885530"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/szl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/szl/firefox-116.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "2377483264bf279c24a01cf883fbea79c78c0150f8c4cfd6da762bc7fd4f7014"; + sha256 = "f699ec97ef95958cfc65191a95b3296618e39eedec9078e8ca28a1a4618ea4d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ta/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ta/firefox-116.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "d1bce010ccd6512d315014f36fe69c5272804716f62bd47d50ced4902c6b2d1d"; + sha256 = "eeb24dd7277660b0903124eb59e14fb69a3fa04f5d9030908de27bba137ff4a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/te/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/te/firefox-116.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "2fe7d6bd5f5341bb3b7a13716ab328736fa3788423d2e226e5a55d1bd1c8f324"; + sha256 = "627a55d9a260edbd71b0753b5dd878a8018e377e26a7825b035fe1d1e041f152"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/tg/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/tg/firefox-116.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "b0ad430e95ae9bc93047fb3f307a298fb72b7a0a92e907f3d2e756bb191559e1"; + sha256 = "51036c3e0107e401db38830171b02ed38b490341426baa9b648689d3108a0e7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/th/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/th/firefox-116.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6de013658d343173c0387ea31cbd13a13283b94c610d8da045ec132a58a00c55"; + sha256 = "07f248626ba69c176c28d0b3cd8412d02590db4bad799b4eed6f89551b46bb50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/tl/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/tl/firefox-116.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e61c21f5dd1b501850ad5fa7e4fc78ff2d6e8204e59641a9def848fb2d0e1db0"; + sha256 = "eae41e5cf45449ad4aa639869ad0ec7c5abe8aab6030bd3c914e19cf37c22904"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/tr/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/tr/firefox-116.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "dcbe3eb837e43d9c11883e2bbf4402703e7e18bf5bfc80de5e6a3b05439ea09a"; + sha256 = "0c3527d182e5033d7767400ac85fc97d1f13f3c858ca6302ef167158338fb0c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/trs/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/trs/firefox-116.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f762bf0c20350079ac9fa8e79fa8711eeae6d8c1cd47d628622b213739ca963b"; + sha256 = "7c4cec572dabdceae08dde4f23dbe13d8fad56b32672219ce2e7cf2e04336b2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/uk/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/uk/firefox-116.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "bda43112d1fcde83e319918c5bfcd8d3e7c087b03a995f5657f0b216b90b3580"; + sha256 = "430c38e381d3dc120716cba77b561ef0707adc8547159719c285b216a0573770"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/ur/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/ur/firefox-116.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "41bbb5805aea4234a82cf7366768d36c572e87cc6a82e289e13cbb8702a0349b"; + sha256 = "796f802b79e4a69581d2eedc0936e7921a8cd307c816075cd59db7b3b52b899c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/uz/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/uz/firefox-116.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "410d410e506c6d924ec556e9dbab1fde140c72761613cee028077c316b01e1ae"; + sha256 = "772260d25afca78633c06cbc931b4356d2dcb0528a95665aae533a9bc3c55833"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/vi/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/vi/firefox-116.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "32d494eb804d88fa7fe0192eca9c6138f3fe6310398342f66e4c739811dd1a3c"; + sha256 = "5fd11545971f8aae762fb372a25f4b30d21f84acbeab1086d75f5696d96b10bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/xh/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/xh/firefox-116.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "e8e919beb4440cf96b5d9656d0e2c9fc2fee66aa0c0fc5aa87fedff4b723eb4e"; + sha256 = "24fc569b9519e902cc570af9f74ff532a680cebc8abd1c151d8f8165c681dc92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/zh-CN/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/zh-CN/firefox-116.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "79226a3ec389275f85c5d586e53181b6db09813231026b31dcbc41f5ae1f10c2"; + sha256 = "f0e7fcbf14e0a9f5281a5bdcc4f9fe82708b6211b09f1db22f036e770f0de713"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/zh-TW/firefox-115.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/zh-TW/firefox-116.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "23db05c309c9753c4b48e027f6c7b4978f102a0226197d11254e703db25ea6e0"; + sha256 = "931c833b5cffc510b96eeeb356ad8599e0478d2b2b485dd553c4b6656bce23ab"; } ]; } 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 348c93d0c3..753e1c9d59 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -187,7 +187,6 @@ let # These values are exposed through telemetry "app.distributor" = "nixos"; "app.distributor.channel" = "nixpkgs"; - "app.partner.nixos" = "nixos"; }; }); 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 27f3ec022c..7b839cdfcb 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 = "115.0.2"; + version = "116.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b"; + sha512 = "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d"; }; meta = { @@ -20,6 +20,7 @@ # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox ]; updateScript = callPackage ./update.nix { @@ -29,11 +30,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "116.0b3"; + version = "116.0b8"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6ba3b57750335fa2067669756d69a05e23c1641e9fe892f9ffc879c17bd5a836815f97c90277d6dc1fe1a68173652bcbb544540ce21a9c37892fad70987e8d39"; + sha512 = "5e34b3eed2ee54de4209af85be80f240c674d22ace072fba5e4cf14a7d733edc0cfd0feafc80b23898ef8c43e5e950b5e683f536d84f12a8a7fcee0120479701"; }; meta = { @@ -46,6 +47,7 @@ # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox-beta ]; updateScript = callPackage ./update.nix { @@ -56,12 +58,12 @@ firefox-devedition = (buildMozillaMach rec { pname = "firefox-devedition"; - version = "116.0b3"; + version = "116.0b8"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "61b07bc9a706af8e947a0f206edb219650f8d64da5db821ca115375e379a11e4623dfe4e5b8734d0992e048ad8017152f8540e921105c3a266ad9347ef7b88e9"; + sha512 = "06ae0998a537a464a85cf9767555eb1b9d1378345201c9df760cb8ca856fcce61d84ca8398450b80175e9d13e6077df3c5fee9d4781d0879490d30bc6d362a0d"; }; meta = { @@ -74,6 +76,7 @@ # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "firefox"; }; tests = [ nixosTests.firefox-devedition ]; updateScript = callPackage ./update.nix { @@ -87,11 +90,11 @@ firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.13.0esr"; + version = "102.14.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "745f4a77e4c898313f11118274d27513f4baa16bb42d5b71d9bd0dbe8957dbf39a5f7ae8442cd711aca9b597bc909c04b44cb8d9094c57aa34e285e64f834fde"; + sha512 = "6cabd474d0f3a768a0f12fa5c9984ed193906b503202010fd1da0e2affa091fcc5c165e6b9c4152d286410d46b72b2ddbf52d323bf5ea542f29e5267a94dfdcd"; }; meta = { @@ -104,6 +107,7 @@ 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 { @@ -115,11 +119,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.0.2esr"; + version = "115.1.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f145d0e0e63032367af4198d4ca046589689b5852cb2451efbdcabeae37dfeda88dd0a2c317120ae5785228a6d7df21aa2d18c18ed7bf4b180823af37326a458"; + sha512 = "b2abb706fef2f1aa9451e7ac7c2affa0cc92cf2b0c6629f106a94c62017476380c7b6f406861fa468f60ea898d8402f534ad74844eb3932741fbd981cec66592"; }; meta = { @@ -132,6 +136,7 @@ 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-115 ]; updateScript = callPackage ./update.nix { 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 6b08a891ec..e909b15f77 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -5,9 +5,9 @@ ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ -, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, web-eid-app, pipewire +, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native -, fx_cast_bridge +, fx-cast-bridge , udev , libkrb5 , libva @@ -65,12 +65,11 @@ let [ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow - ++ lib.optional (cfg.enableEUWebID or false) web-eid-app ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration - ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge + ++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge ++ extraNativeMessagingHosts ; libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] @@ -304,7 +303,7 @@ let "''${executablePath}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ - --suffix PATH ':' "${xdg-utils}/bin" \ + ${lib.optionalString (!xdg-utils.meta.broken) "--suffix PATH ':' \"${xdg-utils}/bin\""} \ --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${launcherName}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix index 1af17ad7aa..c29400c32f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,7 +10,7 @@ , nixosTests }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; version = "unstable-2023-01-17"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; - sourceRoot = "source/Ladybird"; + sourceRoot = "${finalAttrs.src.name}/Ladybird"; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -70,4 +70,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; platforms = platforms.unix; }; -} +}) 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 294f034925..8dad70a3dc 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.5"; + version = "1.16.6"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-OLKUw0qimt0WgcW26T4IWVK16nDGSmqHSuSJ8tHhbsE="; + hash = "sha256-avBZnQi1xuyrJX7YG+8O3+122Of11innCCr5sPYyySg="; }; nativeBuildInputs = [ cmake pkg-config zip ]; 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 f903c31f8b..2e364b5c7f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "115.0.2-2", + "packageVersion": "116.0-1", "source": { - "rev": "115.0.2-2", - "sha256": "092fp608lcxrax391xc33dqgbxspkflvmkmhc4jmji2ij3my12jn" + "rev": "116.0-1", + "sha256": "1nah5a5l5ajyvy8aw4xdpdfs2s3ybfs5jw9c4qj9qczxdp541a66" }, "firefox": { - "version": "115.0.2", - "sha512": "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b" + "version": "116.0", + "sha512": "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d" } } 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 2af28bb8dd..7f72a42ffe 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 @@ -46,13 +46,9 @@ let then baseName else baseName + "-" + channel; - iconSuffix = if channel == "stable" - then "" - else "_${channel}"; + iconSuffix = lib.optionalString (channel != "stable") "_${channel}"; - desktopSuffix = if channel == "stable" - then "" - else "-${channel}"; + desktopSuffix = lib.optionalString (channel != "stable") "-${channel}"; in stdenv.mkDerivation rec { 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 4d068862fe..0e9bfa8fe8 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 @@ -2,14 +2,13 @@ #! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian import base64 -import gzip import textwrap from urllib import request +from collections import OrderedDict from debian.deb822 import Packages from debian.debian_support import Version - def packages(): packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' handle = request.urlopen(packages_url) @@ -17,7 +16,7 @@ def packages(): def latest_packages(packages: bytes): - latest_packages: dict[str, Packages] = {} + latest_packages: OrderedDict[str, Packages] = {} for package in Packages.iter_paragraphs(packages, use_apt_pkg=False): name: str = package['Package'] if not name.startswith('microsoft-edge-'): diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix index 72eeda8152..d9df75b00c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,60 +1,108 @@ -{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook +{ lib +, stdenv +, fetchurl +, SDL +, check +, curl +, expat +, gtk2 +, gtk3 +, libXcursor +, libXrandr +, libidn +, libjpeg +, libpng +, libwebp +, libxml2 +, makeWrapper +, openssl +, perlPackages +, pkg-config +, wrapGAppsHook +, xxd -# Buildtime dependencies. -, check, pkg-config, xxd - -# Runtime dependencies. -, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2 -, openssl, perl, perlPackages - -# uilib-specific dependencies -, gtk2 # GTK 2 -, gtk3 # GTK 3 -, SDL # Framebuffer +# Netsurf-specific dependencies +, buildsystem +, libcss +, libdom +, libhubbub +, libnsbmp +, libnsfb +, libnsgif +, libnslog +, libnspsl +, libnsutils +, libparserutils +, libsvgtiny +, libutf8proc +, libwapcaplet +, nsgenbind # Configuration , uilib - -# Netsurf-specific dependencies -, libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif -, libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc -, libwapcaplet, nsgenbind }: -let - inherit (lib) optional optionals; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netsurf"; version = "3.10"; src = fetchurl { - url = "http://download.netsurf-browser.org/netsurf/releases/source/${pname}-${version}-src.tar.gz"; - sha256 = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4="; + url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4="; }; nativeBuildInputs = [ makeWrapper - perl perlPackages.HTMLParser + perlPackages.perl pkg-config xxd ] - ++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook - ; + ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook; buildInputs = [ - check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl - # Netsurf-specific libraries - nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss - libhubbub libdom libnsbmp libnsgif libsvgtiny libnsutils libnspsl + check + curl + libXcursor + libXrandr + libidn + libjpeg + libpng + libwebp + libxml2 + openssl + + libcss + libdom + libhubbub + libnsbmp + libnsfb + libnsgif + libnslog + libnspsl + libnsutils + libparserutils + libsvgtiny libutf8proc + libwapcaplet + nsgenbind ] - ++ optionals (uilib == "framebuffer") [ expat SDL ] - ++ optional (uilib == "gtk2") gtk2 - ++ optional (uilib == "gtk3") gtk3 + ++ lib.optionals (uilib == "framebuffer") [ expat SDL ] + ++ lib.optional (uilib == "gtk2") gtk2 + ++ lib.optional (uilib == "gtk3") gtk3 ; + # Since at least 2018 AD, GCC and other compilers run in `-fno-common` mode as + # default, in order to comply with C standards and also get rid of some bad + # quality code. Because of this, many codebases that weren't updated need to + # be patched -- or the `-fcommon` flag should be explicitly passed to the + # compiler + + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678 + # https://github.com/NixOS/nixpkgs/issues/54506 + + env.NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' cat < Makefile.conf override NETSURF_GTK_RES_PATH := $out/share/ @@ -67,7 +115,7 @@ stdenv.mkDerivation rec { "TARGET=${uilib}" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "A free, open source, small web browser"; longDescription = '' @@ -76,8 +124,7 @@ stdenv.mkDerivation rec { layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today. ''; - license = licenses.gpl2Only; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix index 4956c70655..385deef99f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/buildsystem.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "buildsystem"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-buildsystem"; version = "1.9"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}.tar.gz"; - sha256 = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio="; + url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${finalAttrs.version}.tar.gz"; + hash = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio="; }; makeFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf browser shared build system"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vrthra AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix index 409ab80ce3..36bfe10d5d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/default.nix @@ -1,20 +1,23 @@ { lib, pkgs }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: + let + inherit (self) callPackage; + in { # ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel) # requires a terminal that supports `sixel` capabilities, such as mlterm # or xterm -ti 340 ui = "gtk3"; - uilib = - if ui == "gtk2" || - ui == "gtk3" || - ui == "framebuffer" then ui - else if ui == "sixel" then "framebuffer" - else null; # Never will happen - SDL = - if ui == "sixel" then pkgs.SDL_sixel - else if ui == "framebuffer" then pkgs.SDL - else null; + uilib = { + "framebuffer" = "framebuffer"; + "gtk2" = "gtk2"; + "gtk3" = "gtk3"; + "sixel" = "framebuffer"; + }.${self.ui} or null; # Null will never happen + SDL = { + "sixel" = pkgs.SDL_sixel; + "framebuffer" = pkgs.SDL; + }.${self.ui} or null; browser = callPackage ./browser.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix index db5a39f228..66a3a4057d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -1,35 +1,43 @@ -{ lib, stdenv, fetchurl, pkg-config, perl +{ lib +, stdenv +, fetchurl +, perl +, pkg-config , buildsystem , libparserutils , libwapcaplet }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libcss"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libcss"; version = "0.9.1"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; + url = "http://download.netsurf-browser.org/libs/releases/libcss-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ perl + buildsystem libparserutils libwapcaplet - buildsystem ]; + ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-fallthrough" + "-Wno-error=maybe-uninitialized" + ]; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libcss/"; description = "Cascading Style Sheets library for netsurf browser"; longDescription = '' LibCSS is a CSS parser and selection engine. It aims to parse the forward @@ -37,8 +45,7 @@ stdenv.mkDerivation rec { and is available for use by other software, under a more permissive license. ''; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix index 4c7224f226..328bed30f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -1,43 +1,47 @@ -{ lib, stdenv, fetchurl, pkg-config, expat +{ lib +, stdenv +, fetchurl +, expat +, pkg-config , buildsystem , libparserutils , libwapcaplet , libhubbub }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libdom"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libdom"; version = "0.4.1"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; + url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ expat + buildsystem libhubbub libparserutils libwapcaplet - buildsystem ]; + ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libdom/"; description = "Document Object Model library for netsurf browser"; longDescription = '' LibDOM is an implementation of the W3C DOM, written in C. It is currently in development for use with NetSurf and is intended to be suitable for use in other projects under a more permissive license. ''; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix index 9fd04904c8..29a3129280 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -1,30 +1,35 @@ -{ lib, stdenv, fetchurl, pkg-config, perl +{ lib +, stdenv +, fetchurl +, perl +, pkg-config , buildsystem , libparserutils }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libhubbub"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libhubbub"; version = "0.3.7"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; + url = "http://download.netsurf-browser.org/libs/releases/libhubbub-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ perl + buildsystem libparserutils - buildsystem ]; + ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/projects/hubbub/"; description = "HTML5 parser library for netsurf browser"; longDescription = '' @@ -37,8 +42,7 @@ stdenv.mkDerivation rec { parse all markup, both valid and invalid. As a result, Hubbub parses web content well. ''; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 24790c477d..9ae8dafa1b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, pkg-config , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libnsbmp"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libnsbmp"; version = "0.1.6"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; + url = "http://download.netsurf-browser.org/libs/releases/libnsbmp-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -20,11 +23,10 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "BMP Decoder for netsurf browser"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix index d093df4662..079e351ab1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsfb.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config -, uilib, SDL +{ lib +, stdenv +, fetchurl +, SDL +, pkg-config , buildsystem +, uilib }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libnsfb"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libnsfb"; version = "0.2.2"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o="; + url = "http://download.netsurf-browser.org/libs/releases/libnsfb-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL buildsystem ]; makeFlags = [ @@ -22,11 +26,10 @@ stdenv.mkDerivation rec { "TARGET=${uilib}" ]; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libnsfb/"; description = "Netsurf framebuffer abstraction library"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 2e1cb37a64..20c990448e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, buildPackages +{ lib +, stdenv +, fetchurl +, pkg-config +, buildPackages , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libnsgif"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libnsgif"; version = "0.2.1"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; + url = "http://download.netsurf-browser.org/libs/releases/libnsgif-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -23,11 +27,10 @@ stdenv.mkDerivation rec { "BUILD_CC=$(CC_FOR_BUILD)" ]; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libnsgif/"; description = "GIF Decoder for netsurf browser"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix index 7189f1c591..f9243ec568 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -1,18 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex +{ lib +, stdenv +, fetchurl +, bison +, flex +, pkg-config , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libnslog"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libnslog"; version = "0.1.3"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; + url = "http://download.netsurf-browser.org/libs/releases/libnslog-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; }; - nativeBuildInputs = [ pkg-config bison flex ]; + nativeBuildInputs = [ + bison + flex + pkg-config + ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -20,11 +29,10 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Parametric Logging Library"; - license = licenses.isc; - maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.isc; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix index 01e3e401a7..30c91908d9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnspsl.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, pkg-config , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libnspsl"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libnspsl"; version = "0.1.6"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; + url = "http://download.netsurf-browser.org/libs/releases/libnspsl-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -20,11 +23,10 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Public Suffix List - Handling library"; - license = licenses.mit; - maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index bba457674c..80e883e4b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, pkg-config , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libnsutils"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libnsutils"; version = "0.1.0"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; + url = "http://download.netsurf-browser.org/libs/releases/libnsutils-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -20,11 +23,10 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "Generalised utility library for netsurf browser"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix index ac50237cc4..411495b8e2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libparserutils.nix @@ -1,29 +1,33 @@ -{ lib, stdenv, fetchurl, perl +{ lib +, stdenv +, fetchurl +, perl , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libparserutils"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libparserutils"; version = "0.2.4"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g="; + url = "http://download.netsurf-browser.org/libs/releases/libparserutils-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g="; }; - buildInputs = [ perl buildsystem ]; + buildInputs = [ + perl + buildsystem + ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libparserutils/"; description = "Parser building library for netsurf browser"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index 1439978843..19b523ce50 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, pkg-config, gperf +{ lib +, stdenv +, fetchurl +, gperf +, pkg-config , buildsystem , libdom , libhubbub @@ -6,34 +10,37 @@ , libwapcaplet }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libsvgtiny"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libsvgtiny"; version = "0.1.7"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; + url = "http://download.netsurf-browser.org/libs/releases/libsvgtiny-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; }; - nativeBuildInputs = [ pkg-config gperf ]; + nativeBuildInputs = [ + gperf + pkg-config + ]; + buildInputs = [ + buildsystem libdom libhubbub libparserutils libwapcaplet - buildsystem ]; + ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libsvgtiny/"; description = "NetSurf SVG decoder"; - license = licenses.mit; - maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index 47b53b4781..adbd138b22 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -5,13 +5,12 @@ , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libutf8proc"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libutf8proc"; version = "2.4.0-1"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + url = "http://download.netsurf-browser.org/libs/releases/libutf8proc-${finalAttrs.version}-src.tar.gz"; hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; @@ -24,11 +23,10 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "UTF8 Processing library for netsurf browser"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index 6a2918fa7d..01c1b6c67f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "libwapcaplet"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-libwapcaplet"; version = "0.4.3"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw="; + url = "http://download.netsurf-browser.org/libs/releases/libwapcaplet-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw="; }; buildInputs = [ buildsystem ]; @@ -21,11 +22,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + meta = { + homepage = "https://www.netsurf-browser.org/projects/libwapcaplet/"; description = "String internment library for netsurf browser"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix index d08f4dbccf..fc2b992803 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/netsurf/nsgenbind.nix @@ -1,30 +1,36 @@ -{ lib, stdenv, fetchurl -, flex, bison +{ lib +, stdenv +, fetchurl +, bison +, flex , buildsystem }: -stdenv.mkDerivation rec { - pname = "netsurf-${libname}"; - libname = "nsgenbind"; +stdenv.mkDerivation (finalAttrs: { + pname = "netsurf-nsgenbind"; version = "0.8"; src = fetchurl { - url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM="; + url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM="; }; - buildInputs = [ flex bison buildsystem ]; + nativeBuildInputs = [ + bison + flex + ]; + + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - meta = with lib; { + meta = { homepage = "https://www.netsurf-browser.org/"; description = "Generator for JavaScript bindings for netsurf browser"; - license = licenses.mit; - maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + inherit (buildsystem.meta) maintainers platforms; }; -} +}) 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 e9f2ea4261..7adb6a1130 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix @@ -14,6 +14,7 @@ let pythonDependencies = with python3Packages; [ beautifulsoup4 + chardet cryptography feedparser pillow @@ -30,7 +31,7 @@ let in python3Packages.buildPythonPackage rec { pname = "offpunk"; - version = "1.9.2"; + version = "1.10"; format = "flit"; disabled = python3Packages.pythonOlder "3.7"; @@ -39,7 +40,7 @@ python3Packages.buildPythonPackage rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - sha256 = "sha256-CYsuoj5/BaaboDRtcOrGzJoZDCfOLs7ROVWLVjOAnRU="; + hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU="; }; nativeBuildInputs = [ installShellFiles ]; 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 cdae7b7c55..ece75ad872 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "palemoon-bin"; - version = "32.2.1"; + version = "32.3.1"; src = fetchzip { urls = [ @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-brF9ACAG+JM7bk/JarB208f8ihI/1d90l+6e1pHmC20=" + "sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII=" else - "sha256-205rhW89Jlk4ICraqndTbJ6/88+ZqhtDOIvhFTiEUz0="; + "sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY="; }; preferLocalBuild = true; 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-bundle-bin/default.nix index 3ed322797f..ee31f79a57 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-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.5.1"; + version = "12.5.2"; lang = "ALL"; @@ -101,7 +101,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-Kuq7ZNhaDl2nBcokWKm/XTIjJ8h4czEvwvsF2z3DzJ4="; + hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es="; }; i686-linux = fetchurl { @@ -111,7 +111,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-WNIlwDNVUJyO5l33QxLwTn1knADXDzPvgG279QeRXl8="; + hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso="; }; }; 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 36e09e8047..f2359e812a 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.1.0"; + version = "10.1.1"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - hash = "sha256-g3TW3hl2D9pulEPpbcP1s536yY1o+dMv6nuMrVjgxGI="; + hash = "sha256-fEnBsxhRl8SmyTV82SPza5jv5GkCyVpfymeq5k48oxk="; }; postPatch = '' sed -i '/"electron"/d' package.json ''; - npmDepsHash = "sha256-P3VdG8JQ0JVbjdhOIfx8CxwSiWr0pYUJ4e2oOgAgtU0="; + npmDepsHash = "sha256-iCuRPC5p7XzKpVjkGYLoZfOySYvO+uL71/qW9rDxI2M="; 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 046200e820..8c25377f66 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -23,7 +23,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.1.3035.111"; + version = "6.1.3035.204"; suffix = { aarch64-linux = "arm64"; @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-0bUe1Rn3pi08SaUxg+PXRXFD8V/TGVh40hkWSKvalhc="; - x86_64-linux = "sha256-be+dKBxfDLitqstg3mZbwL4bYo4De7rIWp8+k99+a2o="; + aarch64-linux = "sha256-i2eIm4AF7avjy3KSUvoOOKWw7Q+BatozGpy/yyX4Esg="; + x86_64-linux = "sha256-TLuTYXp6EdQDBWPM1TEXwhdxWWMSPKIi5fW+SGUVdRo="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 68ba61e1ca..5e49e35313 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,22 +1,24 @@ -{ dpkg, fetchurl, lib, stdenv }: +{ squashfsTools, fetchurl, lib, stdenv }: +# This derivation roughly follows the update-ffmpeg script that ships with the official Vivaldi +# downloads at https://vivaldi.com/download/ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "112.0.5615.49"; + version = "111306"; src = fetchurl { - url = "https://launchpadlibrarian.net/660647727/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-mHjvjRG+toRcsOMca+JPXNZPgyQROH2qtSpBPHLmt3s="; + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_34.snap"; + sha256 = "sha256-Dna9yFgP7JeQLAeZWvSZ+eSMX2yQbX2/+mX0QC22lYY="; }; - buildInputs = [ dpkg ]; + buildInputs = [ squashfsTools ]; unpackPhase = '' - dpkg-deb -x $src . + unsquashfs -dest . $src ''; installPhase = '' - install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so + install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so ''; meta = with lib; { @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://ffmpeg.org/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.lgpl21; - maintainers = with maintainers; [ betaboon cawilliamson lluchs ]; + maintainers = with maintainers; [ betaboon cawilliamson fptje ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix index 6708cf6301..adfb76f485 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "23.5.1.754-1"; + version = "23.5.4.682-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-ngtwrq8vDEt39Zd5jpBadouN1V8ly03la69M0AUyhGM="; + sha256 = "sha256-ZhPX4K9huCO2uyjfUsWEkaspdvUurB7jNfUMqqIFO4U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix index dad293e51a..0f5e807d00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://ibboard.co.uk/cawbird/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with lib.maintainers; [ jonafato schmittlauch SuperSandro2000 ]; + maintainers = with lib.maintainers; [ jonafato schmittlauch ]; }; } 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 2c7f08bc54..bbe36cb0d6 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.3"; + version = "1.3.5"; src = fetchurl { url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-9VsHC0HqV3CavqBw9uK+zC1nHIkK8Dry3zhK1rr+VBU="; + hash = "sha256-dMlJ7f1wpaiJrK5Xwx+e1tsWkGG9gJUyiIjhvVCWEJQ="; }; nativeBuildInputs = [ @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ zendo ]; + mainProgram = "clash-verge"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 53e5a3f168..68dd94b5ca 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.0"; + version = "2023.7.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-/ELKUjo16BbPhQu1Gzj68peaAy83sGteqolR+BDIA2k="; + hash = "sha256-Sv6f12XXVHIi97Ows1hsqAeb4z+ZtVM5B0v0Xz/b5iY="; }; vendorHash = null; @@ -79,5 +79,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ]; + mainProgram = "cloudflared"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index f4e9d5c1cf..b2ea58eac2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.7"; + version = "3.4.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-jvrt8CwYkeZky5xg9a2U/CuenoBe86yX31x2iCb/7EY="; + hash = "sha256-cN1uLy0QHABks99BJqEpLDf2VbYUzLM2iCTTBvcY0es="; }; - vendorHash = "sha256-6vHZxBcmhu6s3qQSX0iNIAR0hvXQB/bbpTA1/R08pj0="; + vendorHash = "sha256-kO4ME0r3MoOjn+83X+8bbkgF7zL/Id2+hKabQjEob+Y="; doCheck = false; 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 478200cf61..3f9a7b73f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.7.7"; + version = "2.7.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-1GFA/zGX9geHgGRWx+sgszr9bJnMhAiiTjrnfvkTzuA="; + sha256 = "sha256-KMoHkMHMyAaywdD/+Bg63PSoB1ORwgl1aiIirhDF0Y0="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index 791df5177d..06b5031819 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.3.0"; + version = "7.3.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o/JhfS2VkN5qzZglFN1YNSZV2A2LowNouQee4Tv2dFc="; + sha256 = "sha256-bCZuX4c/ltnq1se/tbqQmWBc7/6IRUWqSNg7T3pFl3k="; }; vendorHash = null; 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 ccc5777286..c552c4ffeb 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.59"; + version = "1.0.61"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b0KoSPPwxW/r1LHooZWWyZBuP9v4Xl5zK0GxYubTeCI="; + sha256 = "sha256-Q3GIAbQ1I1qsMc5Is9SkYxc+nGuC6z8zu9cW2shwC6c="; }; - vendorHash = "sha256-8lIVFlz9Zt9+GDVc0MxrwdyC/0G4q5LU2IwSiFu9Bqg="; + vendorHash = "sha256-Ye01MmYHK2YGFsbELLVaXBeQbFGABS6WQUoH8AldRW0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix index e6a907347c..7fd163f696 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { homepage = "https://docs.docker.com/machine/"; description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook ]; + maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index 1347c443fb..be01702cdc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k8WCD/FirC62WSmcgM5PmTs/hZEmR9xpneyZ1orcoMI="; + sha256 = "sha256-zuez0ELtlphMHP/Pxu5ARnYhkmLJW/ehNrTLXSGmGL8="; }; - vendorHash = "sha256-nUVFQruesP6a74s4UfVrd+2P2lmn1NyVrJBS2dR2QdI="; + vendorHash = "sha256-n2H6hiKZqujrJyojO2uQTIMLMHaX//t7328GPK6hxH0="; ldflags = [ "-s" 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 d20ce5ab17..4c69ffe92e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.14.11"; + version = "1.14.12"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-c9JYrStbYhFWVAHHYz036k7DzKfVjy3LD4wg+GYcKkE="; + hash = "sha256-0ZrR3y3bTXLCOgN+c96lEfNnT+GKXeEBHifM9jfWTBI="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix index 16fceff4ee..1a6aa12a91 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -12,4 +12,6 @@ helm-secrets = callPackage ./helm-secrets.nix { }; + helm-unittest = callPackage ./helm-unittest.nix { }; + } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix new file mode 100644 index 0000000000..9b88d99e44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -0,0 +1,34 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-unittest"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-11rgARUfTbr8FkmR2lI4uoIqzi9cRuVPalUOsxsnO3E="; + }; + + vendorHash = "sha256-E9HSP8c/rGG+PLbnT8V5GflpnFItCeXyeLGiqDj4tRI="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + postInstall = '' + install -dm755 $out/${pname} + mv $out/bin/helm-unittest $out/${pname}/untt + rmdir $out/bin + install -m644 -Dt $out/${pname} plugin.yaml + ''; + + meta = with lib; { + description = "BDD styled unit test framework for Kubernetes Helm charts as a Helm plugin"; + homepage = "https://github.com/helm-unittest/helm-unittest"; + license = licenses.mit; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix index b932229092..3b13668abf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -31,7 +31,10 @@ in preferLocalBuild = true; nativeBuildInputs = [ makeWrapper ]; - passthru = { unwrapped = helm; }; + passthru = { + inherit pluginsDir; + unwrapped = helm; + }; meta = helm.meta // { # To prevent builds on hydra 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 38bb84d776..7d9db57dda 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,17 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, makeWrapper +, pluginsDir ? null +}: buildGoModule rec { pname = "helmfile"; - version = "0.155.0"; + version = "0.155.1"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-9YOgpXiZegimS81owjHW/in0NbxMTL+DQEgSBWdW7Rs="; + sha256 = "sha256-6y+7Jrs/sIpxJjO9Zzv2ht1RprrqcBjwyOsCnqDHxUY="; }; - vendorHash = "sha256-ioZJr3v/8HhOEJJZpsCw5Gkbg9XvMMEOugyfRhevWBc="; + vendorHash = "sha256-MCx+6K3CqVfFEYgkxT1sFvy0vshpKwW07AUngEG2muk="; doCheck = false; @@ -19,9 +25,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X go.szostok.io/version.version=v${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = + [ installShellFiles ] ++ + lib.optional (pluginsDir != null) makeWrapper; - postInstall = '' + postInstall = lib.optionalString (pluginsDir != null) '' + wrapProgram $out/bin/helmfile \ + --set HELM_PLUGINS "${pluginsDir}" + '' + '' installShellCompletion --cmd helmfile \ --bash <($out/bin/helmfile completion bash) \ --fish <($out/bin/helmfile completion fish) \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 9e7b1fc236..0e0a69496f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.16.4"; + version = "3.17.0"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-8hv68O4U9bPjqqtVOpmY3DwfeTGEZJGVkzIyYhS14aM="; + sha256 = "sha256-mXc3CVKh4pFAZVppvk5TTg6s6dOA2Gv+ROLNV37DAl4="; }; - vendorHash = "sha256-aSpv4TGp0YLdk/RYEvfYswlEWnv8sy9iflXGGCcKPHs="; + vendorHash = "sha256-zn8q3HpyQWNsksYbqJcgnjOxaBVUr3dIYHk+FAalNxA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index be498c5c2d..a442142383 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.18.0"; + version = "1.18.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-vC8EE9v3U6FNbjxWb3At+gL4DUgBIb7MY2xBu7WNMKw="; + sha256 = "sha256-eSftWXwV8W/mpxZNvUUDS27z3vU36vJj/z0/Wo5qEts="; }; - vendorHash = "sha256-YgRW/sVRQLqrtEFxC+bGHZEQoEro5bzNzqKv7c7iO4Y="; + vendorHash = "sha256-tuiQ11pcfoTOu+OVey+YmU4tTOj5C7p5bKP2ylEkUug="; nativeBuildInputs = [ installShellFiles ]; 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 473a12c4de..7c60f7f783 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix @@ -15,15 +15,16 @@ let in buildGoModule rec { pname = "k3d"; - version = "5.4.4"; + version = "5.5.1"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; - rev = "v${version}"; - sha256 = "sha256-3J25Aj/otKDCWJ+YqAsoJogU2vckZMy7fsS8XR2EMgE="; + rev = "refs/tags/v${version}"; + hash = "sha256-cXUuWR5ALgCgr1bK/Qpdpo978p3PRL3/H6j1T7DKrT4="; }; - vendorSha256 = null; + + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; @@ -54,6 +55,8 @@ buildGoModule rec { runHook postInstallCheck ''; + env.GOWORK = "off"; + meta = with lib; { homepage = "https://github.com/k3d-io/k3d/"; changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md"; 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 330afe6b09..799fd3f9b1 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 @@ -1,8 +1,8 @@ { - k3sVersion = "1.26.5+k3s1"; - k3sCommit = "7cefebeaac7dbdd0bfec131ea7a43a45cb125354"; - k3sRepoSha256 = "0iz8w24lhb3mgwnks79ky4nypdqbjn91zm4nrj1ar3abkb5i8bg3"; - k3sVendorSha256 = "sha256-yPzpt9OZfW7qY9gFgrRVgmk2l9OSMMF85OY79MDCKTs="; + k3sVersion = "1.26.6+k3s1"; + k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26"; + k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y"; + k3sVendorSha256 = "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 722f0f6b73..257b8e28a8 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,8 +1,8 @@ { - k3sVersion = "1.27.3+k3s1"; - k3sCommit = "fe9604cac119216e67f8bd5f14eb5608e3bcd3cf"; - k3sRepoSha256 = "09j940fcyg34ip04jjiwh5sv2l802jgvkpvlbnz4g6hdi7gipd8g"; - k3sVendorSha256 = "sha256-kodrl6fEsKPkxpOCfwzEONU2zhCHwg/xdyd+ajP26jc="; + k3sVersion = "1.27.4+k3s1"; + k3sCommit = "36645e7311e9bdbbf2adb79ecd8bd68556bc86f6"; + k3sRepoSha256 = "0nvh66c4c01kcz63vk2arh0cd9kcss7c83r92ds6f15x1fxv1w3z"; + k3sVendorSha256 = "sha256-azHl2jv/ioI7FVWpgtp7a1dmO9Dlr4CnRmGCIh5Biyg="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; 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 3d10acb83c..d1dad25b07 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 @@ -114,7 +114,7 @@ cat >versions.nix < 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 6804c20eb0..e09127df6d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -48,12 +48,6 @@ in rec { mkKops = generic; - kops_1_24 = mkKops rec { - version = "1.24.5"; - sha256 = "sha256-U5OSiU0t2gyvyNd07y68Fb+HaXp5wQN4t0CBPOOMd/M="; - rev = "v${version}"; - }; - kops_1_25 = mkKops rec { version = "1.25.4"; sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo="; @@ -61,8 +55,14 @@ rec { }; kops_1_26 = mkKops rec { - version = "1.26.4"; - sha256 = "sha256-dHwakorYSQCv5Pi6l32y5cajLd9teXwEds1LFgiH0ck="; + version = "1.26.5"; + sha256 = "sha256-DbKzqfcQCHP3ZWJQcRhPDkKVzHB/MkcfukguUDG4UQg="; + rev = "v${version}"; + }; + + kops_1_27 = mkKops rec { + version = "1.27.0"; + sha256 = "sha256-XJOdqOT/vMVXZmVasXRb+pdmWcSd6lsyQDCnZKyqrto="; rev = "v${version}"; }; } 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 dc8c507670..c19344a459 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.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-sIT5vqcKMZvx+6rvUzH3l7aOXMWJq81Lwl9YsGwE66w="; + hash = "sha256-qjXc/2QY0PukvhiudukZGhBkovQMutsLg3Juxg1mgTc="; }; - vendorHash = "sha256-cJFAI/W5ImWcaU6cf/BFt78qES7wQtYnR863UvGP4aM="; + vendorHash = "sha256-9kVFOEMFjix2WRwGi0jWHPagzXkISucGHmd88vcBJfk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix index 06624f2b29..76f81be00e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TPT+zO5WHW/D04dLMJLJ7uAYoDLky75kWqaN7PsyzEo="; + sha256 = "sha256-Tu1hAWAqnTGq9NL0kjG2VGzSKDh55HyAoa0nhsJdNLw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 0b8edb6e8c..8df27913dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - sha256 = "sha256-PFibPL5jBbdGgULiqtt5tKYy3UWsldnbCN2LJpxat60="; + hash = "sha256-JkvaFhzazvuqRJ6ertwMQhp+H2zsjRGA23XbvLCIYg0="; }; - vendorSha256 = "sha256-jD8p5RWbCMPmZec3fEsGa8kevTi1curBazlEDvjeuq8="; + vendorHash = "sha256-unOPTQeJW9rUOpZh7gTjD8IZDh4wi04oBAfDO5juJf8="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix new file mode 100644 index 0000000000..e19929b9e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-explore/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubectl-explore"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "keisku"; + repo = "kubectl-explore"; + rev = "v${version}"; + hash = "sha256-4WxvVsA05Mta7AcrGe26B+Up+x/gwdlCnb/PN9Ehu18="; + }; + + vendorHash = "sha256-z/bPfY9UVqOnrA9jNUtM7jg53/URAMAJQAqH9D5KVPQ="; + doCheck = false; + + meta = with lib; { + description = "A better kubectl explain with the fuzzy finder"; + homepage = "https://github.com/keisku/kubectl-explore"; + changelog = "https://github.com/keisku/kubectl-explore/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ maintainers.koralowiec ]; + }; +} 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 650f5d5178..6eae71afe1 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.2"; + version = "2.2.7"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-pTy7uwPEUmeEQ/3oCeUr5544PRA+xXp5TCbzEuwY8mE="; + hash = "sha256-sIX+B08JNwWr4QsWWi4kpqaY9uZbIeiM2sVvMCvSb0I="; }; - vendorHash = "sha256-uEZY9erGZ19aNGSraD7Zdj8GTCRM247lYAhwqfMznpE="; + vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix index 1712a018cb..1f7d691f0c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubemqctl/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker."; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ brianmcgee ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix index 386327f996..fe1b55bbe9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-d88IEbsk0bwC9Mzag3UOFVcSblCjaWXhKXC8iZr6V1s="; + sha256 = "sha256-C3anYYyhRT+/0jO01uEBX1LLQadovO+Z9JA6nHTNXOo="; }; vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix index 4ac7a163b3..9efefd0646 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-metrics-server"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "metrics-server"; rev = "v${version}"; - sha256 = "sha256-hPI+Wq0mZ2iu4FSDpdPdGEqgFCeUdqeK5ldJCByDE4M="; + sha256 = "sha256-e9iFOe2iZaKbYNUk0vuyzcGDCNxot34kRH06L5UQs4I="; }; vendorHash = "sha256-BR9mBBH5QE3FMTNtyHfHA1ei18CIDr5Yhvg28hGbDR4="; 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 944607955e..168b988b71 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.3"; + version = "1.27.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-g/YRwhhGjeBhbSFS/6xJbljTTMiwJHE3WRySwJlzKys="; + hash = "sha256-Tb+T7kJHyZPXwUcEATj3jBr9qa7Sk6b+wL8HhqFOhYM="; }; 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 3aae9935ce..ab8c7463f0 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.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-Tp43JDLzfOARF+1aEG5A5POdOe0rMcllWPuAdlT6tdI="; + sha256 = "sha256-Xtyn08rlBo17ouxSLQcVT8mQQ6nuDKPjE4OHBdze8/Q="; }; - vendorHash = "sha256-JXWWdr5xmgXKwHx9h9X6Y0IZ4pEkBQxJSCR3CTjgJ5I="; + vendorHash = "sha256-MTueX4+cZIUdjE2BRLVGv7PJr3haV11woJmrkeKFpr0="; subPackages = [ "cmd/kubeseal" ]; @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; homepage = "https://github.com/bitnami-labs/sealed-secrets"; + changelog = "https://github.com/bitnami-labs/sealed-secrets/blob/v${version}/RELEASE-NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; 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 a4eb88147f..76d8a0905a 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.3"; + version = "41.6"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-8RAUFiQLXKYRcthkthoRLl73RKjJj6PVE6SxTvqWiiI="; + sha256 = "sha256-UFBht8H8iOHwMU8PM2FCb+oh7rTkN/XC3/W3EmuTp84="; }; - vendorHash = "sha256-cINzo4G1Rn9T1HBGKOKo2boUpG2S2vnFL/uwEVXq2gU="; + vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix new file mode 100644 index 0000000000..9bd4747d2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubevpn"; + version = "1.1.35"; + + src = fetchFromGitHub { + owner = "KubeNetworks"; + repo = "kubevpn"; + rev = "v${version}"; + sha256 = "sha256-fY0SKluJ1SG323rV7eDdhmDSMn49aITXYyFhR2ArFTw="; + }; + + vendorHash = "sha256-aU8/C/p/VQ3JYApgr/i5dE/nBs0QjsvXBSMnEmj/Sno="; + + # TODO investigate why some config tests are failing + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${src.rev}"; + description = "Create a VPN and connect to Kubernetes cluster network, access resources, and more"; + homepage = "https://github.com/KubeNetworks/kubevpn"; + license = licenses.mit; + maintainers = with maintainers; [ mig4ng ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index 9ec9baa833..e89e63fca8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-TmnWDCucZ4yQjl0+2hGGoopQ62h+AM1WogC5d+JUIO0="; + sha256 = "sha256-kk+NgupFLzbkh/jrbJj9E6H0v3QighKa7DQJoh/fZi8="; }; ldflags = [ 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 93079174bf..fdf85c4351 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.7.1"; - sha256 = "1lvangia0hllnlccxv0f9mlp3ym8l54wmqihicd44p9nyxbwbx3d"; - vendorSha256 = "sha256-1ir+IjyT9P+D3AbPo/7wWyZRFiKqZLJ/hoFUM1jtM0A="; + version = "23.7.2"; + sha256 = "0wc829dzk0in0srq0vbcagrd5ylz2d758032anzlzkf4m3lr9hdw"; + vendorSha256 = "sha256-16j5B96UDZITY1LEWZKtfAnww7ZcUjKh/cARLaYy9wk="; } 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 fc53e14a41..26f0cc4e1a 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.30.1"; + version = "1.31.1"; - vendorHash = "sha256-616T47H+8FdXU37MDvAHRyM59JXurU45uz8c/TNxkkc="; + vendorHash = "sha256-7Wa5Ut3n+CH4LeyRKvFC2aRf2auQXfqsi54QLKWgak8="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-dw+aFckp5Q9i6bNKPetw2WlslrpKAgEzXI+aGAwDurU="; + sha256 = "sha256-6vCZUDH35OclO02sV+AXv8+bj4klwoZC0abotheHSoU="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; 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 c7daafc971..401b5b156f 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.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-30T5HXQz57Uwgly6HcMroEC/qwynm6nB4B3uwDC2WHo="; + hash = "sha256-ngR+xlhTy3oxPN34+MoT9TSOI0+Epp8QG3KiiPmRUts="; }; - vendorHash = "sha256-zsIRdPNoUrlN2FWSlHN8+8yi74CGxW6pX8TYNHtPJ3A="; + vendorHash = "sha256-lsD8AtbREVKFXiPsteSFA7xntRlNgOQ1y5c44vOqMa8="; nativeBuildInputs = [ makeWrapper installShellFiles ]; 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 46cbafff2a..abe2e6ee7f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -77,9 +77,20 @@ rec { nomad_1_5 = generic { buildGoModule = buildGo120Module; - version = "1.5.6"; - sha256 = "sha256-eFzGaTJ9BcK5F10lkTKB3sNaGZsmZ0BbPZI6kT5ZUpo="; - vendorSha256 = "sha256-tOUQr44wUhhCccvj4dCI7fvLMrKaEX7xY7035Q3wU3M="; + version = "1.5.8"; + sha256 = "sha256-5VAUNunQz4s1Icd+s5i8Kx6u1P0By+ikl4C5wXM1oho="; + vendorSha256 = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:/build/go/bin" + ''; + }; + + nomad_1_6 = generic { + buildGoModule = buildGo120Module; + version = "1.6.1"; + sha256 = "sha256-RsyGUaLteGiNf0PTkKLcjHTevhKb/mNx2JORpXhHJMw="; + vendorSha256 = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:/build/go/bin" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix index f77e8be550..2686b79c4b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nova"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; - rev = version; - hash = "sha256-6gTrBogMvM7X6PFthG+c8N9wXoNHwp0wHjGVKjiHJJY="; + rev = "v${version}"; + hash = "sha256-K4D8vCZxOPRalSDlAmva7Qm72EJ2Xdz20oqKKqkD6iA="; }; - vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U="; + vendorHash = "sha256-c30B8Wjvwp4NnB1P8h4/raGiGAX/cbTZ/KQqh/qeNhA="; ldflags = [ "-X main.version=${version}" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index 705b10753c..8dbe03f3ba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -3,26 +3,27 @@ , fetchFromGitHub , gpgme , installShellFiles +, pkg-config , testers , openshift }: buildGoModule rec { pname = "openshift"; - version = "4.12.0"; - gitCommit = "854f807"; + version = "4.13.0"; + gitCommit = "e561d37"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "854f807d8a84dde710c062a5281bca5bc07cb562"; - hash = "sha256-GH3LjAeMIHmFbJoKGoeeNteP4Ma2+kIC5rAxObdziKg="; + rev = "e561d37285c8bde273ce00d086bea599a9cdd3be"; + hash = "sha256-/ar96N+MSy0DPdza3UWiyolg1EZPBR6LCku4GV+HppM="; }; vendorHash = null; buildInputs = [ gpgme ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; ldflags = [ "-s" 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 589893a24e..93986c101b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.18.1"; + version = "5.18.2"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-E4DPJDBa/WX5JVsWgqdEv/O/XCvHDLyaL+nSMmw6Npg="; + sha256 = "sha256-PouKOIyKv7mxlBZJYCBppADdkf/XD28gavozCFFcO24="; }; vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY="; 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 ec373802b4..c3900c4faa 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.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M+M2tK40d05AxBmTjYKv5rrebX7g+Za8KX+/Q3aVLwE="; + sha256 = "sha256-mTzVMO0Msk5q8Wnpb0iQ8kifhNXlp4MfM+irMmOLDv8="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-3uqN6RmkctlE4GuYZQbY6wbHyPBJP15O4Bm0kTtW8qo="; + vendorHash = "sha256-SyORFCfX/4dhYLnsE/lc21/18TKpLkOxz+W9lsHjKNE="; ldflags = [ "-s" 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 ffcb846afd..6efdc1d5c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-P/VvRoTcJuuRuoTT0zhebibBQrM6sz9Vv+qPrWY+B9Y="; + hash = "sha256-XiFXFd9pZBrZdYggVoHhxdu4cH+IyDtDNr7ztM+Zskk="; }; vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk="; 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 c9ce55b0b1..66b1324a6b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix @@ -2,26 +2,38 @@ buildGoModule rec { pname = "rke2"; - version = "1.27.2+rke2r1"; + version = "1.27.3+rke2r1"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-jzm2tYwsomLifAfmb0w1+/FpCgtOk+O8DRmy1OgzfmE="; + hash = "sha256-M/3F97iNeXdMMhs0eoPODeBC6Jp+yo/PwlPiG28SfYU="; }; - vendorHash = "sha256-VVc1IgeR+LWEexTyIXtCcF6TtdDzsgP4U4kqArIKdU4="; + vendorHash = "sha256-7Za8PQr22kvZBvoYRVbI4bXUvGWkfILQC+kAmw9ZCro="; - subPackages = [ "." ]; + postPatch = '' + # Patch the build scripts so they work in the Nix build environment. + patchShebangs ./scripts - ldflags = [ "-s" "-w" "-X github.com/k3s-io/k3s/pkg/version.Version=v${version}" ]; + # Disable the static build as it breaks. + sed -e 's/STATIC_FLAGS=.*/STATIC_FLAGS=/g' -i scripts/build-binary + ''; + + buildPhase = '' + DRONE_TAG="v${version}" ./scripts/build-binary + ''; + + installPhase = '' + install -D ./bin/rke2 $out/bin/rke2 + ''; meta = with lib; { homepage = "https://github.com/rancher/rke2"; description = "RKE2, also known as RKE Government, is Rancher's next-generation Kubernetes distribution."; changelog = "https://github.com/rancher/rke2/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ zygot ]; + maintainers = with maintainers; [ zimbatm zygot ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch new file mode 100644 index 0000000000..b390d49246 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch @@ -0,0 +1,20 @@ +--- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go ++++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go +@@ -696,7 +696,7 @@ func init() { + // Load protocols + data, err := ioutil.ReadFile("/etc/protocols") + if err != nil { +- if !os.IsNotExist(err) { ++ if !os.IsNotExist(err) && !os.IsPermission(err) { + panic(err) + } + +@@ -732,7 +732,7 @@ func init() { + // Load services + data, err = ioutil.ReadFile("/etc/services") + if err != nil { +- if !os.IsNotExist(err) { ++ if !os.IsNotExist(err) && !os.IsPermission(err) { + panic(err) + } + 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 72622d25c3..c35cf14e06 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,6 +1,20 @@ { lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }: let + metaCommon = with lib; { + description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal"; + homepage = "https://docs.temporal.io/cli"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjheng ]; + }; + + overrideModAttrs = old: { + # https://gitlab.com/cznic/libc/-/merge_requests/10 + postBuild = '' + patch -p0 < ${./darwin-sandbox-fix.patch} + ''; + }; + tctl-next = buildGoModule rec { pname = "tctl-next"; version = "0.9.0"; @@ -12,7 +26,9 @@ let hash = "sha256-zgi1wNx7fWf/iFGKaVffcXnC90vUz+mBT6HhCGdXMa0="; }; - vendorHash = "sha256-muTNwK2Sb2+0df/6DtAzT14gwyuqa13jkG6eQaqhSKg="; + vendorHash = "sha256-EX1T3AygarJn4Zae2I8CHQrZakmbNF1OwE4YZFF+nKc="; + + inherit overrideModAttrs; nativeBuildInputs = [ installShellFiles ]; @@ -33,6 +49,12 @@ let --bash <($out/bin/temporal completion bash) \ --zsh <($out/bin/temporal completion zsh) ''; + + __darwinAllowLocalNetworking = true; + + meta = metaCommon // { + mainProgram = "temporal"; + }; }; tctl = buildGoModule rec { @@ -46,7 +68,9 @@ let hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig="; }; - vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0="; + vendorHash = "sha256-5wCIY95mJ6+FCln4yBu+fM4ZcsxBGcXkCvxjGzt0+dM="; + + inherit overrideModAttrs; nativeBuildInputs = [ installShellFiles ]; @@ -63,6 +87,12 @@ let --bash <($out/bin/tctl completion bash) \ --zsh <($out/bin/tctl completion zsh) ''; + + __darwinAllowLocalNetworking = true; + + meta = metaCommon // { + mainProgram = "tctl"; + }; }; in symlinkJoin rec { @@ -75,11 +105,10 @@ symlinkJoin rec { tctl ]; - meta = with lib; { - description = "Temporal CLI"; - homepage = "https://temporal.io"; - license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + passthru = { inherit tctl tctl-next; }; + + meta = metaCommon // { mainProgram = "temporal"; + platforms = lib.unique (lib.concatMap (drv: drv.meta.platforms) paths); }; } 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 72a8f8c23f..de33dd0626 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-fa8UQk3E1XhMqd7E9VRYOv6RLQW8smSUw48FeYBqmSU="; + hash = "sha256-4iosKxGjH2O2y2wkAs/tuCH+SXTj6FhrPqS9qgL+vTQ="; }; vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix index 5fe6b263a6..09cc62352d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terraform-backend-git"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "plumber-cd"; repo = "terraform-backend-git"; rev = "v${version}"; - hash = "sha256-nRh2eIVVBdb8jFfgmPoOk4y0TDoCeng50TRA+nphn58="; + hash = "sha256-ryHFuHIEJ4i1R3oBW3w3aAvtv+vIrO745qwx0+SqBF4="; }; vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0="; 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 7eda46592e..d2744906bd 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 @@ -1,10 +1,10 @@ { "aci": { - "hash": "sha256-MF1YeTzKmua4C6Ay9QQGjVzjYCEZtyGW2wrMQH5Un/k=", + "hash": "sha256-iHWb9dytaXs7ywkxi5aPetBV1YSgYC1rTMn9+EXl42U=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.9.0", + "rev": "v2.10.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -37,20 +37,20 @@ "vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM=" }, "akamai": { - "hash": "sha256-gQZ5yH3sV5DTpSE+/bZM12+PHitmUm/TtpAdPijF+Lk=", + "hash": "sha256-LGgZF2/YCYpoDOSu0UeuPqK9wGXrvPQE4WUGGS0sx30=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.0.1", + "rev": "v5.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xZ0pS7XxfYGbG2kEw5FAjABDQZmektaI7OhToiFMXKk=" + "vendorHash": "sha256-6oPftQghM0h0pgc04Rm4PD8OZ/z+dEdcsIqWPPbSgbM=" }, "alicloud": { - "hash": "sha256-F69Otml1zH5TtD6dRPIXc2pOq2aM8NEsTsnmJDQEdxk=", + "hash": "sha256-0qPmUmQ+CGRyah2GXUADAt3HPietpAahQ9ze6Ip6yvE=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.207.2", + "rev": "v1.208.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -73,13 +73,13 @@ "vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4=" }, "argocd": { - "hash": "sha256-S7Za9V18clq3Kb3pIQxUZpt8d51Dht76e+ypdAZB3VA=", + "hash": "sha256-t1WGa9pfsLn5uB7/LSYIcmb/kfQCHysIcUKHwn6y8GU=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v5.6.0", + "rev": "v6.0.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-4gVJ5j2pdrtZYmatsO5N+IwVbNCJfqMlizDI7UhgiOU=" + "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "auth0": { "hash": "sha256-QljqPcupvU7AgVSuarpd0FwLuAPJI9umgsgMXc2/v6w=", @@ -110,29 +110,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-VDet4IGyd0RXCzlQ+s08QwX9eby5oYfwq2eVRfSS9ME=", + "hash": "sha256-y4KAw4hX+Hl+laVzOoNVxUXo4AkjWEKYSf87ffpSh2w=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.8.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oNPWz/0jcSL0FYuIW9wnj8Jp94vm9dJdiC9gfhtbQiU=" + "vendorHash": "sha256-lf/bx9Uwf2jkOKfgYc2JPJ9Rt0PKHpIHzHW5Dfmt5rM=" }, "azuread": { - "hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=", + "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.40.0", + "rev": "v2.41.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-4cJal4GrL8OwoFNMjN0AKlicq2mC0ba3N8bYISMaY3A=", + "hash": "sha256-7ekMsiMvyJuwp+/fzKJcvp7RirunsGykTH62Z8Znz4Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.65.0", + "rev": "v3.68.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,22 +182,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=", + "hash": "sha256-3rGuE47CYbl1B+DAYUBiuGTC1sn85c5aeay+irdhTe0=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.20.0", + "rev": "v0.22.0", "spdx": "MIT", - "vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I=" + "vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4=" }, "checkly": { - "hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=", + "hash": "sha256-69oRZpJNRFJCwAZNcmVfYTNKmtBgFocvEUZpr4jbJQg=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.6.7", + "rev": "v1.6.8", "spdx": null, - "vendorHash": "sha256-ATj1tGTS7FnEQDa6KuDQITGuVimP0A4sdlUNJ6RNIqI=" + "vendorHash": "sha256-cnvXf0zJrJvpRbQMm2pF7f2cuazxDR4193JCbyGuL2Y=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-Zj8CC+Xiej+gz9V/9IeIGaWP2cjIg6jboXN5jrBCosM=", + "hash": "sha256-vC3uvv04an6KhXT1FECiB2LQMxJbiYhULNuiXoCRhnY=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.10.0", + "rev": "v4.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hxD+0OrCdyYn/9nvz5fd/54YiaZyZMOfsIa7lqZhCHE=" + "vendorHash": "sha256-m+tQeOUbJ+bnVYl4FcBSTHKYuSGtznCqRQ/CR204WkE=" }, "cloudfoundry": { "hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=", @@ -264,13 +264,13 @@ "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-UaTvFxwbLf9krUdsslFP6MXzpacnj/AKXiyUe7iSRCs=", + "hash": "sha256-2oujZd7tqvMnp48m3bs45p5dRC7U5a7hsiS5qBuPUHU=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.17.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-v1RHxXYTvpyWzyph6qg3GW75OPYc5qYQ/yyDI8WkbNc=" + "vendorHash": "sha256-0SRbKFKl1lfiiMDZW20ak9m09T3tSOH/fc+UwGeXmuk=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", @@ -282,13 +282,22 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-2ahiJ4YL0BmrDwc9f9fp/ppStb51bZlzpwEfuTAlgko=", + "hash": "sha256-sytQJgrfgtJ761mGo0KUTxAukqvmPYyLM8+vsYGtoZc=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.27.0", + "rev": "v3.28.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-yAOWcs+rFjjp21Xq1Ch/sE/6N0BSpOC167mxIOmR9nk=" + "vendorHash": "sha256-foS7GyRUdhF/M8uTPf2I4WQo7qEg4Z/3FXjagoeSRkU=" + }, + "dexidp": { + "hash": "sha256-+Nt4bX6+4VB+mtJbsP166RObFbXaNyFrF+80x2/pRco=", + "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", + "owner": "marcofranssen", + "repo": "terraform-provider-dexidp", + "rev": "v0.2.1", + "spdx": "MIT", + "vendorHash": "sha256-L8baV03p0V/xKi1O3YQxvoJXgP21qNhzznyvwrauVqI=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -300,11 +309,11 @@ "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-XKNQdsbh8+iq1N+pwlByFwdm6IlfEsgnT3q/l8SiHvU=", + "hash": "sha256-CnakqGO/adv44knzp3Q5nC17tD+ZpOEFqfQXPk20klg=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.28.1", + "rev": "v2.29.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -354,13 +363,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-mS2o0AyOG2Z3tadv036we2J10S1JvNz3gdoykIjCSq0=", + "hash": "sha256-nqKswIq7cOEvGuoRA9Fv5j84Ob/z2C+Ux5ecdhTW0RY=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.14.3", + "rev": "v1.14.5", "spdx": "MIT", - "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM=" + "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc=" }, "exoscale": { "hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=", @@ -390,11 +399,11 @@ "vendorHash": null }, "flexibleengine": { - "hash": "sha256-Y7rplfN7acrDWNO9Q4K3WaM5reFxi5ms012+wTm+EF0=", + "hash": "sha256-9qwGI7JBhX2WDX7u3SY2l9RJeiDffEpkE16f8/qqlI8=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.39.0", + "rev": "v1.40.0", "spdx": "MPL-2.0", "vendorHash": "sha256-RqYzqKPzb5GcrzHnEDZC7GaBt1zP8g28Wo3WNAe07Ck=" }, @@ -427,42 +436,42 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-xPxrHOuvOT8VO0D7M1TI39i0B1GIQ4Z2F1UckGsU/1A=", + "hash": "sha256-Y70HJEUArUCT1XM3F02bUNPwB1bW4N/Gg/M6aW7XcMM=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.31.0", + "rev": "v5.32.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-SHc1Mz1JsmNqTjfuJ4Ncll7fh5ruoRXNUAQRfFlibog=", + "hash": "sha256-uKImp0kcsLZL1SOAygd/ssJ7pxclUbAcDcEB3ko9Mio=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.1.0", + "rev": "v16.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc=" + "vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0=" }, "google": { - "hash": "sha256-FlBTLc3QUsPAO1OIr8aOlb7ppePsAjtKKrBOTS+JYFI=", + "hash": "sha256-6VLZW6RlBW7D4GS/JTvlpIcF3AhIEKbNFOqsQI58HyE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.73.1", + "rev": "v4.76.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" + "vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8=" }, "google-beta": { - "hash": "sha256-GYX0tmNut04NbpqbfXCy/5Rabn3leWf1VH+yGHTsCek=", + "hash": "sha256-ecmCr1AHpyYDmt1ofjFgJjirsNhpcdLggp9EXz3hT5E=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.73.1", + "rev": "v4.76.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" + "vendorHash": "sha256-rlNYh42Cw2wMF/9aI8QM0x8t2jdz+V9u4uJvS6A4zx8=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -474,31 +483,31 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-I0qfG916mbYYwjKmlUmCD2iG0CuJxTFOFdVS6VyEfHM=", + "hash": "sha256-pgyyOLkMu7W4llDb4oY72ujZ26SiQqvufVGWVv7y3Sk=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.1.0", + "rev": "v2.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-gY15FJb1svy2AxXs6ZOmZX5o3oXIokzf5hXlFlx1cXU=" + "vendorHash": "sha256-+I0nCbe/OK+9ax8PzLw+PCBHrNDTm96J1GITiNCQEfc=" }, "gridscale": { - "hash": "sha256-u0NX1hoawEVbmj2Id6qvb8GYgH/u3cbgWZ/b+2nBYNM=", + "hash": "sha256-Xs3eWLwsHFTvuH0rUroB6lkzusjUiH3ajt6ila9v/9M=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.21.0", + "rev": "v1.21.1", "spdx": "MPL-2.0", "vendorHash": null }, "hcloud": { - "hash": "sha256-gb5Mp9LI0wb+oA+lfkEmrVEIJzCRoAhugFfJaOkvLVw=", + "hash": "sha256-TbEbqTgzp7pUXrhjxvs5hrFI5u//xIIniOvusZsseiE=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.41.0", + "rev": "v1.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jEzCvhfQTK/1MCODUN4tNrtnNE0yR23QI5Vnx1kYr4E=" + "vendorHash": "sha256-wrgGxCNa5xLdBEy6RNNCz8ZVracyVsHzHtaQse6Ph+E=" }, "helm": { "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=", @@ -510,11 +519,11 @@ "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, "heroku": { - "hash": "sha256-zxX7cro1hAtgABlDsKQHxJJH9BrOlJHKFFwL5gGrmU0=", + "hash": "sha256-tdaj6ZbVCvQTYblgpRC5GFoW8fbzTSHf0j6BM1tOlik=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.2.4", + "rev": "v5.2.5", "spdx": null, "vendorHash": null }, @@ -547,11 +556,11 @@ "vendorHash": "sha256-hxT9mpKifb63wlCUeUzgVo4UB2TnYZy9lXF4fmGYpc4=" }, "huaweicloud": { - "hash": "sha256-/KVQU0n91mltVE8UHDb6fpGn3CBPY1ubEP02DVg7eIY=", + "hash": "sha256-Uon1nXtoILFOQp9DsOubi31v6WJqWBa3zDZKHJdboHY=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.52.0", + "rev": "v1.53.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -655,13 +664,13 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-lRkaRy4K43byP0r+wE3gne8pWmPB5il5oK4JMiPMZO4=", + "hash": "sha256-dK7JxmC/GRjsMpiJb2e8EyFl+V/KcxKlw8/5IbyFlXY=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.12.2", + "rev": "v2.13.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-Fb2k493XTePXgpCY9ZoMWaCZqq3fx3A2dBRsOp1MDBc=" + "vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA=" }, "libvirt": { "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", @@ -673,13 +682,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-dX6sG8htSZgs/OSfH09gfx4ng3Sj0uAdzQFMrVwibPk=", + "hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.5.1", + "rev": "v2.5.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-n9ZZsTNE4E3T3SjF3+JjElDq5PVaD9o2Q2ATexRS/q0=" + "vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -736,22 +745,22 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-Xszx9eWLufT0Jky+Z9/rky3SLJsRk2gMDjuTFbPTkS8=", + "hash": "sha256-BsOSImEMgxjldAQ014M25Y/JuxxaJLRdOOOHNAtm/Bg=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.16.0", + "rev": "v1.17.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0=" + "vendorHash": "sha256-Pr5YNDMVNccjQRC5WXUY+0pMTMbuxKqkqtd/Z/z0cXc=" }, "mongodbatlas": { - "hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=", + "hash": "sha256-lNWGGDGr0dp+4S1mnRnLl0n//5GtOqqSH4mWQxvzXEQ=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.10.1", + "rev": "v1.10.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI=" + "vendorHash": "sha256-o8VrabFScEQyjfk4BLJGxq7LgZMWaQZ2cNAph37Grzo=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -772,13 +781,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-cKwefGAx4VIdupCOb6XLQaiy+Na7XyFJ7yjZCiJO224=", + "hash": "sha256-6dQ0oJeYBmMhpldt8SyPL0VY4IM4n3Dpg62SYvCjigI=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.25.2", + "rev": "v3.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zp4gqpbJ6avIjV/cvomgqZsdk8XgweWQ6mIX4RlIo7c=" + "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw=" }, "nomad": { "hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=", @@ -790,13 +799,13 @@ "vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc=" }, "ns1": { - "hash": "sha256-8m9uj6s7oSaqKUv2kwbPmk7R3MsydWKVLMvcbXg945k=", + "hash": "sha256-faxvq99kkJS0rxNflmIhSDCO/VAVvPsIGV4MTgyRf+Y=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.0.4", + "rev": "v2.0.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-37mQ0/2a9nG3+WMvYgQofhhFw94OxSdnzez8RTgWSNU=" + "vendorHash": "sha256-FLQhshuqIcMeqrW6h68pXzPaY0VqRXhfL0YMpHyKfkY=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -809,20 +818,20 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-c2+3nAwbFL3DWQW6OqAweTMmg8nZER4CaHGeGrh1/Tg=", + "hash": "sha256-p7ryvJEoMxfJWKNkUlpZL6lgJt5I93eHRh5qev5RGJ4=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.9.1", + "rev": "v1.9.2", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-NyNQht7mWG4+IbyhCPSJnLTIFm7KeBpEfua5oR6ovC0=", + "hash": "sha256-PLlgHUIQWxBCBmTRuQ6RSLuqkilqUb4svmklbSoYEtA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.4.0", + "rev": "v5.7.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -845,11 +854,11 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-bWmSXlNgPOhzNFodYAzLE1theDntCks3ywtruRbCcYc=", + "hash": "sha256-0XeGaHyN+u5QEU9RUr51FVi13HNmjBN6mnFwfilPw5s=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.2.2", + "rev": "v1.3.0", "spdx": "MPL-2.0", "vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A=" }, @@ -863,38 +872,38 @@ "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-SM6WG7igvFlIbi5AYj/1JXxjbpGgBkz2dKUnR4ZjQb8=", + "hash": "sha256-+goODpTThegmo2cew5bKxGhtqAHd2ObeEzSG2vxWK4w=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.3", + "rev": "v1.35.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-zlviJb2EYw/9NiD64xLFY8cd4H9Nb63tSbBUzFhW8Qo=" + "vendorHash": "sha256-VPQml9PAb/41wwLHAFtHDSwGLwPYG9ePiPgKhtfdt9Y=" }, "opsgenie": { - "hash": "sha256-fZidZFpusgO1PTXArsxn/omo+DC1nfVu6649BvBzj+k=", + "hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.28", + "rev": "v0.6.29", "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { - "hash": "sha256-DAixUxPk0ilbZ6T6Vf9YUKWt+6x7Ru77uYmmzUkPM0M=", + "hash": "sha256-CG7xyx3d9jPD+W0EmNVwdV2ShenfsnxykkERe/8ky3A=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.31.0", + "rev": "v0.32.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-6DYULlwIKC4zVeSuQDrulDxvZeC0cW5wRoS2LbUAFmw=", + "hash": "sha256-vMMxSmfNz9FZtFyOMo6e5OHX6GWNVAP/X/ewJ0sUHb0=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.15.1", + "rev": "v2.15.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -935,13 +944,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-hzcJOWbOh/HKYl9mKpo59/Mw2tjnfs36fQzSyFdKfFw=", + "hash": "sha256-thojEtfA8vn5fMTBuOClAKt3rlKs2XK7/RRMYSHAoMM=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.0.2", + "rev": "v3.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc=" + "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" }, "random": { "hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=", @@ -971,13 +980,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=", + "hash": "sha256-xllc6uQN0Pjak/8eFNWCn639Kpf2UQPoDUPnX9YhoOc=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.24.0", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0=" + "vendorHash": "sha256-39MrDm4v7UIYDK/KNt9ES0SstkxEQ73CHvnxpZq1K5g=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1016,13 +1025,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-mG3JUf7OASLvsfD7jk1p4CQRfrDj/TNnUKD1SzHQqEA=", + "hash": "sha256-zIXlrb/2g/N/slOfvyLmNG2keGXKTes0rHXJmZLV0Sg=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v7.0.0", + "rev": "v8.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JE6gg32TmpEHxskJjFaqeg0tfR463fUUnwKzc0O08eo=" + "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1034,11 +1043,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-Cou96AjZDi6GTz6i7+x/nJfwHkHrHB9E9g8RzX4/QKo=", + "hash": "sha256-gz41dRmJQm4cH7VhrEznir7IRA9+hGMjYzsOyQtNuG0=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.68.1", + "rev": "v0.69.0", "spdx": "MIT", "vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM=" }, @@ -1052,13 +1061,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-YX0NTJ8T+HVrSiRC0WkA+SVakQ+ggVx/7JYvf3SkmPM=", + "hash": "sha256-8Pwy/jSzPWGXRCY+MszDPpbPWL6FFleoiu4VtSle0Kg=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.125.1", + "rev": "v1.131.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cT/85DbG5U/JPA+rgJ2BhxJA90KBKjg+X+glREiezAg=" + "vendorHash": "sha256-NN4mnXzt1GJYGC0HBvYQBBZKENXfvVq7cTbE4XSPwto=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1106,20 +1115,20 @@ "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24=" }, "tencentcloud": { - "hash": "sha256-53s1j5Xw7ZERz35lGzv9pHiAzcUX2dn5A74vFqv94Cg=", + "hash": "sha256-Pk+x9/acer3YWBEMZYZWar8oDTFLPc0QydgAHrJZBNI=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.14", + "rev": "v1.81.18", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-UFTRqRlpS0q8go+dYIpLLmOR7zs4Zi97Q91AjV+LqI8=", + "hash": "sha256-wrqlEWM2id6NXfTGOM7iVbQkKP2CUwpCZdr9n3Lgvuk=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.46.0", + "rev": "v0.47.0", "spdx": "MPL-2.0", "vendorHash": "sha256-HdTx9f9ytE5/IG4yv1Xnqd/5ZA+ZaF6jjUmtI/q5yc0=" }, @@ -1161,11 +1170,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=", + "hash": "sha256-oG6Mme9Q4T/IgQF1jheL0SaV3NDCEGHvw5fbXIcgwPE=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.9.1", + "rev": "v1.10.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1179,32 +1188,32 @@ "vendorHash": null }, "utils": { - "hash": "sha256-vxX8r6bbhp/lGeS2GciqAnwetjG3B5qzCLJnTQIWino=", + "hash": "sha256-3eEC0UN/VVockLstHhSNY9EH0bRv/LK3SkpSfMrMwSI=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.8.0", + "rev": "1.9.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ=" + "vendorHash": "sha256-ZOJ4J+t8YIWAFZe9dnVHezdXdjz5y2ho53wmyS4dJEo=" }, "vault": { - "hash": "sha256-XwM+WDfeWKwSz9pboaf5JfP2PrXevaRUw/YRnw8XXGw=", + "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.18.0", + "rev": "v3.19.0", "spdx": "MPL-2.0", "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0=" }, "vcd": { - "hash": "sha256-AiVmxqktBgvXbMl6jA5sMa86sEAvxD1LjVuxdwdBJvU=", + "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.9.0", + "rev": "v3.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dYFLohH/gU+cAiaLLNluxAjfj7giqnk+zQKGVSR1Kws=" + "vendorHash": "sha256-p/wTnEr/+qe8S83x6EtfsnIMVUF1VWZVHOq0vLDbh60=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", @@ -1252,21 +1261,21 @@ "vendorHash": null }, "wavefront": { - "hash": "sha256-RZUjMAwXFKpWqec7869EMB/My5EVpy7If5ZoJx7IzIg=", + "hash": "sha256-DF9Q1cwzzLlF8+oJFF5HkOD0lfQhxsnIepl/fMCljcs=", "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", "repo": "terraform-provider-wavefront", - "rev": "v3.6.0", + "rev": "v4.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs=" + "vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q=" }, "yandex": { - "hash": "sha256-03lZMLD2Iq9o9ijvMD7JNnaGNdn5OpB/s3509YdYRfQ=", + "hash": "sha256-bG8cBOkwsVew5qmaFXdq7yc2j8JNfY9qwnQ7IJGUZvM=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.95.0", + "rev": "v0.96.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-IdRgtPUAYYR55MiT/2wqGzYhuMfThUmhnGGYoPQlHW0=" + "vendorHash": "sha256-Ni422dybGvn5yzu85FbBdvG0zL7+rSpJWr8+HE1MSeg=" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider index 8c6d0b07e8..4d380a141b 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -151,7 +151,7 @@ update_attr hash "${hash}" old_vendor_hash="$(read_attr vendorHash)" if [[ ${old_vendor_hash} != null ]]; then echo_provider "calculating vendorHash" - vendorHash=$(generate_hash go-modules) + vendorHash=$(generate_hash goModules) update_attr vendorHash "${vendorHash}" fi 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 1aff80d275..fe653013cf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,8 +166,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.3"; - hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo="; + version = "1.5.4"; + hash = "sha256-MvN4gSJcPORD0wj6ixc3gUXPISGvAKSJPA6bS/SmDOY="; vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4="; patches = [ ./provider-path-0_15.patch ]; passthru = { 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 e38fbf36e1..274cd0ce36 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.48.1"; + version = "0.48.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zBjIUoH5s7Yo1qrzSY4LhxPBDcxxqZmvJt8z50FRro0="; + hash = "sha256-3hHCNiuff8CgnQ6hB4I8jODINKA6ZpNOkKwVcCqKDo4="; }; vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; 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 12105f0b59..caf224ccc6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,28 +1,32 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "tilt"; /* 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.1"; + version = "0.33.3"; src = fetchFromGitHub { - owner = "tilt-dev"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-3CRE+gpifV3MHyKdiiHmGwGre0ne3IjheYH0r6NMKY8="; + owner = "tilt-dev"; + repo = "tilt"; + rev = "v${version}"; + hash = "sha256-TNZE335tH50E96yJzD26U+JbVxjU746Wa/8YDGHFeto="; }; + vendorHash = null; subPackages = [ "cmd/tilt" ]; ldflags = [ "-X main.version=${version}" ]; - meta = with lib; { + meta = { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; homepage = "https://tilt.dev/"; - license = licenses.asl20; - maintainers = with maintainers; [ anton-dessiatov ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anton-dessiatov ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix new file mode 100644 index 0000000000..573e2cd78e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "timoni"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "stefanprodan"; + repo = "timoni"; + rev = "v${version}"; + hash = "sha256-1l+PEG3ptlWmM48v9K7Rm090WF8cv+e2ezYFN2JRK/o="; + }; + + vendorHash = "sha256-Mgo6Q3P8Piv5uLgyXDGpRI4CgbZn1DUcM7XhVZxl8EE="; + + subPackages = [ "cmd/timoni" ]; + nativeBuildInputs = [ installShellFiles ]; + + # Some tests require running Kubernetes instance + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X main.VERSION=${version}" + ]; + + postInstall = '' + installShellCompletion --cmd timoni \ + --bash <($out/bin/timoni completion bash) \ + --fish <($out/bin/timoni completion fish) \ + --zsh <($out/bin/timoni completion zsh) + ''; + + meta = with lib; { + homepage = "https://timoni.sh"; + changelog = "https://github.com/stefanprodan/timoni/releases/tag/${src.rev}"; + description = "A package manager for Kubernetes, powered by CUE and inspired by Helm"; + license = licenses.asl20; + maintainers = with maintainers; [ votava ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 3690464ceb..9092dfb307 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-vrRVNVcNahTC+HSHr7Bw3WedNhe+SSX03P65C5xiUnw="; + sha256 = "sha256-G1+zdzHj8fDKVEVQpBEH3o/em+gxCyQmrpSXj8bE/P4="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix index 3107b31ac6..b9e5e023fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.26.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sHk9ULh/792BEjPRcaeY3umx3pcLb41urrrouunm9nw="; + sha256 = "sha256-chL88vWUMN4kcuh8g2ckWOqYAs9JwE0vnm69zLd5KIM="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorSha256 = "sha256-Q9LjKgaFUx4txJlPcrG/YIbHV4hh5oWHVXIBDDgKYRg="; + vendorHash = "sha256-EV8MDHiQBmp/mEB+ug/yALPhcqytp0W8V6IPP+nt9DA="; subPackages = [ "cmd/gitops" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index 63811d27b7..11165cbc8f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.242"; + version = "1.2.248"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8="; + hash = "sha256-z8XuMByI6B49XCgsZWVjErzcmthCCnpE6LdIfHEpxyA="; }; - vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg="; + vendorHash = "sha256-mt/2Pc1xF6seMZiSxQFQ6bfUxpQCgG3WkjZd0utWbiw="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix index 48cb8bd900..75db4554b0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/yor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "yor"; - version = "0.1.180"; + version = "0.1.183"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-m6MEVPF+Jug655ictoUI3KjpMX5w3A3aDhFDZXTQfi4="; + hash = "sha256-OMwDqBZPzjeG47CKk/heRo0JxyN7E7qh/dnV8cAzUfo="; }; vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix index 3c6f1275a2..60c1c59c6a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-TgrYDLlbaYQwRpG4Vy9sZGWawbN4iS9YFVEjlB3JVfY="; + hash = "sha256-4217HkmTridDkq0c0lqkcbwqxqAceNIVFl/TEDcuxCA="; }; - vendorHash = "sha256-dIQ+6aWI47zI++4skMFnyDYpQPcHEHSwUS9aXatY43g="; + vendorHash = "sha256-sTI/fpT/5/2ulhCuhsKpY5epJup2TxF2jpRqBI0eOWA="; proxyVendor = true; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix new file mode 100644 index 0000000000..2fb9664437 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cyberduck/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cyberduck"; + version = "8.6.0.39818"; + + src = fetchurl { + url = "https://update.cyberduck.io/Cyberduck-${finalAttrs.version}.zip"; + sha256 = "1iqq54n267lmmdlv8wmr9k461p49jindc1mn5wy742k08cqxc5ab"; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Libre file transfer client for Mac and Windows"; + homepage = "https://cyberduck.io"; + license = licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix index 5f5283738c..3f6c52a4d4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + mainProgram = "davmail"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix index 1edf513868..fb4f102de0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix @@ -1,15 +1,15 @@ { buildGoModule, lib, installShellFiles, fetchFromGitHub }: let - short_hash = "69aa892"; + short_hash = "86497a5"; in buildGoModule rec { pname = "deck"; - version = "1.23.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-PrpiZBGNb8tWt2RiZ4iHKibN+2EQRm1/tBbDLng/lkA="; + hash = "sha256-dmzxCgZ0HLT9he8jS7lMtSFg5vbEbs8q368vE3lafhQ="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ in buildGoModule rec { "-X github.com/kong/deck/cmd.COMMIT=${short_hash}" ]; - vendorHash = "sha256-brd+gtIHIarMv3l6O6JMDPRFlMwKSLZjBABAvByUC6o="; + vendorHash = "sha256-ucwJQSZSBvSJzNQYLeNyCnZETmrNgVPFLjjkr1zP6b4="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix index 9a0b718293..cf2edf7673 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix @@ -86,5 +86,6 @@ buildFHSEnv { license = licenses.unfree; maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; + mainProgram = "dropbox"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix index fa88705ad2..5334fc01ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix @@ -11,8 +11,8 @@ let pname = "expressvpn"; - clientVersion = "3.25.0"; - clientBuild = "13"; + clientVersion = "3.52.0"; + clientBuild = "2"; version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ]; expressvpnBase = stdenvNoCC.mkDerivation { @@ -20,7 +20,7 @@ let src = fetchurl { url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb"; - hash = "sha256-lyDjG346FrgT7SZbsWET+Hexl9Un6mzMukfO2PwlInA="; + hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew="; }; nativeBuildInputs = [ dpkg autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix index 265e8236be..153cc791cb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/filebrowser/default.nix @@ -12,7 +12,7 @@ let hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc="; }; - sourceRoot = "source/frontend"; + sourceRoot = "${src.name}/frontend"; npmDepsHash = "sha256-acNIMKHc4q7eiFLPBtKZBNweEsrt+//0VR6dqwXHTvA="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix index 424591f07e..5a7dc544bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix @@ -99,6 +99,6 @@ stdenv.mkDerivation rec { description = "Firewall daemon with D-Bus interface"; homepage = "https://github.com/firewalld/firewalld"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 7b2c8c10f4..05f936d46f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.7.9"; + version = "3.8.0"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-TD57tGLTYy8E7lx6hzH1/00oWFYqCQ325UNEhgv/AEA="; + hash = "sha256-sAA01/Hs8yGFJM+ttwhonrBqTpGsEoWrYDU8w/YmE6A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix index 8ce157c6d5..63c674c1a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix @@ -17,11 +17,16 @@ stdenv.mkDerivation rec { pname = "freefilesync"; - version = "12.4"; + version = "12.5"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip"; - hash = "sha256-rH1xp0/ggWWyUPcksY2GhYtUddTGrEDxdL/uODurvDo="; + # The URL only redirects to the file on the second attempt + postFetch = '' + rm -f $out + tryDownload "$url" + ''; + hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM="; }; sourceRoot = "."; @@ -31,8 +36,12 @@ stdenv.mkDerivation rec { # Disable loading of the missing Animal.dat (fetchpatch { url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch"; + postFetch = '' + substituteInPlace $out \ + --replace "-std=c++2b" "-std=c++23" + ''; excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ]; - hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74="; + hash = "sha256-CtUC94AoYTxoqSMWZrzuO3jTD46rj11JnbNyXtWckCo="; }) # Fix build with GTK 3 (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix index 2b7987fa1e..36de704dbc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix @@ -59,7 +59,7 @@ in pname = "gephgui"; inherit version src; - sourceRoot = "source/gephgui-wry/gephgui"; + sourceRoot = "${src.name}/gephgui-wry/gephgui"; postPatch = "ln -s ${./package-lock.json} ./package-lock.json"; @@ -79,7 +79,7 @@ in pname = "gephgui-wry"; inherit version src; - sourceRoot = "source/gephgui-wry"; + sourceRoot = "${src.name}/gephgui-wry"; cargoHash = "sha256-lidlUUfHXKPUlICdaVv/SFlyyWsZ7cYHyTJ3kkMn3L4="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix new file mode 100644 index 0000000000..5f2eb54879 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, buildPackages +}: + +buildGoModule rec { + pname = "gnmic"; + version = "0.31.3"; + + src = fetchFromGitHub { + owner = "openconfig"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+TxOl+at/SQIC1x/LwCgk4JmvOPY2el7HE1reAkmVn8="; + }; + + vendorHash = "sha256-4cmFoDMgD9TKacZ2RD73kQKDrpN5xuSKZ4ikcWAd5Rw="; + + ldflags = [ + "-s" "-w" + "-X" "github.com/openconfig/gnmic/app.version=${version}" + "-X" "github.com/openconfig/gnmic/app.commit=${src.rev}" + "-X" "github.com/openconfig/gnmic/app.date=1970-01-01T00:00:00Z" + ]; + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' + installShellCompletion --cmd gnmic \ + --bash <(${emulator} $out/bin/gnmic completion bash) \ + --fish <(${emulator} $out/bin/gnmic completion fish) \ + --zsh <(${emulator} $out/bin/gnmic completion zsh) + ''; + + meta = with lib; { + description = "gNMI CLI client and collector"; + homepage = "https://gnmic.openconfig.net/"; + changelog = "https://github.com/openconfig/gnmic/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ vincentbernat ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix index b5427384e9..9c0a5ea086 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix @@ -22,8 +22,7 @@ , luajit , lz4 , nspr -, nss -, pcre +, pcre2 , python , zlib , redisSupport ? true, redis, hiredis @@ -34,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.13"; + version = "7.0.0"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-4J8vgA0ODNL5fyHFBZUMzD27nOXP6AjflWe22EmjEFU="; + hash = "sha256-e80TExGDZkUUZdw/g4Wj9qrdCE/+RN0lfdqBBYY7t2k="; }; nativeBuildInputs = [ @@ -67,8 +66,7 @@ stdenv.mkDerivation rec { luajit lz4 nspr - nss - pcre + pcre2 python zlib ] @@ -101,7 +99,6 @@ stdenv.mkDerivation rec { "--enable-nflog" "--enable-nfqueue" "--enable-pie" - "--disable-prelude" "--enable-python" "--enable-unix-socket" "--localstatedir=/var" 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 e0d2cd3e0b..82da4dedc9 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.0"; + version = "3.2.1"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "sha256-7lT69fU7tGujhbDTX0tYpkEquoswMCZOGAUhk2Nr+C0="; + sha256 = "1cfbypn9kh566s09c1bvxswpc0r11pmsvxlh4dixd5s622ia3h7r"; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "sha256-a5qLK8WjrlmKF24U9SiEpY+SNWuHf6gHJBym5IM8HZ4="; + sha256 = "0mb6az0mzjz2zal7igigjcigg3phn2ijfw04igpl7q2rg6ha3z00"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -136,5 +136,6 @@ stdenv.mkDerivation rec { license = licenses.osl3; maintainers = with maintainers; [ wrmilling ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "armcord"; }; } 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 c6e020cdc2..501d8f7d16 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.55.5"; + version = "2.58.0"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,16 +10,17 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo="; + sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk="; + sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; }; meta = oldAttrs.meta // { platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms; + mainProgram = "caprine"; }; }) 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 2bf96fcb46..8bc1c7cb59 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,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.27"; + stable = "0.0.28"; ptb = "0.0.44"; canary = "0.0.162"; development = "0.0.217"; @@ -16,7 +16,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-6fHaiPBcv7TQVh+TatIEYXZ/LwPmnCmU/QWXKFgUR7U="; + sha256 = "sha256-JwxVVm/QIBLoVyQ2Ff/MX06UNgZ+dAsD960GsCg1M+U="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; @@ -61,6 +61,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "discord"; }; package = if stdenv.isLinux diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix index 236ceaa0a7..ce94764ed9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -18,6 +18,7 @@ let { pythonInterpreter = "${python3.interpreter}"; configDirName = lib.toLower binaryName; + meta.mainProgram = "disable-breaking-updates.py"; } '' mkdir -p $out/bin cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py 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 67e21bcd18..f3ec46f364 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 @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { owner = "vector-im"; repo = "element-desktop"; rev = "v${finalAttrs.version}"; - sha256 = desktopSrcHash; + hash = desktopSrcHash; }; offlineCache = fetchYarnDeps { @@ -149,5 +149,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; + mainProgram = "element-desktop"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index e6b73d2983..4e80744a4c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { owner = "vector-im"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - sha256 = webSrcHash; + hash = webSrcHash; }; offlineCache = fetchYarnDeps { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 6e462ef24d..84196371be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "atom"; repo = "node-keytar"; rev = "v${version}"; - sha256 = pinData.srcHash; + hash = pinData.srcHash; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json index dc7420ab45..626f5a62ea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/pin.json @@ -1,5 +1,5 @@ { "version": "7.9.0", - "srcHash": "Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", + "srcHash": "sha256-Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", "npmHash": "sha256-ldfRWV+HXBdBYO2ZiGbVFSHV4/bMG43U7w+sJ4kpVUY=" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index 0ddfa02472..9b8d014f03 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps +#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps nix-prefetch-github if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the keytar package." @@ -25,7 +25,7 @@ wget "$SRC/package.json" npm_hash=$(prefetch-npm-deps package-lock.json) rm -rf node_modules package.json package-lock.json -src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .sha256) +src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .hash) cat > pin.json << EOF { 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 280f8f6690..834bcb9235 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.35"; + "version" = "1.11.37"; "hashes" = { - "desktopSrcHash" = "8BP7PC0ZqE3d0K1AxmG05Xh3Ze1dAOcBVW9ADW4YAjY="; - "desktopYarnHash" = "1k8ih7z9hxm38kbvnfimd0djwqlrs62s8i0hc6d6ii10l3binkzp"; - "webSrcHash" = "IM1M8iygeya8hw0uVjV4EK/jGG4UyQUTviYAvAjI7k4="; - "webYarnHash" = "0lr5cgs8nhdjrv43pcyhq4ysrz8bncx0j969j82l0chq3nzdml5b"; + "desktopSrcHash" = "sha256-6YiMAmOb0lSaLDE/ohVpZFbl4J1NxS9xNFFcebVW9MA="; + "desktopYarnHash" = "1ksj99g649kvilr850rkk8nkl55z7vz7m8159777kjikakzra2ly"; + "webSrcHash" = "sha256-zFRoL/bnic6Waaiz7Vfama4qzlYKk0TTr5zPK6PNSpM="; + "webYarnHash" = "1lpd9mmg51jnhdr2zfisxdpc4i64kn4bpzkxqzip7dnn9iz432kw"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 915e3faa3e..b24b0d7b71 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -5,16 +5,16 @@ let in rustPlatform.buildRustPackage rec { pname = "seshat-node"; - inherit (pinData) version; + inherit (pinData) version cargoHash; src = fetchFromGitHub { owner = "matrix-org"; repo = "seshat"; rev = version; - sha256 = pinData.srcHash; + hash = pinData.srcHash; }; - sourceRoot = "source/seshat-node/native"; + sourceRoot = "${src.name}/seshat-node/native"; nativeBuildInputs = [ nodejs python3 yarn ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; @@ -53,6 +53,4 @@ in rustPlatform.buildRustPackage rec { ''; disallowedReferences = [ stdenv.cc.cc ]; - - cargoSha256 = pinData.cargoHash; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json index 78d5156f54..f0648d11f2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/pin.json @@ -1,6 +1,6 @@ { "version": "2.3.3", - "srcHash": "HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", + "srcHash": "sha256-HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", "yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp", "cargoHash": "sha256-WsgTbQ91aZZV5sIuFVjsccdiXivjtAUC1Zs/4uNk1zU=" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh index 1315715ac0..6e7e75e66b 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/seshat/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch +#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch nix-prefetch-github if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the seshat package." @@ -25,7 +25,7 @@ wget "$SRC/seshat-node/yarn.lock" yarn_hash=$(prefetch-yarn-deps yarn.lock) popd -src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .sha256) +src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .hash) cat > pin.json << EOF { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh index ca9f39c306..c68a347e68 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh @@ -20,7 +20,7 @@ version="${version#v}" # Element Web web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version" -web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .sha256) +web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash) web_tmpdir=$(mktemp -d) trap 'rm -rf "$web_tmpdir"' EXIT @@ -32,7 +32,7 @@ popd # Element Desktop desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" -desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .sha256) +desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash) desktop_tmpdir=$(mktemp -d) trap 'rm -rf "$desktop_tmpdir"' EXIT 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 53c6e7345e..207ba682d2 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 @@ -81,6 +81,12 @@ 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" @@ -92,9 +98,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arrayref" @@ -220,6 +226,24 @@ 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", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "signal-hook", + "windows-sys 0.48.0", +] + [[package]] name = "async-recursion" version = "1.0.4" @@ -228,7 +252,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -271,7 +295,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -316,9 +340,9 @@ 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" @@ -352,7 +376,7 @@ dependencies = [ "cc", "cfg-if", "constant_time_eq", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -421,9 +445,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" @@ -485,9 +509,9 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" dependencies = [ "smallvec", "target-lexicon", @@ -526,12 +550,12 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "serde", "winapi", @@ -566,16 +590,6 @@ dependencies = [ "cc", ] -[[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 = "color_quant" version = "1.1.0" @@ -674,16 +688,6 @@ dependencies = [ "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.7.0" @@ -715,50 +719,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - [[package]] name = "derivative" version = "2.2.0" @@ -781,9 +741,9 @@ dependencies = [ [[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.4", "crypto-common", @@ -792,33 +752,34 @@ dependencies = [ [[package]] name = "dirs" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[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.18", ] [[package]] @@ -845,7 +806,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -922,11 +883,11 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", + "memoffset 0.9.0", "rustc_version", ] @@ -938,7 +899,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.8.0" +version = "0.9.0" dependencies = [ "ashpd", "async-recursion", @@ -973,12 +934,12 @@ 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", ] [[package]] @@ -1083,7 +1044,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -1613,7 +1574,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]] @@ -1731,12 +1692,11 @@ dependencies = [ [[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]] @@ -1794,9 +1754,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -1832,9 +1792,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -1894,15 +1854,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsignal-protocol" @@ -1935,7 +1895,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e871a#a2e871a3a28e615d70b0cdc50e9d8abc2867e535" dependencies = [ "aes 0.7.5", "aes-gcm", @@ -1968,7 +1928,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c2f70ef#c2f70efd88bbebc9b646690a8449c451af619f2c" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e871a#a2e871a3a28e615d70b0cdc50e9d8abc2867e535" dependencies = [ "async-trait", "async-tungstenite", @@ -1991,15 +1951,6 @@ dependencies = [ "url", ] -[[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" @@ -2008,9 +1959,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "locale_config" @@ -2037,11 +1988,10 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" dependencies = [ - "cfg-if", "value-bag", ] @@ -2106,6 +2056,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 = "mime" version = "0.3.17" @@ -2128,15 +2087,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2149,14 +2099,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2366,9 +2315,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "oncemutex" @@ -2388,7 +2337,7 @@ dependencies = [ "byteorder", "cbc", "cipher 0.4.4", - "digest 0.10.6", + "digest 0.10.7", "dirs", "futures-util", "hkdf 0.12.3", @@ -2416,6 +2365,12 @@ 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" @@ -2500,7 +2455,7 @@ 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", "hmac 0.12.1", "password-hash", "sha2 0.10.6", @@ -2512,7 +2467,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "hmac 0.12.1", ] @@ -2566,9 +2521,9 @@ 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 = "png" @@ -2580,7 +2535,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -2641,7 +2596,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage.git?rev=24af78c#24af78c499e4e7d1b0ac6788a98ecb3fb03ca80e" +source = "git+https://github.com/Schmiddiii/presage.git?rev=c1a246e1ac5181c34e83d9f838da154ca3160b5c#c1a246e1ac5181c34e83d9f838da154ca3160b5c" dependencies = [ "base64 0.12.3", "futures", @@ -2660,7 +2615,7 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage.git?rev=24af78c#24af78c499e4e7d1b0ac6788a98ecb3fb03ca80e" +source = "git+https://github.com/Schmiddiii/presage.git?rev=c1a246e1ac5181c34e83d9f838da154ca3160b5c#c1a246e1ac5181c34e83d9f838da154ca3160b5c" dependencies = [ "async-trait", "base64 0.12.3", @@ -2713,9 +2668,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -2856,9 +2811,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -2965,13 +2920,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.1", + "regex-syntax 0.7.2", ] [[package]] @@ -2994,9 +2949,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "ring" @@ -3024,9 +2979,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.13" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", @@ -3075,7 +3030,7 @@ 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]] @@ -3105,12 +3060,6 @@ 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" @@ -3123,9 +3072,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags", "core-foundation", @@ -3136,9 +3085,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -3152,22 +3101,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -3189,14 +3138,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" dependencies = [ "serde", ] @@ -3209,7 +3158,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3220,7 +3169,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3244,7 +3193,26 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", ] [[package]] @@ -3325,9 +3293,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -3348,9 +3316,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -3361,9 +3329,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "temp-dir" @@ -3410,7 +3378,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -3430,9 +3398,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "libc", @@ -3441,7 +3409,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3456,13 +3424,13 @@ dependencies = [ [[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.15", + "syn 2.0.18", ] [[package]] @@ -3504,9 +3472,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] @@ -3545,20 +3513,20 @@ 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", + "syn 2.0.18", ] [[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", ] @@ -3623,9 +3591,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -3642,12 +3610,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "unicode-xid" version = "0.2.4" @@ -3696,22 +3658,18 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "uuid" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "serde", ] [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" [[package]] name = "version-compare" @@ -3755,9 +3713,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3765,24 +3723,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -3792,9 +3750,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3802,28 +3760,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -4069,15 +4027,16 @@ dependencies = [ [[package]] name = "zbus" -version = "3.12.0" +version = "3.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" +checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29" dependencies = [ "async-broadcast", "async-executor", "async-fs", "async-io", "async-lock", + "async-process", "async-recursion", "async-task", "async-trait", @@ -4108,23 +4067,24 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.12.0" +version = "3.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" +checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "regex", "syn 1.0.109", + "winnow", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a" dependencies = [ "serde", "static_assertions", @@ -4148,7 +4108,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -4170,9 +4130,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "622cc473f10cef1b0d73b7b34a266be30ebdcfaea40ec297dd8cbda088f9f93c" dependencies = [ "byteorder", "enumflags2", @@ -4185,9 +4145,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "5d9c1b57352c25b778257c661f3c4744b7cefb7fc09dd46909a153cce7773da2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4198,9 +4158,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", 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 f8559c57d6..ef8630b736 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 @@ -5,25 +5,28 @@ , meson , ninja , pkg-config +, gst_all_1 , protobuf , libsecret , libadwaita , rustPlatform , rustc +, appstream-glib +, blueprint-compiler , desktop-file-utils , wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "flare"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "Schmiddiii"; repo = pname; rev = version; - hash = "sha256-w4WaWcUsjKiWfNe5StwRcPlcXqWz0427It96L1NsR0U="; + hash = "sha256-6p9uuK71fJvJs0U14jJEVb2mfpZWrCZZFE3eoZe9eVo="; }; cargoDeps = rustPlatform.importCargoLock { @@ -31,12 +34,14 @@ stdenv.mkDerivation rec { outputHashes = { "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0="; "libsignal-protocol-0.1.0" = "sha256-IBhmd3WzkICiADO24WLjDJ8pFILGwWNUHLXKpt+Y0IY="; - "libsignal-service-0.1.0" = "sha256-art5O06X4lhp9PoAd23mi6F1wRWkUcyON7AK8uBDoK8="; - "presage-0.6.0-dev" = "sha256-DVImXySYL0zlGkwss/5DnQ3skTaBa7l55VWIGCd6kQU="; + "libsignal-service-0.1.0" = "sha256-WSRqBNq9jbe6PSeExfmehNZwjlB70GLlHkrDlw59O5c="; + "presage-0.6.0-dev" = "sha256-oNDfFLir3XL2UOGrWR/IFO7XTeJKX+vjdrd3qbIomtw="; }; }; nativeBuildInputs = [ + appstream-glib # for appstream-util + blueprint-compiler desktop-file-utils # for update-desktop-database meson ninja @@ -51,6 +56,12 @@ stdenv.mkDerivation rec { libadwaita libsecret protobuf + + # To reproduce audio messages + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad ]; meta = { @@ -58,7 +69,7 @@ stdenv.mkDerivation rec { description = "An unofficial Signal GTK client"; homepage = "https://gitlab.com/Schmiddiii/flare"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ dotlambda tomfitzhenry ]; + maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.linux; }; } 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 09d2af372a..f58f62a7ae 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 @@ -7,8 +7,8 @@ }: flutter.buildFlutterApplication rec { + pname = "fluffychat"; version = "1.12.1"; - name = "fluffychat"; src = fetchFromGitLab { owner = "famedly"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ffe82e6708..fdfbbc5b27 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,43 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchurl , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf }: +, argp-standalone }: stdenv.mkDerivation rec { pname = "freetalk"; - version = "4.1"; + version = "4.2"; - src = fetchFromGitHub { - owner = "GNUFreetalk"; - repo = "freetalk"; - rev = "v${version}"; - sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; + src = fetchurl { + url = "mirror://gnu/freetalk/freetalk-${version}.tar.gz"; + hash = "sha256-u1tPKacGry+JGYeAIgDia3N7zs5EM4FyQZdV8e7htYA="; }; - patches = [ - # Pull pending patch for -fno-common tuulchain support: - # https://github.com/GNUFreetalk/freetalk/pull/39 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; - sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; - }) - ]; - - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ pkg-config texinfo autoconf automake ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson + ] ++ lib.optionals stdenv.isDarwin [ + argp-standalone ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; + meta = with lib; { description = "Console XMPP client"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; downloadPage = "https://www.gnu.org/software/freetalk/"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix new file mode 100644 index 0000000000..2308a4b616 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, yarn +, fixup_yarn_lock +, nodejs +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hydrogen-web"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "vector-im"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$PWD/tmp + mkdir -p $HOME + + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $offlineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn build --offline + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R target $out + + runHook postInstall + ''; + + meta = { + description = "Lightweight matrix client with legacy and mobile browser support"; + homepage = "https://github.com/vector-im/hydrogen-web"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/wrapper.nix new file mode 100644 index 0000000000..9ea22e864f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/hydrogen-web/wrapper.nix @@ -0,0 +1,26 @@ +{ stdenv +, jq +, hydrogen-web-unwrapped +, conf ? { } +}: + +if (conf == { }) then hydrogen-web-unwrapped else +stdenv.mkDerivation { + pname = "${hydrogen-web-unwrapped.pname}-wrapped"; + inherit (hydrogen-web-unwrapped) version meta; + + dontUnpack = true; + + nativeBuildInputs = [ jq ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ln -s ${hydrogen-web-unwrapped}/* $out + rm $out/config.json + jq -s '.[0] * $conf' "${hydrogen-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + + runHook postInstall + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch deleted file mode 100644 index 5420b77c89..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f60e38b394c55e709cba2c0839c1fbba2fd8a1d2 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Sun, 16 Apr 2023 21:56:06 +0800 -Subject: [PATCH] fix annotations in bin/dbus/cx.ring.Ring.CallManager.xml - ---- - bin/dbus/cx.ring.Ring.CallManager.xml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bin/dbus/cx.ring.Ring.CallManager.xml b/bin/dbus/cx.ring.Ring.CallManager.xml -index 8c5732f30..4228fcad2 100644 ---- a/bin/dbus/cx.ring.Ring.CallManager.xml -+++ b/bin/dbus/cx.ring.Ring.CallManager.xml -@@ -87,7 +87,7 @@ - - Once enabled using the startSmartInfo method, this signal is emitted every refreshTimeMS - -- -+ - - - -@@ -761,7 +761,7 @@ - The caller phone number. - - -- -+ - - - The list of media offered in the incoming call. -@@ -791,7 +791,7 @@ - Call ID of the incoming call. - - -- -+ - - - The list of media offered in the incoming call. -@@ -807,7 +807,7 @@ - - - -- -+ - - - --- -2.39.2 - diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix index ee14657bed..87f65e6d05 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -4,7 +4,7 @@ , fetchFromGitLab , fetchpatch , gitUpdater -, ffmpeg_5 +, ffmpeg_6 # for daemon , autoreconfHook @@ -12,7 +12,7 @@ , alsa-lib , asio , dbus -, dbus_cplusplus +, sdbus-cpp , fmt , gmp , gnutls @@ -66,14 +66,14 @@ let in stdenv.mkDerivation rec { pname = "jami"; - version = "20230323.0"; + version = "20230619.1"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-X8iIT8UtI2Vq0Ne5e2ahSPN4g7QLZGnq3SZV/NY+1pY="; + hash = "sha256-gOl4GtGmEvhM8xtlyFvTwXrUsbocUKULnVy9cnCNAM0="; fetchSubmodules = true; }; @@ -82,16 +82,24 @@ stdenv.mkDerivation rec { patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "3b78ef1c48732d238ba284cdccb04dc6de79c54f"; + version = "e4b83585a0bdf1523e808a4fc1946ec82ac733d0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ="; + hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ + (fetchpatch { + name = "CVE-2023-27585.patch"; + url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; + hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; + }) + ]; + + patchFlags = [ "-p1" "-l" ]; configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); @@ -105,15 +113,7 @@ stdenv.mkDerivation rec { daemon = stdenv.mkDerivation { pname = "jami-daemon"; inherit src version meta; - sourceRoot = "source/daemon"; - - patches = [ - ./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch - (fetchpatch { - url = "https://git.jami.net/savoirfairelinux/jami-daemon/-/commit/315b5fbf546712f22a7b03ca750257bc92263a91.patch"; - hash = "sha256-GNUhFWvYpihAVe1gkVkZARpQmN+Cgv97hRQ4VFiEoKI="; - }) - ]; + sourceRoot = "${src.name}/daemon"; nativeBuildInputs = [ autoreconfHook @@ -125,9 +125,9 @@ stdenv.mkDerivation rec { alsa-lib asio dbus - dbus_cplusplus + sdbus-cpp fmt - ffmpeg_5 + ffmpeg_6 gmp gnutls http-parser @@ -154,6 +154,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; }; + postPatch = '' + substituteInPlace src/app/commoncomponents/ModalTextEdit.qml \ + --replace 'required property string placeholderText' 'property string placeholderText: ""' + ''; + preConfigure = '' echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h ''; @@ -168,7 +173,7 @@ stdenv.mkDerivation rec { buildInputs = [ daemon - ffmpeg_5 + ffmpeg_6 libnotify networkmanager qtbase diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index d3700a66be..1314853ad6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,99 +1,149 @@ -{ callPackage, stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11, gtkspell2, aspell -, gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss -, nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn -, lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl -, gnutls, libgcrypt, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true +{ stdenv +, callPackage +, fetchurl +, makeWrapper +, aspell +, avahi +, cacert +, dbus +, dbus-glib +, farstream +, gettext +, gst_all_1 +, gtk2 +, gtk2-x11 +, gtkspell2 +, intltool +, lib +, libICE +, libSM +, libXScrnSaver +, libXext +, libgcrypt +, libgnt +, libidn +, libstartup_notification +, libxml2 +, ncurses +, nspr +, nss +, perlPackages +, pkg-config +, python3 +, pidgin +, plugins ? [] +, withOpenssl ? false, openssl +, withGnutls ? false , gnutls +, withCyrus_sasl ? true, cyrus_sasl +, pidginPackages }: # FIXME: clean the mess around choosing the SSL library (nss by default) -let unwrapped = stdenv.mkDerivation rec { - pname = "pidgin"; - version = "2.14.12"; +let + unwrapped = stdenv.mkDerivation rec { + pname = "pidgin"; + version = "2.14.12"; - src = fetchurl { - url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; - }; + src = fetchurl { + url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; + sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; + }; - nativeBuildInputs = [ makeWrapper intltool ]; + nativeBuildInputs = [ makeWrapper intltool ]; - env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; - buildInputs = let - python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); - in [ - aspell libstartup_notification - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libxml2 nss nspr - libXScrnSaver python-with-dbus - avahi dbus dbus-glib libidn - libICE libXext libSM cyrus_sasl - libgnt ncurses # optional: build finch - the console UI - ] - ++ lib.optional withOpenssl openssl - ++ lib.optionals withGnutls [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] - ++ lib.optional stdenv.isDarwin gtk2-x11; - - - propagatedBuildInputs = [ pkg-config gettext ] - ++ (with perlPackages; [ perl XMLParser ]) - ++ lib.optional stdenv.isLinux gtk2 + buildInputs = let + python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); + in [ + aspell + avahi + cyrus_sasl + dbus + dbus-glib + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gstreamer + libICE + libSM + libXScrnSaver + libXext + libgnt + libidn + libstartup_notification + libxml2 + ncurses # optional: build finch - the console UI + nspr + nss + python-with-dbus + ] + ++ lib.optional withOpenssl openssl + ++ lib.optionals withGnutls [ gnutls libgcrypt ] + ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] ++ lib.optional stdenv.isDarwin gtk2-x11; - patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; - configureFlags = [ - "--with-nspr-includes=${nspr.dev}/include/nspr" - "--with-nspr-libs=${nspr.out}/lib" - "--with-nss-includes=${nss.dev}/include/nss" - "--with-nss-libs=${nss.out}/lib" - "--with-ncurses-headers=${ncurses.dev}/include" - "--with-system-ssl-certs=${cacert}/etc/ssl/certs" - "--disable-meanwhile" - "--disable-nm" - "--disable-tcl" - "--disable-gevolution" - ] - ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] - ++ lib.optionals withGnutls ["--enable-gnutls=yes" "--enable-nss=no"] - ++ lib.optionals stdenv.isDarwin ["--disable-gtkspell" "--disable-vv"]; + propagatedBuildInputs = [ pkg-config gettext ] + ++ (with perlPackages; [ perl XMLParser ]) + ++ lib.optional stdenv.isLinux gtk2 + ++ lib.optional stdenv.isDarwin gtk2-x11; - enableParallelBuilding = true; + patches = [ + ./add-search-path.patch + ./pidgin-makefile.patch + ]; - postInstall = '' - wrapProgram $out/bin/pidgin \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; + configureFlags = [ + "--with-nspr-includes=${nspr.dev}/include/nspr" + "--with-nspr-libs=${nspr.out}/lib" + "--with-nss-includes=${nss.dev}/include/nss" + "--with-nss-libs=${nss.out}/lib" + "--with-ncurses-headers=${ncurses.dev}/include" + "--with-system-ssl-certs=${cacert}/etc/ssl/certs" + "--disable-meanwhile" + "--disable-nm" + "--disable-tcl" + "--disable-gevolution" + ] + ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] + ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] + ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ]; - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - # In particular, this detects missing python imports in some of the tools. - postFixup = let - # TODO: python is a script, so it doesn't work as interpreter on darwin - binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; - in lib.optionalString doInstallCheck '' - for f in "''${!outputBin}"/bin/{${binsToTest}}; do - echo "Testing: $f --help" - "$f" --help - done - ''; + enableParallelBuilding = true; - passthru = { - makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}"; + postInstall = '' + wrapProgram $out/bin/pidgin \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + # In particular, this detects missing python imports in some of the tools. + postFixup = let + # TODO: python is a script, so it doesn't work as interpreter on darwin + binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; + in lib.optionalString doInstallCheck '' + for f in "''${!outputBin}"/bin/{${binsToTest}}; do + echo "Testing: $f --help" + "$f" --help + done + ''; + + passthru = { + makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${lib.versions.major version}"; + withPlugins = pluginfn: callPackage ./wrapper.nix { + plugins = pluginfn pidginPackages; + pidgin = unwrapped; + }; + }; + + meta = { + description = "Multi-protocol instant messaging client"; + homepage = "https://pidgin.im/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.lucasew ]; + }; }; - meta = with lib; { - description = "Multi-protocol instant messaging client"; - homepage = "https://pidgin.im/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ ]; - }; -}; - in if plugins == [] then unwrapped - else callPackage ./wrapper.nix { - inherit plugins; - pidgin = unwrapped; - } + else unwrapped.withPlugins (_: plugins) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix new file mode 100644 index 0000000000..b666df3096 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -0,0 +1,70 @@ +{ lib +, newScope +, pidgin +, texlive +, config +}: + +lib.makeScope newScope (self: + let callPackage = self.callPackage; + in { + pidgin = callPackage ../. { + withOpenssl = config.pidgin.openssl or true; + withGnutls = config.pidgin.gnutls or false; + plugins = []; + }; + + pidginPackages = self; + + pidgin-indicator = callPackage ./pidgin-indicator { }; + + pidgin-latex = callPackage ./pidgin-latex { + texLive = texlive.combined.scheme-basic; + }; + + pidgin-msn-pecan = callPackage ./msn-pecan { }; + + pidgin-mra = callPackage ./pidgin-mra { }; + + pidgin-skypeweb = callPackage ./pidgin-skypeweb { }; + + pidgin-carbons = callPackage ./carbons { }; + + pidgin-xmpp-receipts = callPackage ./pidgin-xmpp-receipts { }; + + pidgin-otr = callPackage ./otr { }; + + pidgin-osd = callPackage ./pidgin-osd { }; + + pidgin-sipe = callPackage ./sipe { }; + + pidgin-window-merge = callPackage ./window-merge { }; + + purple-discord = callPackage ./purple-discord { }; + + purple-googlechat = callPackage ./purple-googlechat { }; + + purple-hangouts = callPackage ./purple-hangouts { }; + + purple-lurch = callPackage ./purple-lurch { }; + + purple-matrix = callPackage ./purple-matrix { }; + + purple-mm-sms = callPackage ./purple-mm-sms { }; + + purple-plugin-pack = callPackage ./purple-plugin-pack { }; + + purple-signald = callPackage ./purple-signald { }; + + purple-slack = callPackage ./purple-slack { }; + + purple-vk-plugin = callPackage ./purple-vk-plugin { }; + + purple-xmpp-http-upload = callPackage ./purple-xmpp-http-upload { }; + + tdlib-purple = callPackage ./tdlib-purple { }; + + pidgin-opensteamworks = callPackage ./pidgin-opensteamworks { }; + + purple-facebook = callPackage ./purple-facebook { }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/msn-pecan/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/otr/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-latex/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix index a396e9acc0..ceeac0acd0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU="; }; - sourceRoot = "source/steam-mobile"; + sourceRoot = "${src.name}/steam-mobile"; installFlags = [ "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-osd/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-osd/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-xmpp-receipts/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-xmpp-receipts/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-facebook/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix index 3bdecf504c..121ef0231a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A libpurple plugin for sending and receiving SMS via Modemmanager"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-vk-plugin/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-xmpp-http-upload/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-xmpp-http-upload/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tox-prpl/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix 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 6307782736..5a72c1bd1e 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 @@ -19,6 +19,7 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook +, makeWrapper }: let @@ -42,7 +43,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + # makeBinaryWrapper not support shell wrapper specifically for `NIXOS_OZONE_WL`. + (wrapGAppsHook.override { inherit makeWrapper; }) dpkg ]; @@ -87,7 +89,10 @@ stdenv.mkDerivation { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ gjs ]}") + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ gjs ]}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + ) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index e80d5955b3..4062911bd7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-wvjCr1U+/1/GtebMNWJjizzegqZ+wWXUrmOshYtMq6o="; + sha256 = "sha256-+9caiyh5o537cwjF0/bGdaJGQNd2Navn/nLYaYjnRN8="; }; desktopItem = (makeDesktopItem { 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 464fc65cfb..647b2e662a 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.10.8"; + version = "1.11.0"; 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-r/MQlZ3dmQmQZ/FCYIIF2sh9+VXwG97PFfTIXIQijx8="; + sha256 = "sha256-QartWtp5/OtJqQq5GXRoIQ/ytK9/YCW1ixXTUrnGwqw="; }; appimage = appimageTools.wrapType2 { inherit version pname src; 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 b150c2f9fb..ea1ab235fc 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,8 +1,8 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.23.0"; - hash = "sha256-WZe1fJ6H+h7QcXn+gR7OJ+KSOgd9NxTDLMs7UOFeq70="; + version = "6.27.1"; + hash = "sha256-nEOt6bep6SqhAab8yD9NlRrDGU2IvZeOxSqPj2u1bio="; }; signal-desktop-beta = { dir = "Signal Beta"; 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 0122426786..49035e9bd5 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 = "20230707"; + version = "20230730"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-kVXkcAhDpwc6/d5iXMJ3Z31p9REqWUvSimE8p+OD8aU="; + hash = "sha256-5gXeAX3eV70p5wdQEMXv5QAv3vXH2OH46XL2rY0AUvE="; }; postPatch = '' 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 e2135734bd..99b8b4563d 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 @@ -17,5 +17,6 @@ buildGoModule rec { homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "slack-term"; }; } 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 4d8c1d4aee..3a03a5fce8 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 @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.32.122"; - x86_64-darwin-sha256 = "sha256-aKvMtuo3cNJsw42RNezmETsLAtl6G2yqYGOGp2Pt32U=3"; + x86_64-darwin-version = "4.33.73"; + x86_64-darwin-sha256 = "0y8plkl3pm8250xpavc91kn5b9gcdwr7bqzd3i79n48395lx11ka"; - x86_64-linux-version = "4.32.122"; - x86_64-linux-sha256 = "sha256-ViJHG7s7xqnatNOss5mfa7GqqlHbBrLGHBzTqqo7W/w="; + x86_64-linux-version = "4.33.73"; + x86_64-linux-sha256 = "007i8sjnm1ikjxvgw6nisj4nmv99bwk0r4sfpvc2j4w4wk68sx3m"; - aarch64-darwin-version = "4.32.122"; - aarch64-darwin-sha256 = "sha256-j3PbH/5cKN5+vUiLvXaxyPYilt6GX6FsGo+1hlJKrls="; + aarch64-darwin-version = "4.33.73"; + aarch64-darwin-sha256 = "15s3ss15yawb04dyzn82xmk1gs70sg2i3agsj2aw0xdx73yjl34p"; version = { x86_64-darwin = x86_64-darwin-version; @@ -85,6 +85,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ mmahut maxeaubrey ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; + mainProgram = "slack"; }; linux = stdenv.mkDerivation rec { 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 8a9fc9d88b..792572e5c1 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 @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.1.11"; + version = "1.2.8"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-D0qZvKGfLE6VreCYn4Io2KmHcAHCVegG8xZwmxsQH5c="; + hash = "sha256-5OocTsQjmNZCnzAY1RfrxD6Ad/kZTIkFl/3OmeJl1oI="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-Zk3TAoGAPeki/ogfNl/XqeBBn6N/kbNcktRHEyqPOAA="; + hash = "sha256-XUASMWrH8wWeYsr6gCdQGgV/7E6hLDWkJ0BXHZCepKQ="; }; patches = [ 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 1f21891c79..be4334438c 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 @@ -39,6 +39,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "teams"; }; linux = stdenv.mkDerivation rec { 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 5a0a9006e0..540555b412 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 @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, perl, llvmPackages }: let - arch = if stdenv.is64bit then "amd64" else "x86"; + arch = "amd64"; - libDir = if stdenv.is64bit then "lib64" else "lib"; + libDir = "lib64"; deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages_10.libcxx llvmPackages_10.libcxxabi # llvmPackages_11 and higher crash https://github.com/NixOS/nixpkgs/issues/161395 + qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi ]; desktopItem = makeDesktopItem { @@ -25,21 +25,16 @@ let genericName = "TeamSpeak"; categories = [ "Network" ]; }; - - fakeLess = writeShellScriptBin "less" "cat"; - in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.5.6"; + version = "3.6.1"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; - sha256 = if stdenv.is64bit - then "sha256:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg" - else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija"; + hash = "sha256-j4sgZ+tJpV6ST0yLmbLTLgBxQTcK1LZoEEfMe3TUAC4="; }; # grab the plugin sdk for the desktop icon @@ -48,11 +43,20 @@ stdenv.mkDerivation rec { sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f"; }; - nativeBuildInputs = [ makeWrapper fakeLess which unzip ]; + nativeBuildInputs = [ + makeWrapper + which + unzip + perl # Installer script needs `shasum` + ]; + # This just runs the installer script. If it gets stuck at something like + # ++ exec + # + PAGER_PATH= + # it's looking for a dependency and didn't find it. Check the script and make sure the dep is in nativeBuildInputs. unpackPhase = '' - echo -e '\ny' | sh -xe $src + echo -e '\ny' | PAGER=cat sh -xe $src cd TeamSpeak* ''; @@ -110,8 +114,9 @@ stdenv.mkDerivation rec { url = "https://www.teamspeak.com/en/privacy-and-terms/"; free = false; }; - maintainers = with maintainers; [ lhvwb lukegb ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ lhvwb lukegb atemu ]; + mainProgram = "ts3client"; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix deleted file mode 100644 index c8e8598c14..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages -, makeWrapper, openssl, pkg-config, python3, readline, zlib -}: - -stdenv.mkDerivation rec { - pname = "telegram-cli"; - version = "20200106"; - - src = fetchFromGitHub { - owner = "kenorb-contrib"; - repo = "tg"; - rev = "refs/tags/${version}"; - sha256 = "sha256-wYBPr2b8IOycO9y/CNyGjnRsyGyYl3oiXYtTzwTurVA="; - fetchSubmodules = true; - }; - - patches = [ - # Pull patch pending upstream upstream inclusion for -fno-common toolchains: - # https://github.com/kenorb-contrib/tg/pull/61 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/kenorb-contrib/tg/commit/aad2e644fffa16066b227741d54de31bddb04ff8.patch"; - sha256 = "sha256-LAa5J4BVj3QCiDSs+p2bynDroMSIqCeexQvrgaDl6OE="; - }) - ]; - - buildInputs = [ - jansson - libconfig - libevent - libgcrypt - lua - lua53Packages.lgi - openssl - python3 - readline - zlib - ]; - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - - installPhase = '' - runHook preInstall - install -Dm755 ./bin/telegram-cli $out/bin/telegram-cli-keyless - install -Dm644 ./tg-server.pub -t $out/share/telegram-cli - makeWrapper $out/bin/telegram-cli-keyless $out/bin/telegram-cli \ - --add-flags "-k $out/share/telegram-cli/tg-server.pub" - runHook postInstall - ''; - - meta = with lib; { - description = "Command-line interface for Telegram, that uses readline interface, it's a client implementation of TGL library"; - downloadPage = "https://github.com/kenorb-contrib/tg"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 4de6ce1bce..7a7835ede4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -209,5 +209,6 @@ stdenv.mkDerivation rec { homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; + mainProgram = "telegram-desktop"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 347fa9d2e6..0cb8cc4ff2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.27"; + version = "1.2.31"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20230302151220/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "0jx271zwqja7i7qdvhiyq5m6g19a12falfvxbkxrw7ab3ycds2px"; + url = "https://web.archive.org/web/20230731230034if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + hash = "sha256-eZ/bjcSnrnzub1G4sbwPn3GCTwhDfFuYv9Plf5SJL90="; }; nativeBuildInputs = [ 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 8834ba2a15..b7f46e13ed 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.3.20121"; - versions.x86_64-darwin = "5.15.3.20121"; - versions.x86_64-linux = "5.15.3.4839"; + versions.aarch64-darwin = "5.15.5.20753"; + versions.x86_64-darwin = "5.15.5.20753"; + versions.x86_64-linux = "5.15.5.5603"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-FEgLtKhjODZGuwzOWUK//TilXM3Gvka7B5E48eyrBuw="; + hash = "sha256-yDdmr0lHmhsJpTpvw4Qr4ZUk7SfEZw/53bVL3yV+a/Q="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-q4//skfKwAuPqPxJedVACbSQQiTKmc8J24t7mCY6c/w="; + hash = "sha256-qZ5jiNL7I6IHwm1bZ8rgjVwwFJKPeAViQvx+qatGPug="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-4r1jayWHg+5Oerksj7DSc5xV15l7miA0a+CgPDUkpa0="; + hash = "sha256-JIS+jxBiW/ek47iz+yCcmoCZ8+UBzEXMC1Yd7Px0ofg="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix index 0ccca903f1..eff1458e07 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "thelounge"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "thelounge"; repo = "thelounge"; rev = "v${finalAttrs.version}"; - hash = "sha256-2MHq71lKkFe1uHEENgUiYsO99bPyLmEZZIdcdgsZfSM="; + hash = "sha256-4FdNYP9VLgv/rfvT7KHCF+ABFsZvPbJjfz6IvvDkRNA="; }; # Allow setting package path for the NixOS module. @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-OKLsNGl94EDyLgP2X2tiwihgRQFXGvf5XgXwgX+JEpk="; + hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; }; nativeBuildInputs = [ nodejs yarn fixup_yarn_lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; @@ -88,5 +88,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ winter raitobezarius ]; license = licenses.mit; inherit (nodejs.meta) platforms; + mainProgram = "thelounge"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch new file mode 100644 index 0000000000..775a7b7178 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/Cargo.lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + + [[package]] + name = "tiny" +-version = "0.10.0" ++version = "0.11.0" + dependencies = [ + "clap", + "dirs", diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix index 4d7f5b0ca3..519d1dad76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix @@ -12,16 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1"; + hash = "sha256-oOaLQh9gJlurHi9awoRh4wQnXwkuOGJLnGQA6di6k1Q="; }; - cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoHash = "sha256-wUBScLNRNAdDZ+HpQjYiExgPJnE9cxviooHePbJI13Q="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals dbusSupport [ dbus ] @@ -30,6 +32,11 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional notificationSupport "desktop-notifications"; + checkFlags = [ + # flaky test + "--skip=tests::config::parsing_tab_configs" + ]; + meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; 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 d9a2ed5789..46d5d97e43 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -95,6 +95,7 @@ let ''; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ncfavier ]; + mainProgram = "weechat"; platforms = lib.platforms.unix; }; } 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 ecfddcf649..39a9f141c7 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 @@ -13,7 +13,7 @@ let fs-repo-common = pname: version: buildGoModule { inherit pname version; inherit (kubo-migrator-unwrapped) src; - sourceRoot = "source/${pname}"; + sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}"; vendorSha256 = 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 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 b553185164..d5dc1421a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -19,7 +19,7 @@ buildGoModule rec { hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4="; }; - sourceRoot = "source/fs-repo-migrations"; + sourceRoot = "${src.name}/fs-repo-migrations"; vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix new file mode 100644 index 0000000000..ed2817ed10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, protobuf3_19 +, catch2 +, boost181 +, icu +}: +let + boost = boost181.override { enableStatic = true; }; +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="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl protobuf3_19 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; + }; + }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix index 33afc84509..6ce0abb6c0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.7.3"; + version = "1.8.0"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-IzE+rCudMskJuPIWsz+u2D5KC8mc1JhNDVSHXixUEZA="; + hash = "sha256-Ys7XrvV4qzq4Q9llua2WgU013Ui0+x+uMwLNIv6xxCw="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix index eb517e76c9..197fe15861 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - hash = "sha256-N/g5//yIVot2vHPD/staVneO9eWPx0jT5dnYpcs1SZU="; + hash = "sha256-AImLYRRCL6IvoSeMFH2mbkNOvUmLwIvhWB3cOoqDljk="; }; - cargoSha256 = "hjkCvyzsBzfP4FGSli0acrVCfbRC0V7uBecV5VSiClI="; + cargoSha256 = "deJZPaZW6rb7A6wOL3vcphBXu0F7EXc1xRwSDY/v8l4="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; 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 6e694d01b4..9b5adb3a97 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.8"; + version = "1.11.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-aXpPn6tpSOwWL/34qlpJ+on/H+X7303J1jwvwcVOTNs="; + hash = "sha256-aAqkltVxIlGwRVGM+1QkrVgfnitl+D3Xb0qi0o8ow+Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index 3c21b64933..c1db119080 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ notmuch openssl sqlite xapian zlib ]; + XAPIAN_CONFIG = "${xapian}/bin/xapian-config"; meta = { description = "Synchronize maildirs and notmuch databases"; homepage = "http://www.muchsync.org/"; 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 3a13620a85..a4069e332c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -42,13 +42,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.0"; + version = "115.0.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2370a8e0b5ad2bc71bcb787cc93d31e5bf91bee9a4126c8677210e05936a726938b5fcff9b83c2ef1f509c1cadaa58638ba2399682308f32326a054496ea7a23"; + sha512 = "9a53024790a537fb012d66e683248e82a9b2c2a4db6fc90d1e1d3c785c28e9d65f1d110c33dcbdad63f8f6ecb3e5c6a526c0028c3970125022ebe384506d4ba3"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. 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 6bb9e653ab..f5a2139b53 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.113.3"; + version = "3.115.2"; 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-d4yvz0BE0YeZjcH9X/2eGAk5CmJI4CQWblVoU5CO77k="; + sha256 = "sha256-PdVvrb+sC8LF4tZXAHt2CevyoXhxTXJB01Fe64YI6BI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json index fe202a7753..f7b7280b46 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/source.json @@ -2,7 +2,7 @@ "owner": "zammad", "repo": "zammad", "rev": "643aba6ba4ba66c6127038c8cc2cc7a20b912678", - "sha256": "vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=", + "hash": "sha256-vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=", "fetchSubmodules": true } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix index de08620cf8..fa734e7dea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mkchromecast/default.nix @@ -13,6 +13,7 @@ , opusTools , gst_all_1 , enableSonos ? true +, qtwayland }: let packages = [ vorbis-tools @@ -27,17 +28,18 @@ let packages = [ ] ++ lib.optionals stdenv.isLinux [ pulseaudio ]; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "mkchromecast-unstable"; version = "2022-10-31"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "muammar"; repo = "mkchromecast"; rev = "0de9fd78c4122dec4f184aeae2564790b45fe6dc"; sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; }; + buildInputs = lib.optional stdenv.isLinux qtwayland; propagatedBuildInputs = with python3Packages; ([ pychromecast psutil diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix index 287797fd8e..0ed9599963 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix @@ -11,7 +11,7 @@ buildGoModule { src ; - sourceRoot = "source/wireguard/libwg"; + sourceRoot = "${mullvad.src.name}/wireguard/libwg"; vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix index b191c31d39..ad33172801 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/openvpn.nix @@ -1,14 +1,17 @@ { lib +, stdenv , openvpn , fetchpatch , fetchurl , iproute2 -, autoconf -, automake +, libnl +, autoreconfHook +, pkg-config }: openvpn.overrideAttrs (oldAttrs: let + inherit (lib) optional; fetchMullvadPatch = { commit, sha256 }: fetchpatch { url = "https://github.com/mullvad/openvpn/commit/${commit}.patch"; inherit sha256; @@ -16,68 +19,90 @@ openvpn.overrideAttrs (oldAttrs: in rec { pname = "openvpn-mullvad"; - version = "2.5.3"; + version = "2.6.0"; src = fetchurl { url = "https://swupdate.openvpn.net/community/releases/openvpn-${version}.tar.gz"; - sha256 = "sha256-dfAETfRJQwVVynuZWit3qyTylG/cNmgwG47cI5hqX34="; + sha256 = "sha256-6+yTMmPJhQ72984SXi8iIUvmCxy7jM/xiJJkP+CDro8="; }; - buildInputs = oldAttrs.buildInputs or [ ] ++ [ - iproute2 - ]; - - configureFlags = oldAttrs.configureFlags or [ ] ++ [ - "--enable-iproute2" - "IPROUTE=${iproute2}/sbin/ip" - ]; - nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ - autoconf - automake + autoreconfHook + pkg-config + ]; + + buildInputs = oldAttrs.buildInputs or [ ] + ++ optional stdenv.isLinux [ libnl.dev ]; + + configureFlags = [ + # Assignement instead of appending to make sure to use exactly the flags required by mullvad + + # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L17 + "--enable-static" + "--disable-shared" + "--disable-debug" + "--disable-plugin-down-root" + "--disable-management" + "--disable-port-share" + "--disable-systemd" + "--disable-dependency-tracking" + "--disable-pkcs11" + "--disable-plugin-auth-pam" + "--enable-plugins" + "--disable-lzo" + "--disable-lz4" + "--enable-comp-stub" + ] + ++ optional stdenv.isLinux [ + # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35 + "--enable-dco" # requires libnl + "--disable-iproute2" ]; patches = oldAttrs.patches or [ ] ++ [ # look at compare to find the relevant commits - # https://github.com/OpenVPN/openvpn/compare/release/2.5...mullvad:mullvad-patches + # https://github.com/OpenVPN/openvpn/compare/release/2.6...mullvad:mullvad-patches # used openvpn version is the latest tag ending with -mullvad # https://github.com/mullvad/openvpn/tags (fetchMullvadPatch { # "Reduce PUSH_REQUEST_INTERVAL to one second" - commit = "41e44158fc71bb6cc8cc6edb6ada3307765a12e8"; - sha256 = "sha256-UoH0V6gTPdEuybFkWxdaB4zomt7rZeEUyXs9hVPbLb4="; - }) - (fetchMullvadPatch { - # "Allow auth plugins to set a failure reason" - commit = "f51781c601e8c72ae107deaf25bf66f7c193e9cd"; - sha256 = "sha256-+kwG0YElL16T0e+avHlI8gNQdAxneRS6fylv7QXvC1s="; + commit = "4084b49de84e64c56584a378e85faf37973b6d6d"; + sha256 = "sha256-MmYeFSw6c/QJh0LqLgkx+UxrbtTVv6zEFcnYEqznR1c="; }) (fetchMullvadPatch { # "Send an event to any plugins when authentication fails" - commit = "c2f810f966f2ffd68564d940b5b8946ea6007d5a"; - sha256 = "sha256-PsKIxYwpLD66YaIpntXJM8OGcObyWBSAJsQ60ojvj30="; + commit = "f24de7922d70c6e1ae06acf18bce1f62d9fa6b07"; + sha256 = "sha256-RvlQbR6/s4NorYeA6FL7tE6geg6MIoZJtHeYxkVbdwA="; }) (fetchMullvadPatch { # "Shutdown when STDIN is closed" - commit = "879d6a3c0288b5443bbe1b94261655c329fc2e0e"; - sha256 = "sha256-pRFY4r+b91/xAKXx6u5GLzouQySXuO5gH0kMGm77a3c="; - }) - (fetchMullvadPatch { - # "Update TAP hardware ID" - commit = "7f71b37a3b25bec0b33a0e29780c222aef869e9d"; - sha256 = "sha256-RF/GvD/ZvhLdt34wDdUT/yxa+IVWx0eY6WRdNWXxXeQ="; + commit = "81ae84271c044359b67991b15ebfb0cf9a32b3ad"; + sha256 = "sha256-ilKMyU97ha2m0p1FD64aNQncnKo4Tyi/nATuD5yPmVw="; }) (fetchMullvadPatch { # "Undo dependency on Python docutils" - commit = "abd3c6214529d9f4143cc92dd874d8743abea17c"; - sha256 = "sha256-SC2RlpWHUDMAEKap1t60dC4hmalk3vok6xY+/xhC2U0="; + commit = "a5064b4b6c598b68d8cabc3f4006e5addef1ec1e"; + sha256 = "sha256-+B6jxL0M+W5LzeukXkir26hn1OaYnycVNBwMYFq6gsE="; }) (fetchMullvadPatch { # "Prevent signal when stdin is closed from being cleared (#10)" - commit = "b45b090c81e7b4f2dc938642af7a1e12f699f5c5"; - sha256 = "sha256-KPTFmbuJhMI+AvaRuu30CPPLQAXiE/VApxlUCqbZFls="; + commit = "abe529e6d7f71228a036007c6c02624ec98ad6c1"; + sha256 = "sha256-qJQeEtZO/+8kenXTKv4Bx6NltUYe8AwzXQtJcyhrjfc="; + }) + (fetchMullvadPatch { + # "Disable libcap-ng" + commit = "598014de7c063fa4e8ba1fffa01434229faafd04"; + sha256 = "sha256-+cFX5gmMuG6XFkTs6IV7utiKRF9E47F5Pgo93c+zBXo="; + }) + (fetchMullvadPatch { + # "Remove libnsl dep" + commit = "845727e01ab3ec9bd58fcedb31b3cf2ebe2d5226"; + sha256 = "sha256-Via62wKVfMWHTmO7xIXXO7b5k0KYHs1D0JVg3qnXkeM="; }) ]; + postPatch = oldAttrs.postPatch or "" + '' + rm ./configure + ''; meta = oldAttrs.meta or { } // { description = "OpenVPN with Mullvad-specific patches applied"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix index 2bc25913e0..a673f1b381 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.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-S4j9JoY3e763Jw46nCfJYdmZd8Ryao5v/zSiP1Cz9Pc="; + hash = "sha256-4njC4hQoiAWlkwyvP14wWK+PxQ6bGR5QzteurHcuo4o="; }; - vendorHash = "sha256-BkBS1Gd9aZFIc1bTujYn2694SvRMF3nNCBg5i1NRwns="; + vendorHash = "sha256-f6foYD/2b9iLzQbPTXeiKCdrm7gz5E8ulWHZaj+KB/M="; inherit subPackages; diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix index 854f1c3484..839766e2ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,11 +1,12 @@ { spellChecking ? true , lib , stdenv -, fetchurl +, fetchFromGitLab +, autoreconfHook , pkg-config , gtk3 , gtkspell3 -, gmime2 +, gmime3 , gettext , intltool , itstool @@ -21,21 +22,19 @@ stdenv.mkDerivation rec { pname = "pan"; - version = "0.146"; + version = "0.154"; - src = fetchurl { - url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "v${version}"; + hash = "sha256-o+JFUraSoQ0HDmldHvTX+X7rl2L4n4lJmI4UFZrsfkQ="; }; - patches = [ - # Take , , "gtk-compat.h" out of extern "C" - ./move-out-of-extern-c.diff - ]; + nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ]; - nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ]; - - buildInputs = [ gtk3 gmime2 libnotify gnutls ] + buildInputs = [ gtk3 gmime3 libnotify gnutls ] ++ lib.optional spellChecking gtkspell3 ++ lib.optionals gnomeSupport [ libsecret gcr ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff deleted file mode 100644 index 02b19b58ee..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff +++ /dev/null @@ -1,1113 +0,0 @@ -diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc -index b06d0c2..f424738 100644 ---- a/pan/data-impl/article-filter.cc -+++ b/pan/data-impl/article-filter.cc -@@ -25,10 +25,7 @@ - #include - - //#include --extern "C" --{ -- #include --} -+#include - - #include "article-filter.h" - -diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc -index 88012cc..4465966 100644 ---- a/pan/data-impl/data-impl.cc -+++ b/pan/data-impl/data-impl.cc -@@ -22,10 +22,8 @@ - **************/ - - #include --extern "C" { -- #include -- #include // for g_build_filename --} -+#include -+#include // for g_build_filename - #include - #include - #include -diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc -index bea1a90..d938634 100644 ---- a/pan/data-impl/data-io.cc -+++ b/pan/data-impl/data-io.cc -@@ -27,9 +27,9 @@ extern "C" { - #include // for chmod - #include // for chmod - #include -- #include -- #include - } -+#include -+#include - #include - #include - #include -diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc -index 244feb9..da0183a 100644 ---- a/pan/data-impl/groups.cc -+++ b/pan/data-impl/groups.cc -@@ -29,9 +29,9 @@ - #include - - #include -+#include - extern "C" { - #include -- #include - } - - #include -diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc -index f8c4466..16d5672 100644 ---- a/pan/data-impl/headers.cc -+++ b/pan/data-impl/headers.cc -@@ -25,10 +25,10 @@ - #include - #include - #include -+#include - extern "C" { - #include // for chmod - #include // for chmod -- #include - } - #include - #include -diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc -index e999fda..a6e6bb5 100644 ---- a/pan/data-impl/profiles.cc -+++ b/pan/data-impl/profiles.cc -@@ -26,9 +26,9 @@ - extern "C" { - #include // for chmod - #include // for chmod -- #include -- #include - } -+#include -+#include - #include - #include - #include -diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc -index 9ea55d4..b23782f 100644 ---- a/pan/data-impl/server.cc -+++ b/pan/data-impl/server.cc -@@ -25,10 +25,8 @@ - #include - #include - #include --extern "C" { -- #include // for GMarkup -- #include --} -+#include // for GMarkup -+#include - #include - #include - #include -diff --git a/pan/data-impl/xover.cc b/pan/data-impl/xover.cc -index ff8644f..a199556 100644 ---- a/pan/data-impl/xover.cc -+++ b/pan/data-impl/xover.cc -@@ -20,10 +20,8 @@ - #include - #include - #include --extern "C" { -- #include -- #include --} -+#include -+#include - #include - #include - #include -diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc -index 1855153..30fa0f9 100644 ---- a/pan/data/article-cache.cc -+++ b/pan/data/article-cache.cc -@@ -26,11 +26,10 @@ extern "C" - #include - #include - #include -- -- #include -- #include -- #include - } -+#include -+#include -+#include - - #include - #include -diff --git a/pan/data/article-cache.h b/pan/data/article-cache.h -index 2ac722b..1304bfe 100644 ---- a/pan/data/article-cache.h -+++ b/pan/data/article-cache.h -@@ -22,9 +22,7 @@ - - #include - #include --extern "C" { -- #include // for guint64 --} -+#include // for guint64 - #include - #include - -diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc -index 340fc8b..f6cd46e 100644 ---- a/pan/data/cert-store.cc -+++ b/pan/data/cert-store.cc -@@ -34,10 +34,8 @@ - #include - #include - --extern "C" { - #include - #include --} - - #include - #include -diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc -index 3a82ea9..61c67a2 100644 ---- a/pan/data/encode-cache.cc -+++ b/pan/data/encode-cache.cc -@@ -28,11 +28,10 @@ extern "C" - #include - #include - #include -- -- #include -- #include -- #include - } -+#include -+#include -+#include - - #include - #include -diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h -index 8bbd530..1affc0c 100644 ---- a/pan/data/encode-cache.h -+++ b/pan/data/encode-cache.h -@@ -22,9 +22,7 @@ - - #include - #include --extern "C" { -- #include // for guint64 --} -+#include // for guint64 - #include - #include - -diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc -index af5ccd0..62879ee 100644 ---- a/pan/general/e-util.cc -+++ b/pan/general/e-util.cc -@@ -26,9 +26,9 @@ - #include - extern "C" { - #include -- #include -- #include - } -+#include -+#include - #include "debug.h" - #include "e-util.h" - -diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc -index 02e9ed1..9efa269 100644 ---- a/pan/general/file-util.cc -+++ b/pan/general/file-util.cc -@@ -27,12 +27,12 @@ extern "C" - #include - #include - #include -- #include -- #include - #ifndef G_OS_WIN32 - #include - #endif - } -+#include -+#include - - #include "debug.h" - #include "log.h" -diff --git a/pan/general/file-util.h b/pan/general/file-util.h -index c125c8d..8c67639 100644 ---- a/pan/general/file-util.h -+++ b/pan/general/file-util.h -@@ -25,9 +25,9 @@ - extern "C" { - #include - #include -- #include -- #include - } -+#include -+#include - #include - - #define g_freopen freopen -diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc -index afb9be8..6b80fc4 100644 ---- a/pan/general/line-reader.cc -+++ b/pan/general/line-reader.cc -@@ -1,9 +1,7 @@ - #include - #include - #include --extern "C"{ -- #include --} -+#include - #include - #include "file-util.h" - #include "line-reader.h" -diff --git a/pan/general/macros.h b/pan/general/macros.h -index 6dcf908..b16230f 100644 ---- a/pan/general/macros.h -+++ b/pan/general/macros.h -@@ -63,9 +63,6 @@ - *** g_assert - **/ - --extern "C" --{ -- #include --} -+#include - - #endif -diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc -index fcacbe2..d390de0 100644 ---- a/pan/general/text-match.cc -+++ b/pan/general/text-match.cc -@@ -20,9 +20,9 @@ - #include - extern "C" { - #include -- #include -- #include - } -+#include -+#include - #include "debug.h" - #include "log.h" - #include "text-match.h" -diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc -index be79a13..fea6100 100644 ---- a/pan/general/utf8-utils.cc -+++ b/pan/general/utf8-utils.cc -@@ -21,9 +21,7 @@ - #include - #include - #include --extern "C" { - #include --} - #include - #include - #include -diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc -index 520c08b..5ec397c 100644 ---- a/pan/gui/actions.cc -+++ b/pan/gui/actions.cc -@@ -18,11 +18,9 @@ - */ - - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" - -+#include - #include - #include - #include -diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc -index 53e9124..e9841e2 100644 ---- a/pan/gui/body-pane.cc -+++ b/pan/gui/body-pane.cc -@@ -22,11 +22,9 @@ - #include - #include - #include --extern "C" { -- #include -- #include "gtk-compat.h" -- #include --} -+#include "gtk-compat.h" -+#include -+#include - #include - #include - #include -diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc -index 5841651..e9f4b2d 100644 ---- a/pan/gui/dl-headers-ui.cc -+++ b/pan/gui/dl-headers-ui.cc -@@ -18,11 +18,9 @@ - */ - - #include --extern "C" { -- #include -- #include -- #include "gtk-compat.h" --} -+#include -+#include -+#include "gtk-compat.h" - #include - #include - #include -diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc -index 28ad581..3ff103e 100644 ---- a/pan/gui/group-pane.cc -+++ b/pan/gui/group-pane.cc -@@ -20,10 +20,8 @@ - #include - #include - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - //#include - #include -diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc -index 677b07a..0d7df8b 100644 ---- a/pan/gui/group-prefs-dialog.cc -+++ b/pan/gui/group-prefs-dialog.cc -@@ -18,14 +18,14 @@ - */ - - #include --extern "C" { -- #include -- #include -- #include "gtk-compat.h" -+#include -+#include - #ifdef HAVE_GTKSPELL -+extern "C" { - #include --#endif - } -+#endif -+#include "gtk-compat.h" - #include - #include - #include -diff --git a/pan/gui/group-prefs.cc b/pan/gui/group-prefs.cc -index 3e9851b..b06a949 100644 ---- a/pan/gui/group-prefs.cc -+++ b/pan/gui/group-prefs.cc -@@ -21,8 +21,8 @@ extern "C" { - #include - #include // chmod - #include // chmod -- #include - } -+#include - #include - #include - #include -diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc -index f79aa1e..9f8787e 100644 ---- a/pan/gui/gui.cc -+++ b/pan/gui/gui.cc -@@ -25,9 +25,9 @@ - extern "C" { - #include // for chmod - #include // for chmod -- #include - #include - } -+#include - #include - #include - #include -diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc -index dc65a77..a4a9952 100644 ---- a/pan/gui/header-pane.cc -+++ b/pan/gui/header-pane.cc -@@ -19,10 +19,9 @@ - - extern "C" { - #include -- #include -- #include "gtk-compat.h" -- #include "gtk-compat.h" - } -+#include "gtk-compat.h" -+#include - #include - #include - #include -diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc -index 7b11493..b204298 100644 ---- a/pan/gui/log-ui.cc -+++ b/pan/gui/log-ui.cc -@@ -21,10 +21,8 @@ - #include - #include - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - #include - #include -diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc -index 705fc91..c67acf8 100644 ---- a/pan/gui/pan-file-entry.cc -+++ b/pan/gui/pan-file-entry.cc -@@ -19,10 +19,8 @@ - - #include - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - #include "pad.h" - #include "pan-file-entry.h" -diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc -index fb3a696..46c1a5d 100644 ---- a/pan/gui/pan.cc -+++ b/pan/gui/pan.cc -@@ -24,9 +24,6 @@ - #include - - extern "C" { -- #include -- #include "gtk-compat.h" -- #include - #include - #include - #include -@@ -34,6 +31,9 @@ extern "C" { - #include - } - -+#include "gtk-compat.h" -+#include -+#include - #ifdef G_OS_WIN32 - #undef _WIN32_WINNT - #define _WIN32_WINNT 0x0501 -diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc -index 8769ec5..92c757d 100644 ---- a/pan/gui/post-ui.cc -+++ b/pan/gui/post-ui.cc -@@ -23,14 +23,14 @@ - #include - #include - extern "C" { -- #include -- #include -- #include "gtk-compat.h" - #include - #ifdef HAVE_GTKSPELL - #include - #endif - } -+#include "gtk-compat.h" -+#include -+#include - #include - #include - #include -diff --git a/pan/gui/prefs-file.cc b/pan/gui/prefs-file.cc -index bde7ef3..64c540f 100644 ---- a/pan/gui/prefs-file.cc -+++ b/pan/gui/prefs-file.cc -@@ -24,8 +24,8 @@ - extern "C" { - #include // for chmod - #include // for chmod -- #include - } -+#include - #include - #include "prefs-file.h" - -diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc -index f7dc0f0..aac9ec1 100644 ---- a/pan/gui/prefs-ui.cc -+++ b/pan/gui/prefs-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - #include - #include -diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc -index fdbd908..64dd8da 100644 ---- a/pan/gui/prefs.cc -+++ b/pan/gui/prefs.cc -@@ -23,10 +23,8 @@ - #include - #include - #include --extern "C" { -- #include -- #include --} -+#include -+#include - #include - #include - #include -diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc -index 26ff029..cf8bd44 100644 ---- a/pan/gui/profiles-dialog.cc -+++ b/pan/gui/profiles-dialog.cc -@@ -23,10 +23,8 @@ - - #include - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - #include - #include -diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc -index 241ad1c..43ef4f2 100644 ---- a/pan/gui/progress-view.cc -+++ b/pan/gui/progress-view.cc -@@ -18,9 +18,7 @@ - */ - - #include --extern "C" { -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" - #include - #include - #include "progress-view.h" -diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc -index 0b08b6f..0e86a1b 100644 ---- a/pan/gui/save-attach-ui.cc -+++ b/pan/gui/save-attach-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - #include - #include -diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc -index 0f034e5..1df0cfb 100644 ---- a/pan/gui/save-ui.cc -+++ b/pan/gui/save-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - #include - #include -diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc -index e72bdb5..3b81167 100644 ---- a/pan/gui/score-add-ui.cc -+++ b/pan/gui/score-add-ui.cc -@@ -20,9 +20,7 @@ - #include - #include - #include --extern "C" { -- #include --} -+#include - #include - #include - #include "hig.h" -diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc -index d6c81c1..1327426 100644 ---- a/pan/gui/score-view-ui.cc -+++ b/pan/gui/score-view-ui.cc -@@ -18,10 +18,8 @@ - */ - - #include --extern "C" { -- #include -- #include "gtk-compat.h" --} -+#include "gtk-compat.h" -+#include - #include - #include "pad.h" - #include "score-add-ui.h" -diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc -index b42bc18..268114b 100644 ---- a/pan/gui/server-ui.cc -+++ b/pan/gui/server-ui.cc -@@ -21,11 +21,9 @@ - #include - #include - #include --extern "C" { -- #include -- #include -- #include "gtk-compat.h" --} -+#include -+#include -+#include "gtk-compat.h" - - #include - #include -diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc -index 4f77922..18a8f74 100644 ---- a/pan/gui/task-pane.cc -+++ b/pan/gui/task-pane.cc -@@ -18,11 +18,9 @@ - */ - - #include --extern "C" { -- #include -- #include -- #include "gtk-compat.h" --} -+#include -+#include -+#include "gtk-compat.h" - #include - #include - #include -diff --git a/pan/gui/url.cc b/pan/gui/url.cc -index e1173ae..94ffb52 100644 ---- a/pan/gui/url.cc -+++ b/pan/gui/url.cc -@@ -20,10 +20,8 @@ - #include - #include - #include --extern "C" { -- #include -- #include --}; -+#include -+#include - #include - #include "url.h" - -diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc -index b4c21ae..f8cb6db 100644 ---- a/pan/tasks/decoder.cc -+++ b/pan/tasks/decoder.cc -@@ -28,8 +28,8 @@ - extern "C" { - # define PROTOTYPES - # include --# include - }; -+#include - #include - #include - #include -diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc -index 7960b84..5989059 100644 ---- a/pan/tasks/encoder.cc -+++ b/pan/tasks/encoder.cc -@@ -31,10 +31,10 @@ - extern "C" { - #define PROTOTYPES - #include --#include - #include - }; - -+#include - #include - #include - #include -diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc -index ceb1574..71c5cf1 100644 ---- a/pan/tasks/nntp.cc -+++ b/pan/tasks/nntp.cc -@@ -22,10 +22,8 @@ - #include - #include // abort, atoi, strtoul - #include // snprintf --extern "C" { -- #include -- #include --} -+#include -+#include - #include - #include - #include -diff --git a/pan/tasks/nzb.cc b/pan/tasks/nzb.cc -index af890e5..14df6f6 100644 ---- a/pan/tasks/nzb.cc -+++ b/pan/tasks/nzb.cc -@@ -24,9 +24,7 @@ - #include - #include - #include --extern "C" { -- #include --} -+#include - #include - #include - #include -diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc -index d3339dd..7dc2ec1 100644 ---- a/pan/tasks/socket-impl-gio.cc -+++ b/pan/tasks/socket-impl-gio.cc -@@ -31,9 +31,9 @@ - - extern "C" { - #include -- #include - } - -+#include - #include - #include - #include -diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc -index c33edfd..688183c 100644 ---- a/pan/tasks/socket-impl-main.cc -+++ b/pan/tasks/socket-impl-main.cc -@@ -30,10 +30,7 @@ - //#include - //#include - --extern "C" --{ -- #include --} -+#include - - #include - -diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc -index b58e074..5b1b0b0 100644 ---- a/pan/tasks/socket-impl-openssl.cc -+++ b/pan/tasks/socket-impl-openssl.cc -@@ -34,13 +34,14 @@ - - extern "C" { - #include -- #include - #include - #include - #include - #include - } - -+#include -+ - #include - #include - #include -diff --git a/pan/tasks/socket-impl-openssl.h b/pan/tasks/socket-impl-openssl.h -index e48cbae..eea41d4 100644 ---- a/pan/tasks/socket-impl-openssl.h -+++ b/pan/tasks/socket-impl-openssl.h -@@ -27,10 +27,7 @@ - #include - //#include - //#include --extern "C" --{ -- #include --} -+#include - - #include - #include -diff --git a/pan/tasks/socket.cc b/pan/tasks/socket.cc -index 78d53fb..2c7a28d 100644 ---- a/pan/tasks/socket.cc -+++ b/pan/tasks/socket.cc -@@ -21,9 +21,7 @@ - #include - #include - #include --extern "C" { -- #include --} -+#include - #include - #include - #include "socket.h" -diff --git a/pan/tasks/task-article.cc b/pan/tasks/task-article.cc -index 9c96b7d..1dc17ba 100644 ---- a/pan/tasks/task-article.cc -+++ b/pan/tasks/task-article.cc -@@ -24,10 +24,7 @@ - #include - #include - #include --extern "C" --{ -- #include --} -+#include - #include - #include - #include -diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc -index b8618d6..9b72369 100644 ---- a/pan/tasks/task-groups.cc -+++ b/pan/tasks/task-groups.cc -@@ -20,9 +20,9 @@ - #include - #include - extern "C" { -- #include - #include - } -+#include - #include - #include - #include -diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc -index bb80fb9..4ab9c2f 100644 ---- a/pan/tasks/task-post.cc -+++ b/pan/tasks/task-post.cc -@@ -18,9 +18,7 @@ - */ - - #include --extern "C" { -- #include --} -+#include - #include "task-post.h" - #include - #include -diff --git a/pan/tasks/task-upload.h b/pan/tasks/task-upload.h -index 7bd4fe0..e5377c6 100644 ---- a/pan/tasks/task-upload.h -+++ b/pan/tasks/task-upload.h -@@ -37,10 +37,10 @@ - extern "C" { - #define PROTOTYPES - #include -- #include -- #include - }; - -+#include -+#include - #include - - namespace pan -diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc -index c3c8260..64b41a4 100644 ---- a/pan/tasks/task-xover.cc -+++ b/pan/tasks/task-xover.cc -@@ -26,10 +26,10 @@ extern "C" - #define PROTOTYPES - #include - #include --#include --#include - } - -+#include -+#include - #include - #include - #include -diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc -index c598bf8..9a9e488 100644 ---- a/pan/tasks/task-xoverinfo.cc -+++ b/pan/tasks/task-xoverinfo.cc -@@ -24,10 +24,10 @@ extern "C" { - #define PROTOTYPES - #include - #include -- #include -- #include - #include - } -+#include -+#include - #include - #include - #include -diff --git a/pan/usenet-utils/filter-info.cc b/pan/usenet-utils/filter-info.cc -index f464428..6b1a5c9 100644 ---- a/pan/usenet-utils/filter-info.cc -+++ b/pan/usenet-utils/filter-info.cc -@@ -18,10 +18,8 @@ - */ - - #include --extern "C" { -- #include -- #include --} -+#include -+#include - #include - #include "filter-info.h" - -diff --git a/pan/usenet-utils/gnksa.cc b/pan/usenet-utils/gnksa.cc -index db1f2c4..fb888d5 100644 ---- a/pan/usenet-utils/gnksa.cc -+++ b/pan/usenet-utils/gnksa.cc -@@ -37,10 +37,10 @@ extern "C" - { - #include - #include -- #include - #include - } - -+#include - #include - #include - #include -diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc -index 4df4525..8755777 100644 ---- a/pan/usenet-utils/gpg.cc -+++ b/pan/usenet-utils/gpg.cc -@@ -28,9 +28,9 @@ extern "C" { - #include - #include - #include -- #include -- #include - } -+#include -+#include - - #ifdef HAVE_GMIME_CRYPTO - -diff --git a/pan/usenet-utils/message-check.cc b/pan/usenet-utils/message-check.cc -index a511556..461ce86 100644 ---- a/pan/usenet-utils/message-check.cc -+++ b/pan/usenet-utils/message-check.cc -@@ -21,9 +21,7 @@ - #include - #include - #include --extern "C" { - #include --} - #include - #include - #include -diff --git a/pan/usenet-utils/rules-info.cc b/pan/usenet-utils/rules-info.cc -index 1c03adc..91e78be 100644 ---- a/pan/usenet-utils/rules-info.cc -+++ b/pan/usenet-utils/rules-info.cc -@@ -22,10 +22,8 @@ - - - #include --extern "C" { -- #include -- #include --} -+#include -+#include - #include - #include "rules-info.h" - -diff --git a/pan/usenet-utils/scorefile.cc b/pan/usenet-utils/scorefile.cc -index 8b56a2a..4b151f0 100644 ---- a/pan/usenet-utils/scorefile.cc -+++ b/pan/usenet-utils/scorefile.cc -@@ -23,9 +23,7 @@ - #include - #include - #include --extern "C" { -- #include --} -+#include - #include - #include - #include -diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h -index 2286250..0beb32f 100644 ---- a/pan/usenet-utils/ssl-utils.h -+++ b/pan/usenet-utils/ssl-utils.h -@@ -43,9 +43,7 @@ - #include - #include - #include --extern "C" { -- #include --} -+#include - - namespace pan - { -diff --git a/pan/usenet-utils/text-massager.cc b/pan/usenet-utils/text-massager.cc -index 4fcd8d5..15a818b 100644 ---- a/pan/usenet-utils/text-massager.cc -+++ b/pan/usenet-utils/text-massager.cc -@@ -22,9 +22,7 @@ - #include - #include - #include --extern "C" { - #include --} - #include "text-massager.h" - #include - #include 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 820bfa8b4e..11831c24b4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,7 +4,6 @@ , cmake , extra-cmake-modules , inotify-tools -, installShellFiles , libcloudproviders , librsvg , libsecret @@ -26,7 +25,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.9.0"; + version = "3.9.1"; outputs = [ "out" "dev" ]; @@ -34,7 +33,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-XcQYttd5dl2TCbBxOlRBg8/mEiHekoxayPi81ot7N7o="; + sha256 = "sha256-DQM7n7rTk1q+F8H8OpiEgg1pvIzQw2UwBObbj20O5MQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix index 8b97bbf463..e46a95d71e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.devhell ]; + mainProgram = "nload"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 49193a384a..369cd7e338 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -124,6 +124,7 @@ rec { inherit tor meek obfs4 snowflake; inherit (tor) geoip; }) + ./fix-qrcode-gui.patch ]; disable = !isPy3k; @@ -138,6 +139,13 @@ rec { nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + postInstall = '' + mkdir -p $out/share/{appdata,applications,icons} + cp $src/org.onionshare.OnionShare.desktop $out/share/applications + cp $src/org.onionshare.OnionShare.svg $out/share/icons + cp $src/org.onionshare.OnionShare.appdata.xml $out/share/appdata + ''; + preFixup = '' wrapQtApp $out/bin/onionshare ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch b/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch new file mode 100644 index 0000000000..97ee3817ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch @@ -0,0 +1,14 @@ +diff --git desktop/onionshare/widgets.py desktop/onionshare/widgets.py +index 64a07703..bca974fb 100644 +--- desktop/onionshare/widgets.py ++++ desktop/onionshare/widgets.py +@@ -101,7 +101,7 @@ class Image(qrcode.image.base.BaseImage): + A custom Image class, for use with the QR Code pixmap. + """ + +- def __init__(self, border, width, box_size): ++ def __init__(self, border, width, box_size, *args, **kargs): + self.border = border + self.width = width + self.box_size = box_size + diff --git a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix index 0f0bdb5a3d..31412e72ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hash = "sha256-wbdamPi2XSLWeprrYZtBUDH1A2gdp6/5geFZv+ZqSWk="; }; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix new file mode 100644 index 0000000000..8ee94f17e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/flood/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "flood"; + version = "unstable-2023-06-03"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = pname; + rev = "2b652f8148dab7134eeeb201b9d81dd6b8bda074"; + hash = "sha256-wI6URPGUZUbydSgNaHN2C5IA2x/HHjBWIRT6H6iZU/0="; + }; + + npmDepsHash = "sha256-XmDnvq+ni5TOf3UQFc4JvGI3LiGpjbrLAocRvrW8qgk="; + + meta = with lib; { + description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; + homepage = "https://flood.js.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ thiagokokada winter ]; + mainProgram = "flood"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index 366af7121e..2fdaf3c52f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.17.6"; + version = "0.19.4"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-JJNY7zsQzpmBB4H+2uxSam6rlDwSDku6CWrt+Rwa/EA="; + sha256 = "sha256-AKY99AjVmH9bqaUEQfKncYK9n7MvHjAq5WOslOesAJs="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix index 369244604a..739c3013e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.15.0"; + version = "0.19.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-FLLlqpQ7Bf+oNRUvx7IniVxFusy/tPYxEP2T6VGF7h8="; + sha256 = "sha256-MwAWs1rHXYlRUcAWX8LnCLTwEOSI68aA0s7uZGgYR3w="; }; nativeBuildInputs= [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/avoid-stack-overflow-for-lockfile-buf.patch b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/avoid-stack-overflow-for-lockfile-buf.patch new file mode 100644 index 0000000000..2a20b157a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/avoid-stack-overflow-for-lockfile-buf.patch @@ -0,0 +1,30 @@ +From dd4a96073d4a60ca8fff55be6ea6b17018de96a8 Mon Sep 17 00:00:00 2001 +From: Varun Madiath +Date: Wed, 19 Jul 2023 15:30:57 -0400 +Subject: [PATCH] utils: lockfile: avoid stack overflow for lockfile buffer + +Original patch by @cyphar was submitted to rakshasa/rtorrent at +https://github.com/rakshasa/rtorrent/pull/1169. + +Observed the segfault on nixos-unstable. +--- + src/utils/lockfile.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/utils/lockfile.cc b/src/utils/lockfile.cc +index 76e4b8f..441f5c8 100644 +--- a/src/utils/lockfile.cc ++++ b/src/utils/lockfile.cc +@@ -75,7 +75,8 @@ Lockfile::try_lock() { + int pos = ::gethostname(buf, 255); + + if (pos == 0) { +- ::snprintf(buf + std::strlen(buf), 255, ":+%i\n", ::getpid()); ++ ssize_t len = std::strlen(buf); ++ ::snprintf(buf + len, 255 - len, ":+%i\n", ::getpid()); + ssize_t __attribute__((unused)) result = ::write(fd, buf, std::strlen(buf)); + } + +-- +2.41.0 + diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 5a0cebc528..94c1994bd0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; + patches = [ + ./avoid-stack-overflow-for-lockfile-buf.patch + ]; + passthru = { inherit libtorrent; }; 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 26f1e1574c..7ac355690c 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.9.0"; + version = "2.9.1"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KDQUSsotTpmnYq7kCRGIRWCZKxr2bxPKCvKy+OmoOm8="; + hash = "sha256-eRj9zHbopzwPvB3YxN5P8A/Dqwvh+FcIr+pEC0ov/xg="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index a6f59374db..c454c3ad20 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.9.8+date=2021-08-07"; + version = "0.9.8+date=2022-06-20"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "a6bc99bb821d86b3b0633552db3fbd0a22497657"; - hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; + rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7"; + hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index e1a2a38264..c8ac75683a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -6,29 +6,33 @@ python3Packages.buildPythonApplication rec { pname = "zeronet-conservancy"; - version = "0.7.8.1"; + version = "0.7.10"; format = "other"; src = fetchFromGitHub { owner = "zeronet-conservancy"; repo = "zeronet-conservancy"; rev = "v${version}"; - sha256 = "sha256-+wZiwUy5bmW8+3h4SuvNN8I6mCIPOlOeFmiXlMu12OU="; + sha256 = "sha256-ZQYdK0B0z0cXTx7ujFngW3wSa/j8sEuwHB+BC5Xqq8o="; }; propagatedBuildInputs = with python3Packages; [ gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich defusedxml - pyaes + pyaes coincurve ]; buildPhase = '' + runHook preBuild ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share cp -r plugins src *.py $out/share/ + runHook postInstall ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix index 11462dab9a..9c1b8e4f26 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix @@ -2,7 +2,6 @@ , testers , stdenv , fetchFromGitHub -, fetchpatch , openssl , libsamplerate , swig @@ -16,27 +15,17 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "pjsip"; - version = "2.13"; + version = "2.13.1"; src = fetchFromGitHub { owner = finalAttrs.pname; repo = "pjproject"; - rev = finalAttrs.version; - sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-R1iKIkWyNCRV2PjQgTqKmJYUgHAZrREanD60Jz6MY1Y="; }; patches = [ ./fix-aarch64.patch - (fetchpatch { - name = "CVE-2022-23537.patch"; - url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; - sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; - }) - (fetchpatch { - name = "CVE-2022-23547.patch"; - url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; - sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; - }) ]; nativeBuildInputs = 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 52c91673b3..4c278dcdf8 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.2.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-1gllk6pRMEf4hYUN/i4jHZ5zwx9C+eoTOn3h+w7Pr0U="; + hash = "sha256-crYxrjfo0fss9uOl7k2C2ZCpbQExxnAX4520k4iPhuo="; }; - vendorHash = "sha256-41Le59X4TW105X3q+r3U1y1hZLz7Hup7TS/zP2E4v0M="; + vendorHash = "sha256-PgUj7MxGeDA7hYXzN/WWwZrUthkxyQL+MnSx9ZpzHms="; nativeBuildInputs = [ pkg-config ]; @@ -50,7 +50,7 @@ buildGoModule rec { An application that runs on your computer in the background and seamlessly encrypts and decrypts your mail as it enters and leaves your computer. - To work, gnome-keyring service must be enabled. + To work, use secret-service freedesktop.org API (e.g. Gnome keyring) or pass. ''; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix new file mode 100644 index 0000000000..ebe4db46ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/pyload-ng/default.nix @@ -0,0 +1,54 @@ +{ lib, fetchPypi, python3 }: + +python3.pkgs.buildPythonApplication rec { + version = "0.5.0b3.dev72"; + pname = "pyload-ng"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pcbJc23Fylh/JoWRmbZmC8xUzUqh2ej6gT+B2w8DHFQ="; + }; + + postPatch = '' + # relax version bounds + sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg + # not sure what Flask-Session2 is but flask-session works just fine + sed -i '/Flask-Session2/d' setup.cfg + ''; + + propagatedBuildInputs = with python3.pkgs; [ + bitmath + certifi + cheroot + cryptography + filetype + flask + flask-babel + flask-caching + flask-compress + flask-session + flask-themes2 + js2py + pycurl + semver + setuptools + ]; + + passthru.optional-dependencies = { + plugins = with python3.pkgs; [ + beautifulsoup4 # for some plugins + colorlog # colorful console logging + pillow # for some CAPTCHA plugin + send2trash # send some files to trash instead of deleting them + slixmpp # XMPP plugin + ]; + }; + + meta = with lib; { + description = "Free and open-source download manager with support for 1-click-hosting sites"; + homepage = "https://github.com/pyload/pyload"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ruby0b ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix new file mode 100644 index 0000000000..8af457c7d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/dayon/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, jre +, makeWrapper +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "dayon"; + version = "12.0.1"; + + src = fetchFromGitHub { + owner = "RetGal"; + repo = "dayon"; + rev = "v${version}"; + hash = "sha256-SCInonMTvBXtiDxWlN8QWNS+8MFB52vloonqfLcAEis="; + }; + + # https://github.com/RetGal/Dayon/pull/66 + postPatch = '' + substituteInPlace resources/deb/dayon_assisted.desktop resources/deb/dayon_assistant.desktop \ + --replace "Exec=/usr/bin/" "Exec=" + ''; + + nativeBuildInputs = [ + ant + jdk + makeWrapper + copyDesktopItems + ]; + + buildPhase = '' + runHook preBuild + ant + runHook postBuild + ''; + + desktopItems = [ + "resources/deb/dayon_assisted.desktop" + "resources/deb/dayon_assistant.desktop" + ]; + + installPhase = '' + runHook preInstall + install -Dm644 build/dayon.jar $out/share/dayon/dayon.jar + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/dayon \ + --add-flags "-jar $out/share/dayon/dayon.jar" + makeWrapper ${jre}/bin/java $out/bin/dayon_assisted \ + --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assisted.AssistedRunner" + makeWrapper ${jre}/bin/java $out/bin/dayon_assistant \ + --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assistant.AssistantRunner" + install -Dm644 resources/dayon.png $out/share/icons/hicolor/128x128/apps/dayon.png + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://retgal.github.io/Dayon/index.html"; + description = "An easy to use, cross-platform remote desktop assistance solution"; + license = licenses.gpl3Plus; # https://github.com/RetGal/Dayon/issues/59 + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 77d6d269f0..90f155ce28 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -10,7 +10,7 @@ , configText ? "" }: let - version = "2303"; + version = "2306"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -39,14 +39,17 @@ let pname = "vmware-horizon-files"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/CART24FQ1_LIN_2303_TARBALL/VMware-Horizon-Client-Linux-2303-8.9.0-21435420.tar.gz"; - sha256 = "a4dcc6afc0be7641e10e922ccbbab0a10adbf8f2a83e4b5372dfba095091fb78"; + url = "https://download3.vmware.com/software/CART24FQ2_LIN_2306_TARBALL/VMware-Horizon-Client-Linux-2306-8.10.0-21964631.tar.gz"; + sha256 = "6051f6f1617385b3c211b73ff42dad27e2d22362df6ffd2f3d9f559d0b5743ea"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir ext $out + mkdir ext find ${sysArch} -type f -print0 | xargs -0n1 tar -Cext --strip-components=1 -xf - mv ext/bin ext/lib ext/share "$out"/ + + chmod -R u+w ext/usr/lib + mv ext/usr $out + cp -r ext/bin ext/lib $out/ # Horizon includes a copy of libstdc++ which is loaded via $LD_LIBRARY_PATH # when it cannot detect a new enough version already present on the system. @@ -54,9 +57,6 @@ let # Deleting the bundled library is the simplest way to force it to use our version. rm "$out/lib/vmware/gcc/libstdc++.so.6" - # This library causes the program to core-dump occasionally. Use ours instead. - rm -r $out/lib/vmware/view/crtbora - # This opensc library is required to support smartcard authentication during the # initial connection to Horizon. mkdir $out/lib/vmware/view/pkcs11 @@ -76,6 +76,7 @@ let atk cairo dbus + file fontconfig freetype gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 160485dd0c..e6e97bd0ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.53"; + version = "3.55"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-VfKzptMxT2ra1uVzbL52EWjEGHTxmnh5xZGiQpRivTU="; + hash = "sha256-qAyvGisj6GOjyRmqpTsxX/Zy8bx6+cAtmEId5us70+k="; }; - vendorHash = "sha256-kL6huukrM4YeU7uvj7abXOEAvRhm1Nfp4JODW4BTy0A="; + vendorHash = "sha256-F6Fqv5tUsty/uGwBnKM4r671Gh2T1+9Z2LRGAMF+M2g="; subPackages = [ "weed" ]; 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 8a6ca39ee3..7e0ea7e815 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, gitUpdater +, nix-update-script , makeWrapper , openssh , libxcrypt @@ -11,26 +11,23 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-WKMy2JttXFRcW1yb5aQ6xe8BoSoN65K8Hlmac62+QPc="; + hash = "sha256-OvXbc3feCatyubbRZlaiXvGP59ApyAS0b0Z6SeJsZnE="; }; modRoot = "./agent"; - vendorHash = "sha256-BqzpQcL3U6SIrDW5NfBG0D2zyvv1zNu7uoOBYmKbF4Y="; + vendorHash = "sha256-qQRi4GeepRpYPhE5ftUj01tMCqBh5txbizfkVXmrgOQ="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = ".(rc|beta).*"; - }; + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = shellhub-agent; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix index 71eece9e3b..0597162770 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix @@ -2,7 +2,7 @@ python3, rsync, cron, openssh, sshfs-fuse, encfs }: let - python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]); + python' = python3.withPackages (ps: with ps; [ dbus-python keyring packaging ]); apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { 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 4900b95469..f138523016 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles, fetchpatch +{ lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles , makeWrapper , enableCmount ? true, fuse, macfuse-stubs , librclone @@ -6,25 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.63.0"; + version = "1.63.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ojP1Uf9iP6kOlzW8qsUx1SnMRxFZLsgkjFD4LVH0oTI="; + hash = "sha256-H//Y7BFBr3VXAoKZZgjSgU4aA+Af7tvFozhpoj14ba0="; }; - patches = [ - # Fix build on aarch64-darwin. Remove with the next release. - # https://github.com/rclone/rclone/pull/7099 - (fetchpatch { - url = "https://github.com/rclone/rclone/commit/fb5125ecee4ae1061ff933bb3b9b19243e022241.patch"; - hash = "sha256-3SzU9iiQM8zeL7VQhmq0G6e0km8WBRz4BSplRLE1vpM="; - }) - ]; - - vendorSha256 = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y="; + vendorHash = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix index d91ba79061..748c97b51b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix @@ -4,23 +4,24 @@ }: let - taler-merchant-backoffice = fetchgit { - url = "https://git.taler.net/merchant-backoffice.git"; - # branch "prebuilt" as of 2022-07-01 - rev = "1ef7150f32960cb65ebea67839cd5023f29a3d1d"; - sha256 = "sha256-ZtLYWHi6l5DxFvDm8RFGUD0BiAfJXCZr/ggrP3Uw7/0="; + version = "0.9.2"; + + taler-wallet-core = fetchgit { + url = "https://git.taler.net/wallet-core.git"; + rev = "v${version}"; + sha256 = "sha256-DTnwj/pkowR1b1+N94pnuLykD2O37Nh8AKhUIzY7NaU="; }; in rec { taler-exchange = stdenv.mkDerivation rec { pname = "taler-exchange"; - version = "unstable-2022-07-17"; + inherit version; src = fetchgit { url = "https://git.taler.net/exchange.git"; - rev = "93b45e62eef254eae68bc119b9770e97bae2c9fa"; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-BQxbwEf0wIkBOBVsPgMkMvUj4kFReXMUFTiSG0jXOJ0="; + sha256 = "sha256-c0cX38hDIZGVhHrD9LgDU70dF2AYuZmsakC8yDyZE54="; }; nativeBuildInputs = [ @@ -42,7 +43,6 @@ in rec { ]; propagatedBuildInputs = [ gnunet ]; - configureFlags = [ "--with-gnunet=${gnunet}" ]; preConfigure = '' ./contrib/gana-update.sh ''; @@ -73,15 +73,15 @@ in rec { taler-merchant = stdenv.mkDerivation rec { pname = "taler-merchant"; - version = "unstable-2022-07-11"; + inherit version; src = fetchgit { url = "https://git.taler.net/merchant.git"; - rev = "960dcacf25e51cc2bff359ea1fc86cdd3d9e6083"; - sha256 = "sha256-Wn11z6YjnylZl3z2JjBlrtZ1KHfQUHLIYWo5F+mAmNo="; + rev = "v${version}"; + sha256 = "sha256-NPK8yhuTtZZiWE7OsUMdlb2aycegPzRFud41xHE9IL8="; }; postUnpack = '' - ln -s ${taler-merchant-backoffice}/spa.html $sourceRoot/contrib/ + ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ ''; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix index e555ddacff..cd72539f77 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix @@ -13,17 +13,25 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "1.0.60"; + version = "1.0.83+88994"; src = fetchurl { - url = "https://binaries.twingate.com/client/linux/DEB/${version}/twingate-amd64.deb"; - sha256 = "b308c422af8a33ecd58e21a10a72c353351a189df67006e38d1ec029a93d5678"; + url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; + hash = "sha256-rPYjGSrjSNSdjMZRP0Gd7a9lRC+I06oOvZZEUEJ6s5k="; }; - buildInputs = [ dbus curl libnl udev cryptsetup ]; - nativeBuildInputs = [ dpkg autoPatchelfHook ]; + buildInputs = [ + dbus + curl + libnl + udev + cryptsetup + ]; - unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; postPatch = '' while read file; do @@ -49,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://twingate.com"; license = licenses.unfree; maintainers = with maintainers; [ tonyshkurenko ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix index c9f194a5a8..45da18f8f7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "meteo"; - version = "0.9.9.1"; + version = "0.9.9.2"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "sha256-kkUVTxh5svk61oDp/dpe3ILGyexYe3UaS+LgWsy+Z9s="; + sha256 = "sha256-9+FNpLjiX0zdsUnbBnNSLt/Ma/cqtclP25tl+faPlpU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index 3a5b4c09f1..78062ab787 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.24.4"; + version = "1.25"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-klRPe6NQMn3HVayfCGc05mB0afi3x4Wlj3EI0XdSkMc="; + hash = "sha256-3SxFvvYZupYOsQU/n+zq3hamyWaaN9guoiV8km9mHjM="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { click flask flask-babel - jaraco_functools + jaraco-functools jinja2 markdown2 ply diff --git a/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix index 43bb42ea20..7caa8d2d53 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnote/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-3DvXkmj+mdTtVmeawHbMnZqq9ieWE403HPCIFffmSS0="; + hash = "sha256-aWelUGgiMguuGcHrC8dFFmRPnp61TtwslCU+rhDHYE0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/iotas/default.nix b/third_party/nixpkgs/pkgs/applications/office/iotas/default.nix index c5c3afb5c5..4c9c53afd2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/iotas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/iotas/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "iotas"; - version = "0.1.14"; + version = "0.2.2"; format = "other"; src = fetchFromGitLab { @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "cheywood"; repo = pname; rev = version; - hash = "sha256-IvKjvsHJdoFmDvsM1/kFPikYbBLUEQ57DKr1T+Jyw7w="; + hash = "sha256-oThsyTsNM3283e4FViISdFzmeQnU7qXHh4xEJWA2fkc="; }; nativeBuildInputs = [ @@ -56,11 +56,11 @@ python3.pkgs.buildPythonApplication rec { requests markdown-it-py linkify-it-py + mdit-py-plugins ]; # prevent double wrapping dontWrapGApps = true; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index 786fa2f462..d218d7351b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { comment = meta.description; - name = "JabRef %U"; + name = "JabRef"; desktopName = "JabRef"; genericName = "Bibliography manager"; categories = [ "Office" ]; icon = "jabref"; - exec = "JabRef"; + exec = "JabRef %U"; startupWMClass = "org.jabref.gui.JabRefMain"; mimeTypes = [ "text/x-bibtex" ]; }) @@ -144,8 +144,14 @@ stdenv.mkDerivation rec { 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') + + runHook postInstall + ''; + + postFixup = '' rm $out/bin/* + # put this in postFixup because some gappsWrapperArgs are generated in gappsWrapperArgsHook in preFixup makeWrapper ${jdk}/bin/java $out/bin/JabRef \ "''${gappsWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ @@ -154,8 +160,6 @@ stdenv.mkDerivation rec { # lowercase alias (for convenience and required for browser extensions) ln -sf $out/bin/JabRef $out/bin/jabref - - runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch b/third_party/nixpkgs/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch new file mode 100644 index 0000000000..b477f902b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch @@ -0,0 +1,32 @@ +From 982d38084f08950863b55043f36ce5548bd73635 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Mon, 24 Jul 2023 19:12:25 +0200 +Subject: [PATCH] Strip away BUILDCONFIG + +The `BuildConfig` field in `libsofficeapp.so` includes the entire +`PKG_CONFIG_PATH` and subsequently references to a lot of `dev` outputs +of library dependencies blowing up the closure. + +Since this is not strictly needed and the inputs are comprehensible via +`nix derivation show`, this doesn't bring a real benefit in the case of +nixpkgs anyways. +--- + desktop/source/lib/init.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx +index 8d830c0cbd00..fbdc86aa7115 100644 +--- a/desktop/source/lib/init.cxx ++++ b/desktop/source/lib/init.cxx +@@ -7097,7 +7097,7 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/) + "\"ProductVersion\": \"%PRODUCTVERSION\", " + "\"ProductExtension\": \"%PRODUCTEXTENSION\", " + "\"BuildId\": \"%BUILDID\", " +- "\"BuildConfig\": \"" BUILDCONFIG "\" " ++ "\"BuildConfig\": \"removed to avoid runtime dependencies against dev outputs of each dependency. Use 'nix derivation show' against the package to find out details about BuildConfig.\" " + "}")); + } + +-- +2.40.1 + diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 25e8f18998..70df53f1eb 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -214,6 +214,23 @@ 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") [ + ./0001-Strip-away-BUILDCONFIG.patch + ]; + + # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) + # in the binary causing the closure size to blow up because of many unnecessary + # dependencies to dev outputs. This behavior was patched away in nixpkgs + # (see above), make sure these don't leak again by accident. + disallowedRequisites = lib.optionals (!kdeIntegration) + (lib.concatMap + (x: lib.optional (x?dev) x.dev) + buildInputs); + ### QT/KDE # # configure.ac assumes that the first directory that contains headers and @@ -395,7 +412,7 @@ in dontWrapQtApps = true; configureFlags = [ - (if withHelp then "" else "--without-help") + (lib.optionalString (!withHelp) "--without-help") "--with-boost=${getDev boost}" "--with-boost-libdir=${getLib boost}/lib" "--with-beanshell-jar=${bsh}" diff --git a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix index 30cc891d09..559474b741 100644 --- a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-jrDu4tXuYl2ttTRHpKHZDucqWO4mYc6zwAdRd0rQht4="; + sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/notes/default.nix b/third_party/nixpkgs/pkgs/applications/office/notes/default.nix new file mode 100644 index 0000000000..7ddc7d98dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/notes/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, wrapQtAppsHook +, qtbase +, qtdeclarative +, Cocoa +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "notes"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "nuttyartist"; + repo = "notes"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ZfAm77UHyjs2aYOYb+AhKViz6uteb7+KKSedonSiMkY="; + fetchSubmodules = true; + }; + + cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ]; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + 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 '' + mkdir $out/Applications + mv $out/bin/Notes.app $out/Applications + ''; + + meta = { + description = "A fast and beautiful note-taking app"; + downloadPage = "https://github.com/nuttyartist/notes"; + homepage = "https://www.get-notes.com"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ zendo ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix index 8f08b56d4d..ee4fe040bf 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "openpaperwork-core"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/openpaperwork-core"; + sourceRoot = "${src.name}/openpaperwork-core"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index f1eb43dbdb..9566a60106 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-gtk"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/openpaperwork-gtk"; + sourceRoot = "${src.name}/openpaperwork-gtk"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix index c7ddfa09e2..cbb5749642 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "paperwork-backend"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/paperwork-backend"; + sourceRoot = "${src.name}/paperwork-backend"; patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index 36d3b0056b..d4ae3070d9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { src = sample_documents; }; - sourceRoot = "source/paperwork-gtk"; + sourceRoot = "${src.name}/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix index ca6cab2c1e..56d84e1039 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "paperwork-shell"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/paperwork-shell"; + sourceRoot = "${src.name}/paperwork-shell"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index 7a6e95db80..88fcdfd50c 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.64.4"; + version = "0.64.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-RjwZVJxPVbSlC0huGsreMdKDFV97bshoGA302u4N0Vk="; + hash = "sha256-dF8w5JyUNypLyPqFC6dWLArPjykvy9BPZnHYs6lyYQM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index f7d4f273a5..84ba9c2fbb 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.7.2"; + version = "23.7.3"; 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-DjVLfP6tUMUFJHZyBIMivqbjiqgQecW78YbLobOnXnM="; + hash = "sha256-Jk0KPYYB+CW60ggVn58JKJ1UX5VXWbSUC+osHG4wjR0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix index aa98e98c8d..4e33f0f5de 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-07-08"; + version = "unstable-2023-08-01"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "7c0967ed28e3d5b100a668015e38993dab7e3e34"; - sha256 = "969Ogxcoto2pNVr5itijeYXqytJxgUJ8rH97P6K8O1A="; + rev = "4548a14939e4862d1bb61552f5c2f16e7ccef865"; + sha256 = "BxA0vJrWk3YW7yCK010q5OYub3amJA/uUrgg1/cTGNc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix index 0436c31c94..9e100459f7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix @@ -42,6 +42,7 @@ let comment = meta.description; desktopName = "Trilium Notes"; categories = [ "Office" ]; + startupWMClass = "trilium notes"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix b/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix index 7daaa02a64..ef77a07782 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.15.1"; + version = "3.16.0"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-A0OJzhvHP+muPI8N23zD4RTiyK0m3JGr/3uJ0Tqz97c="; + hash = "sha256-tcu6y2DqdhFE2nbDkiANDk/Mzidcp8PLi8bWZaI6sH0="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://vnotex.github.io/vnote"; description = "A pleasant note-taking platform"; - changelog = "https://github.com/vnotex/vnote/releases/tag/v${finalAttrs.src.rev}"; + changelog = "https://github.com/vnotex/vnote/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/radio/abracadabra/default.nix b/third_party/nixpkgs/pkgs/applications/radio/abracadabra/default.nix index 5058a740b3..9ecd846b93 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.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - sha256 = "sha256-pjcao8KTEmgE54dUBxLLnStszR32LryfciMKScBOGdc="; + sha256 = "sha256-hK7mRDJqn0ETgHlvZl3m6lRDbsp5v7a8eGBFdm7ihdA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/ax25-apps/default.nix b/third_party/nixpkgs/pkgs/applications/radio/ax25-apps/default.nix index 4f9ecd3580..ea53d7c38b 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/ax25-apps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/ax25-apps/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" + "--localstatedir=/var/lib" "--program-transform-name=s@^call$@ax&@;s@^listen$@ax&@" ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/ax25-tools/default.nix b/third_party/nixpkgs/pkgs/applications/radio/ax25-tools/default.nix index 0e806c1107..80c42da9a3 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/ax25-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/ax25-tools/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-kqnLi1iobcufVWMPxUyaRsWKIPyTvtUkuMERGQs2qgY="; }; - configureFlags = [ "--sysconfdir=/etc" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var/lib" + ]; meta = with lib; { description = "Non-GUI tools used to configure an AX.25 enabled computer"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 669a596ccb..680278bf0e 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.3"; + version = "2.4.5"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-2L+Yp8yxhmoVh34cW1s5Xy1f0X2xUo3UP32XcAV2LsM="; + sha256 = "sha256-L68jk49lGw9LNSqIPlDp2WHoQhn8UBW6VDZwsCtjTQI="; }; postPath = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix index 3da74a1116..8eb68db56a 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.01"; + version = "2.0.02"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-TFZZaTtU7TLBPA7jpBTu2JtkZpxjG57Rin8OVFedHwA="; + sha256 = "sha256-3I9ucz8XtGqY9I0tO9BRt1IQiOkpAkjMy3e7302gGMg="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix index cf62da4d0e..a8a3d0f875 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.11"; + version = "1.8.12"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-uI81dz0rU2/UnLvoQffuFOB3NGaTK0MJmCWGvGQKw24="; + hash = "sha256-5qq7EDCLAiCReFS1V8R2SkFI8CesmQclimcE3USGV/U="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix index ed4c797fac..c057fe62f1 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix @@ -2,7 +2,7 @@ , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT -, withGui ? true +, withGui ? !stdenv.isDarwin # withGui transitively depends on mesa, which is broken on darwin }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix b/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix new file mode 100644 index 0000000000..58eefd0dbc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pat"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "la5nta"; + repo = "pat"; + rev = "v${version}"; + hash = "sha256-ydv7RQ6MJ+ifWr+babdsDRnaS7DSAU+jiFJkQszy/Ro="; + }; + + vendorHash = "sha256-TMi5l9qzhhtdJKMkKdy7kiEJJ5UPPJLkfholl+dm/78="; + + ldflags = [ "-s" "-w" ]; + + 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 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index dd982cebc3..bcdd15bfd3 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "sdrangel"; - version = "7.15.0"; + version = "7.15.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - hash = "sha256-APDrVujz/2ZYqxGggabAj8ght72Vuf+oMS/kuVaWkWM="; + hash = "sha256-xOnToYe7+0Jlm4bWvnFbYxVi1VqBlGfKYdzHf4igyl0="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix b/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix index 2f6eed575b..62e645fb6d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/ubertooth/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw"; }; - sourceRoot = "source/host"; + sourceRoot = "${src.name}/host"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbtbb libpcap libusb1 bluez ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix index 3dd7a54225..9a5d3c3cbb 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/jopohl/urh"; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; } 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 f2ecbbd85d..00b36de280 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , perl , wrapGAppsHook @@ -30,6 +31,14 @@ stdenv.mkDerivation rec { hash = "sha256-8Iheb/9wjf0u10ZQRkLMLNN2s7P++Fqcr26iatiKcTo="; }; + patches = [ + # Compatibility with INDI 2.0 series from https://github.com/Stellarium/stellarium/pull/3269 + (fetchpatch { + url = "https://github.com/Stellarium/stellarium/commit/31fd7bebf33fa710ce53ac8375238a24758312bc.patch"; + hash = "sha256-eJEqqitZgtV6noeCi8pDBYMVTFIVWXZU1fiEvoilX8o="; + }) + ]; + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix index 993afff596..fa96f32e8c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AfddjnAdhbLHWRckEgCcwE8pthYWrOL6dRFhI95Flsw="; + sha256 = "sha256-2bnTYpPkzGKrdHOqJTk4nU4d55sakn1IP26R88POrH4="; }; nativeBuildInputs = [ 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 a09bbac27c..1281643fe7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.3.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-TE2fus3KaGd9jo7cOWmJSooHjxTbcxEldR1Mui2SGP0="; + hash = "sha256-Gic/rE/G24P5g4Uhf2lcvVa6i/4KGQzCpK4KlpjXcS0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index b4560728e3..95f8a75e66 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1456"; + version = "1460"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-9DkmqqovVqaahoHoY30CfINEHTKn3Rqb9yVtU4fIgKw="; + hash = "sha256-9Er15zsq9Xrw66M8QOmARC1S/O5NvmpdUvOZUGc92P0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix index 7696acefd7..366d027822 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/muscle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' install -m755 -D Linux/muscle $out/bin/muscle diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix index c2948087d8..35898aae9f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}: +{lib, stdenv, fetchurl, fetchFromGitHub, cmake, boost179, gmp, htslib, zlib, xz, pkg-config}: stdenv.mkDerivation rec { pname = "octopus"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost gmp htslib zlib xz ]; + buildInputs = [ boost179 gmp htslib zlib xz ]; patches = [ (fetchurl { url = "https://github.com/luntergroup/octopus/commit/17a597d192bcd5192689bf38c5836a98b824867a.patch"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix index 871c76dc6e..c593b5ed3d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/paml/default.nix @@ -1,23 +1,28 @@ -{stdenv, fetchurl}: +{ lib +, stdenv +, fetchFromGitHub +}: -stdenv.mkDerivation rec { - version = "4.9j"; +stdenv.mkDerivation (finalAttrs: { pname = "paml"; - src = fetchurl { - url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; - sha256 = "0qflf3i27x6jwks3c6q560m1q8r043ja96syah145113iz5wdalp"; + version = "4.10.7"; + + src = fetchFromGitHub { + owner = "abacus-gene"; + repo = "paml"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s="; }; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: /build/ccKomtcd.o:(.bss+0x4544): multiple definition of `SeqTypes'; - # /build/ccx7EsgU.o:(.bss+0x2a0dfdc): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_POSIX_C_SOURCE"; preBuild = '' cd ./src/ ''; + installPhase = '' + runHook preInstall + mkdir -pv $out/bin cp -v codeml $out/bin cp -v baseml $out/bin @@ -28,12 +33,16 @@ stdenv.mkDerivation rec { cp -v mcmctree $out/bin cp -v pamp $out/bin cp -v yn00 $out/bin + + runHook postInstall ''; meta = { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; - license = "non-commercial"; + license = lib.licenses.gpl3Only; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; + changelog = "https://github.com/abacus-gene/paml/releases/tag/${finalAttrs.src.rev}"; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 8bd1af4b11..e0555055c1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-DV4oqzAfrTsCAw0BkjiIEpuoLF9yKsXMstQYq3asVJk="; + sha256 = "sha256-6nnKYnml6BjLb6aKNHbd55nH6gP/5Somo8poxx7yhVk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/seqkit/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/seqkit/default.nix index 598c8248bf..e785d6c25f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/seqkit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/seqkit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "seqkit"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-v2Z94UDuXnT7eVFX+uLSxXR34eIBzRm1bHwD7gO9SVA="; + sha256 = "sha256-pk4HNtG2x3zZ+GEH5MNn/XPNSmx8zGWbVYPGCYIZucs="; }; - vendorHash = "sha256-dDMSwZnTWC60zvPDvUT+9T/mUUrhW0Itn87XO/+Ef2Q="; + vendorHash = "sha256-54kb9Na76+CgW61SnXu7EfO0InH/rjliNRcH2M/gxII="; meta = with lib; { description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix index e1a21cba0d..3383a78e1d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/star/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q="; }; - sourceRoot = "source/source"; + sourceRoot = "${src.name}/source"; postPatch = '' substituteInPlace Makefile --replace "/bin/rm" "rm" diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix index 5f197bd7f7..0b3f2520d8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - sourceRoot = "source/tandem_aligner"; + sourceRoot = "${finalAttrs.src.name}/tandem_aligner"; nativeBuildInputs = [ cmake ]; 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 6f46524a5b..e29b2da0fc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix @@ -1,28 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages}: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, llvmPackages +}: -stdenv.mkDerivation rec { - pname = "veryfasttree"; - version = "4.0.1"; +stdenv.mkDerivation (finalAttrs: { + pname = "veryfasttree"; + version = "4.0.2"; src = fetchFromGitHub { owner = "citiususc"; - repo = pname; - rev = "v${version}"; - hash = "sha256-fv5ovi180Osok5GYJEidjMqmL8gZKUcxrcCQ/00lvi4="; + repo = "veryfasttree"; + rev = "v${finalAttrs.version}"; + hash = "sha256-JMBhSxfGO3qz7Yl4s5r6zWHFefXGzu0ktEJdRUh/Uqg="; }; nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp; installPhase = '' + runHook preInstall + install -m755 -D VeryFastTree $out/bin/VeryFastTree + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Speeding up the estimation of phylogenetic trees for large alignments through parallelization and vectorization strategies"; - license = licenses.gpl3Plus; - homepage = "https://github.com/citiususc/veryfasttree"; - maintainers = with maintainers; [ thyol ]; - platforms = platforms.all; + homepage = "https://github.com/citiususc/veryfasttree"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ thyol ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix index 99d132912e..fb7fd1ece0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix @@ -12,7 +12,7 @@ buildPythonPackage { format = "pyproject"; - sourceRoot = "source/build/python"; + sourceRoot = "${autodock-vina.src.name}/build/python"; postPatch = '' # wildcards are not allowed 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 a16797b955..5defaafa3c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "2023.1"; + version = "2023.2"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - hash = "sha256-SG5Gz0cDiSfbSZ8m4K+eARMLU4iMk/xK3esN5yt05RE="; + hash = "sha256-1TJorIjajWFO7i9vqSBDTAIukBdyvxbr5dargt4QB8M="; fetchSubmodules = true; }; 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 c99c5da06f..695d5502b5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,19 +1,47 @@ -{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl -, blas-ilp64, hdf5-cpp, python3, texlive -, armadillo, libxc, makeWrapper -# Note that the CASPT2 module is broken with MPI -# See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 +{ lib +, stdenv +, fetchFromGitLab +, fetchFromGitHub +, cmake +, gfortran +, perl +, blas-ilp64 +, hdf5-cpp +, python3 +, texlive +, armadillo +, libxc +, makeWrapper +, gsl +, boost175 +, autoPatchelfHook + # Note that the CASPT2 module is broken with MPI + # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 , enableMpi ? false -, mpi, globalarrays -} : +, mpi +, globalarrays +}: assert blas-ilp64.isILP64; assert lib.elem blas-ilp64.passthru.implementation [ "openblas" "mkl" ]; let - python = python3.withPackages (ps : with ps; [ six pyparsing numpy h5py ]); + python = python3.withPackages (ps: with ps; [ six pyparsing numpy h5py ]); + qcmaquisSrc = fetchFromGitHub { + owner = "qcscine"; + repo = "qcmaquis"; + rev = "release-3.1.1"; # Must match tag in cmake/custom/qcmaquis.cmake + hash = "sha256-diLDWj/Om6EHrVp+Hd24jsN6R9vV2vRl0y9gqyRWhkI="; + }; + nevtp2Src = fetchFromGitHub { + owner = "qcscine"; + repo = "nevpt2"; + rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake + hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0="; + }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "openmolcas"; version = "23.06"; @@ -28,12 +56,22 @@ in stdenv.mkDerivation { patches = [ # Required to handle openblas multiple outputs ./openblasPath.patch + + # Required for a local QCMaquis build + ./qcmaquis.patch ]; postPatch = '' # Using env fails in the sandbox substituteInPlace Tools/pymolcas/export.py --replace \ "/usr/bin/env','python3" "python3" + + # Pointing CMake to local QCMaquis and NEVPT2 archives + substituteInPlace cmake/custom/qcmaquis.cmake \ + --subst-var-by "qcmaquis_src_url" "file://${qcmaquisSrc}" + + substituteInPlace cmake/custom/nevpt2.cmake \ + --subst-var-by "nevpt2_src_url" "file://${nevtp2Src}" ''; nativeBuildInputs = [ @@ -42,6 +80,7 @@ in stdenv.mkDerivation { cmake texlive.combined.scheme-minimal makeWrapper + autoPatchelfHook ]; buildInputs = [ @@ -50,6 +89,8 @@ in stdenv.mkDerivation { python armadillo libxc + gsl.dev + boost175 ] ++ lib.optionals enableMpi [ mpi globalarrays @@ -64,10 +105,15 @@ in stdenv.mkDerivation { "-DHDF5=ON" "-DFDE=ON" "-DEXTERNAL_LIBXC=${libxc}" + "-DDMRG=ON" + "-DNEVPT2=ON" + "-DCMAKE_SKIP_BUILD_RPATH=ON" ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ - "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" "-DLINALG=OpenBLAS" + "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" + "-DLINALG=OpenBLAS" ] ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ - "-DMKLROOT=${blas-ilp64.passthru.provider}" "-DLINALG=MKL" + "-DMKLROOT=${blas-ilp64.passthru.provider}" + "-DLINALG=MKL" ] ++ lib.optionals enableMpi [ "-DGA=ON" "-DMPI=ON" @@ -89,6 +135,10 @@ in stdenv.mkDerivation { rm -r $out/Tools ''; + # DMRG executables contain references to /build, however, they are properly + # removed by autopatchelf + noAuditTmpdir = true; + postFixup = '' # Wrong store path in shebang (no Python pkgs), force re-patching sed -i "1s:/.*:/usr/bin/env python:" $out/bin/pymolcas @@ -101,7 +151,7 @@ in stdenv.mkDerivation { description = "Advanced quantum chemistry software package"; homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; - license = licenses.lgpl21Only; + license = with licenses; [ lgpl21Only bsd3 ]; platforms = [ "x86_64-linux" ]; mainProgram = "pymolcas"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch new file mode 100644 index 0000000000..ca276bb3fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch @@ -0,0 +1,46 @@ +diff --git a/cmake/custom/nevpt2.cmake b/cmake/custom/nevpt2.cmake +index 789739ec8..6c86a7b8c 100644 +--- a/cmake/custom/nevpt2.cmake ++++ b/cmake/custom/nevpt2.cmake +@@ -67,6 +67,7 @@ list(APPEND NEVPT2CMakeArgs + "-DMOLCAS_BUILD_DIR=${PROJECT_BINARY_DIR}" + "-DCMAKE_Fortran_MODULE_DIRECTORY=${mod_dir}" + "-DDMRG_INCLUDE=${HDF5_QCM_INCLUDE}" ++ "-DCMAKE_SKIP_BUILD_RPATH=ON" + ) + + if(HDF5_ROOT) +@@ -118,9 +119,7 @@ endif () + + ExternalProject_Add(${EP_PROJECT} + PREFIX ${CUSTOM_NEVPT2_LOCATION} +- GIT_REPOSITORY ${reference_git_repo} +- GIT_TAG ${reference_git_commit} +- UPDATE_DISCONNECTED ${EP_SkipUpdate} ++ URL @nevpt2_src_url@ + CMAKE_ARGS "${NEVPT2CMakeArgs}" + INSTALL_DIR "${PROJECT_BINARY_DIR}/qcmaquis" + ) +diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake +index 176d02761..e160b7bc8 100644 +--- a/cmake/custom/qcmaquis.cmake ++++ b/cmake/custom/qcmaquis.cmake +@@ -78,6 +78,7 @@ list(APPEND QCMaquisCMakeArgs + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_CXX_FLAGS=${QCM_CMake_CXX_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= ++ -DCMAKE_SKIP_BUILD_RPATH=ON + ) + if(HDF5_ROOT) + list(APPEND QCMaquisCMakeArgs +@@ -278,9 +279,7 @@ set (CMAKE_DISABLE_SOURCE_CHANGES OFF) + + ExternalProject_Add(${EP_PROJECT} + PREFIX ${extprojpath} +- GIT_REPOSITORY ${reference_git_repo} +- GIT_TAG ${reference_git_commit} +- UPDATE_DISCONNECTED ${EP_SkipUpdate} ++ URL @qcmaquis_src_url@ + + SOURCE_SUBDIR dmrg + CMAKE_ARGS ${EP_CMAKE_ARGS} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix index 147e27a835..ed90b03dbc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/digital/default.nix @@ -39,9 +39,9 @@ maven.buildMavenPackage rec { }; inherit mvnParameters; - mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68="; + mvnHash = "sha256-wm/axWJucoW9P98dKqHI4bjrUnmBTfosCOdJg9VBJ+4="; - nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix index 6b77f75b11..775bae9813 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix @@ -1,32 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "geda"; - version = "1.8.2-20130925"; + version = "1.10.2"; src = fetchurl { - url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz"; - sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; + url = "http://ftp.geda-project.org/geda-gaf/stable/v${lib.versions.majorMinor version}/${version}/geda-gaf-${version}.tar.gz"; + hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ="; }; - patches = [ - # Pull upstream patch for -fno-common toolchains - (fetchpatch { - name = "fno-common-p1.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6"; - sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq"; - }) - (fetchpatch { - name = "fno-common-p2.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158"; - sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k"; - }) - ]; - configureFlags = [ "--disable-update-xdg-database" + "--without-libfam" ]; - nativeBuildInputs = [ pkg-config ]; + + nativeBuildInputs = [ groff pkg-config python2 ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { 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 296fae0a0e..5ee77fce96 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 @@ -41,7 +41,7 @@ let # 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 = fmt_8.overrideAttrs (_: rec { + fmt_9 = fmt_8.overrideAttrs (_: rec { version = "8.0.1"; src = fetchFromGitHub { owner = "fmtlib"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kingstvis/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kingstvis/default.nix new file mode 100644 index 0000000000..3699aebbbf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kingstvis/default.nix @@ -0,0 +1,59 @@ +{ buildFHSEnv +, dbus +, fetchzip +, fontconfig +, freetype +, glib +, lib +, libGL +, stdenv +, xkeyboard_config +, xorg +, zlib +}: + +let + name = "kingstvis"; + version = "3.6.1"; + src = fetchzip { + url = "http://res.kingst.site/kfs/KingstVIS_v${version}.tar.gz"; + hash = "sha256-eZJ3RZWdmNx/El3Hh5kUf44pIwdvwOEkRysYBgUkS18="; + }; +in + +buildFHSEnv { + inherit name; + + targetPkgs = pkgs: (with pkgs; [ + dbus + fontconfig + freetype + glib + libGL + xkeyboard_config + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libxcb + zlib + ]); + + extraInstallCommands = '' + install -Dvm644 ${src}/Driver/99-Kingst.rules \ + $out/lib/udev/rules.d/99-Kingst.rules + ''; + + runScript = "${src}/KingstVIS"; + + meta = { + description = "Kingst Virtual Instruments Studio, software for logic analyzers"; + homepage = "http://www.qdkingst.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.luisdaranda ]; + platforms = [ "x86_64-linux" ]; + }; +} 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 1e2620e39c..15157b11f2 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.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-WwO46x6McV18ebGFjXQ8fvqRh6ih1Wt5JTbfTxVWTi0="; + hash = "sha256-7Kw9irZltNE8VRnIvVX786/u0QQtmRhV8pzpba0h1JY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix new file mode 100644 index 0000000000..58ecf986cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/sv-lang/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost182 +, catch2_3 +, cmake +, ninja +, fmt_9 +, python3 +}: + +let + # dependency for this library has been removed in master (i.e. next release) + unordered_dense = stdenv.mkDerivation rec { + version = "2.0.1"; + pname = "unordered_dense"; + src = fetchFromGitHub { + owner = "martinus"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9zlWYAY4lOQsL9+MYukqavBi5k96FvglRgznLIwwRyw="; + }; + nativeBuildInputs = [ + cmake + ]; + }; + +in +stdenv.mkDerivation rec { + pname = "sv-lang"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "MikePopoloski"; + repo = "slang"; + rev = "v${version}"; + sha256 = "sha256-v2sStvukLFMRXGeATxvizmnwEPDE4kwnS06n+37OrJA="; + }; + + cmakeFlags = [ + # fix for https://github.com/NixOS/nixpkgs/issues/144170 + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + + "-DSLANG_INCLUDE_TESTS=${if doCheck then "ON" else "OFF"}" + ]; + + nativeBuildInputs = [ + cmake + python3 + ninja + + # though only used in tests, cmake will complain its absence when configuring + catch2_3 + ]; + + buildInputs = [ + unordered_dense + boost182 + fmt_9 + ]; + + # TODO: a mysterious linker error occurs when building the unittests on darwin. + # The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "SystemVerilog compiler and language services"; + homepage = "https://github.com/MikePopoloski/slang"; + license = licenses.mit; + maintainers = with maintainers; [ sharzy ]; + mainProgram = "slang"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/systemc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/systemc/default.nix index cdb489c632..dc6186841f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/systemc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/systemc/default.nix @@ -1,18 +1,26 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "systemc"; - version = "2.3.3"; + version = "2.3.4"; - src = fetchurl { - url = "https://www.accellera.org/images/downloads/standards/systemc/${pname}-${version}.tar.gz"; - sha256 = "5781b9a351e5afedabc37d145e5f7edec08f3fd5de00ffeb8fa1f3086b1f7b3f"; + src = fetchFromGitHub { + owner = "accellera-official"; + repo = pname; + rev = version; + sha256 = "0sj8wlkp68cjhmkd9c9lvm3lk3sckczpz7w9vby64inc1f9fnf0b"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ "--with-unix-layout" ]; + meta = with lib; { description = "The language for System-level design, modeling and verification"; homepage = "https://systemc.org/"; license = licenses.asl20; - maintainers = with maintainers; [ victormignot ]; + platforms = platforms.linux; + maintainers = with maintainers; [ victormignot amiloradovsky ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 8311bb758e..90601651e5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv, fetchFromGitHub -, perl, flex, bison, python3, autoconf -, which, cmake, help2man -, makeWrapper, glibcLocales -}: +{ lib, stdenv, fetchFromGitHub, perl, flex, bison, python3, autoconf, + which, cmake, ccache, help2man, makeWrapper, glibcLocales, + systemc, git, numactl }: stdenv.mkDerivation rec { pname = "verilator"; @@ -16,9 +14,9 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ perl ]; - nativeBuildInputs = [ makeWrapper flex bison python3 autoconf help2man ]; - nativeCheckInputs = [ which ]; + buildInputs = [ perl python3 systemc ]; # ccache + nativeBuildInputs = [ makeWrapper flex bison autoconf help2man git ]; + nativeCheckInputs = [ which numactl ]; # cmake doCheck = stdenv.isLinux; # darwin tests are broken for now... checkTarget = "test"; @@ -26,8 +24,12 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; postPatch = '' - patchShebangs bin/* src/{flexfix,vlcovgen} test_regress/{driver.pl,t/*.pl} + patchShebangs bin/* src/* nodist/* docs/bin/* examples/xml_py/* \ + test_regress/{driver.pl,t/*.{pl,pf}} \ + ci/* ci/docker/run/* ci/docker/run/hooks/* ci/docker/buildenv/build.sh ''; + # grep '^#!/' -R . | grep -v /nix/store | less + # (in nix-shell after patchPhase) postInstall = lib.optionalString stdenv.isLinux '' for x in $(ls $out/bin/verilator*); do @@ -36,10 +38,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Fast and robust (System)Verilog simulator/compiler"; - homepage = "https://www.veripool.org/wiki/verilator"; + description = "Fast and robust (System)Verilog simulator/compiler and linter"; + homepage = "https://www.veripool.org/verilator"; license = with licenses; [ lgpl3Only artistic2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice amiloradovsky ]; }; } 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 bea9381132..1062582d82 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-02-23"; + version = "unstable-2023-06-28"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "2c1c83f75b8078ced51f92c697da3e712feb3ac3"; - hash = "sha256-THcyEifIp9v1bOofFVm9NFPqgI6NfKKys+Ea2KyNpv8="; + rev = "bb64142b07794ee685494564471e67365a093710"; + hash = "sha256-Qkk61Lh84ervtehWskSB9GKh+JPB7mI1IuG32OSZMdg="; }; nativeBuildInputs = [ cmake ]; 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 19d296269f..3cb06c4e7b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix @@ -1,28 +1,30 @@ -{ lib, fetchFromGitHub, ocamlPackages, rsync }: +{ lib, fetchFromGitHub, ocamlPackages }: ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { - owner = "Beluga-lang"; - repo = "Beluga"; - rev = "v${version}"; - sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw"; + owner = "Beluga-lang"; + repo = "Beluga"; + rev = "refs/tags/v${version}"; + hash = "sha256-0E7rmiLmQPfOAQ1qKiqxeLdqviVl+Thkl6KfOWkGZRc="; }; duneVersion = "3"; buildInputs = with ocamlPackages; [ - gen sedlex extlib dune-build-info linenoise + gen + sedlex + extlib + dune-build-info + linenoise + omd + uri + ounit2 + yojson ]; - postPatch = '' - patchShebangs ./TEST ./run_harpoon_test.sh - ''; - - checkPhase = "./TEST"; - nativeCheckInputs = [ rsync ]; doCheck = true; postInstall = '' @@ -32,9 +34,10 @@ ocamlPackages.buildDunePackage rec { meta = with lib; { description = "A functional language for reasoning about formal systems"; - homepage = "http://complogic.cs.mcgill.ca/beluga/"; - license = licenses.gpl3Plus; + homepage = "https://complogic.cs.mcgill.ca/beluga"; + changelog = "https://github.com/Beluga-lang/Beluga/releases/tag/v${version}"; + license = licenses.gpl3Plus; maintainers = [ maintainers.bcdarwin ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } 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 c24d5bb7f6..c287a74010 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.87.0"; + version = "5.88.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-aBqJqsZK5O3yWTQ1BEej0eeDI8JcsnO6sIv7eH6wnkw="; + sha256 = "sha256-bfrtYqTMU/Nib0wZjS/t0kg5sBsuQuq9GaHX4PxL7tU="; }; nativeBuildInputs = [ 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 962f9c8ae8..2b30d3aeeb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix @@ -8,20 +8,20 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.0.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - sha256 = "sha256-7mVFDORbu9KsJ4IH8PrrpXE7xFrWVTyBmRaL8Kt/ghY="; + sha256 = "sha256-RSGaOgGf3m94t3SKnvSPqz0VHhWr6NmIMtGsmOynMaM="; }; 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.jar -C classes dafny + jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew # Needed to fix diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/dafny/deps.nix b/third_party/nixpkgs/pkgs/applications/science/logic/dafny/deps.nix index 708ea37f91..895c359ce3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/dafny/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/dafny/deps.nix @@ -3,18 +3,18 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Boogie"; version = "2.16.0"; sha256 = "1zcbbqhn7brxnywp3m5pfd7rcapg5w1xjr5pkfsqmmv8fk36nfja"; }) - (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "2.16.0"; sha256 = "05l8lfh25w0a92swhlgp01l62bp6d07191jjvhnnak1k184drqm4"; }) - (fetchNuGet { pname = "Boogie.BaseTypes"; version = "2.16.0"; sha256 = "0qak5dzxja5ffprb0frgvbf88nlk232fr2m3lvg27qz3ai70p8xm"; }) - (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "2.16.0"; sha256 = "078b5hzllqw08g5wvgp63lq2qg1ywk0scph3wdgjn966q2yfqz84"; }) - (fetchNuGet { pname = "Boogie.Concurrency"; version = "2.16.0"; sha256 = "1wcfqgnvinkfd26ig82gbj6ykn6b3f2iv8gr8h96q9jd6x9rmlkb"; }) - (fetchNuGet { pname = "Boogie.Core"; version = "2.16.0"; sha256 = "00sgvjxx613ljmppb69abrw50gv2rv9kk96rc1dq8ymlw8b3imw7"; }) - (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "2.16.0"; sha256 = "1kxyrbwcp5slgq3n26s2l69fs2hbda41v7jkxhpjh1yn9wb56b4n"; }) - (fetchNuGet { pname = "Boogie.Graph"; version = "2.16.0"; sha256 = "1qhfdysbca63agb7lcclyhi4wvi6142ipcbh9ag0g9mdf0pkwiqv"; }) - (fetchNuGet { pname = "Boogie.Houdini"; version = "2.16.0"; sha256 = "0rqhybfhbkb4cb14d546gknjabgrfl7pm1b87nzhmxpwzszw6ss3"; }) - (fetchNuGet { pname = "Boogie.Model"; version = "2.16.0"; sha256 = "0k328lcnxqf06pc97sgmqdzr564zgdvacy6j2n1209w882xs43rg"; }) - (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "2.16.0"; sha256 = "19xx2x9ccr64rr7cldgdmd0d1xi56rz0skmvkqn1hdwcndh01n6a"; }) - (fetchNuGet { pname = "Boogie.VCExpr"; version = "2.16.0"; sha256 = "0ysmw9sl713xdpbcij3w4bm2hkigkjw7c2j1a7wwax02gsvx8djw"; }) - (fetchNuGet { pname = "Boogie.VCGeneration"; version = "2.16.0"; sha256 = "1g3ipl27qcy23g0pnsahyba9j90fvhm17wxczqx7hbgw0h183nji"; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "2.16.8"; sha256 = "1a4pfzc7r6yxzwixsij2xijiyk50ii84zlwl151naw0y05yj4zxn"; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "2.16.8"; sha256 = "17zii7d31bqlhn2ygfjh5a37nb98wkn377z8rm6fg44f83788ll9"; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "2.16.8"; sha256 = "18aixxw5xrivzpwrwj91dyhdnj3xd1apmjrgbdgg5f0z6p9863nq"; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "2.16.8"; sha256 = "1qsp24ckvjz01mjq1fxssdvpsx6kvrdx8l7hd2rll86rrh1bc6w4"; }) + (fetchNuGet { pname = "Boogie.Core"; version = "2.16.8"; sha256 = "1qp6yaa0h16ihqrr2vgbgnakmvshd76skdhqrp1v7jcp7mw8af7n"; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "2.16.8"; sha256 = "1q3x8im85i68vz8ls51ywd4ayjsy53ygra01byscbnhc1qflpzia"; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "2.16.8"; sha256 = "1pyd35rfv0bn0b1xxvqzixnprwjbps54zs0yaily9xxsyg33y1jr"; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "2.16.8"; sha256 = "1n6dlr84y9kni1sskgd6zx4cfflw28yavwwaz6hmmm01l8zg8y6w"; }) + (fetchNuGet { pname = "Boogie.Model"; version = "2.16.8"; sha256 = "0cbq5lyprz0m1kv6a8yyjnhyx42k1jbl00ljrj1bldlj7dz4ahw3"; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "2.16.8"; sha256 = "1q48xzmzch4mc8z0wg2ap8f9glmxcj59i9a645ybysf1jah6yphy"; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "2.16.8"; sha256 = "130jmlvvjd2ls95ry7ds0y2h7pxa109dikx1p3a3psb9dph7zxkr"; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "2.16.8"; sha256 = "0fim2d7p1y6ms1m8f1d5yl4pq3167pi4i7nwink5ydv3fvsckh08"; }) (fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; }) (fetchNuGet { pname = "dotnet-format"; version = "5.1.250801"; sha256 = "1i0icx2yyp9141rjb2a221a71fvsy0knrfyvv631vb56r8fnsywh"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) @@ -181,4 +181,5 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) + (fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; sha256 = "1i928q6a7l65mk7wj2vvfclyvxamdjxg4dbj3g6g95inrfgvidah"; }) ] diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/egglog/Cargo.lock b/third_party/nixpkgs/pkgs/applications/science/logic/egglog/Cargo.lock index a11ce80897..b2d8ef8a90 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/egglog/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/science/logic/egglog/Cargo.lock @@ -249,6 +249,7 @@ name = "egglog" version = "0.1.0" dependencies = [ "clap", + "egraph-serialize", "env_logger", "glob", "hashbrown 0.14.0", @@ -265,12 +266,25 @@ dependencies = [ "ordered-float", "regex", "rustc-hash", + "serde_json", "smallvec", "symbol_table", "symbolic_expressions", "thiserror", ] +[[package]] +name = "egraph-serialize" +version = "0.1.0" +source = "git+https://github.com/egraphs-good/egraph-serialize?rev=54b1a4f1e2f2135846b084edcb495cd159839540#54b1a4f1e2f2135846b084edcb495cd159839540" +dependencies = [ + "indexmap 2.0.0", + "once_cell", + "ordered-float", + "serde", + "serde_json", +] + [[package]] name = "either" version = "1.8.1" @@ -404,6 +418,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -438,6 +453,12 @@ dependencies = [ "either", ] +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + [[package]] name = "js-sys" version = "0.3.64" @@ -607,6 +628,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ "num-traits", + "rand", + "serde", ] [[package]] @@ -681,6 +704,25 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", + "serde", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "serde", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -764,12 +806,50 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "serde" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "indexmap 2.0.0", + "itoa", + "ryu", + "serde", +] + [[package]] name = "siphasher" version = "0.3.10" 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 f3ebe9f246..65dbcd5a1b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix @@ -5,18 +5,19 @@ rustPlatform.buildRustPackage { pname = "egglog"; - version = "unstable-2023-07-11"; + version = "unstable-2023-07-19"; src = fetchFromGitHub { owner = "egraphs-good"; repo = "egglog"; - rev = "14a6fc6060c09541728ae460e0a92909fabf508f"; - hash = "sha256-1osdjd86xZHUAwvPBNxWYlkX6tKt+jI05AEVYr77YSQ="; + rev = "9fe03ad35a2a975a2c9140a641ba91266b7a72ce"; + hash = "sha256-9JeJJdZW8ecogReJzQrp3hFkK/pp/+pLxJMNREWuiyI="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "egraph-serialize-0.1.0" = "sha256-1lDaoR/1TNFW+uaf3UdfDZgXlxyAb37Ij7yky16xCG8="; "symbol_table-0.2.0" = "sha256-f9UclMOUig+N5L3ibBXou0pJ4S/CQqtaji7tnebVbis="; "symbolic_expressions-5.0.3" = "sha256-mSxnhveAItlTktQC4hM8o6TYjgtCUgkdZj7i6MR4Oeo="; }; 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 05c2246d37..d08a342a28 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.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-97gkBViNIqs03JuPlUOyE/X3UKzF5KVZBKH3JnXw37E="; + sha256 = "sha256-gnE0uISKfUqUdmrHI6F7nLOFcsQALjRy584nMRrC68w="; }; - cargoHash = "sha256-9aLCElsoWTUsuy+muhCcgo/1xmRYsbQDvhRa5YsV3lM="; + cargoHash = "sha256-rjxJ4bGep5OJUWME+EV5CqEsFY1SuoU07ANL0cbD+DU="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix index 4c105a40e2..5f4bc89db3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix @@ -1,9 +1,8 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, findlib, num, camlp5, camlp-streams }: let load_num = - if num == null then "" else - '' + lib.optionalString (num != null) '' -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ @@ -16,19 +15,23 @@ let exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ ${load_num} \ + -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma -init make.ml ''; in +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "hol_light is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation { pname = "hol_light"; - version = "unstable-2019-10-06"; + version = "unstable-2023-07-21"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; - sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; + rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349"; + hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E="; }; patches = [ @@ -40,8 +43,8 @@ stdenv.mkDerivation { strictDeps = true; - nativeBuildInputs = [ ocaml camlp5 ]; - propagatedBuildInputs = [ num ]; + nativeBuildInputs = [ ocaml findlib camlp5 ]; + propagatedBuildInputs = [ camlp-streams num ]; installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix index 28fd832368..5ae032ea30 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-XwrhqxDunao4uyUyBhDgGdMjRlmetke77Zmb7za+Aes="; + sha256 = "sha256-gP2oaTEBVk54oK4Le5VudF7+HM8JXCzVqv8UXc08RFQ="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix index 23136ddf7a..15f6770404 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = z3.src; - sourceRoot = "source/examples/tptp"; + sourceRoot = "${src.name}/examples/tptp"; nativeBuildInputs = [cmake]; buildInputs = [z3]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix index 4cd2511786..5af927294d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -13,7 +13,7 @@ , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} +, cudaSupport ? config.cudaSupport, cudaPackages ? { } , cudnnSupport ? cudaSupport , ncclSupport ? false , pythonSupport ? false, python ? null, numpy ? null diff --git a/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix index f885dae444..91d208a56e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix @@ -2,7 +2,8 @@ , fetchpatch , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false -, cudaSupport ? false, cudaPackages ? {}, addOpenGLRunpath, cudatoolkit, nvidia_x11 +, config +, cudaSupport ? config.cudaSupport, cudaPackages ? { }, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport }: diff --git a/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix index 48c36b6677..355238ace1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/fricas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fricas"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2"; - sha256 = "sha256-amAGPLQo70nKATyZM7h3yX5mMUxCwOFwb/fTIWB5hUQ="; + sha256 = "sha256-5RPcffM0GN0l6r8IgHJlwdxwwp2y4kIdJ5M3JnGZCzc="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; 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 b8d149364e..e9e309f421 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix @@ -27,7 +27,7 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ sikmir imsofi ]; + maintainers = with maintainers; [ sikmir soupglasses ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; sourceProvenance = with sourceTypes; [ binaryBytecode diff --git a/third_party/nixpkgs/pkgs/applications/science/math/labplot/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/labplot/default.nix index 0105148d96..b790116a58 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/labplot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/labplot/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "labplot"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { url = "https://download.kde.org/stable/labplot/labplot-${version}.tar.xz"; - sha256 = "sha256-XfxnQxCQSkOHXWnj4mCh/t2WjmwbHs2rp1WrGqOMupA="; + sha256 = "sha256-K24YFRfPtuDf/3uJXz6yDHzjWeZzLThUXgdXya6i2u8="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix index c0f370d884..289c9b7b65 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/default.nix @@ -2,7 +2,7 @@ , config , lib , cudaPackages -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , lang ? "en" , webdoc ? false , version ? null diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix index f8e6555d76..7cd699e58e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix @@ -125,8 +125,9 @@ in stdenv.mkDerivation { "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" # Fix xkeyboard config path for Qt "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" - # wayland isn't supported - "--set QT_QPA_PLATFORM xcb" + # if wayland isn't supported we fail over to xcb + # see https://github.com/qt/qtbase/blob/35d0f012ee9b95e8cf3563a41d710ff3c023d841/src/gui/kernel/qguiapplication.cpp#L1218 + "--set QT_QPA_PLATFORM wayland;xcb" ] ++ lib.optionals cudaSupport [ "--set CUDA_PATH ${cudaEnv}" "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix index 240a175939..d65de87d8e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake , opencv3, gtest, blas, gomp, llvmPackages, perl -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {}, nvidia_x11 +, cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 , cudnnSupport ? cudaSupport }: @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 - "-Wno-error=maybe-uninitialized" "-Wno-error=uninitialized" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix index 6b050f0f4f..706cbe28f2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "primecount"; - version = "7.8"; + version = "7.9"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${version}"; - hash = "sha256-yKk+zXvA/MI7y9gCMwJNYHRYIYgeWyJHjyPi1uNWVnM="; + hash = "sha256-0sn6WnrI6Umrsz3lvFIzFi8/fEAqh1qhWxtNPPq5SyA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix index d4b678d36f..a4173d1f5e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/default.nix @@ -11,8 +11,8 @@ let inherit (pkgs) symlinkJoin callPackage nodePackages; - python3 = pkgs.python3.override { - packageOverrides = self: super: { + python3 = pkgs.python3 // { + pkgs = pkgs.python3.pkgs.overrideScope (self: super: { # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; @@ -29,7 +29,7 @@ let sage-setup = self.callPackage ./python-modules/sage-setup.nix { inherit sage-src; }; - }; + }); }; jupyter-kernel-definition = { diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix index 4910f5e8bf..1a415ae65e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-tests.nix @@ -19,7 +19,7 @@ let runAllTests = files == null; testArgs = if runAllTests then "--all" else testFileList; patienceSpecifier = lib.optionalString longTests "--long"; - timeSpecifier = if timeLimit == null then "" else "--short ${toString timeLimit}"; + timeSpecifier = lib.optionalString (timeLimit != null) "--short ${toString timeLimit}"; relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute testFileList = lib.concatStringsSep " " (map relpathToArg files); in 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 625de3a3a8..f806be834b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -22,6 +22,7 @@ , libnotify , libX11 , libxcb +, headless ? false }: stdenv.mkDerivation rec { @@ -40,6 +41,9 @@ stdenv.mkDerivation rec { buildInputs = [ curl + sqlite + patchelf + ] ++ lib.optionals (!headless) [ libGLU libGL libXmu @@ -47,17 +51,15 @@ stdenv.mkDerivation rec { freeglut libjpeg wxGTK32 - sqlite gtk3 libXScrnSaver libnotify - patchelf libX11 libxcb xcbutil ]; - NIX_LDFLAGS = "-lX11"; + NIX_LDFLAGS = lib.optionalString (!headless) "-lX11"; preConfigure = '' ./_autosetup @@ -66,7 +68,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--disable-server" ]; + configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ]; postInstall = '' install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service" diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/colmap/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/colmap/default.nix index e3ce66356b..a029f5440b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/colmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/colmap/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, - cudaSupport ? false, cudaPackages }: + config, + cudaSupport ? config.cudaSupport, cudaPackages }: assert cudaSupport -> cudaPackages != { }; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix index 3013f08c69..a08f5da441 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix @@ -18,7 +18,7 @@ mavenJdk11.buildMavenPackage rec { mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg="; - nativeBuildInputs = [ jdk11 mavenJdk11 ]; + nativeBuildInputs = [ jdk11 ]; installPhase = '' cp -r modules/application/target/gephi $out @@ -44,6 +44,5 @@ mavenJdk11.buildMavenPackage rec { ]; license = licenses.gpl3; maintainers = [ maintainers.taeer ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d08c15dd8a..aa24fa6a5d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit , singlePrec ? true +, config , enableMpi ? false -, enableCuda ? false +, enableCuda ? config.cudaSupport , cpuAcceleration ? null }: @@ -19,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2023.1"; + version = "2023.2"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-7vK7Smy2MUz52kfybfKg0nr0v3swmXI9Q2AQc6sKQvQ="; + sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4="; }; nativeBuildInputs = [ cmake ]; 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 a1c0f60ffa..5842efea44 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 @@ -7,6 +7,7 @@ , blas , lapack , cmake +, cudaPackages , pkg-config # Available list of packages can be found near here: # @@ -59,6 +60,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + # Although not always needed, it is needed if cmakeFlags include + # GPU_API=cuda, and it doesn't users that don't enable the GPU package. + cudaPackages.autoAddOpenGLRunpathHook ]; passthru = { @@ -84,9 +88,14 @@ stdenv.mkDerivation rec { ] ++ extraBuildInputs ; - # For backwards compatibility postInstall = '' + # For backwards compatibility ln -s $out/bin/lmp $out/bin/lmp_serial + # Install vim and neovim plugin + install -Dm644 ../../tools/vim/lammps.vim $out/share/vim-plugins/lammps/syntax/lammps.vim + install -Dm644 ../../tools/vim/filetype.vim $out/share/vim-plugins/lammps/ftdetect/lammps.vim + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/lammps $out/share/nvim/site ''; meta = with lib; { @@ -106,5 +115,6 @@ stdenv.mkDerivation rec { # support. broken = (blas.isILP64 && lapack.isILP64); maintainers = [ maintainers.costrouc maintainers.doronbehar ]; + mainProgram = "lmp"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix index c6cf73da36..a55837af6e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Br5ugEyGu3zLeylCvoVE92zOCpB5cuXLv1dGLpM3FwI="; + sha256 = "sha256-/MKhec4nhz6juTCc5dNrrDAlzldodGjili4vWkzafPM="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 385944bc5b..a57aec0301 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.2.6"; + version = "4.2.8"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mMeKDfylVEqLo1i2ucUBu287Og4472Ecp7Cge9Cw3kE="; + sha256 = "sha256-EmGtVy/cHiZ2SqOOKmt9vCUQbyT5Sl8XnkRlhn9BdvA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/system/booster/default.nix b/third_party/nixpkgs/pkgs/applications/system/booster/default.nix index f1e55644fa..e7c646faf0 100644 --- a/third_party/nixpkgs/pkgs/applications/system/booster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/booster/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "booster"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "anatol"; repo = pname; rev = version; - hash = "sha256-mUmh2oAD3G9cpv7yiKcFaXJkEdo18oMD/sttnYnAQL8="; + hash = "sha256-+0pY4/f/qfIT1lLn2DXmJBZcDDEOil4H3zNY3911ACQ="; }; - vendorHash = "sha256-czzNAUO4eRYTwfnidNLqyvIsR0nyzR9cb+G9/5JRvKs="; + vendorHash = "sha256-RmRY+HoNuijfcK8gNbOIyWCOa50BVJd3IZv2+Pc3FYw="; postPatch = '' substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck" diff --git a/third_party/nixpkgs/pkgs/applications/system/mgmt/default.nix b/third_party/nixpkgs/pkgs/applications/system/mgmt/default.nix index 0bc65dc950..8a83966308 100644 --- a/third_party/nixpkgs/pkgs/applications/system/mgmt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/mgmt/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { hash = "sha256-jurZvEtiaTjWeDkmCJDIFlTzR5EVglfoDxkFgOilo8s="; }; - # patching must be done in prebuild, so it is shared with go-modules + # patching must be done in prebuild, so it is shared with goModules # see https://github.com/NixOS/nixpkgs/issues/208036 preBuild = '' for file in `find -name Makefile -type f`; do diff --git a/third_party/nixpkgs/pkgs/applications/system/psitop/default.nix b/third_party/nixpkgs/pkgs/applications/system/psitop/default.nix new file mode 100644 index 0000000000..cfcdf2488f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/system/psitop/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "psitop"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "jamespwilliams"; + repo = "psitop"; + rev = version; + hash = "sha256-TD+NTlfmBtz+m2w2FnTcUIJQakpvVBCK/MAHfCrOue4="; + }; + + vendorHash = "sha256-oLtKpBvTsM5TbzfWIDfqgb7DL5D3Mldu0oimVeiUeSc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Top for /proc/pressure"; + homepage = "https://github.com/jamespwilliams/psitop"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} 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 9b0905d27a..c54c92c201 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 @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitLab -, fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -27,16 +27,24 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - hash = "sha256-qz1805HLG/Yexilw0YCkTzed1wqonUtJ+QrbMyhKHh8="; + hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw="; }; + patches = [ + # Fix closing confirmation dialogs not showing + (fetchpatch { + url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch"; + hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A="; + }) + ]; + postPatch = '' patchShebangs build-aux/meson/postinstall.py ''; @@ -64,6 +72,8 @@ stdenv.mkDerivation rec { libgee ]; + mesonFlags = [ "-Dblackbox_is_flatpak=false" ]; + meta = with lib; { description = "Beautiful GTK 4 terminal"; homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix index 6d100c0894..e6c3850416 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation { pname = "marble"; - version = "unstable-2022-04-20"; + version = "unstable-2023-05-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "marble"; - # Latest commit from the 'wip/gtk4' branch - rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8"; - sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY="; + # the same used on flatpak + rev = "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb"; + sha256 = "sha256-obtz7zOyEZPgi/NNjtLr6aFm/1UVTzjTdJpN3JQfpUs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 4243502e7f..0e7c6a27e2 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -1,22 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget -, qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, mkDerivation +, qtbase +, qtquick1 +, qmltermwidget +, qtquickcontrols2 +, qtgraphicaleffects +, qmake +, nixosTests +}: mkDerivation rec { - version = "1.1.1"; + version = "1.2.0"; pname = "cool-retro-term"; src = fetchFromGitHub { owner = "Swordfish90"; repo = "cool-retro-term"; - rev = version; - sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5"; + rev = "refs/tags/${version}"; + hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c="; }; patchPhase = '' sed -i -e '/qmltermwidget/d' cool-retro-term.pro ''; - buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; + buildInputs = [ + qtbase + qtquick1 + qmltermwidget + qtquickcontrols2 + qtgraphicaleffects + ]; + nativeBuildInputs = [ qmake ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; 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 b2b3526951..c2d817b4d5 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitea , fetchurl +, fetchpatch , runCommand , fcft , freetype @@ -26,7 +27,7 @@ }: let - version = "1.14.0"; + version = "1.15.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -39,7 +40,7 @@ let src = fetchurl { url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; - sha256 = "0w4d0rxi54p8lvbynypcywqqwbbzmyyzc0svjab27ngmdj1034ii"; + hash = "sha256-NvkKJ75n/OzgEd2WHX1NQIXPn9R0Z+YI1rpFmNxaDhk="; }; dontUnpack = true; @@ -96,9 +97,9 @@ stdenv.mkDerivation rec { src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; - repo = pname; + repo = "foot"; rev = version; - sha256 = "1187805pxygyl547w75i4cl37kaw8y8ng11r5qqldv6fm74k31mk"; + hash = "sha256:1iz9l01fpryc335pb0c3qi67fmmfplizv5pbc9s578mxl5j9dxg4"; }; depsBuildBuild = [ 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 ecd0169acf..9b4a1be708 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -29,21 +29,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.29.0"; + version = "0.29.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-FTitj43RFCNvSWInXHALyIljfcBBkaq/XI1ZA1k0glk="; + hash = "sha256-ureJHG6Jh4bsXqQZnGwY5Hlq7sXxYX3iTajb8ZkpZw8="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; vendorHash = "sha256-jk2EcYVuhV/UQfHAIfpnn8ZIZnwjA/o8YRXmpoC85Vc="; - }).go-modules; + }).goModules; buildInputs = [ harfbuzz @@ -190,8 +190,8 @@ buildPythonApplication rec { installPhase = '' runHook preInstall - mkdir -p $out - mkdir -p $kitten/bin + mkdir -p "$out" + mkdir -p "$kitten/bin" ${if stdenv.isDarwin then '' mkdir "$out/bin" ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" @@ -202,8 +202,8 @@ buildPythonApplication rec { installManPage 'docs/_build/man/kitty.1' '' else '' - cp -r linux-package/{bin,share,lib} $out - cp linux-package/bin/kitten $kitten/bin/kitten + cp -r linux-package/{bin,share,lib} "$out" + cp linux-package/bin/kitten "$kitten/bin/kitten" ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" @@ -220,7 +220,7 @@ buildPythonApplication rec { mkdir -p $terminfo/share mv "$terminfo_src" $terminfo/share/terminfo - mkdir -p $out/nix-support + mkdir -p "$out/nix-support" echo "$terminfo" >> $out/nix-support/propagated-user-env-packages cp -r 'shell-integration' "$shell_integration" @@ -229,7 +229,6 @@ buildPythonApplication rec { ''; passthru = { - go-modules = goModules; # allow for updateScript to handle vendorHash tests.test = nixosTests.terminal-emulators.kitty; updateScript = nix-update-script {}; }; 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 937f4e0320..3029adbd81 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix @@ -1,9 +1,11 @@ { lib , fetchFromGitHub , rustPlatform -, gitUpdater +, nixosTests +, nix-update-script , autoPatchelfHook +, ncurses , pkg-config , gcc-unwrapped @@ -41,19 +43,20 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.8"; + version = "0.0.16"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-NonIMGBASbkbc5JsHKwfaZ9dGQt1f8+hFh/FFyIlIZs="; + hash = "sha256-jyfobmwDCsvhpKcAD0ivxfRENaTVjjauRBMDNPgvjVY="; }; - cargoHash = "sha256-4IJJtLa25aZkFwkMYpnYyRQLeqoBwncgCjorF6Gx6pk="; + cargoHash = "sha256-efMw07KH8Nic76MWTyf16Gg/8PyM9gZKSNs5cuIKBJQ="; nativeBuildInputs = [ autoPatchelfHook + ncurses pkg-config ]; @@ -61,17 +64,32 @@ rustPlatform.buildRustPackage rec { buildInputs = rlinkLibs; + outputs = [ "out" "terminfo" ]; + buildNoDefaultFeatures = true; buildFeatures = [ (lib.optionalString withX11 "x11") (lib.optionalString withWayland "wayland") ]; + checkFlags = [ + # Fail to run in sandbox environment. + "--skip=screen::context::test" + ]; + + postInstall = '' + install -dm 755 "$terminfo/share/terminfo/r/" + tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = ".(rc|beta).*"; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v([0-9.]+)" ]; }; + + tests.test = nixosTests.terminal-emulators.rio; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix index eeb258f48c..63736ac35e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "wayst"; - version = "unstable-2021-04-05"; + version = "unstable-2023-07-16"; src = fetchFromGitHub { owner = "91861"; repo = pname; - rev = "e72ca78ef72c7b1e92473a98d435a3c85d7eab98"; - hash = "sha256-UXAVSfVpk/8KSg4oMw2tVWImD6HqJ7gEioR2MqhUUoQ="; + rev = "f8b218eec1af706fd5ae287f5073e6422eb8b6d8"; + hash = "sha256-tA2R6Snk5nqWkPXSbs7wmovWkT97xafdK0e/pKBUIUg="; }; makeFlags = [ "INSTALL_DIR=\${out}/bin" ]; @@ -56,11 +56,7 @@ stdenv.mkDerivation rec { utf8proc wayland ]; - - # This patch forces the Makefile to use utf8proc - # The makefile relies on ldconfig to find the utf8proc libraries - # which is not possible on nixpkgs - patches = [ ./utf8proc.patch ]; + enableParallelBuilding = true; postPatch = '' substituteInPlace src/settings.c \ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/utf8proc.patch b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/utf8proc.patch deleted file mode 100644 index 0923c5dbe1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wayst/utf8proc.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit caa5a6bed31937f2d1b322da204e11eae57a720f -Author: Nicolas Berbiche -Date: Tue Oct 20 18:14:44 2020 -0400 - - PATCH: use nixpkgs utf8proc - - This patch forces the Makefile to use utf8proc from `buildInputs`. - The Makefile relies on ldconfig to find the utf8proc libraries, - which is not possible with nixpkgs. - -diff --git a/Makefile b/Makefile -index caccdf7..90b11ea 100644 ---- a/Makefile -+++ b/Makefile -@@ -29,7 +29,7 @@ else - LDFLAGS = -O2 -flto - endif - --ifeq ($(shell ldconfig -p | grep libutf8proc.so > /dev/null || echo fail),fail) -+ifeq (false,fail) - $(info libutf8proc not found. Support for language-specific combining characters and unicode normalization will be disabled.) - CFLAGS += -DNOUTF8PROC - else - diff --git a/third_party/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix new file mode 100644 index 0000000000..da16be94c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/codeberg-cli/default.nix @@ -0,0 +1,42 @@ +{ lib +, CoreServices +, Security +, fetchFromGitea +, installShellFiles +, openssl +, pkg-config +, rustPlatform +, stdenv +}: +rustPlatform.buildRustPackage rec { + pname = "codeberg-cli"; + version = "0.3.5"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "RobWalt"; + repo = "codeberg-cli"; + rev = "v${version}"; + hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o="; + }; + + cargoHash = "sha256-RE4Zwa5vUWPc42w5GaaYkS6fLIbges1fAsOUuwqR2ag="; + nativeBuildInputs = [ pkg-config installShellFiles ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + + postInstall = '' + installShellCompletion --cmd berg \ + --bash <($out/bin/berg completion bash) \ + --fish <($out/bin/berg completion fish) \ + --zsh <($out/bin/berg completion zsh) + ''; + + meta = with lib; { + description = "CLI Tool for Codeberg similar to gh and glab"; + homepage = "https://codeberg.org/RobWalt/codeberg-cli"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ robwalt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix index 0fb0c5f87a..1cfa62ea6d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dvc"; - version = "3.5.0"; + version = "3.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AQE8KQ5j/EgN1P2HFghWXgQJbBc+KYu8kwNeV0Tktho="; + hash = "sha256-ZHB2XAYjPwhCWHqq2Kro4CzDW34YBaknv9xBotCDkOw="; }; pythonRelaxDeps = [ @@ -26,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { ]; postPatch = '' + substituteInPlace dvc/analytics.py --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False' substituteInPlace dvc/daemon.py \ --subst-var-by dvc "$out/bin/dcv" ''; 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 b571d0a48d..663f7d3f7b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix @@ -6,6 +6,7 @@ , gzip , lib , makeWrapper +, nix-update-script , nixosTests , openssh , pam @@ -23,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-dB/uBuS0kgaTwsPYnqklT450ejLHcPAqBdDs3JT8Uxg="; + npmDepsHash = "sha256-YZzVw+WWqTmJafqnZ5vrzb7P6V4DTMNQwW1/+wvZEM8="; patches = [ ./package-json-npm-build-frontend.patch @@ -38,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.19.4-0"; + version = "1.20.2-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-pTcnST8A4gADPBkNago9uwRFEmTx8vNONL/Emer4xLI="; + hash = "sha256-8mFI5Zt2J6EQZqu/qcirFp8WMz+IlrkvHeA+oUb0X5U="; }; - vendorHash = "sha256-LKxhNbSIRaP4EGWX6mE26G9CWfoFTrPRjrL4ShpRHWo="; + vendorHash = "sha256-ZoFs2T3NNixrbTDdp7fqTgjJ+G8DpkxHW8K6BM8tZ9w="; subPackages = [ "." ]; @@ -88,13 +89,16 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - # $data is not available in go-modules.drv and preBuild isn't needed + # $data is not available in goModules.drv and preBuild isn't needed overrideModAttrs = (_: { postPatch = null; preBuild = null; }); passthru = { + # allow nix-update to handle npmDepsHash + inherit (frontend) npmDeps; + data-compressed = runCommand "forgejo-data-compressed" { nativeBuildInputs = [ brotli xorg.lndir ]; } '' @@ -108,6 +112,7 @@ buildGoModule rec { ''; tests = nixosTests.forgejo; + updateScript = nix-update-script { }; }; meta = { @@ -115,7 +120,7 @@ buildGoModule rec { homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emilylange urandom bendlas ]; + maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens ]; broken = stdenv.isDarwin; mainProgram = "gitea"; }; 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 4675b22a61..5e1faa58dc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gex/default.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-//sQ0s8bBQzuu5aO3RjPRjFuVYiGW6BwSPoCWKAx9DQ="; + hash = "sha256-J2tmDpt4vRFgD5yfFZOdBLROvyZVEthc+MHM1Yta5jI="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2 ]; - cargoHash = "sha256-rkhkFnRDtMTWFM+E5C4jR7TWtHdy3WUtIzvGDDLHqtE="; + cargoHash = "sha256-AsUHswR7+wMyAvOp3rkvRJvThHLH993gQ+/V38vbbNQ="; 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/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix index 7fa0e6c4bd..a350f1d91e 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.32.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-YnIwrx/NEOH3yXkkCq30i9Jt2IXKX5IX8BuM6+u9tvs="; + hash = "sha256-DfcafkgauO0mlMEJTfR7hjnkY1QJ4dUyrWv/bqJlVAo="; }; - vendorHash = "sha256-fbf5EKDISdptbiJipvqygfjGWAP6fPXbYsgxVq8eUnM="; + vendorHash = "sha256-7Izhqma/zukH9M7EvV9I4axefVaTDoNVXQmLx+GjAt0="; nativeBuildInputs = [ installShellFiles ]; 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 d96981e612..dbe3841b29 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.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-++jUs/V4luOWNjCrZpJAT/08aEr00kvl4vDxKTqA5fc="; + sha256 = "sha256-uIhYk79ZXcJ/ttexgjtxskI2nEwlq+E4jgIZzwz8hmI="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix new file mode 100644 index 0000000000..0898ce089f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-backdate/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, git, python3 }: + +stdenv.mkDerivation rec { + pname = "git-backdate"; + version = "2023-07-19"; + + src = fetchFromGitHub { + owner = "rixx"; + repo = pname; + rev = "8ba5a0eba04e5559be2e4b1b6e02e62b64ca4dd8"; + sha256 = "sha256-91cEGQ0FtoiHEZHQ93jPFHF2vLoeQuBidykePFHtrsY="; + }; + + buildInputs = [ + python3 + ]; + + installPhase = '' + runHook preInstall + install -Dm555 git-backdate -t $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Backdate a commit or range of commit to a date or range of dates"; + homepage = "https://github.com/rixx/git-backdate"; + license = licenses.wtfpl; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix index 64fa89f436..ca6a0165f1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix @@ -1,29 +1,48 @@ -{ stdenv, lib, fetchFromGitHub, cargo, pkg-config, rustPlatform -, bzip2, curl, zlib, zstd, libiconv, CoreServices +{ stdenv +, lib +, fetchFromGitHub +, cargo +, pkg-config +, rustPlatform +, bzip2 +, curl +, zlib +, zstd +, libiconv +, CoreServices }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-cinnabar"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "glandium"; repo = "git-cinnabar"; - rev = version; - sha256 = "VvfoMypiFT68YJuGpEyPCxGOjdbDoF6FXtzLWlw0uxY="; + rev = finalAttrs.version; + hash = "sha256-1Y4zd4rYNRatemDXRMkQQwBJdkfOGfDWk9QBvJOgi7s="; fetchSubmodules = true; }; nativeBuildInputs = [ - pkg-config rustPlatform.cargoSetupHook cargo + cargo + pkg-config + rustPlatform.cargoSetupHook ]; - buildInputs = [ bzip2 curl zlib zstd ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; + buildInputs = [ + bzip2 + curl + zlib + zstd + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + CoreServices + ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - sha256 = "GApYgE7AezKmcGWNY+dF1Yp1TZmEeUdq3CsjvMvo/Rw="; + inherit (finalAttrs) src; + hash = "sha256-p85AS2DukUzEbW9UGYmiF3hpnZvPrZ2sRaeA9dU8j/8="; }; ZSTD_SYS_USE_PKG_CONFIG = true; @@ -32,17 +51,19 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p $out/bin install -v target/release/git-cinnabar $out/bin ln -sv git-cinnabar $out/bin/git-remote-hg + runHook postInstall ''; - meta = with lib; { - homepage = "https://github.com/glandium/git-cinnabar"; + meta = { description = "git remote helper to interact with mercurial repositories"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.all; + homepage = "https://github.com/glandium/git-cinnabar"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ qyliss ]; + platforms = lib.platforms.all; }; -} +}) 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 3c78623d23..e2d5c0e005 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.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-GZ1qdFjWhEO1fd+G5qWaV7OTUaalBZFbLTrIO58hKOQ="; + hash = "sha256-N6L+TlPU/lStMPTFYKFH2GiwyGkEJJuKtkH7wKLuM00="; }; 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 155feb25fa..f7b5d082e1 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 @@ -7,8 +7,11 @@ , libSM , fontconfig , libsecret +, git +, git-credential-manager , gnupg , pass +, testers , withGuiSupport ? true , withLibsecretSupport ? true , withGpgSupport ? true @@ -17,34 +20,48 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-PeQ9atSCgSvduAcqY2CnNJH3ucvoInduA5i8dPUJiHo="; + hash = "sha256-XXtir/sSjJ1rpv3UQHM3Kano/fMBch/sm8ZtYwGyFyQ="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; - dotnetInstallFlags = [ "--framework" "net6.0" ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnetInstallFlags = [ "--framework" "net7.0" ]; executables = [ "git-credential-manager" ]; runtimeDeps = [ fontconfig ] ++ lib.optionals withGuiSupport [ libX11 libICE libSM ] ++ lib.optional withLibsecretSupport libsecret; - makeWrapperArgs = lib.optionals withGpgSupport [ "--prefix" "PATH" ":" (lib.makeBinPath [ gnupg pass ]) ]; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}" + ]; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = git-credential-manager; + }; + }; meta = with lib; { - description = "Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services."; + description = "A secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services"; homepage = "https://github.com/git-ecosystem/git-credential-manager"; license = with licenses; [ mit ]; platforms = platforms.unix; maintainers = with maintainers; [ _999eagle ]; + longDescription = '' + git-credential-manager is a secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services. + + > requires sandbox to be disabled on MacOS, so that + .NET can find `/usr/bin/codesign` to sign the compiled binary. + This problem is common to all .NET packages on MacOS with Nix. + ''; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix index 87806d1fd6..96dbf0bb96 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -28,8 +28,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.52.0"; sha256 = "0g7bzzm04lrfar3l1rl1lsb0q1nm0ix5fc24bhm4faxvzdyd3vg7"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.0"; sha256 = "0p4msajlfbc536qpfnhz2w81rmwgwivfbhdyfk3d198vbadv8zlq"; }) (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.28.0"; sha256 = "1z2irqbjqxawyxq2778bcjbj0x8m63dh3lj5m04knq48wl4wh40x"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -37,7 +36,33 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) @@ -45,7 +70,7 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta1.21216.1"; sha256 = "10p3i10sh9aarqfzac3bgmv9zabb8m5c2aylf3chwlh71kp9l63l"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) @@ -59,6 +84,7 @@ (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix index 49dcb14fc0..c2f4b4a270 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-crypt/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/AGWA/git-crypt/releases"; license = licenses.gpl3; - maintainers = with maintainers; [ dochang SuperSandro2000 ]; + maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; }; 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 463d550cbc..d2be44bc1a 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 @@ -26,6 +26,6 @@ buildGoModule rec { homepage = "https://github.com/tillson/git-hound"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock new file mode 100644 index 0000000000..3757eab5de --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock @@ -0,0 +1,1366 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" +dependencies = [ + "libc", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[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 = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "captur" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70fab32548d14602e13307a86c41b2dc2fc2ef19c2881bf63598275a7e45b182" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "claim" +version = "0.5.0" +source = "git+https://github.com/Turbo87/rust-claim.git?rev=23892a3#23892a345d38e1434303143a73033925284ad04d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +dependencies = [ + "cfg-if", + "lazy_static", +] + +[[package]] +name = "crossterm" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +dependencies = [ + "winapi", +] + +[[package]] +name = "dashmap" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391b56fbd302e585b7a9494fb70e40949567b1cf9003a8e4a6041a1687c26573" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", +] + +[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-executor" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" + +[[package]] +name = "futures-macro" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.104", +] + +[[package]] +name = "futures-sink" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + +[[package]] +name = "futures-task" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", +] + +[[package]] +name = "girt-config" +version = "2.3.0" +dependencies = [ + "claim", + "girt-git", + "girt-testutils", + "lazy_static", + "proc-macro2", + "rstest", + "rustc_version", + "serial_test", + "tempfile", + "thiserror", +] + +[[package]] +name = "girt-core" +version = "2.3.0" +dependencies = [ + "anyhow", + "bitflags", + "captur", + "chrono", + "claim", + "crossbeam-channel", + "girt-config", + "girt-display", + "girt-git", + "girt-input", + "girt-runtime", + "girt-todo-file", + "girt-view", + "if_chain", + "lazy_static", + "num-format", + "parking_lot", + "pico-args", + "pretty_assertions", + "rstest", + "rustc_version", + "serial_test", + "unicode-segmentation", +] + +[[package]] +name = "girt-display" +version = "2.3.0" +dependencies = [ + "crossterm", + "girt-config", + "rstest", + "rustc_version", + "serial_test", + "thiserror", +] + +[[package]] +name = "girt-git" +version = "2.3.0" +dependencies = [ + "chrono", + "claim", + "girt-testutils", + "git2", + "lazy_static", + "parking_lot", + "pretty_assertions", + "rstest", + "rustc_version", + "serial_test", + "tempfile", + "thiserror", +] + +[[package]] +name = "girt-input" +version = "2.3.0" +dependencies = [ + "anyhow", + "bitflags", + "captur", + "crossbeam-channel", + "crossterm", + "girt-config", + "girt-runtime", + "lazy_static", + "parking_lot", + "rstest", + "rustc_version", + "serial_test", +] + +[[package]] +name = "girt-runtime" +version = "2.3.0" +dependencies = [ + "claim", + "crossbeam-channel", + "girt-testutils", + "parking_lot", + "rustc_version", + "thiserror", +] + +[[package]] +name = "girt-testutils" +version = "2.3.0" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "girt-todo-file" +version = "2.3.0" +dependencies = [ + "claim", + "girt-testutils", + "pretty_assertions", + "rstest", + "rustc_version", + "tempfile", + "thiserror", + "version-track", +] + +[[package]] +name = "girt-view" +version = "2.3.0" +dependencies = [ + "anyhow", + "bitflags", + "captur", + "claim", + "crossbeam-channel", + "girt-config", + "girt-display", + "girt-runtime", + "parking_lot", + "rustc_version", + "unicode-segmentation", + "unicode-width", + "uuid", + "xi-unicode", +] + +[[package]] +name = "git-interactive-rebase-tool" +version = "2.3.0" +dependencies = [ + "girt-core", + "rustc_version", +] + +[[package]] +name = "git2" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "iana-time-zone" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5528d9c2817db4e10cc78f8d4c8228906e5854f389ff6b076cee3572a09d35" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "jobserver" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libgit2-sys" +version = "0.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 = "libz-sys" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "lock_api" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mio" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +dependencies = [ + "libc", + "log", + "miow", + "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + +[[package]] +name = "num-format" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" +dependencies = [ + "arrayvec", + "itoa", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.13", + "smallvec", + "windows-sys 0.34.0", +] + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + +[[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.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "relative-path" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" + +[[package]] +name = "rstest" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b96577ca10cb3eade7b337eb46520108a67ca2818a24d0b63f41fd62bc9651c" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225e674cf31712b8bb15fdbca3ec0c1b9d825c5a24407ff2b7e005fb6a29ba03" +dependencies = [ + "cfg-if", + "glob", + "proc-macro2", + "quote", + "regex", + "relative-path", + "rustc_version", + "syn 2.0.26", + "unicode-ident", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "semver" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" + +[[package]] +name = "serial_test" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "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.26", +] + +[[package]] +name = "signal-hook" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" + +[[package]] +name = "smallvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" + +[[package]] +name = "syn" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "rand", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-track" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9affed6b4e63b1f30ed8f0f2c401fa725f5f511eb00e52269f401c4d5ae12f" +dependencies = [ + "uuid", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.104", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.104", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" +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" +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 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 0.48.0", +] + +[[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.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" +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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 97e2cf0537..176e271475 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -2,27 +2,41 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "sha256-KqItunxh24jAkvsAMnByS+dhm+wyUqmdF96qEDs/5mI="; + sha256 = "sha256-tMeA2LsNCXxI086y8S+STYwjClWMPaBheP0s0oZ5I5c="; }; - cargoSha256 = "sha256-510kNtcSsuXADMmSqu2t0HsnPUS/Jedsfvjnh2k+vDs="; + postPatch = '' + # unknown lint: `ffi_unwind_calls` + # note: the `ffi_unwind_calls` lint is unstable + substituteInPlace src/main.rs src/{config,core,display,input,git,runtime,todo_file,testutils,view}/src/lib.rs \ + --replace "ffi_unwind_calls," "" + ''; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "claim-0.5.0" = "sha256-quVV5PnWW1cYK+iSOM/Y0gLu2gPOrZ1ytJif0D5v9g0="; + }; + }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlags = [ - "--skip=external_editor::tests::edit_success" - "--skip=external_editor::tests::editor_non_zero_exit" - "--skip=external_editor::tests::empty_edit_abort_rebase" - "--skip=external_editor::tests::empty_edit_error" - "--skip=external_editor::tests::empty_edit_noop" - "--skip=external_editor::tests::empty_edit_re_edit_rebase_file" - "--skip=external_editor::tests::empty_edit_undo_and_edit" + # Compilation during tests fails if this env var is not set. + preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; + postCheck = "unset GIRT_BUILD_GIT_HASH"; + cargoTestFlags = [ + "--workspace" + # build everything except for doctests which are currently broken because + # `config::lib` expects the sourcetree to be a git repo. + "--tests" + "--lib" + "--bins" ]; meta = with lib; { @@ -30,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ masaeedu SuperSandro2000 zowoq ]; + maintainers = with maintainers; [ SuperSandro2000 zowoq ma27 ]; mainProgram = "interactive-rebase-tool"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 4285c5be8a..ed36f20927 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - hash = "sha256-r1z97sgqo1IyR0oW5b3bMGTUHGE8U+hrWgQ0Su9FRrw="; + hash = "sha256-lZx+sJQttclZPET0jkv3dmpQysCpsYani+La7yfSUlI="; }; - vendorHash = "sha256-did6qAUawmQ/juLzJWIXGzmErj9tBKgM7HROTezX+tw="; + vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg="; nativeBuildInputs = [ asciidoctor installShellFiles ]; @@ -39,6 +39,10 @@ buildGoModule rec { postInstall = '' installManPage man/man*/* + installShellCompletion --cmd git-lfs \ + --bash <($out/bin/git-lfs completion bash) \ + --fish <($out/bin/git-lfs completion fish) \ + --zsh <($out/bin/git-lfs completion zsh) ''; passthru.tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix index 05e21b641e..f571cee0fa 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.6"; + version = "3.17.8"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-o3Z1xPu5RcspU4m3Bb6ydZkXOMgOMJPN/+TLekwe/wI="; + hash = "sha256-d1vbLlGKln/zcuuKZgNOcu/z15co3p8ecrwL5lucIEk="; }; nativeBuildInputs = [ installShellFiles ]; 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 0b9e1a9d93..89cae801ec 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.19.4"; + version = "1.20.1"; # 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-vNMNEKMpUoVLUGwPPVhLKfElFmjCWgZHY5i1liNs+xk="; + hash = "sha256-LYOCNZJiGuMM1ly1Sp+0F8Us8LtAXzH5NzJf2CLcHck="; }; vendorHash = null; @@ -88,5 +88,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ]; broken = stdenv.isDarwin; + mainProgram = "gitea"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix index e49c7f3508..34fb6f73c6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix @@ -11,6 +11,6 @@ bundlerApp { description = "GitLab's issues and merge requests triage, automated!"; homepage = "https://gitlab.com/gitlab-org/gitlab-triage"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } 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 7b4ababdcd..ea2d40f923 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.2", - "repo_hash": "sha256-A9JkBwGym+CPpb5B7+Kwt8Ej4PGSHc3ZOgUA28hdyN8=", - "yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al", + "version": "16.1.3", + "repo_hash": "sha256-PI0nmwfk8uu74NJkavbbJR9/jDN9SS0Z9Axe4UmT2kk=", + "yarn_hash": "0wykn0vq16n8mz4jfh7dfyp9javzhqlfwmc5i1zm07gld91nirlm", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.1.2-ee", + "rev": "v16.1.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.1.2", - "GITLAB_PAGES_VERSION": "16.1.2", + "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.2" + "GITLAB_WORKHORSE_VERSION": "16.1.3" } } 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 01f407e2e6..2d35d06dc8 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 @@ -13,7 +13,7 @@ }: let - version = "16.1.2"; + version = "16.1.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-/yCmFbmKTp8V8CjdhoAPpAdwNEcaP/wB0oAeTLdMESo="; + sha256 = "sha256-g9K1dFcrUkWJInPrwg9fz/TEK35GrjqFpUS2bnemwLQ="; }; vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA="; 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 17a186ef25..62521099a7 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.77.0"; + version = "3.79.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-tHNxPwm1h1wyXuzUUadz5YcRkPdc0QeayMIRt292uf8="; + sha256 = "sha256-JOXJ8HSTf7yW78SlYzbdn7IAbSwv/UE/W3oSJRyGrAQ="; }; - vendorHash = "sha256-/ITZBh0vRYHb6fDUZQNRwW2pmQulJlDZ8EbObUBtsz4="; + vendorHash = "sha256-4cxfyG1uhqgIheAVDQbIDb4MRSqAUtLgxGYt5MuNfKw="; patches = [ ./Disable-inmemory-storage-driver-test.patch 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 4b3595819a..7fcc652056 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,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.1.2"; + version = "16.1.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-T33/SnV+aWUjfRKxVOQNWaPtFnounMkCXAeQCQ9w5RY="; + sha256 = "sha256-FSdew0HMbgEAzVoDhINDIQQs8Q63AHu8mu/dKo+wP9k="; }; vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0="; 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 6d1eecd891..9b19ec2aec 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.2"; + version = "16.1.3"; src = fetchFromGitLab { owner = data.owner; @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = data.repo_hash; }; - sourceRoot = "source/workhorse"; + sourceRoot = "${src.name}/workhorse"; vendorSha256 = "sha256-lKl/V2fti0eqrEoeJNNwvJbZO7z7v+5HlES+dyxxcP4="; buildInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix index f03de45890..575cf96826 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { # Upstream splitted the project into gitlint and gitlint-core to # simplify the dependency handling - sourceRoot = "source/gitlint-core"; + sourceRoot = "${src.name}/gitlint-core"; nativeBuildInputs = with python3.pkgs; [ hatch-vcs diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix index 4912dae323..6e7a627f9c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitolite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitolite"; - version = "3.6.12"; + version = "3.6.13"; src = fetchFromGitHub { owner = "sitaramc"; repo = "gitolite"; rev = "v${version}"; - sha256 = "05xw1pmagvkrbzga5pgl3xk9qyc6b5x73f842454f3w9ijspa8zy"; + hash = "sha256-/VBu+aepIrxWc2padPa/WoXbIdKfIwqmA/M8d1GE5FI="; }; buildInputs = [ nettools perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix index a1c4ec5c69..622c0f0451 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitqlient/default.nix @@ -6,48 +6,52 @@ , gitUpdater }: -mkDerivation rec { +let pname = "gitqlient"; version = "1.5.0"; - srcs = [ - (fetchFromGitHub { - owner = "francescmm"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw="; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "AuxiliarCustomWidgets"; - rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"; - sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "QLogger"; - rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"; - sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "QPinnableTabWidget"; - rev = "cc937794e910d0452f0c07b4961c6014a7358831"; - sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "git"; - rev = "b62750f4da4b133faff49e6f53950d659b18c948"; - sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs="; - name = repo; - }) - ]; + main_src = fetchFromGitHub { + owner = "francescmm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw="; + }; + aux_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "AuxiliarCustomWidgets"; + rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"; + sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA="; + name = repo; + }; + qlogger_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "QLogger"; + rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"; + sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4="; + name = repo; + }; + qpinnabletab_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "QPinnableTabWidget"; + rev = "cc937794e910d0452f0c07b4961c6014a7358831"; + sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE="; + name = repo; + }; + git_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "git"; + rev = "b62750f4da4b133faff49e6f53950d659b18c948"; + sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs="; + name = repo; + }; +in - sourceRoot = "source"; +mkDerivation rec { + inherit pname version; + + srcs = [ main_src aux_src qlogger_src qpinnabletab_src git_src ]; + + sourceRoot = main_src.name; nativeBuildInputs = [ qmake 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 4e39d46b66..797b508e13 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glab"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-mNwjyKde9xlaGVwK7oIbPGPipxKTvLwf6uMZVjL+joc="; + hash = "sha256-K7yGRuIfYEqs4ziystxLMK+dYUZoyGlBJAmx2qmY08Q="; }; vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s="; 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 59d04d081f..e3bf938303 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.90"; + version = "0.91"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-2jU/Q6W5G1Y/HZvksr21D93//HCwpLd3+l3RFGKb94M="; + hash = "sha256-ebFetQhgEBjy3aq3TfK9veeevbmSAEv9kaUohsnsrlU="; }; nativeBuildInputs = [ pkg-config bison ] 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 481c007c15..80cb28a09e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-x6Es8J6qdtCdrs23eQoIDSusOiDH/mLKch14loEhO5k="; + hash = "sha256-d6uncWHq9bLDODFle7xij9YjhpiQPL7mmyFmVxmy8hY="; }; - cargoHash = "sha256-OUMIISLsOAjjIZjMrPYK/cW+n0NbTnuu5Rakvm4LUf4="; + cargoHash = "sha256-jR79xchMpib76oVnpy+UIbcwhDXvDPyl+jWmVPfXVog="; nativeBuildInputs = [ pkg-config @@ -28,11 +28,6 @@ rustPlatform.buildRustPackage rec { zlib ]; - # Cargo.lock is outdated - preConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A SQL like query language to perform queries on .git files"; homepage = "https://github.com/AmrDeveloper/GQL"; 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 36c6756802..568460d7ce 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix @@ -1,52 +1,92 @@ -{ lib -, rustPlatform +{ stdenv +, lib , fetchFromGitHub -, pkg-config -, openssl -, stdenv -, dbus -, sqlite +, rustPlatform , Security , SystemConfiguration +, pkg-config , libiconv +, openssl +, gzip +, libssh2 +, libgit2 +, zstd +, fetchpatch +, installShellFiles +, nix-update-script , testers , jujutsu }: rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-FczlSBlLhLIamLiY4cGVAoHx0/sxx+tykICzedFbbx8="; + sha256 = "sha256-kbJWkCnb77VRKemA8WejaChaQYCxNiVMbqW5PCrDoE8="; }; - cargoHash = "sha256-PydDgXp47KUSLvAQgfO+09lrzTnBjzGd+zA5f/jZfRc="; + cargoHash = "sha256-qbCOVcKpNGWGonRAwPsr3o3yd+7qUTy3IVmC3Ifn4xE="; - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; + buildNoDefaultFeatures = true; + buildFeatures = [ + # enable 'packaging' feature, which enables extra features such as support + # for watchman + "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 + LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2 nativeBuildInputs = [ + gzip + installShellFiles pkg-config ]; buildInputs = [ openssl - dbus - sqlite + zstd + libgit2 + libssh2 ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - passthru.tests = { - version = testers.testVersion { - package = jujutsu; - command = "jj --version"; + postInstall = '' + $out/bin/jj util mangen > ./jj.1 + installManPage ./jj.1 + + installShellCompletion --cmd jj \ + --bash <($out/bin/jj util completion --bash) \ + --fish <($out/bin/jj util completion --fish) \ + --zsh <($out/bin/jj util completion --zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { + package = jujutsu; + command = "jj --version"; + }; }; }; @@ -55,7 +95,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/martinvonz/jj"; changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ _0x4A6F ]; + maintainers = with maintainers; [ _0x4A6F thoughtpolice ]; mainProgram = "jj"; }; } 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 38531775b9..d882edc5a3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix @@ -36,6 +36,6 @@ buildGoModule rec { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; - maintainers = with maintainers; [ marsam dtzWill SuperSandro2000 ]; + maintainers = with maintainers; [ marsam dtzWill ]; }; } 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 d793e05a2c..e4e9010f64 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.4"; + version = "1.4.7"; in buildGoModule rec { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule rec { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-YVnf+ieYnvNQkw6W2gPBFiZLknaBknptv4ltvGKdw04="; + hash = "sha256-zpey+2j0pLpE+wvqPcjVS5Mp+eQJiYtRsFAC8lPh4ck="; }; - vendorHash = "sha256-QKprfszbWqegvIJ2J+f3gxLpkpZgfuLP5HjoMwyCi5M="; + vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; nativeBuildInputs = [ installShellFiles ]; 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 c5dd09eb19..258bc5d71d 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.4.5"; + version = "6.5"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-sLSwC4smOci+OHOUeW8EJb6zOTFN9+cpN/jd0qQbG4o="; + sha256 = "sha256-pWA9DTlev2f+XSeruzvTf8wBhx7POUx5NnLSweaL5+c="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-shB2MRGATTg4l6pJ9FVYfBtnrX/eEHRvPhc8GZTA9ns="; + sha256 = "sha256-umjOU3OmTdPmLS4IWncqmKxSa6J4KXwTlGhylFt6TQo="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix index e885b7c060..b369e5db05 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec { description = "A fast git core.fsmonitor hook written in Rust"; homepage = "https://github.com/jgavris/rs-git-fsmonitor"; license = licenses.mit; - maintainers = [ maintainers.SuperSandro2000 ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix index 0d14d512c5..85a4e4d901 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix @@ -38,7 +38,7 @@ let # # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { - cargoConfig = if stdenv.isDarwin then "" else old.cargoConfig; + cargoConfig = lib.optionalString (!stdenv.isDarwin) old.cargoConfig; }); src = fetchFromGitHub { @@ -96,7 +96,7 @@ python3Packages.buildPythonApplication { pname = "sapling"; inherit src version; - sourceRoot = "source/eden/scm"; + sourceRoot = "${src.name}/eden/scm"; # Upstream does not commit Cargo.lock cargoDeps = rustPlatform.importCargoLock { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix index 20d4d463a0..0af4b1ceee 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix @@ -30,7 +30,7 @@ let buildsrht-worker = buildGoModule { inherit src version; - sourceRoot = "source/worker"; + sourceRoot = "${src.name}/worker"; pname = "buildsrht-worker"; vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix index 629d767a1c..4327e395d5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -3,7 +3,7 @@ }: { overrideModAttrs = (_: { - # No need to workaround -trimpath: it's not used in go-modules, + # No need to workaround -trimpath: it's not used in goModules, # but do download `go generate`'s dependencies nonetheless. preBuild = '' go generate ./loaders diff --git a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix index bb2d5822a2..9b427a2284 100644 --- a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix @@ -2,7 +2,7 @@ , config , stdenv , fetchFromGitHub -, boost +, boost179 , cmake , expat , harfbuzz @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + boost179 expat ffmpeg ffms diff --git a/third_party/nixpkgs/pkgs/applications/video/asciicam/default.nix b/third_party/nixpkgs/pkgs/applications/video/asciicam/default.nix new file mode 100644 index 0000000000..fa9a232e0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/asciicam/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "asciicam"; + version = "unstable-2022-06-25"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "asciicam"; + rev = "e17a9333fdfe5f7c4c610c6aac23419fe2cba7a9"; + hash = "sha256-BzMoyqp2chlQGA2Q9i8koXlH4pemN6q3P8gwM1i8ZAU="; + }; + + vendorHash = "sha256-Qnt1wo/yKC3Ce4JoZBIWtXyzlkh4bWz9vyE349iRsjk="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Displays your webcam on the terminal"; + homepage = "https://github.com/muesli/asciicam"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix index 459208f411..d6a8125f32 100644 --- a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix @@ -74,6 +74,7 @@ let "email" = "someone@nixos.org"; "phone" = "+31 71 452 5670"; "country" = "nl"; + "street" = "Hogeweide 346"; "state" = "Province of Utrecht"; "city" = "Utrecht"; "product" = "DaVinci Resolve"; @@ -98,7 +99,6 @@ let curl \ --retry 3 --retry-delay 3 \ - --header "Host: sw.blackmagicdesign.com" \ --header "Upgrade-Insecure-Requests: 1" \ --header "$USERAGENT" \ --header "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" \ diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix b/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix index b5f5ba9e73..49d2dedbb0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix @@ -49,7 +49,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-a/cDPABWI4lPxvSOI4D90O71A9lm8icPMak/g6DPYQY="; npmRootPath = ""; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; NODE_OPTIONS = "--openssl-legacy-provider"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix b/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix index e61d276147..42d5b281bb 100644 --- a/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix @@ -92,11 +92,11 @@ python.pkgs.buildPythonApplication rec { substituteInPlace frigate/const.py \ --replace "/media/frigate" "/var/lib/frigate" \ - --replace "/tmp/cache" "/var/cache/frigate" + --replace "/tmp/cache" "/var/cache/frigate/" substituteInPlace frigate/http.py \ --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \ - --replace "/tmp/cache/" "/var/cache/frigate" + --replace "/tmp/cache/" "/var/cache/frigate/" substituteInPlace frigate/output.py \ --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" diff --git a/third_party/nixpkgs/pkgs/applications/video/frigate/web.nix b/third_party/nixpkgs/pkgs/applications/video/frigate/web.nix index 08b9cef19e..01a3e70b43 100644 --- a/third_party/nixpkgs/pkgs/applications/video/frigate/web.nix +++ b/third_party/nixpkgs/pkgs/applications/video/frigate/web.nix @@ -7,7 +7,7 @@ buildNpmPackage { pname = "frigate-web"; inherit version src; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; postPatch = '' substituteInPlace package.json \ diff --git a/third_party/nixpkgs/pkgs/applications/video/iina/default.nix b/third_party/nixpkgs/pkgs/applications/video/iina/default.nix index 20089630c8..8e317102b3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/iina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/iina/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "iina"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - hash = "sha256-rF5yv2QHWVUUsyf/u78jWRn4C629GBJgB/i8YnaKHBk="; + hash = "sha256-Sz9sS+07t32+KcEr9tXQlZKEr7Ace1mjX9caOicIiZE="; }; nativeBuildInputs = [ undmg ]; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "The modern media player for macOS"; platforms = platforms.darwin; license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ arkivm stepbrobd ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 68a8624c5e..b93d7d6606 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -67,7 +67,7 @@ , sdl2Support ? true, SDL2 , sixelSupport ? false, libsixel , speexSupport ? true, speex -, swiftSupport ? stdenv.isDarwin && stdenv.isAarch64, swift +, swiftSupport ? stdenv.isDarwin, swift , theoraSupport ? true, libtheora , vaapiSupport ? x11Support || waylandSupport, libva , vapoursynthSupport ? false, vapoursynth @@ -82,7 +82,20 @@ let inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer Accelerate; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); -in stdenv.mkDerivation (finalAttrs: { + + overrideSDK = platform: version: + platform // lib.optionalAttrs (platform ? darwinMinVersion) { + darwinMinVersion = version; + }; + + stdenv' = if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 + then stdenv.override (old: { + buildPlatform = overrideSDK old.buildPlatform "10.15"; + hostPlatform = overrideSDK old.hostPlatform "10.15"; + targetPlatform = overrideSDK old.targetPlatform "10.15"; + }) + else stdenv; +in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; version = "0.35.1"; @@ -201,6 +214,7 @@ in stdenv.mkDerivation (finalAttrs: { cp ../TOOLS/umpv $out/bin cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop sed -i '/Icon=/ ! s/mpv/umpv/g; s/^Exec=.*/Exec=umpv %U/' $out/share/applications/umpv.desktop + printf "NoDisplay=true\n" >> $out/share/applications/umpv.desktop '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r mpv.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix b/third_party/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix new file mode 100644 index 0000000000..0c6dbe8e7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -0,0 +1,103 @@ +{ stdenvNoCC +, fetchurl +, lib +, makeWrapper +, autoPatchelfHook +, dpkg +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, glib +, gtk3 +, libdrm +, libudev0-shim +, libxkbcommon +, mesa +, nspr +, nss +, pango +, xorg +}: + +let + id = "118976581"; +in +stdenvNoCC.mkDerivation rec { + pname = "multiviewer-for-f1"; + version = "1.24.2"; + + src = fetchurl { + url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; + sha256 = "sha256-zll639fQFdrNvIj/4ECqEGxQw4VgfERGlti7opSmSi0="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + ffmpeg + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + xorg.libX11 + xorg.libXcomposite + xorg.libxcb + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + runHook preUnpack + + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + mv -t $out/share usr/share/* usr/lib/multiviewer-for-f1 + + makeWrapper "$out/share/multiviewer-for-f1/MultiViewer for F1" $out/bin/multiviewer-for-f1 \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libudev0-shim ]}:\"$out/share/Multiviewer for F1\"" + + runHook postInstall + ''; + + meta = with lib; { + description = "Unofficial desktop client for F1 TV®"; + homepage = "https://multiviewer.app"; + downloadPage = "https://multiviewer.app/download"; + license = licenses.unfree; + maintainers = with maintainers; [ babeuh ]; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/Provide-runtime-plugin-destination-as-relative-path.patch b/third_party/nixpkgs/pkgs/applications/video/obs-studio/Provide-runtime-plugin-destination-as-relative-path.patch deleted file mode 100644 index b39cb04a89..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/Provide-runtime-plugin-destination-as-relative-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index 790583cd5..763cf3548 100644 ---- a/libobs/CMakeLists.txt -+++ b/libobs/CMakeLists.txt -@@ -455,6 +455,8 @@ elseif(OS_POSIX) - libobs PROPERTIES BUILD_RPATH "$") - endif() - -+string(REGEX REPLACE "^${OBS_INSTALL_PREFIX}" "" OBS_PLUGIN_DESTINATION_RELATIVE ${OBS_PLUGIN_DESTINATION}) -+ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/obsconfig.h.in - ${CMAKE_BINARY_DIR}/config/obsconfig.h) - -diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in -index 4a664285a..5cff2ca53 100644 ---- a/libobs/obsconfig.h.in -+++ b/libobs/obsconfig.h.in -@@ -13,7 +13,7 @@ - #define OBS_VERSION_CANONICAL "@OBS_VERSION_CANONICAL@" - #define OBS_DATA_PATH "@OBS_DATA_PATH@" - #define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@" --#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@" -+#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION_RELATIVE@" - #define OBS_QT_VERSION @_QT_VERSION@ - - #cmakedefine LINUX_PORTABLE diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 2ac85084b4..1889d4354f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -21,11 +21,12 @@ , xorg , pkg-config , libvlc +, libGL , mbedtls , wrapGAppsHook , scriptingSupport ? true , luajit -, swig +, swig4 , python3 , alsaSupport ? stdenv.isLinux , alsa-lib @@ -42,6 +43,9 @@ , srt , qtwayland , wrapQtAppsHook +, nlohmann_json +, websocketpp +, asio }: let @@ -50,20 +54,20 @@ let in stdenv.mkDerivation rec { pname = "obs-studio"; - version = "29.0.2"; + version = "29.1.3"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-TIUSjyPEsKRNTSLQXuLJGEgD989hJ5GhOsqJ4nkKVsY="; + sha256 = "sha256-D0DPueMtopwz5rLgM8QcPT7DgTKcJKQHnst69EY9V6Q="; fetchSubmodules = true; }; patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch - ./Provide-runtime-plugin-destination-as-relative-path.patch + ./fix-nix-plugin-path.patch ]; nativeBuildInputs = [ @@ -73,7 +77,7 @@ stdenv.mkDerivation rec { wrapGAppsHook wrapQtAppsHook ] - ++ optional scriptingSupport swig; + ++ optional scriptingSupport swig4; buildInputs = [ curl @@ -99,6 +103,9 @@ stdenv.mkDerivation rec { libva srt qtwayland + nlohmann_json + websocketpp + asio ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib @@ -117,11 +124,7 @@ stdenv.mkDerivation rec { cp -r ${libcef}/include cef/ ''; - # obs attempts to dlopen libobs-opengl, it fails unless we make sure - # DL_OPENGL is an explicit path. Not sure if there's a better way - # to handle this. cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" "-DOBS_VERSION_OVERRIDE=${version}" "-Wno-dev" # kill dev warnings that are useless for packaging # Add support for browser source @@ -133,7 +136,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; preFixup = '' qtWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" + --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath [ xorg.libX11 libvlc libGL ]}" ''${gappsWrapperArgs[@]} ) ''; @@ -151,7 +154,7 @@ stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V miangraham ]; + maintainers = with maintainers; [ jb55 MP2E V ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/third_party/nixpkgs/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch new file mode 100644 index 0000000000..d2c08c308b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch @@ -0,0 +1,13 @@ +diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c +index 36aac7097..801cec788 100644 +--- a/libobs/obs-nix.c ++++ b/libobs/obs-nix.c +@@ -56,7 +56,7 @@ const char *get_module_extension(void) + #define FLATPAK_PLUGIN_PATH "/app/plugins" + + static const char *module_bin[] = { +- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION, ++ OBS_PLUGIN_DESTINATION, + "../../obs-plugins/" BIT_STRING, + FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION, + }; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix index 29dcb53391..9f1a52bd8b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix @@ -1,21 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, obs-studio }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, obs-studio }: stdenv.mkDerivation rec { pname = "obs-source-record"; - version = "unstable-2022-11-10"; + version = "0.3.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-source-record"; - rev = "4a543d3577d56a27f5f2b9aa541a466b37dafde0"; - sha256 = "sha256-LoMgrWZ7r6lu2fisNvqrAiFvxWQQDE6lSxUHkMB/ZPY="; + rev = version; + sha256 = "sha256-H65uQ9HnKmHs52v3spG92ayeYH/TvmwcMoePMmBMqN8="; }; + patches = [ + # fix obs 29.1 compatibility + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/exeldro/obs-source-record/pull/83.diff"; + hash = "sha256-eWOjHHfoXZeoPtqvVyexSi/UQqHm8nu4FEEjma64Ly4="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + cmakeFlags = [ "-DBUILD_OUT_OF_TREE=On" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 6c8ef3b67a..ffea337c32 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-a9r01adzeC8KSr+ATgRQLoJ+dlAj6NWFZ5cRYlS7FeM="; + sha256 = "sha256-6I73YukhqOLsqVimTfVKYG6LzIYoJRnMaxkPhEAinfQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix b/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix index 3ed220561c..28d25844e0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pyca/default.nix @@ -18,6 +18,10 @@ let inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; }); }; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix index 72dd596134..cf942202e5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix @@ -4,7 +4,9 @@ , alsa-lib , cmake , ffmpeg +, fribidi , game-music-emu +, libXdmcp , libXv , libass , libcddb @@ -12,6 +14,7 @@ , libpulseaudio , libsidplayfp , libva +, libxcb , pkg-config , qtbase , qttools @@ -23,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmplay2"; - version = "23.02.05"; + version = "23.06.17"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = finalAttrs.version; - sha256 = "sha256-ZDpUgD9qTvjopGFVrwTBSEmrXn+4aKq2zeqoTnXwmI8="; fetchSubmodules = true; + hash = "sha256-f4lIXB0eTyteCJdWFP0XnsnxGWc32CV+HlqpaCjmgOE="; }; nativeBuildInputs = [ @@ -42,7 +45,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib ffmpeg + fribidi game-music-emu + libXdmcp libXv libass libcddb @@ -50,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libsidplayfp libva + libxcb qtbase qttools taglib diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix index c0827b523b..56137bef13 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "5.5.1"; + version = "6.0.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-srT+jWQ22+e87HjeLUu3gBVjiFYUNbYaGWMVbp/F+9A="; + hash = "sha256-BeP+YOBtTz1D//LDBMha+07yVXdgBHfM4v4aVNHzwAw="; }; nativeCheckInputs = with python3Packages; [ @@ -20,6 +20,7 @@ python3Packages.buildPythonApplication rec { requests-mock freezegun pytest-asyncio + pytest-trio ]; nativeBuildInputs = with python3Packages; [ @@ -27,15 +28,18 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = (with python3Packages; [ + certifi isodate lxml pycountry pycryptodome pysocks requests - websocket-client + trio + trio-websocket + typing-extensions urllib3 - certifi + websocket-client ]) ++ [ ffmpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix new file mode 100644 index 0000000000..3ced362b94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, vdr +, fetchFromGitHub +, graphicsmagick +, pcre +, xorgserver +, ffmpeg +, libiconv +, boost +, libgcrypt +, perl +, util-linux +, groff +, libva +, xorg +, ncurses +, callPackage +}: +stdenv.mkDerivation rec { + pname = "vdr-markad"; + version = "3.3.3"; + + src = fetchFromGitHub { + repo = "vdr-plugin-markad"; + owner = "kfb77"; + sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI="; + rev = "V${version}"; + }; + + buildInputs = [ vdr ffmpeg ]; + + postPatch = '' + substituteInPlace command/Makefile --replace '/usr' "" + + substituteInPlace plugin/markad.cpp \ + --replace "/usr/bin" "$out/bin" \ + --replace "/var/lib/markad" "$out/var/lib/markad" + + substituteInPlace command/markad-standalone.cpp \ + --replace "/var/lib/markad" "$out/var/lib/markad" + ''; + + buildFlags = [ + "DESTDIR=$(out)" + "VDRDIR=${vdr.dev}/lib/pkgconfig" + ]; + + installFlags = buildFlags; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Plugin for VDR that marks advertisements"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix new file mode 100644 index 0000000000..b46723fbf8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }: +stdenv.mkDerivation rec { + pname = "vdr-skin-nopacity"; + version = "1.1.14"; + + src = fetchFromGitLab { + repo = "SkinNopacity"; + owner = "kamel5"; + sha256 = "sha256-zSAnjBkFR8m+LXeoYO163VkNtVpfQZR5fI5CEzUABdQ="; + rev = version; + }; + + buildInputs = [ vdr graphicsmagick ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Highly customizable native true color skin for the Video Disc Recorder"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix index 404af2ec83..92d9128543 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix @@ -1,6 +1,6 @@ { lib, stdenv, vdr, fetchFromGitHub -, graphicsmagick, pcre, xorgserver, ffmpeg -, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses +, graphicsmagick, pcre +, boost, libgcrypt, perl, util-linux, groff, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { @@ -12,6 +12,10 @@ }; in { + markad = callPackage ./markad {}; + + nopacity = callPackage ./nopacity {}; + softhddevice = callPackage ./softhddevice {}; streamdev = callPackage ./streamdev {}; @@ -53,52 +57,6 @@ in { }; - markad = stdenv.mkDerivation rec { - pname = "vdr-markad"; - version = "3.1.1"; - - src = fetchFromGitHub { - repo = "vdr-plugin-markad"; - owner = "kfb77"; - sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M="; - rev = "V${version}"; - }; - - buildInputs = [ vdr ffmpeg ]; - - postPatch = '' - substituteInPlace command/Makefile --replace '/usr' "" - - substituteInPlace plugin/markad.cpp \ - --replace "/usr/bin" "$out/bin" \ - --replace "/var/lib/markad" "$out/var/lib/markad" - - substituteInPlace command/markad-standalone.cpp \ - --replace "/var/lib/markad" "$out/var/lib/markad" - ''; - - buildFlags = [ - "DESTDIR=$(out)" - "LIBDIR=/lib/vdr" - "BINDIR=/bin" - "MANDIR=/share/man" - "APIVERSION=${vdr.version}" - "VDRDIR=${vdr.dev}/include/vdr" - "LOCDIR=/share/locale" - ]; - - installFlags = buildFlags; - - meta = with lib; { - inherit (src.meta) homepage; - description = "MarkAd marks advertisements in VDR recordings."; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - inherit (vdr.meta) platforms; - }; - - }; - epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; version = "2.4.2"; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix index b0ea1b04c2..1be01e63fc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.10.3"; + version = "1.11.1"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-iuQ6ZHPrtIQzEqHYrLibZ8uOOwNqMbWYCD5plDQcBZg="; + sha256 = "sha256-+itSxkyst/KJzyT8ALJkCKumrHHKiWfnvikonwexgnc="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix index 75c8fbf982..e601f0443c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "sha256-Du/Dq7AUH5CeEKYr0kxcqguAyRVI5Ame41nU3FGvG+U="; + sha256 = "sha256-epz/KoXo84zzCD1dzclRWgeQSqrgwEtaIGvrTPuN9hw="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/xine/lib.nix b/third_party/nixpkgs/pkgs/applications/video/xine/lib.nix new file mode 100644 index 0000000000..ec3a642082 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/xine/lib.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, fetchurl +, aalib +, alsa-lib +, autoreconfHook +, ffmpeg +, flac +, libGL +, libGLU +, libX11 +, libXext +, libXinerama +, libXv +, libcaca +, libcdio +, libmng +, libmpcdec +, libpulseaudio +, libtheora +, libv4l +, libvorbis +, libxcb +, ncurses +, perl +, pkg-config +, speex +, vcdimager +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xine-lib"; + version = "1.2.13"; + + src = fetchurl { + url = "mirror://sourceforge/xine/xine-lib-${finalAttrs.version}.tar.xz"; + hash = "sha256-XxDW1xikpRwX7RsysDHU+bgLBh6CdlNbK+MeWsS3Xm8="; + }; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = [ + aalib + alsa-lib + ffmpeg + flac + libGL + libGLU + libX11 + libXext + libXinerama + libXv + libcaca + libcdio + libmng + libmpcdec + libpulseaudio + libtheora + libv4l + libvorbis + libxcb + ncurses + perl + speex + vcdimager + zlib + libX11 + libXext + libXinerama + libXv + libxcb + ]; + + enableParallelBuilding = true; + + env.NIX_LDFLAGS = "-lxcb-shm"; + + meta = { + homepage = "https://xine.sourceforge.net/"; + description = "A high-performance, portable and reusable multimedia playback engine"; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix b/third_party/nixpkgs/pkgs/applications/video/xine/ui.nix similarity index 50% rename from third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix rename to third_party/nixpkgs/pkgs/applications/video/xine/ui.nix index 8becf629d1..2437705cea 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xine/ui.nix @@ -4,6 +4,13 @@ , fetchpatch , autoreconfHook , curl +, libXext +, libXft +, libXi +, libXinerama +, libXtst +, libXv +, libXxf86vm , libjpeg , libpng , lirc @@ -12,41 +19,28 @@ , readline , shared-mime-info , xine-lib -, xorg +, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xine-ui"; - version = "0.99.13"; + version = "0.99.14"; src = fetchurl { - url = "mirror://sourceforge/xine/${pname}-${version}.tar.xz"; - sha256 = "sha256-sjgtB1xysbEAOeDpAxDMhsjZEDWMU1We2C09WEIB9cU="; + url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz"; + hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM="; }; - patches = [ - (fetchpatch { - # Fix build on aarch64 - name = "xine-ui_FTBS_aarch64.patch"; - url = "https://salsa.debian.org/debian/xine-ui/-/raw/b2f04f64947a8975a805950e7e67b15cb44007ef/debian/patches/backport/0003-Fix-build.patch"; - sha256 = "03f8nkm7q11v5vssl1bj500ja4ljz4y752mfk22k2g4djkwimx62"; - }) - ]; + outputs = [ "out" "dev" "lib" "man" ]; nativeBuildInputs = [ autoreconfHook pkg-config shared-mime-info ]; + buildInputs = [ curl - libjpeg - libpng - lirc - ncurses - readline - xine-lib - ] ++ (with xorg; [ libXext libXft libXi @@ -54,24 +48,32 @@ stdenv.mkDerivation rec { libXtst libXv libXxf86vm + libjpeg + libpng + lirc + ncurses + readline + xine-lib xorgproto - ]); + ]; configureFlags = [ "--with-readline=${readline.dev}" ]; - LIRC_CFLAGS="-I${lirc}/include"; - LIRC_LIBS="-L ${lirc}/lib -llirc_client"; + env = { + LIRC_CFLAGS="-I${lirc}/include"; + LIRC_LIBS="-L ${lirc}/lib -llirc_client"; + }; postInstall = '' substituteInPlace $out/share/applications/xine.desktop \ --replace "MimeType=;" "MimeType=" ''; - meta = with lib; { + meta = { homepage = "https://xine.sourceforge.net/"; description = "Xlib-based frontend for Xine video player"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix b/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix index 8eb4623356..f789c12508 100644 --- a/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/youtube-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "youtube-tui"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Siriusmart"; repo = pname; rev = "v${version}"; - hash = "sha256-gogV/+zo/Spg5d8Fh4gDTJL4ojdWbB6mDbppF0i+H20="; + hash = "sha256-UN70V+RGYlYJxCQGPH8cnQDSqpihGuwzETYEhbG6Ggo="; }; - cargoHash = "sha256-TUq/Kix+Z+rELN7x3/gmFOtpa1bj/xakiYDYSyVtA/s="; + cargoHash = "sha256-kAhxsSFIJAoKlmN7hVUoTSSHQ2G23f21rEvxcIRQ+kw="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index 6e3e9ba0d1..eada778e1c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -1,5 +1,7 @@ { stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools, llvmPackages , csmSupport ? false, seabios ? null +, fdSize2MB ? csmSupport +, fdSize4MB ? false , secureBoot ? false , httpSupport ? false , tpmSupport ? false @@ -49,7 +51,9 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ++ lib.optionals debug [ "-D DEBUG_ON_SERIAL_PORT=TRUE" ] ++ lib.optionals sourceDebug [ "-D SOURCE_DEBUG_ENABLE=TRUE" ] ++ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] - ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] + ++ lib.optionals csmSupport [ "-D CSM_ENABLE" ] + ++ lib.optionals fdSize2MB ["-D FD_SIZE_2MB"] + ++ lib.optionals fdSize4MB ["-D FD_SIZE_4MB"] ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] ++ lib.optionals tlsSupport [ "-D NETWORK_TLS_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; @@ -100,6 +104,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: { homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; inherit (edk2.meta) platforms; - maintainers = [ lib.maintainers.raitobezarius ]; + maintainers = with lib.maintainers; [ adamcstephens raitobezarius ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index c93ebc0740..4817a9f435 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "acpi_tables" version = "0.1.0" -source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#98dcb0309d362dd83f6ffcac4f66914a2fbd5a73" +source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#05a609136387cc1cc9b499cee4320020325c263f" dependencies = [ "zerocopy", ] @@ -27,18 +27,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "api_client" @@ -94,7 +94,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -103,6 +103,134 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64cb94155d965e3d37ffbbe7cc5b82c3dd79dd33bd48e536f73d2cfb8d85506f" +[[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", + "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", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2", + "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", + "blocking", + "cfg-if", + "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", + "quote", + "syn 2.0.18", +] + +[[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.18", +] + +[[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" @@ -139,6 +267,21 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "block_util" version = "0.1.0" @@ -152,13 +295,28 @@ dependencies = [ "versionize", "versionize_derive", "vhdx", - "virtio-bindings 0.2.0", + "virtio-bindings", "virtio-queue", "vm-memory", "vm-virtio", "vmm-sys-util", ] +[[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 = "byteorder" version = "1.4.3" @@ -179,7 +337,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cloud-hypervisor" -version = "32.0.0" +version = "33.0.0" dependencies = [ "anyhow", "api_client", @@ -205,6 +363,25 @@ dependencies = [ "vmm", "vmm-sys-util", "wait-timeout", + "zbus", +] + +[[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 = "cpufeatures" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +dependencies = [ + "libc", ] [[package]] @@ -223,10 +400,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910" [[package]] -name = "darling" -version = "0.14.4" +name = "crossbeam-utils" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" dependencies = [ "darling_core", "darling_macro", @@ -234,27 +430,38 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.18", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.18", +] + +[[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]] @@ -264,7 +471,7 @@ dependencies = [ "acpi_tables", "anyhow", "arch", - "bitflags", + "bitflags 2.3.3", "byteorder", "hypervisor", "libc", @@ -296,23 +503,55 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "5.0.0" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "windows-sys 0.45.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", ] [[package]] @@ -334,7 +573,7 @@ version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -359,6 +598,12 @@ dependencies = [ "libc", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "event_monitor" version = "0.1.0" @@ -368,6 +613,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "fdt" version = "0.1.5" @@ -381,12 +635,116 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "gdbstub" -version = "0.6.4" +name = "futures" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4fddc6f9d12cbef29e395d9a6b48c128f513c8a2ded7048c97ed5c484e53e7" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ - "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[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 = "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.18", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdbstub" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e02bf1b1a624d96925c608f1b268d82a76cbc587ce9e59f7c755e9ea11c75c" +dependencies = [ + "bitflags 1.3.2", "cfg-if", "log", "managed", @@ -405,10 +763,20 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.2.8" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -417,9 +785,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glob" @@ -427,12 +795,24 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hermit-abi" 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 = "humantime" version = "2.1.0" @@ -463,9 +843,9 @@ dependencies = [ [[package]] name = "iced-x86" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd04b950d75b3498320253b17fb92745b2cc79ead8814aede2f7c1bab858bec" +checksum = "b7cc8d38244d84278262c8ebe6930cc44283d194cbabae2651f6112103802fb5" dependencies = [ "lazy_static", ] @@ -476,6 +856,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + [[package]] name = "instant" version = "0.1.12" @@ -487,9 +877,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", @@ -502,7 +892,7 @@ version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd1e1a01cfb924fd8c5c43b6827965db394f5a3a16c599ce03452266e1cf984c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -561,9 +951,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libssh2-sys" @@ -581,9 +971,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -593,24 +983,24 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9259ddbfbb52cc918f6bbc60390004ddd0228cf1d85f402009ff2b3d95de83f" +checksum = "8d3adb7b28e189741eca3b1a4a27de0bf15e0907c9d4b0c74bd2d7d84ef72e08" dependencies = [ "vm-memory", ] [[package]] name = "linux-raw-sys" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[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", @@ -637,6 +1027,15 @@ 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 = "micro_http" version = "0.1.0" @@ -648,9 +1047,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e212582ede878b109755efd0773a4f0f4ec851584cf0aefbeb4d9ecc114822" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -668,7 +1067,7 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#c1230f282c2836ba89ee112146bf638343424de8" +source = "git+https://github.com/rust-vmm/mshv?branch=main#04f5adbf64866d2776f668122f48f317add53b22" dependencies = [ "libc", "serde", @@ -680,7 +1079,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#c1230f282c2836ba89ee112146bf638343424de8" +source = "git+https://github.com/rust-vmm/mshv?branch=main#04f5adbf64866d2776f668122f48f317add53b22" dependencies = [ "libc", "mshv-bindings", @@ -712,13 +1111,26 @@ dependencies = [ "thiserror", "versionize", "versionize_derive", - "virtio-bindings 0.2.0", + "virtio-bindings", "virtio-queue", "vm-memory", "vm-virtio", "vmm-sys-util", ] +[[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", + "static_assertions", +] + [[package]] name = "no-std-net" version = "0.6.0" @@ -751,20 +1163,19 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl-src" -version = "111.25.0+1.1.1t" +version = "111.26.0+1.1.1u" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -772,10 +1183,32 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "option_parser" version = "0.1.0" +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + [[package]] name = "parking_lot" version = "0.11.2" @@ -794,7 +1227,7 @@ 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.7", ] [[package]] @@ -806,22 +1239,22 @@ 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.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -867,10 +1300,22 @@ dependencies = [ ] [[package]] -name = "pkg-config" -version = "0.3.26" +name = "pin-project-lite" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pnet" @@ -917,7 +1362,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.109", ] [[package]] @@ -964,10 +1409,42 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.52" +name = "polling" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -985,13 +1462,43 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" 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 = "rate_limiter" version = "0.1.0" @@ -1007,7 +1514,16 @@ 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]] @@ -1017,15 +1533,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", @@ -1034,19 +1550,19 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "remain" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5704e2cda92fd54202f05430725317ba0ea7d0c96b246ca0a92e45177127ba3b" +checksum = "e13cca257d068dd3a390d04b2c3009a3fad2ee5048dfa8f239d048372810470c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -1072,16 +1588,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.3" +version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1113,22 +1629,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.156" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -1143,10 +1659,21 @@ dependencies = [ ] [[package]] -name = "serde_with" -version = "2.3.2" +name = "serde_repr" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "serde_with" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" dependencies = [ "serde", "serde_with_macros", @@ -1154,20 +1681,31 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" +checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "serial_buffer" version = "0.1.0" +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "signal-hook" version = "0.3.15" @@ -1187,24 +1725,49 @@ dependencies = [ "libc", ] +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + [[package]] name = "smallvec" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "ssh2" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libssh2-sys", "parking_lot 0.11.2", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.10.0" @@ -1213,9 +1776,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -1232,6 +1806,19 @@ dependencies = [ "libc", ] +[[package]] +name = "tempfile" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", +] + [[package]] name = "termcolor" version = "1.2.0" @@ -1258,22 +1845,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -1282,6 +1869,23 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "tpm" version = "0.1.0" @@ -1307,16 +1911,64 @@ dependencies = [ ] [[package]] -name = "unicode-ident" -version = "1.0.6" +name = "tracing" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" dependencies = [ "getrandom", ] @@ -1327,6 +1979,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + [[package]] name = "versionize" version = "0.1.10" @@ -1339,7 +1997,7 @@ dependencies = [ "quote", "serde", "serde_derive", - "syn", + "syn 1.0.109", "versionize_derive", "vmm-sys-util", ] @@ -1347,17 +2005,17 @@ dependencies = [ [[package]] name = "versionize_derive" version = "0.1.4" -source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch#ae35ef7a3ddabd3371ab8ac0193a383aff6e4b1b" +source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch#e502b1d4aabab342386f0c53780d49f21a6a1df6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#ea8f710464a24690ce109e6b7dfaa623dc518304" +source = "git+https://github.com/rust-vmm/vfio?branch=main#89f8e77dd1a2829197ecde65b686bafcc8a1def4" dependencies = [ "vmm-sys-util", ] @@ -1365,7 +2023,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#ea8f710464a24690ce109e6b7dfaa623dc518304" +source = "git+https://github.com/rust-vmm/vfio?branch=main#89f8e77dd1a2829197ecde65b686bafcc8a1def4" dependencies = [ "byteorder", "kvm-bindings", @@ -1383,9 +2041,9 @@ dependencies = [ [[package]] name = "vfio_user" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-user?branch=main#e75c9415d973769c5fd1d07716eb92d6e5be7c48" +source = "git+https://github.com/rust-vmm/vfio-user?branch=main#eef6bec4d421f08ed1688fe67c5ea33aabbf5069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "log", "serde", @@ -1412,11 +2070,10 @@ dependencies = [ [[package]] name = "vhost" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b791c5b0717a0558888a4cf7240cea836f39a99cb342e12ce633dcaa078072" +version = "0.7.0" +source = "git+https://github.com/rust-vmm/vhost?branch=main#bdc6f2ab2b3dbd3b9574100ac641a2f8e9667400" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "vm-memory", "vmm-sys-util", @@ -1424,14 +2081,14 @@ dependencies = [ [[package]] name = "vhost-user-backend" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f237b91db4ac339d639fb43398b52d785fa51e3c7760ac9425148863c1f4303" +checksum = "a5d3b7affe04f61d19b03c5db823287855789b687218fec139699a0c7f7f2790" dependencies = [ "libc", "log", "vhost", - "virtio-bindings 0.1.0", + "virtio-bindings", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1451,7 +2108,7 @@ dependencies = [ "qcow", "vhost", "vhost-user-backend", - "virtio-bindings 0.2.0", + "virtio-bindings", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1470,17 +2127,11 @@ dependencies = [ "option_parser", "vhost", "vhost-user-backend", - "virtio-bindings 0.2.0", + "virtio-bindings", "vm-memory", "vmm-sys-util", ] -[[package]] -name = "virtio-bindings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" - [[package]] name = "virtio-bindings" version = "0.2.0" @@ -1512,7 +2163,7 @@ dependencies = [ "versionize", "versionize_derive", "vhost", - "virtio-bindings 0.2.0", + "virtio-bindings", "virtio-queue", "vm-allocator", "vm-device", @@ -1524,12 +2175,12 @@ dependencies = [ [[package]] name = "virtio-queue" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba81e2bcc21c0d2fc5e6683e79367e26ad219197423a498df801d79d5ba77bd" +checksum = "91aebb1df33db33cbf04d4c2445e4f78d0b0c8e65acfd16a4ee95ef63ca252f8" dependencies = [ "log", - "virtio-bindings 0.1.0", + "virtio-bindings", "vm-memory", "vmm-sys-util", ] @@ -1559,13 +2210,13 @@ dependencies = [ [[package]] name = "vm-fdt" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#ad21ede0ddb4cc97448eeb64c1dfc27803b9ec08" +source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#77212bd0d62913e445c89376bcbbecd595afc5b1" [[package]] name = "vm-memory" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" +checksum = "9d6ea57fe00f9086c59eeeb68e102dd611686bc3c28520fa465996d4d4bdce07" dependencies = [ "arc-swap", "libc", @@ -1602,11 +2253,13 @@ dependencies = [ "anyhow", "arc-swap", "arch", - "bitflags", + "bitflags 2.3.3", "block_util", + "blocking", "devices", "epoll", "event_monitor", + "futures", "gdbstub", "gdbstub_arch", "hypervisor", @@ -1640,6 +2293,7 @@ dependencies = [ "vm-migration", "vm-virtio", "vmm-sys-util", + "zbus", "zerocopy", ] @@ -1649,7 +2303,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd64fe09d8e880e600c324e7d664760a17f56e9672b7495a86381b49e4f72f46" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "serde", "serde_derive", @@ -1664,6 +2318,12 @@ dependencies = [ "libc", ] +[[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" @@ -1701,21 +2361,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -1848,6 +2493,91 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "zbus" +version = "3.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "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.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "winnow", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82441e6033be0a741157a72951a3e4957d519698f3a824439cc131c5ba77ac2a" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + [[package]] name = "zerocopy" version = "0.6.1" @@ -1866,5 +2596,43 @@ checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "zvariant" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622cc473f10cef1b0d73b7b34a266be30ebdcfaea40ec297dd8cbda088f9f93c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d9c1b57352c25b778257c661f3c4744b7cefb7fc09dd46909a153cce7773da2" +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/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 7cd3e00f3d..bad71e7c73 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,27 +2,28 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "32.0"; + version = "33.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "aSBzbxL9TOYVQUZBgHI8GHELfx9avRDHh/MWmN+/nY0="; + sha256 = "sha256-ODhiK0lAN5G9FLBjIdvDl9ya5JKwg8Sv06iDkt44vWc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "acpi_tables-0.1.0" = "sha256-aT0p85QDGjBEnbABedm0q7JPpiNjhupoIzBWifQ0RaQ="; + "acpi_tables-0.1.0" = "sha256-OdtnF2fV6oun3NeCkXdaGU3U7ViBcgFKqHKdyZsRsPA="; "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; "micro_http-0.1.0" = "sha256-w2witqKXE60P01oQleujmHSnzMKxynUGKWyq5GEh1Ew="; - "mshv-bindings-0.1.1" = "sha256-Pg7UPhW6UOahCQu1jU27lenrsmLT/VdceDqL6lOdmFU="; - "versionize_derive-0.1.4" = "sha256-BPl294UqjVl8tThuvylXUFjFNjJx8OSfBGJLg8jIkWw="; - "vfio-bindings-0.4.0" = "sha256-lKdoo/bmnZTRV7RRWugwHDFFCB6FKxpzxDEEMVqSbwA="; - "vfio_user-0.1.0" = "sha256-JYNiONQNNpLu57Pjdn2BlWOdmSf3c4/XJg/RsVxH3uk="; - "vm-fdt-0.2.0" = "sha256-gVKGiE3ZSe+z3oOHR3zqVdc7XMHzkp4kO4p/WfK0VI8="; + "mshv-bindings-0.1.1" = "sha256-hmOTu/e1WFk6rc+oXxBja+gFlDqnAIXzyWdiUd+Al1E="; + "versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o="; + "vfio-bindings-0.4.0" = "sha256-8zdpLD9e1TAwG+m6ifS7/Fh39fAs5VxtnS5gUj/eKmY="; + "vfio_user-0.1.0" = "sha256-b/gL6vPMW44O44lBIjqS+hgqVUUskBmttGk5UKIMgZk="; + "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; + "vhost-0.7.0" = "sha256-KdVROh44UzZJqtzxfM6gwAokzY6El8iDPfw2nnkmhiQ="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 33fb9457ba..f07debac98 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-L4zaA+kMBz2tRMbitZUxb9/wdimSO2njx6ozvyKKlkk="; + hash = "sha256-BUbZe37rBZTr6nWb4lY2HHuwtq7toDUkGaJOiOoVkWI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 7b5a26975f..ad48ae1e0d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-ZFt8KcEJ7iN2JgKbOGDgpq0+pjlxEU7V9GSX+c3VnbY="; + sha256 = "sha256-29lA497DTJ1AOqcfbgUCYcBqB8WUWWXBMqFOpyx93wY="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index fbc4482536..7b99443384 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -23,6 +23,7 @@ let "test_exec.py" "test_hooks.py" "test_hostname.py" + "test_oci_features" "test_paths.py" "test_pid.py" "test_pid_file.py" @@ -38,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-T51dVNtqQbXoPshlAkBzJOGTNTPM+AlqRYbqS8GX2NE="; + hash = "sha256-qPbJ8h/s4E7EmNlgBdrNZ0AW0D/N7PkK57C1cXjuM9U="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 964d86a445..1834d38d7f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-slim"; - version = "1.40.2"; + version = "1.40.3"; src = fetchFromGitHub { owner = "slimtoolkit"; repo = "slim"; rev = version; - hash = "sha256-byB7GTw0hHY4dp3CkMCl6ga/Zn82+K6qmyWy6ezCLoE="; + hash = "sha256-fXB2rMW73F12ZO1sqUIiaky6LDiMasg3QcIgeWwtkOs="; }; vendorHash = null; @@ -17,6 +17,10 @@ buildGoModule rec { nativeBuildInputs = [ makeBinaryWrapper ]; + preBuild = '' + go generate github.com/docker-slim/docker-slim/pkg/appbom + ''; + ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index ff5fb35d42..033d6a55d4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-a33jGbafkmv55cKBCr8xlGTsD3bU/1CNyOfaXQIGMg0="; + hash = "sha256-FPqXfIxuqwsnvsuWN5baIIn6o7ucP/Zgn+OsHfI61zU="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 1e4266ca3b..a7fa69b96c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.19.1"; + version = "2.20.2"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-/U1jaApmhrI+wctb01IIL2h4BaYHb2/7VsEEJnjs5Cg="; + sha256 = "sha256-i2/cydp3ZLnmutWW3lpoP2jPQIJ8M6nUTgfhOiz6SPk="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-impVmzVZVIhUlAOmNFSzZBaSHgOhata1HDQ5yp3cbtk="; + vendorHash = "sha256-Njv2wzVQN4ySdU6NFrOwqS+V5f3/b5AMwgv1/vWnlz0="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; @@ -34,6 +34,6 @@ buildGoModule rec { description = "Docker CLI plugin to define and run multi-container applications with Docker"; homepage = "https://github.com/docker/compose"; license = licenses.asl20; - maintainers = with maintainers; [ babariviere SuperSandro2000 ]; + maintainers = with maintainers; [ babariviere ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 0d846e9a69..5deb6d77c3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -97,7 +97,7 @@ rec { extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); - patches = [ + patches = lib.optionals (lib.versionOlder version "23") [ # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. # It could be removed when a version incorporating this patch is released. (fetchpatch { @@ -105,6 +105,12 @@ rec { url = "https://github.com/moby/moby/pull/43136.patch"; hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; }) + ] ++ lib.optionals (lib.versionOlder version "23.0.5") [ + (fetchpatch { + name = "fix-issue-with-go-1.20.6.patch"; + url = "https://github.com/moby/moby/pull/45972.patch"; + hash = "sha256-zxFh/bI6+INOYSg6QFs0S9rdl9Z21KUIZFmzpNVjpSA="; + }) ]; postPatch = '' @@ -176,12 +182,19 @@ rec { nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = lib.optional (!clientOnly) sqlite - ++ lib.optional withLvm lvm2 - ++ lib.optional withBtrfs btrfs-progs - ++ lib.optional withSystemd systemd - ++ lib.optional withSeccomp libseccomp - ++ plugins; + + buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23") [ + glibc + glibc.static + ]; + + patches = lib.optionals (lib.versionOlder version "23.0.5") [ + (fetchpatch { + name = "fix-issue-with-go-1.20.6.patch"; + url = "https://github.com/docker/cli/pull/4441.patch"; + hash = "sha256-F4ueSbdBk1w8OqC4Dgh8+4Ql4zTjehaM368ET7k6Yx8="; + }) + ]; postPatch = '' patchShebangs man scripts/build/ @@ -209,7 +222,7 @@ rec { cd - ''; - outputs = ["out" "man"]; + outputs = ["out"] ++ lib.optional (lib.versionOlder version "23") "man"; installPhase = '' cd ./go/src/${goPackagePath} @@ -231,13 +244,13 @@ rec { installShellCompletion --bash ./contrib/completion/bash/docker installShellCompletion --fish ./contrib/completion/fish/docker.fish installShellCompletion --zsh ./contrib/completion/zsh/_docker - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && lib.versionOlder version "23") '' # Generate man pages from cobra commands echo "Generate man pages from cobra" mkdir -p ./man/man1 go build -o ./gen-manpages github.com/docker/cli/man ./gen-manpages --root . --target ./man/man1 - '' + '' + '' + lib.optionalString (lib.versionOlder version "23") '' # Generate legacy pages from markdown echo "Generate legacy manpages" ./man/md2man-all.sh -q @@ -260,22 +273,36 @@ rec { To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`. ''; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ]; + maintainers = with maintainers; [ offline vdemeester periklis maxeaubrey ]; }; }); # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.23"; + version = "20.10.25"; cliRev = "v${version}"; - cliHash = "sha256-fNaRpstyG90Jzq3+U2A42Jj+ixb+m7tXLioIcsegPbQ="; + cliHash = "sha256-Wi/NHn8erqvKEVEJqkc99cO/sfPHptwMT44Savcuw2M="; mobyRev = "v${version}"; - mobyHash = "sha256-nBPw/M4VC9XeZ9S33HWdWSjY2J2mYpI/TPOzvLjSmJM="; - runcRev = "v1.1.4"; - runcHash = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; - containerdRev = "v1.6.15"; - containerdHash = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; + mobyHash = "sha256-trJjQMYF/Uog7nvUlELyUYbsTPGz8Rn21v1/V5xhu+A="; + runcRev = "v1.1.5"; + runcHash = "sha256-r5as3hb0zt+XPfxAPeH+YIc/n6IRlscPOZMGfhVE5C4="; + containerdRev = "v1.6.20"; + containerdHash = "sha256-Nd3S6hmvA8LBFUN4XaQJMApbmwGIp6GTnFQimnYagZg="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + + docker_24 = callPackage dockerGen rec { + version = "24.0.5"; + cliRev = "v${version}"; + cliHash = "sha256-u1quVGTx/p8BDyRn33vYyyuE5BOhWMnGQ5uVX0PZ5mg="; + mobyRev = "v${version}"; + mobyHash = "sha256-JQjRz1fHZlQRkNw/R8WWLV8caN3/U3mrKKQXbZt2crU="; + runcRev = "v1.1.8"; + runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; + containerdRev = "v1.7.1"; + containerdHash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index ecb95f5d87..7857145103 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.73.0"; + version = "1.73.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-poVhzJi5cYAYJgLxcsnR8b9gGa5+T56xsFex3/pr7CU="; + hash = "sha256-+IFlr1xLLnk0Ox3CcHUdEEiDqk5z0MegWu6h9RW7M8Q="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix index 168c6c5acf..b366a28e59 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.3.1"; + version = "1.4.0"; # nixpkgs-update: no auto update suffix = { @@ -23,8 +23,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-VfTo3TaTqqBYT2/CZW0F5tGXaT4CyBcKBnP5Xqc1BLI="; - aarch64-linux = "sha256-ODIBa482X8bNhRyvdmIGGi/6BZYif02cf8tAWYRcI2k="; + x86_64-linux = "sha256-WSa8fd0OSPo1HFkH6i8cGMNH1df88xI6PCx39ONb73c="; + aarch64-linux = "sha256-eOsO/nbwKT50tC5g6INPELh2yVb5C3EGqNLQLT7IGBs="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix index bf134e2cb0..e3b52c411d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = licenses.gpl2Only; maintainers = with maintainers; [ astro ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "nvramtool"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index 4d69bb7177..6c9ea55a29 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ltssKi78lBkHEgdlVSRPWXEczWIACwHTz0SW57/sTAQ="; + sha256 = "sha256-Pm02VKqaxXVLKqChbp7MQIccwzukAG2h0QrEZftQoQo="; }; - cargoHash = "sha256-nUP4g3RFBCC13beSHRqRKdlf3HtHUthGo/friKvce+Q="; + cargoHash = "sha256-elBLH2n+t+bixKePRmK1YiXsdDuerYzV+PbpjFEcA1g="; # skip test due FHS dependency doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index e3af5774c1..2bb3dc24fb 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -40,7 +40,6 @@ let runc crun conmon - slirp4netns fuse-overlayfs util-linux iptables @@ -57,18 +56,19 @@ let aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark + slirp4netns ]; }; in buildGoModule rec { pname = "podman"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-PG2/iMsr/shLqhuYSvhT1I1kPDh0g0ebnGUHHzA7u5A="; + hash = "sha256-8cfEZBYhR5CWkHEpIZ0j011gyV6lnY7z4KgJPJr0MfQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index d1fe9bcc9b..db6455cab4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,9 +1,9 @@ diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index 4f25b4d26..8a79862fd 100644 +index a118285f7..d775f0099 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go -@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward - case notInstalled: +@@ -1560,11 +1560,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState machine.APIForwardingState, + case machine.NotInstalled: fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") fmt.Printf("address can't be used by podman. ") - if helper := findClaimHelper(); len(helper) > 0 { @@ -11,6 +11,6 @@ index 4f25b4d26..8a79862fd 100644 - fmt.Printf("\n\tsudo %s install\n", helper) - fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) - } - case machineLocal: + case machine.MachineLocal: fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") - case claimUnsupported: + case machine.ClaimUnsupported: diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 46bbb4314c..fef89eb100 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { url = "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "8GCr1DX75nlBJeLDmFaP/Dz6VABCWWkHqLGO3KNM9qU="; + hash = "sha256-7PTTLL7505e/yMxQ5NHpKhswJTvzLo7nPHqNz5ojKwk="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index b23c35c513..6b2fae7b23 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU="; + hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix index 8da3610ac0..2e4d589d15 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix @@ -93,7 +93,7 @@ in inherit pname version src; # Override vendorHash with the output got from - # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" # or with `null` when using vendored source tarball. inherit vendorHash deleteVendor proxyVendor; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix index 73bed19fb7..a2b47562f8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix @@ -18,7 +18,7 @@ let }; # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository vendorHash = "sha256-PfFubgR/W1WBXIsRO+Kg7hA6ebeAcRiJlTlAZbnl19A="; @@ -49,7 +49,7 @@ let }; # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules" + # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository vendorHash = "sha256-mBhlH6LSmcJuc6HbU/3Q9ii7vJkW9jcikBWCl8oeMOk="; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 1610fe1200..38eb794426 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -24,14 +24,14 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "7.0.8"; + version = "7.0.10"; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}a.tar.bz2"; - sha256 = "7de37359518d467b7f888235175cd388f66e9f16bd9359dd6265fbc95933c1e6"; + url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; + sha256 = "0b1e6d8b7f87d017c7fae37f80586acff04f799ffc1d51e995954d6415dee371"; }; outputs = [ "out" "modsrc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 7e2ed37992..8c19504a3a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "452320f3b1da42b30c32ea5ab5887983b575638ceb4e3beacfefbbb3b0510a48"; + let value = "af84dccac488df72bfaeb1eb8c922ba466668561a6ac05c64a7f8b6ebdddbaeb"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1e6cfcf4eb..f365e43515 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "8d73e2361afbf696e6128ffa5e96d9f6a78ff32cb2cb54c727a5be7992be0b31"; + sha256 = "bbabd89b8fff38a257bab039a278f0c4dc4426eff6e4238c1db01edb7284186a"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix index fafad73527..c94263f816 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cage/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper -, wlroots, wayland, wayland-protocols, pixman, libxkbcommon +, wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm , systemd, libGL, libX11, mesa , xwayland ? null , nixosTests @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cage"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "Hjdskes"; repo = "cage"; rev = "v${version}"; - sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6"; + hash = "sha256-Suq14YRw/MReDRvO/TQqjpZvpzAEDnHUyVbQj0BPT4c="; }; depsBuildBuild = [ @@ -24,15 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ - wlroots wayland wayland-protocols pixman libxkbcommon + wlroots wayland wayland-protocols pixman libxkbcommon xcbutilwm mesa # for libEGL headers systemd libGL libX11 ]; - # https://github.com/cage-kiosk/cage/issues/231 - # cage will segfault on start with `-m last` without this - CFLAGS = "-O0"; - mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ]; postFixup = lib.optionalString (xwayland != null) '' @@ -48,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; + mainProgram = "cage"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix index 581dab562e..848da9116f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" "WAYLAND_SCANNER=wayland-scanner" "PREFIX=$(out)" - "MANDIR=$(man)/share/man/man1" + "MANDIR=$(man)/share/man" ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix index 0637988819..2f9475054c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/e16/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-Lr5OC14N6KTZNU3Ei4O9taYGL+1NZd5JmejYBmmELUE="; + hash = "sha256-k3W2IoBc75DNQ2QSjChsC/yVRO/aZT3E31Tl/njgH30="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix index 27e147d253..5c35894543 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix @@ -33,7 +33,7 @@ }: let pname = "gamescope"; - version = "3.12.0-beta9"; + version = "3.12.0-beta10"; vkroots = fetchFromGitHub { owner = "Joshua-Ashton"; @@ -49,7 +49,7 @@ stdenv.mkDerivation { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-nPFHMRp3uq2CIxY3EdaoTltqyb5z0kFwXw5U9ajbrfo="; + hash = "sha256-31zGo22Z0+zQ81LmzI+Xif9eREzRpS0S9+nK1i/cBCY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index 9d7eac5f55..d779297445 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.31.8"; + version = "0.31.9"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JkX1CGTy5iaItqKCEHaWmUt3qkLSEnxsZGpPScL4ERc="; + hash = "sha256-PldCtV979mJSgQtMHx/gfhKrsBByiywLMO9LjyggvCA="; }; - cargoHash = "sha256-QjqdGT0uVW67gQHeR4Rixpt9Wn0tyZvsDw1lyLrqabA="; + cargoHash = "sha256-wCBg3qYy9wrsM4eJ1FV4OEI+ZwkbXn5jQZ/m7KMgHCc="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/osd.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/osd.nix index bc634d1b34..b2a7b17b43 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/osd.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/osd.nix @@ -3,33 +3,64 @@ , fetchFromGitHub , pkg-config , wrapGAppsHook +, cargo +, coreutils , gtk-layer-shell +, libevdev +, libinput , libpulseaudio +, meson +, ninja +, rustc +, stdenv +, udev }: -rustPlatform.buildRustPackage { +stdenv.mkDerivation rec { pname = "swayosd"; - version = "unstable-2023-05-09"; + version = "unstable-2023-07-18"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayOSD"; - rev = "5c2176ae6a01a18fdc2b0f5d5f593737b5765914"; - hash = "sha256-rh42J6LWgNPOWYLaIwocU1JtQnA5P1jocN3ywVOfYoc="; + rev = "b14c83889c7860c174276d05dec6554169a681d9"; + hash = "sha256-MJuTwEI599Y7q+0u0DMxRYaXsZfpksc2csgnK9Ghp/E="; }; - cargoHash = "sha256-ZcgrUcRQTcEYhw2mpJDuYDz3I/u/2Q+O60ajXYRMeow="; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-pExpzQwuHREhgkj+eZ8drBVsh/B3WiQBBh906O6ymFw="; + }; nativeBuildInputs = [ wrapGAppsHook pkg-config + meson + rustc + cargo + ninja + rustPlatform.cargoSetupHook ]; buildInputs = [ gtk-layer-shell + libevdev + libinput libpulseaudio + udev ]; + patches = [ + ./swayosd_systemd_paths.patch + ]; + + postPatch = '' + substituteInPlace data/udev/99-swayosd.rules \ + --replace /bin/chgrp ${coreutils}/bin/chgrp \ + --replace /bin/chmod ${coreutils}/bin/chmod + ''; + meta = with lib; { description = "A GTK based on screen display for keyboard shortcuts"; homepage = "https://github.com/ErikReider/SwayOSD"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch b/third_party/nixpkgs/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch new file mode 100644 index 0000000000..189c761e9d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch @@ -0,0 +1,24 @@ +diff --git a/data/meson.build b/data/meson.build +index fc687a5..68decdf 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,6 @@ + datadir = get_option('datadir') + sysconfdir = get_option('sysconfdir') ++libdir = get_option('libdir') + + # LICENSE + install_data( +@@ -41,11 +42,7 @@ configure_file( + + # Systemd service unit + systemd = dependency('systemd', required: false) +-if systemd.found() +- systemd_service_install_dir = systemd.get_variable(pkgconfig :'systemdsystemunitdir') +-else +- systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') +-endif ++systemd_service_install_dir = join_paths(libdir, 'systemd', 'system') + + configure_file( + configuration: conf_data, diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix index b4e9289f19..21a7daa1fa 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/wrapper.nix @@ -28,7 +28,7 @@ let export DBUS_SESSION_BUS_ADDRESS exec ${sway}/bin/sway "$@" else - exec ${if !dbusSupport then "" else "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@" + exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@" fi ''; in symlinkJoin { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix index b89d9dafd9..84defaa98b 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/tinywl/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "tinywl"; inherit (wlroots) version src; - sourceRoot = "source/tinywl"; + sourceRoot = "${wlroots.src.name}/tinywl"; nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/applications.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/applications.nix deleted file mode 100644 index a77d3f8bf5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/applications.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, newScope, wayfirePlugins }: - -lib.makeExtensible (self: with self; { - inherit wayfirePlugins; - - callPackage = newScope self; - - wayfire = callPackage ./. { }; - - wcm = callPackage ./wcm.nix { - inherit (wayfirePlugins) wf-shell; - }; - - wrapWayfireApplication = callPackage ./wrapper.nix { }; - - withPlugins = selector: self // { - wayfire = wrapWayfireApplication wayfire selector; - wcm = wrapWayfireApplication wcm selector; - }; -}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix index ab68bc58ee..133b561be6 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix @@ -21,16 +21,16 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wayfire"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; + hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; }; nativeBuildInputs = [ @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = [ wf-config libdrm @@ -78,11 +77,12 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "wayfire" ]; - meta = with lib; { + meta = { homepage = "https://wayfire.org/"; description = "3D Wayland compositor"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wayfire"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/plugins.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/plugins.nix index 830a918fcb..111a8c87dd 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/plugins.nix @@ -1,12 +1,11 @@ -{ newScope, wayfire }: - -let - self = with self; { - inherit wayfire; - - callPackage = newScope self; +{ lib, pkgs }: +lib.makeScope pkgs.newScope (self: + let + inherit (self) callPackage; + in { + wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; + wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; - }; -in -self + } +) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix new file mode 100644 index 0000000000..110fcfe75f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayfire +, wf-config +, gtkmm3 +, gtk-layer-shell +, libxkbcommon +, xcbutilwm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wayfire-plugins-extra"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "WayfireWM"; + repo = "wayfire-plugins-extra"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo="; + }; + + postPatch = '' + substituteInPlace metadata/meson.build \ + --replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + wayfire + wf-config + libxkbcommon + xcbutilwm + gtkmm3 + gtk-layer-shell + ]; + + mesonFlags = [ "--sysconfdir /etc" ]; + + meta = { + homepage = "https://github.com/WayfireWM/wayfire-plugins-extra"; + description = "Additional plugins for Wayfire"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rewine ]; + inherit (wayfire.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix index a677021855..48be049560 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix @@ -16,16 +16,16 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wcm"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wcm"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; + hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; }; nativeBuildInputs = [ @@ -51,11 +51,12 @@ stdenv.mkDerivation rec { "-Denable_wdisplays=false" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wcm"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix index 19435a8739..923c3930c9 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -11,15 +11,15 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; version = "0.7.1"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; + repo = "wf-config"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; }; nativeBuildInputs = [ @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix index 10e16a6573..7af794db78 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -13,16 +13,16 @@ , pulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; version = "0.7.0"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wf-shell"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; + hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; }; nativeBuildInputs = [ @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { mesonFlags = [ "--sysconfdir /etc" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-shell"; description = "GTK3-based panel for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix index e972929237..35bb3ad158 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wrapper.nix @@ -1,39 +1,32 @@ -{ runCommand, lib, makeWrapper, wayfirePlugins }: +{ symlinkJoin, lib, makeWrapper, wayfire, plugins ? [ ] }: -let - inherit (lib) escapeShellArg makeBinPath; +symlinkJoin { + name = "wayfire-wrapped-${lib.getVersion wayfire}"; - xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell"; - - makePluginPath = lib.makeLibraryPath; - makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath; -in - -application: - -choosePlugins: - -let - plugins = choosePlugins wayfirePlugins; -in - -runCommand "${application.name}-wrapped" { nativeBuildInputs = [ makeWrapper ]; - passthru = application.passthru // { - unwrapped = application; + paths = [ + wayfire + ] ++ plugins; + + postBuild = '' + for binary in $out/bin/*; do + wrapProgram $binary \ + --prefix WAYFIRE_PLUGIN_PATH : $out/lib/wayfire \ + --prefix WAYFIRE_PLUGIN_XML_PATH : $out/share/wayfire/metadata + done + ''; + + preferLocalBuild = true; + + passthru = wayfire.passthru // { + unwrapped = wayfire; }; - inherit (application) meta; -} '' - mkdir -p $out/bin - for bin in ${application}/bin/* - do - makeWrapper "$bin" $out/bin/''${bin##*/} \ - --suffix PATH : ${escapeShellArg (makeBinPath plugins)} \ - --suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \ - --suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)} - done - find ${application} -mindepth 1 -maxdepth 1 -not -name bin \ - -exec ln -s '{}' $out ';' -'' + meta = wayfire.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (wayfire.meta.priority or 0) - 1; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix index 24690eeaa4..f439833e54 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wmderlandc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, libX11, xorgproto }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "wmderlandc"; version = "unstable-2020-07-17"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98"; }; - sourceRoot = "source/ipc-client"; + sourceRoot = "${finalAttrs.src.name}/ipc-client"; nativeBuildInputs = [ cmake @@ -29,4 +29,4 @@ stdenv.mkDerivation { platforms = platforms.all; maintainers = with maintainers; [ takagiy ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index adaf80dcd9..9ed4f5886f 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -59,12 +59,12 @@ let bintoolsVersion = lib.getVersion bintools; bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools); - libc_bin = if libc == null then "" else getBin libc; - libc_dev = if libc == null then "" else getDev libc; - libc_lib = if libc == null then "" else getLib libc; - bintools_bin = if nativeTools then "" else getBin bintools; + libc_bin = lib.optionalString (libc != null) (getBin libc); + libc_dev = lib.optionalString (libc != null) (getDev libc); + libc_lib = lib.optionalString (libc != null) (getLib libc); + bintools_bin = lib.optionalString (!nativeTools) (getBin bintools); # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. - coreutils_bin = if nativeTools then "" else getBin coreutils; + coreutils_bin = lib.optionalString (!nativeTools) (getBin coreutils); # See description in cc-wrapper. suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; @@ -103,7 +103,7 @@ in stdenv.mkDerivation { pname = targetPrefix + (if name != "" then name else "${bintoolsName}-wrapper"); - version = if bintools == null then "" else bintoolsVersion; + version = lib.optionalString (bintools != null) bintoolsVersion; preferLocalBuild = true; @@ -265,7 +265,7 @@ stdenv.mkDerivation { # install the wrapper, you get tools like objdump (same for any # binaries of libc). + optionalString (!nativeTools) '' - printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages + printWords ${bintools_bin} ${lib.optionalString (libc != null) libc_bin} > $out/nix-support/propagated-user-env-packages '' ## @@ -381,7 +381,7 @@ stdenv.mkDerivation { # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = if nativeTools then "" else gnugrep; + gnugrep_bin = lib.optionalString (!nativeTools) gnugrep; wrapperName = "BINTOOLS_WRAPPER"; inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; inherit bintools_bin libc_bin libc_dev libc_lib; diff --git a/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl b/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl index ebd6026b25..975e76df05 100755 --- a/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl +++ b/third_party/nixpkgs/pkgs/build-support/buildenv/builder.pl @@ -126,7 +126,7 @@ sub findFiles { return if $relName eq "/propagated-build-inputs" || $relName eq "/nix-support" || - $relName =~ /info\/dir/ || + $relName =~ /info\/dir$/ || ( $relName =~ /^\/share\/mime\// && !( $relName =~ /^\/share\/mime\/packages/ ) ) || $baseName eq "perllocal.pod" || $baseName eq "log" || diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index db3efa068c..551074e0a2 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -75,14 +75,14 @@ let ccVersion = lib.getVersion cc; ccName = lib.removePrefix targetPrefix (lib.getName cc); - libc_bin = if libc == null then "" else getBin libc; - libc_dev = if libc == null then "" else getDev libc; - libc_lib = if libc == null then "" else getLib libc; + libc_bin = optionalString (libc != null) (getBin libc); + libc_dev = optionalString (libc != null) (getDev libc); + libc_lib = optionalString (libc != null) (getLib libc); cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. - coreutils_bin = if nativeTools then "" else getBin coreutils; + coreutils_bin = optionalString (!nativeTools) (getBin coreutils); # The "suffix salt" is a arbitrary string added in the end of env vars # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used @@ -176,7 +176,7 @@ assert nativePrefix == bintools.nativePrefix; stdenv.mkDerivation { pname = targetPrefix + (if name != "" then name else "${ccName}-wrapper"); - version = if cc == null then "" else ccVersion; + version = optionalString (cc != null) ccVersion; preferLocalBuild = true; @@ -612,10 +612,10 @@ stdenv.mkDerivation { # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = if nativeTools then "" else gnugrep; + gnugrep_bin = optionalString (!nativeTools) gnugrep; # stdenv.cc.cc should not be null and we have nothing better for now. # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again. - cc = if nativeTools then "" else cc; + cc = optionalString (!nativeTools) cc; wrapperName = "CC_WRAPPER"; inherit suffixSalt coreutils_bin bintools; inherit libc_bin libc_dev libc_lib; diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 5f48fb9f7b..b74d7885d5 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -594,7 +594,7 @@ rec { nativeBuildInputs = [ jshon pigz jq moreutils ]; # Image name must be lowercase imageName = lib.toLower name; - imageTag = if tag == null then "" else tag; + imageTag = lib.optionalString (tag != null) tag; inherit fromImage baseJson; layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; diff --git a/third_party/nixpkgs/pkgs/build-support/fetch9front/default.nix b/third_party/nixpkgs/pkgs/build-support/fetch9front/default.nix new file mode 100644 index 0000000000..677fee1dec --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/fetch9front/default.nix @@ -0,0 +1,36 @@ +{ fetchgit, fetchzip, lib }: + +lib.makeOverridable ( + { owner + , repo + , rev + , domain ? "git.9front.org" + , name ? "source" + , leaveDotGit ? false + , deepClone ? false + , ... # For hash agility + } @ args: + + let + passthruAttrs = removeAttrs args [ "domain" "owner" "repo" "rev" "leaveDotGit" "deepClone" ]; + + useFetchGit = leaveDotGit || deepClone; + fetcher = if useFetchGit then fetchgit else fetchzip; + + gitRepoUrl = "git://${domain}/${owner}/${repo}"; + + fetcherArgs = (if useFetchGit then { + # git9 does not support shallow fetches + inherit rev leaveDotGit; + url = gitRepoUrl; + } else { + url = "https://${domain}/${owner}/${repo}/${rev}/snap.tar.gz"; + + passthru = { + inherit gitRepoUrl; + }; + }) // passthruAttrs // { inherit name; }; + in + + fetcher fetcherArgs // { inherit rev; } +) diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix index 9ab57d5c05..6073efec28 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/default.nix @@ -4,14 +4,10 @@ lib.makeOverridable ( { url , rev ? null , context ? null -, md5 ? "" , sha256 ? "" , name ? "fetchdarcs" }: -if md5 != "" then - throw "fetchdarcs does not support md5 anymore, please use sha256" -else stdenvNoCC.mkDerivation { builder = ./builder.sh; nativeBuildInputs = [cacert darcs]; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix index 41eaa550ea..e07a6a1a79 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -9,7 +9,6 @@ { name , url ? null -, md5 ? "" , sha1 ? "" , sha256 ? "" , sha512 ? "" @@ -23,7 +22,7 @@ let source = if url == null then src else fetchurl { url = url; - inherit md5 sha1 sha256 sha512 hash; + inherit sha1 sha256 sha512 hash; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix index 3d73eae982..1d06ce44a9 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix @@ -11,7 +11,7 @@ in "${if matched == null then base else builtins.head matched}${appendShort}"; in lib.makeOverridable ( -{ url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone +{ url, rev ? "HEAD", sha256 ? "", hash ? "", leaveDotGit ? deepClone , fetchSubmodules ? true, deepClone ? false , branchName ? null , sparseCheckout ? [] @@ -56,9 +56,7 @@ lib.makeOverridable ( assert deepClone -> leaveDotGit; assert nonConeMode -> (sparseCheckout != []); -if md5 != "" then - throw "fetchgit does not support md5 anymore, please use sha256" -else if hash != "" && sha256 != "" then +if hash != "" && sha256 != "" then throw "Only one of sha256 or hash can be set" else if builtins.isString sparseCheckout then # Changed to throw on 2023-06-04 diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git index ae2e360080..79ab699bcc 100755 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git @@ -390,6 +390,7 @@ print_results() { "date": "$(json_escape "$commitDateStrict8601")", "path": "$(json_escape "$finalPath")", "$(json_escape "$hashType")": "$(json_escape "$hash")", + "hash": "$(nix-hash --to-sri --type $hashType $hash)", "fetchLFS": $([[ -n "$fetchLFS" ]] && echo true || echo false), "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false), "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false), diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix index faa338b672..a2498700b5 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix @@ -24,7 +24,7 @@ let position = "${position.file}:${toString position.line}"; }; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ]; - varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; + varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_"; useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != []); # We prefer fetchzip in cases we don't need submodules as the hash # is more stable in that case. diff --git a/third_party/nixpkgs/pkgs/build-support/fetchhg/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchhg/default.nix index a5817f2c30..6af886bf09 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchhg/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchhg/default.nix @@ -2,15 +2,12 @@ { name ? null , url , rev ? null -, md5 ? null , sha256 ? null , hash ? null , fetchSubrepos ? false , preferLocalBuild ? true }: -if md5 != null then - throw "fetchhg does not support md5 anymore, please use sha256 or hash" -else if hash != null && sha256 != null then +if hash != null && sha256 != null then throw "Only one of sha256 or hash can be set" else # TODO: statically check if mercurial as the https support if the url starts woth https. diff --git a/third_party/nixpkgs/pkgs/build-support/fetchpijul/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchpijul/default.nix new file mode 100644 index 0000000000..ca7e1a7926 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/fetchpijul/default.nix @@ -0,0 +1,56 @@ +{ lib, stdenvNoCC, pijul }: + +lib.makeOverridable ( +{ url +, hash ? "" +, change ? null +, state ? null +, channel ? "main" +, name ? "fetchpijul" +, # TODO: Changes in pijul are unordered so there's many ways to end up with the same repository state. + # This makes leaveDotPijul unfeasible to implement until pijul CLI implements + # a way of reordering changes to sort them in a consistent and deterministic manner. + # leaveDotPijul ? false +}: +if change != null && state != null then + throw "Only one of 'change' or 'state' can be set" +else + stdenvNoCC.mkDerivation { + inherit name; + nativeBuildInputs = [ pijul ]; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + pijul clone \ + ''${change:+--change "$change"} \ + ''${state:+--state "$state"} \ + --channel "$channel" \ + "$url" \ + "$out" + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + rm -rf "$out/.pijul" + + runHook postFixup + ''; + + outputHashAlgo = if hash != "" then null else "sha256"; + outputHashMode = "recursive"; + outputHash = if hash != "" then + hash + else + lib.fakeSha256; + + inherit url change state channel; + } +) diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsvn/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchsvn/default.nix index 82dececc12..41752eb55a 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsvn/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchsvn/default.nix @@ -2,7 +2,7 @@ , subversion, glibcLocales, sshSupport ? true, openssh ? null }: -{ url, rev ? "HEAD", md5 ? "", sha256 ? "" +{ url, rev ? "HEAD", sha256 ? "", hash ? "" , ignoreExternals ? false, ignoreKeywords ? false, name ? null , preferLocalBuild ? true }: @@ -32,8 +32,8 @@ let name_ = if name == null then "${repoName}-r${toString rev}" else name; in -if md5 != "" then - throw "fetchsvn does not support md5 anymore, please use sha256" +if hash != "" && sha256 != "" then + throw "Only one of sha256 or hash can be set" else stdenvNoCC.mkDerivation { name = name_; @@ -43,9 +43,14 @@ stdenvNoCC.mkDerivation { SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; - outputHashAlgo = "sha256"; + outputHashAlgo = if hash != "" then null else "sha256"; outputHashMode = "recursive"; - outputHash = sha256; + outputHash = if hash != "" then + hash + else if sha256 != "" then + sha256 + else + lib.fakeSha256; inherit url rev ignoreExternals ignoreKeywords; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/default.nix index fbd74efd75..ef72de61fe 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/default.nix @@ -1,10 +1,7 @@ {stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: -{username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: +{username, password, url, rev ? "HEAD", sha256 ? ""}: -if md5 != "" then - throw "fetchsvnssh does not support md5 anymore, please use sha256" -else stdenvNoCC.mkDerivation { name = "svn-export-ssh"; builder = ./builder.sh; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix index 28d2519f42..bcab54e273 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/default.nix @@ -67,7 +67,6 @@ in , # Legacy ways of specifying the hash. outputHash ? "" , outputHashAlgo ? "" -, md5 ? "" , sha1 ? "" , sha256 ? "" , sha512 ? "" @@ -125,7 +124,6 @@ let if hash != "" && sha256 != "" then throw "multiple hashes passed to fetchurl" else if hash != "" then { outputHashAlgo = null; outputHash = hash; } - else if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512" else if (outputHash != "" && outputHashAlgo != "") then { inherit outputHashAlgo outputHash; } else if sha512 != "" then { outputHashAlgo = "sha512"; outputHash = sha512; } else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } diff --git a/third_party/nixpkgs/pkgs/build-support/go/module.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix index 61abd040a4..6c2284a7a9 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/module.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix @@ -6,7 +6,7 @@ , passthru ? { } , patches ? [ ] - # A function to override the go-modules derivation + # A function to override the goModules derivation , overrideModAttrs ? (_oldAttrs: { }) # path to go.mod and go.sum directory @@ -52,7 +52,7 @@ assert (args' ? vendorHash && args' ? vendorSha256) -> throw "both `vendorHash` let args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ]; - go-modules = if (vendorHash == null) then "" else + goModules = if (vendorHash == null) then "" else (stdenv.mkDerivation { name = "${name}-go-modules"; @@ -163,10 +163,10 @@ let cd "$modRoot" '' + lib.optionalString (vendorHash != null) '' ${if proxyVendor then '' - export GOPROXY=file://${go-modules} + export GOPROXY=file://${goModules} '' else '' rm -rf vendor - cp -r --reflink=auto ${go-modules} vendor + cp -r --reflink=auto ${goModules} vendor ''} '' + '' @@ -288,7 +288,7 @@ let disallowedReferences = lib.optional (!allowGoReference) go; - passthru = passthru // { inherit go go-modules vendorHash; } // { inherit (args') vendorSha256; }; + passthru = passthru // { inherit go goModules vendorHash; } // { inherit (args') vendorSha256; }; meta = { # Add default meta information diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix index f3cf3d59f9..2418838176 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix @@ -72,7 +72,7 @@ in ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression; passAsFile = ["contents"]; - contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n"; + contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${lib.optionalString (symlink != null) symlink}") contents + "\n"; nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; diff --git a/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix b/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix index f8e673a2a7..c047bfc7d9 100644 --- a/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/nix-gitignore/default.nix @@ -66,7 +66,7 @@ in rec { handleSlashPrefix = l: let split = (match "^(/?)(.*)" l); - findSlash = l: if (match ".+/.+" l) != null then "" else l; + findSlash = l: lib.optionalString ((match ".+/.+" l) == null) l; hasSlash = mapAroundCharclass findSlash l != l; in (if (elemAt split 0) == "/" || hasSlash diff --git a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix index 357a0bd073..0a988cbbaf 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix @@ -57,7 +57,5 @@ stdenv.mkDerivation (args // { # Stripping takes way too long with the amount of files required by a typical Node.js project. dontStrip = args.dontStrip or true; - passthru = { inherit npmDeps; } // (args.passthru or { }); - meta = (args.meta or { }) // { platforms = args.meta.platforms or nodejs.meta.platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/default.nix b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/default.nix index f3b5a6bd16..d95b1078c1 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -6,6 +6,8 @@ let sha512 = "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; + tests = callPackage ./tests {}; + in { prefetch-yarn-deps = stdenv.mkDerivation { name = "prefetch-yarn-deps"; @@ -38,6 +40,8 @@ in { runHook postInstall ''; + + passthru = { inherit tests; }; }; fetchYarnDeps = let @@ -75,6 +79,6 @@ in { } // hash_ // (removeAttrs args ["src" "name" "hash" "sha256"])); in lib.setFunctionArgs f (lib.functionArgs f) // { - tests = callPackage ./tests {}; + inherit tests; }; } diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/index.js b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/index.js index 9f95e16970..04f47362b1 100755 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -22,7 +22,14 @@ const exec = async (...args) => { const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { return new Promise((resolve, reject) => { - https.get(url, (res) => { + const get = (url, redirects = 0) => https.get(url, (res) => { + if(redirects > 10) { + reject('Too many redirects!'); + return; + } + if(res.statusCode === 301 || res.statusCode === 302) { + return get(res.headers.location, redirects + 1) + } const file = fs.createWriteStream(fileName) const hash = crypto.createHash(hashType) res.pipe(file) @@ -35,6 +42,7 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { }) res.on('error', e => reject(e)) }) + get(url) }) } @@ -78,12 +86,21 @@ const isGitUrl = pattern => { } const downloadPkg = (pkg, verbose) => { + const [ name, spec ] = pkg.key.split('@', 2); + if (spec.startsWith('file:')) { + console.info(`ignoring relative file:path dependency "${spec}"`) + return + } + const [ url, hash ] = pkg.resolved.split('#') if (verbose) console.log('downloading ' + url) const fileName = urlToName(url) if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) { const s = url.split('/') - downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[6]) + return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1]) + } else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz')) { + const s = url.split('/') + return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, '')) } else if (isGitUrl(url)) { return downloadGit(fileName, url.replace(/^git\+/, ''), hash) } else if (url.startsWith('https://')) { diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix index 19451466f2..8ffe103a95 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix @@ -3,14 +3,18 @@ { simple = testers.invalidateFetcherByDrvHash fetchYarnDeps { yarnLock = ./simple.lock; - sha256 = "sha256-Erdkw2E8wWT09jFNLXGkrdwKl0HuSZWnUDJUrV95vSE="; + sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8="; }; gitDep = testers.invalidateFetcherByDrvHash fetchYarnDeps { yarnLock = ./git.lock; - sha256 = "sha256-lAqN4LpoE+jgsQO1nDtuORwcVEO7ogEV53jCu2jFJUI="; + sha256 = "sha256-f90IiEzHDiBdswWewRBHcJfqqpPipaMg8N0DVLq2e8Q="; }; githubDep = testers.invalidateFetcherByDrvHash fetchYarnDeps { yarnLock = ./github.lock; - sha256 = "sha256-Tsfgyjxz8x6gNmfN0xR7G/NQNoEs4svxRN/N+26vfJU="; + sha256 = "sha256-DIKrhDKoqm7tHZmcuh9eK9VTqp6BxeW0zqDUpY4F57A="; + }; + gitUrlDep = testers.invalidateFetcherByDrvHash fetchYarnDeps { + yarnLock = ./giturl.lock; + sha256 = "sha256-VPnyqN6lePQZGXwR7VhbFnP7/0/LB621RZwT1F+KzVQ="; }; } diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/giturl.lock b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/giturl.lock new file mode 100644 index 0000000000..154030a7e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/tests/giturl.lock @@ -0,0 +1,11 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"autocomplete-atom-api@https://codeload.github.com/atom/autocomplete-atom-api/legacy.tar.gz/refs/tags/v0.10.7": + version "0.10.7" + resolved "https://codeload.github.com/atom/autocomplete-atom-api/legacy.tar.gz/refs/tags/v0.10.7#c9d51fa721d543ccfc1b2189101155e81db6b97d" + +"find-and-replace@https://github.com/atom-community/find-and-replace/archive/refs/tags/v0.220.1.tar.gz": + version "0.220.1" + resolved "https://github.com/atom-community/find-and-replace/archive/refs/tags/v0.220.1.tar.gz#d7a0f56511e38ee72a89895a795bbbcab4a1a405" diff --git a/third_party/nixpkgs/pkgs/build-support/release/default.nix b/third_party/nixpkgs/pkgs/build-support/release/default.nix index ee414ea328..d09f6c8568 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/default.nix @@ -5,7 +5,7 @@ with pkgs; rec { sourceTarball = args: import ./source-tarball.nix ( - { inherit stdenv autoconf automake libtool; + { inherit lib stdenv autoconf automake libtool; } // args); makeSourceTarball = sourceTarball; # compatibility diff --git a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix index 583831d482..348cd5b834 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix @@ -154,8 +154,8 @@ stdenv.mkDerivation ( // - (if buildOutOfSourceTree - then { + (lib.optionalAttrs buildOutOfSourceTree + { preConfigure = # Build out of source tree and make the source tree read-only. This # helps catch violations of the GNU Coding Standards (info @@ -170,5 +170,5 @@ stdenv.mkDerivation ( ${lib.optionalString (preConfigure != null) preConfigure} ''; } - else {}) + ) ) diff --git a/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix b/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix index d624d071cc..fbc8bc6b25 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix @@ -10,7 +10,7 @@ if officialRelease then "" else "pre${toString (src.rev or src.revCount or "")}" -, src, stdenv, autoconf, automake, libtool +, src, lib, stdenv, autoconf, automake, libtool , # By default, provide all the GNU Build System as input. bootstrapBuildInputs ? [ autoconf automake libtool ] , ... } @ args: @@ -73,7 +73,7 @@ stdenv.mkDerivation ( } # Then, the caller-supplied attributes. - // args // + // (builtins.removeAttrs args [ "lib" ]) // # And finally, our own stuff. { @@ -117,7 +117,7 @@ stdenv.mkDerivation ( version = version + versionSuffix; }; - meta = (if args ? meta then args.meta else {}) // { + meta = (lib.optionalAttrs (args ? meta) args.meta) // { description = "Source distribution"; # Tarball builds are generally important, so give them a high diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 5168eb6ab7..60310f1787 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -21,7 +21,7 @@ , verbose , workspace_member }: let version_ = lib.splitString "-" crateVersion; - versionPre = if lib.tail version_ == [] then "" else lib.elemAt version_ 1; + versionPre = lib.optionalString (lib.tail version_ != []) (lib.elemAt version_ 1); version = lib.splitVersion (lib.head version_); rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix index 9099a38b75..d095974513 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix @@ -242,7 +242,11 @@ rec { */ - writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; + writeScriptBin = name: text: writeTextFile { + inherit name text; + executable = true; + destination = "/bin/${name}"; + }; /* Similar to writeScript. Writes a Shell script and checks its syntax. @@ -374,6 +378,9 @@ rec { # Pointless to do this on a remote machine. preferLocalBuild = true; allowSubstitutes = false; + meta = { + mainProgram = name; + }; } '' n=$out/bin/$name diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix new file mode 100644 index 0000000000..683f4b9fd0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix @@ -0,0 +1,33 @@ +/* + Run all tests with: + + cd nixpkgs + nix-build -A tests.trivial-builders + + or run a specific test with: + + cd nixpkgs + nix-build -A tests.trivial-builders.foo + +*/ + +{ callPackage, lib, stdenv }: +let + inherit (lib) recurseIntoAttrs; +in +recurseIntoAttrs { + concat = callPackage ./concat-test.nix {}; + linkFarm = callPackage ./link-farm.nix {}; + overriding = callPackage ../test-overriding.nix {}; + references = + # VM test not supported beyond linux yet + if stdenv.hostPlatform.isLinux + then callPackage ./references.nix {} + else null; + writeCBin = callPackage ./writeCBin.nix {}; + writeScriptBin = callPackage ./writeScriptBin.nix {}; + writeShellScript = callPackage ./write-shell-script.nix {}; + writeShellScriptBin = callPackage ./writeShellScriptBin.nix {}; + writeStringReferencesToFile = callPackage ./writeStringReferencesToFile.nix {}; + writeTextFile = callPackage ./write-text-file.nix {}; +} diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/write-text-file.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/write-text-file.nix index ac83a75fca..2e6685c198 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/write-text-file.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/write-text-file.nix @@ -1,34 +1,71 @@ -{ writeTextFile }: +/* + To run: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeTextFile + + or to run an individual test case + + cd nixpkgs + nix-build -A tests.trivial-builders.writeTextFile.foo +*/ +{ lib, runCommand, runtimeShell, writeTextFile }: let veryWeirdName = ''here's a name with some "bad" characters, like spaces and quotes''; -in writeTextFile { - name = "weird-names"; - destination = "/etc/${veryWeirdName}"; - text = ''passed!''; - checkPhase = '' - # intentionally hardcode everything here, to make sure - # Nix does not mess with file paths +in +lib.recurseIntoAttrs { - name="here's a name with some \"bad\" characters, like spaces and quotes" - fullPath="$out/etc/$name" + different-exe-name = + let + pkg = writeTextFile { + name = "bar"; + destination = "/bin/foo"; + executable = true; + text = '' + #!${runtimeShell} + echo hi + ''; + }; + in + assert pkg.meta.mainProgram == "foo"; + assert baseNameOf (lib.getExe pkg) == "foo"; + assert pkg.name == "bar"; + runCommand "test-writeTextFile-different-exe-name" {} '' + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + x=$(foo) + [[ "$x" == hi ]] + touch $out + ''; - if [ -f "$fullPath" ]; then - echo "[PASS] File exists!" - else - echo "[FAIL] File was not created at expected path!" - exit 1 - fi + weird-name = writeTextFile { + name = "weird-names"; + destination = "/etc/${veryWeirdName}"; + text = ''passed!''; + checkPhase = '' + # intentionally hardcode everything here, to make sure + # Nix does not mess with file paths - content=$(<"$fullPath") - expected="passed!" + name="here's a name with some \"bad\" characters, like spaces and quotes" + fullPath="$out/etc/$name" - if [ "$content" = "$expected" ]; then - echo "[PASS] Contents match!" - else - echo "[FAIL] File contents don't match!" - echo " Expected: $expected" - echo " Got: $content" - exit 2 - fi - ''; + if [ -f "$fullPath" ]; then + echo "[PASS] File exists!" + else + echo "[FAIL] File was not created at expected path!" + exit 1 + fi + + content=$(<"$fullPath") + expected="passed!" + + if [ "$content" = "$expected" ]; then + echo "[PASS] Contents match!" + else + echo "[FAIL] File contents don't match!" + echo " Expected: $expected" + echo " Got: $content" + exit 2 + fi + ''; + }; } diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeCBin.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeCBin.nix new file mode 100644 index 0000000000..56cab45b38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeCBin.nix @@ -0,0 +1,43 @@ +/* + Run with: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeCBin +*/ + +{ lib, writeCBin, runCommand }: +let + output = "hello"; + pkg = writeCBin "test-script" '' + #include + int main () { + printf("hello\n"); + return 0; + } + ''; +in + assert pkg.meta.mainProgram == "test-script"; + runCommand "test-writeCBin" { } '' + + echo Testing with getExe... + + target=${lib.getExe pkg} + expected=${lib.escapeShellArg output} + got=$("$target") + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + echo Testing with makeBinPath... + + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + got=$(test-script) + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + touch $out + '' + diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeScriptBin.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeScriptBin.nix new file mode 100644 index 0000000000..1487443130 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeScriptBin.nix @@ -0,0 +1,39 @@ +/* + Run with: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeShellScriptBin +*/ + +{ lib, writeScriptBin, runCommand }: +let + output = "hello"; + pkg = writeScriptBin "test-script" '' + echo ${lib.escapeShellArg output} + ''; +in + assert pkg.meta.mainProgram == "test-script"; + runCommand "test-writeScriptBin" { } '' + + echo Testing with getExe... + + target=${lib.getExe pkg} + expected=${lib.escapeShellArg output} + got=$("$target") + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + echo Testing with makeBinPath... + + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + got=$(test-script) + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + touch $out + '' + diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeShellScriptBin.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeShellScriptBin.nix new file mode 100644 index 0000000000..e93410e25b --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeShellScriptBin.nix @@ -0,0 +1,39 @@ +/* + Run with: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeShellScriptBin +*/ + +{ lib, writeShellScriptBin, runCommand }: +let + output = "hello"; + pkg = writeShellScriptBin "test-script" '' + echo ${lib.escapeShellArg output} + ''; +in + assert pkg.meta.mainProgram == "test-script"; + runCommand "test-writeShellScriptBin" { } '' + + echo Testing with getExe... + + target=${lib.getExe pkg} + expected=${lib.escapeShellArg output} + got=$("$target") + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + echo Testing with makeBinPath... + + PATH="${lib.makeBinPath [ pkg ]}:$PATH" + got=$(test-script) + if [[ "$got" != "$expected" ]]; then + echo "wrong output: expected $expected, got $got" + exit 1 + fi + + touch $out + '' + diff --git a/third_party/nixpkgs/pkgs/build-support/vm/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/default.nix index 5cc107d2c4..f6baa42348 100644 --- a/third_party/nixpkgs/pkgs/build-support/vm/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/vm/default.nix @@ -468,7 +468,7 @@ rec { echo "installing RPMs..." PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ - rpm -iv --nosignature ${if runScripts then "" else "--noscripts"} $rpms + rpm -iv --nosignature ${lib.optionalString (!runScripts) "--noscripts"} $rpms echo "running post-install script..." eval "$postInstall" diff --git a/third_party/nixpkgs/pkgs/build-support/writers/data.nix b/third_party/nixpkgs/pkgs/build-support/writers/data.nix new file mode 100644 index 0000000000..48f9bc547e --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/writers/data.nix @@ -0,0 +1,80 @@ +{ lib, runCommand, dasel }: +let + daselBin = lib.getExe dasel; + + inherit (lib) + last + optionalString + types + ; +in +rec { + # Creates a transformer function that writes input data to disk, transformed + # by both the `input` and `output` arguments. + # + # Type: makeDataWriter :: input -> output -> nameOrPath -> data -> (any -> string) -> string -> string -> any -> derivation + # + # input :: T -> string: function that takes the nix data and returns a string + # output :: string: script that takes the $inputFile and write the result into $out + # nameOrPath :: string: if the name contains a / the files gets written to a sub-folder of $out. The derivation name is the basename of this argument. + # data :: T: the data that will be converted. + # + # Example: + # writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; }; + # myConfig = writeJSON "config.json" { hello = "world"; } + # + makeDataWriter = { input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data: + assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); + let + name = last (builtins.split "/" nameOrPath); + in + runCommand name + { + input = input data; + passAsFile = [ "input" ]; + } '' + ${output} + + ${optionalString (types.path.check nameOrPath) '' + mv $out tmp + mkdir -p $out/$(dirname "${nameOrPath}") + mv tmp $out/${nameOrPath} + ''} + ''; + + # Writes the content to text. + # + # Example: + # writeText "filename.txt" "file content" + writeText = makeDataWriter { + input = toString; + output = "cp $inputPath $out"; + }; + + # Writes the content to a JSON file. + # + # Example: + # writeJSON "data.json" { hello = "world"; } + writeJSON = makeDataWriter { + input = builtins.toJSON; + output = "${daselBin} -f $inputPath -r json -w json > $out"; + }; + + # Writes the content to a TOML file. + # + # Example: + # writeTOML "data.toml" { hello = "world"; } + writeTOML = makeDataWriter { + input = builtins.toJSON; + output = "${daselBin} -f $inputPath -r json -w toml > $out"; + }; + + # Writes the content to a YAML file. + # + # Example: + # writeYAML "data.yaml" { hello = "world"; } + writeYAML = makeDataWriter { + input = builtins.toJSON; + output = "${daselBin} -f $inputPath -r json -w yaml > $out"; + }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/writers/default.nix b/third_party/nixpkgs/pkgs/build-support/writers/default.nix index 3016a45b8a..a161322cd3 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/default.nix @@ -1,367 +1,14 @@ -{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: +{ config, lib, callPackages }: let aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {}; - writers = with lib; rec { - # Base implementation for non-compiled executables. - # Takes an interpreter, for example `${pkgs.bash}/bin/bash` - # - # Examples: - # writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; } - # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world" - makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content: - assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); - assert lib.or (types.path.check content) (types.str.check content); - let - name = last (builtins.split "/" nameOrPath); - in + # Writers for JSON-like data structures + dataWriters = callPackages ./data.nix { }; - pkgs.runCommandLocal name (if (types.str.check content) then { - inherit content interpreter; - passAsFile = [ "content" ]; - } else { - inherit interpreter; - contentPath = content; - }) '' - # On darwin a script cannot be used as an interpreter in a shebang but - # there doesn't seem to be a limit to the size of shebang and multiple - # arguments to the interpreter are allowed. - if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter - then - wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) - # Get first word from the line (note: xargs echo remove leading spaces) - wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1) + # Writers for scripts + scriptWriters = callPackages ./scripts.nix { }; - if isScript $wrapperInterpreter - then - echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported." - exit 1 - fi - - # This should work as long as wrapperInterpreter is a shell, which is - # the case for programs wrapped with makeWrapper, like - # python3.withPackages etc. - interpreterLine="$wrapperInterpreterLine $interpreter" - else - interpreterLine=$interpreter - fi - - echo "#! $interpreterLine" > $out - cat "$contentPath" >> $out - ${optionalString (check != "") '' - ${check} $out - ''} - chmod +x $out - ${optionalString (types.path.check nameOrPath) '' - mv $out tmp - mkdir -p $out/$(dirname "${nameOrPath}") - mv tmp $out/${nameOrPath} - ''} - ''; - - # Base implementation for compiled executables. - # Takes a compile script, which in turn takes the name as an argument. - # - # Examples: - # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } - makeBinWriter = { compileScript, strip ? true }: nameOrPath: content: - assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); - assert lib.or (types.path.check content) (types.str.check content); - let - name = last (builtins.split "/" nameOrPath); - in - pkgs.runCommand name ((if (types.str.check content) then { - inherit content; - passAsFile = [ "content" ]; - } else { - contentPath = content; - }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { - # post-link-hook expects codesign_allocate to be in PATH - # https://github.com/NixOS/nixpkgs/issues/154203 - # https://github.com/NixOS/nixpkgs/issues/148189 - nativeBuildInputs = [ stdenv.cc.bintools ]; - }) '' - ${compileScript} - ${lib.optionalString strip - "${lib.getBin buildPackages.bintools-unwrapped}/bin/${buildPackages.bintools-unwrapped.targetPrefix}strip -S $out"} - # Sometimes binaries produced for darwin (e. g. by GHC) won't be valid - # mach-o executables from the get-go, but need to be corrected somehow - # which is done by fixupPhase. - ${lib.optionalString pkgs.stdenvNoCC.hostPlatform.isDarwin "fixupPhase"} - ${optionalString (types.path.check nameOrPath) '' - mv $out tmp - mkdir -p $out/$(dirname "${nameOrPath}") - mv tmp $out/${nameOrPath} - ''} - ''; - - # Like writeScript but the first line is a shebang to bash - # - # Example: - # writeBash "example" '' - # echo hello world - # '' - writeBash = makeScriptWriter { - interpreter = "${pkgs.bash}/bin/bash"; - }; - - # Like writeScriptBin but the first line is a shebang to bash - writeBashBin = name: - writeBash "/bin/${name}"; - - # Like writeScript but the first line is a shebang to dash - # - # Example: - # writeDash "example" '' - # echo hello world - # '' - writeDash = makeScriptWriter { - interpreter = "${pkgs.dash}/bin/dash"; - }; - - # Like writeScriptBin but the first line is a shebang to dash - writeDashBin = name: - writeDash "/bin/${name}"; - - # Like writeScript but the first line is a shebang to fish - # - # Example: - # writeFish "example" '' - # echo hello world - # '' - writeFish = makeScriptWriter { - interpreter = "${pkgs.fish}/bin/fish --no-config"; - check = "${pkgs.fish}/bin/fish --no-config --no-execute"; # syntax check only - }; - - # Like writeScriptBin but the first line is a shebang to fish - writeFishBin = name: - writeFish "/bin/${name}"; - - # writeHaskell takes a name, an attrset with libraries and haskell version (both optional) - # and some haskell source code and returns an executable. - # - # Example: - # writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } '' - # import Acme.Missiles - # - # main = launchMissiles - # ''; - writeHaskell = name: { - libraries ? [], - ghc ? pkgs.ghc, - ghcArgs ? [], - threadedRuntime ? true, - strip ? true - }: - let - appendIfNotSet = el: list: if elem el list then list else list ++ [ el ]; - ghcArgs' = if threadedRuntime then appendIfNotSet "-threaded" ghcArgs else ghcArgs; - - in makeBinWriter { - compileScript = '' - cp $contentPath tmp.hs - ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs - mv tmp $out - ''; - inherit strip; - } name; - - # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) - writeHaskellBin = name: - writeHaskell "/bin/${name}"; - - writeRust = name: { - rustc ? pkgs.rustc, - rustcArgs ? [], - strip ? true - }: - let - darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; - in - makeBinWriter { - compileScript = '' - cp "$contentPath" tmp.rs - PATH=${makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} ${lib.escapeShellArgs darwinArgs} -o "$out" tmp.rs - ''; - inherit strip; - } name; - - writeRustBin = name: - writeRust "/bin/${name}"; - - # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and - # returns an executable - # - # Example: - # writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } '' - # var UglifyJS = require("uglify-js"); - # var code = "function add(first, second) { return first + second; }"; - # var result = UglifyJS.minify(code); - # console.log(result.code); - # '' - writeJS = name: { libraries ? [] }: content: - let - node-env = pkgs.buildEnv { - name = "node"; - paths = libraries; - pathsToLink = [ - "/lib/node_modules" - ]; - }; - in writeDash name '' - export NODE_PATH=${node-env}/lib/node_modules - exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content} "$@" - ''; - - # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin) - writeJSBin = name: - writeJS "/bin/${name}"; - - awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" '' - awk -f - {sub(/^[ \t]+/,"");idx=0} - /\{/{ctx++;idx=1} - /\}/{ctx--} - {id="";for(i=idx;i $out - gixy $out - ''; - - # writePerl takes a name an attributeset with libraries and some perl sourcecode and - # returns an executable - # - # Example: - # writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } '' - # use boolean; - # print "Howdy!\n" if true; - # '' - writePerl = name: { libraries ? [] }: - makeScriptWriter { - interpreter = "${pkgs.perl.withPackages (p: libraries)}/bin/perl"; - } name; - - # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) - writePerlBin = name: - writePerl "/bin/${name}"; - - # makePythonWriter takes python and compatible pythonPackages and produces python script writer, - # which validates the script with flake8 at build time. If any libraries are specified, - # python.withPackages is used as interpreter, otherwise the "bare" python is used. - makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [] }: - let - ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}"; - in - makeScriptWriter { - interpreter = - if libraries == [] - then python.interpreter - else (python.withPackages (ps: libraries)).interpreter - ; - check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' - exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" - ''); - } name; - - # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and - # returns an executable - # - # Example: - # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } '' - # from enum import Enum - # - # class Test(Enum): - # a = "success" - # - # print Test.a - # '' - writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages buildPackages.pypy2Packages; - - # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin) - writePyPy2Bin = name: - writePyPy2 "/bin/${name}"; - - # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and - # returns an executable - # - # Example: - # writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } '' - # import yaml - # - # y = yaml.load(""" - # - test: success - # """) - # print(y[0]['test']) - # '' - writePython3 = makePythonWriter pkgs.python3 pkgs.python3Packages buildPackages.python3Packages; - - # writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin) - writePython3Bin = name: - writePython3 "/bin/${name}"; - - # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and - # returns an executable - # - # Example: - # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } '' - # import yaml - # - # y = yaml.load(""" - # - test: success - # """) - # print(y[0]['test']) - # '' - writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages buildPackages.pypy3Packages; - - # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin) - writePyPy3Bin = name: - writePyPy3 "/bin/${name}"; - - - makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [] }: nameOrPath: - let - fname = last (builtins.split "/" nameOrPath); - path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx"; - _nugetDeps = mkNugetDeps { name = "${fname}-nuget-deps"; nugetDeps = libraries; }; - - nuget-source = mkNugetSource { - name = "${fname}-nuget-source"; - description = "A Nuget source with the dependencies for ${fname}"; - deps = [ _nugetDeps ]; - }; - - fsi = writeBash "fsi" '' - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - script="$1"; shift - ${dotnet-sdk}/bin/dotnet fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script" - ''; - - in content: writers.makeScriptWriter { - interpreter = fsi; - } path - '' - #i "nuget: ${nuget-source}/lib" - ${ content } - exit 0 - ''; - - writeFSharp = - makeFSharpWriter {}; - - writeFSharpBin = name: - writeFSharp "/bin/${name}"; - -}; + writers = scriptWriters // dataWriters; in writers // (aliases writers) diff --git a/third_party/nixpkgs/pkgs/build-support/writers/scripts.nix b/third_party/nixpkgs/pkgs/build-support/writers/scripts.nix new file mode 100644 index 0000000000..c43f10f0a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/writers/scripts.nix @@ -0,0 +1,384 @@ +{ pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: +let + inherit (lib) + concatMapStringsSep + elem + escapeShellArg + last + optionalString + stringLength + strings + types + ; +in +rec { + # Base implementation for non-compiled executables. + # Takes an interpreter, for example `${pkgs.bash}/bin/bash` + # + # Examples: + # writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; } + # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world" + makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content: + assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); + assert lib.or (types.path.check content) (types.str.check content); + let + name = last (builtins.split "/" nameOrPath); + in + + pkgs.runCommandLocal name ( + lib.optionalAttrs (nameOrPath == "/bin/${name}") { + meta.mainProgram = name; + } + // ( + if (types.str.check content) then { + inherit content interpreter; + passAsFile = [ "content" ]; + } else { + inherit interpreter; + contentPath = content; + } + ) + ) + '' + # On darwin a script cannot be used as an interpreter in a shebang but + # there doesn't seem to be a limit to the size of shebang and multiple + # arguments to the interpreter are allowed. + if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter + then + wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) + # Get first word from the line (note: xargs echo remove leading spaces) + wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1) + + if isScript $wrapperInterpreter + then + echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported." + exit 1 + fi + + # This should work as long as wrapperInterpreter is a shell, which is + # the case for programs wrapped with makeWrapper, like + # python3.withPackages etc. + interpreterLine="$wrapperInterpreterLine $interpreter" + else + interpreterLine=$interpreter + fi + + echo "#! $interpreterLine" > $out + cat "$contentPath" >> $out + ${optionalString (check != "") '' + ${check} $out + ''} + chmod +x $out + ${optionalString (types.path.check nameOrPath) '' + mv $out tmp + mkdir -p $out/$(dirname "${nameOrPath}") + mv tmp $out/${nameOrPath} + ''} + ''; + + # Base implementation for compiled executables. + # Takes a compile script, which in turn takes the name as an argument. + # + # Examples: + # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } + makeBinWriter = { compileScript, strip ? true }: nameOrPath: content: + assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); + assert lib.or (types.path.check content) (types.str.check content); + let + name = last (builtins.split "/" nameOrPath); + in + pkgs.runCommand name ((if (types.str.check content) then { + inherit content; + passAsFile = [ "content" ]; + } else { + contentPath = content; + }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { + # post-link-hook expects codesign_allocate to be in PATH + # https://github.com/NixOS/nixpkgs/issues/154203 + # https://github.com/NixOS/nixpkgs/issues/148189 + nativeBuildInputs = [ stdenv.cc.bintools ]; + } // lib.optionalAttrs (nameOrPath == "/bin/${name}") { + meta.mainProgram = name; + }) '' + ${compileScript} + ${lib.optionalString strip + "${lib.getBin buildPackages.bintools-unwrapped}/bin/${buildPackages.bintools-unwrapped.targetPrefix}strip -S $out"} + # Sometimes binaries produced for darwin (e. g. by GHC) won't be valid + # mach-o executables from the get-go, but need to be corrected somehow + # which is done by fixupPhase. + ${lib.optionalString pkgs.stdenvNoCC.hostPlatform.isDarwin "fixupPhase"} + ${optionalString (types.path.check nameOrPath) '' + mv $out tmp + mkdir -p $out/$(dirname "${nameOrPath}") + mv tmp $out/${nameOrPath} + ''} + ''; + + # Like writeScript but the first line is a shebang to bash + # + # Example: + # writeBash "example" '' + # echo hello world + # '' + writeBash = makeScriptWriter { + interpreter = "${pkgs.bash}/bin/bash"; + }; + + # Like writeScriptBin but the first line is a shebang to bash + writeBashBin = name: + writeBash "/bin/${name}"; + + # Like writeScript but the first line is a shebang to dash + # + # Example: + # writeDash "example" '' + # echo hello world + # '' + writeDash = makeScriptWriter { + interpreter = "${pkgs.dash}/bin/dash"; + }; + + # Like writeScriptBin but the first line is a shebang to dash + writeDashBin = name: + writeDash "/bin/${name}"; + + # Like writeScript but the first line is a shebang to fish + # + # Example: + # writeFish "example" '' + # echo hello world + # '' + writeFish = makeScriptWriter { + interpreter = "${pkgs.fish}/bin/fish --no-config"; + check = "${pkgs.fish}/bin/fish --no-config --no-execute"; # syntax check only + }; + + # Like writeScriptBin but the first line is a shebang to fish + writeFishBin = name: + writeFish "/bin/${name}"; + + # writeHaskell takes a name, an attrset with libraries and haskell version (both optional) + # and some haskell source code and returns an executable. + # + # Example: + # writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } '' + # import Acme.Missiles + # + # main = launchMissiles + # ''; + writeHaskell = name: { + libraries ? [], + ghc ? pkgs.ghc, + ghcArgs ? [], + threadedRuntime ? true, + strip ? true + }: + let + appendIfNotSet = el: list: if elem el list then list else list ++ [ el ]; + ghcArgs' = if threadedRuntime then appendIfNotSet "-threaded" ghcArgs else ghcArgs; + + in makeBinWriter { + compileScript = '' + cp $contentPath tmp.hs + ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs + mv tmp $out + ''; + inherit strip; + } name; + + # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) + writeHaskellBin = name: + writeHaskell "/bin/${name}"; + + writeRust = name: { + rustc ? pkgs.rustc, + rustcArgs ? [], + strip ? true + }: + let + darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; + in + makeBinWriter { + compileScript = '' + cp "$contentPath" tmp.rs + PATH=${lib.makeBinPath [pkgs.gcc]} ${lib.getBin rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} ${lib.escapeShellArgs darwinArgs} -o "$out" tmp.rs + ''; + inherit strip; + } name; + + writeRustBin = name: + writeRust "/bin/${name}"; + + # writeJS takes a name an attributeset with libraries and some JavaScript sourcecode and + # returns an executable + # + # Example: + # writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } '' + # var UglifyJS = require("uglify-js"); + # var code = "function add(first, second) { return first + second; }"; + # var result = UglifyJS.minify(code); + # console.log(result.code); + # '' + writeJS = name: { libraries ? [] }: content: + let + node-env = pkgs.buildEnv { + name = "node"; + paths = libraries; + pathsToLink = [ + "/lib/node_modules" + ]; + }; + in writeDash name '' + export NODE_PATH=${node-env}/lib/node_modules + exec ${pkgs.nodejs}/bin/node ${pkgs.writeText "js" content} "$@" + ''; + + # writeJSBin takes the same arguments as writeJS but outputs a directory (like writeScriptBin) + writeJSBin = name: + writeJS "/bin/${name}"; + + awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" '' + awk -f + {sub(/^[ \t]+/,"");idx=0} + /\{/{ctx++;idx=1} + /\}/{ctx--} + {id="";for(i=idx;i $out + gixy $out + ''; + + # writePerl takes a name an attributeset with libraries and some perl sourcecode and + # returns an executable + # + # Example: + # writePerl "example" { libraries = [ pkgs.perlPackages.boolean ]; } '' + # use boolean; + # print "Howdy!\n" if true; + # '' + writePerl = name: { libraries ? [] }: + makeScriptWriter { + interpreter = "${pkgs.perl.withPackages (p: libraries)}/bin/perl"; + } name; + + # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) + writePerlBin = name: + writePerl "/bin/${name}"; + + # makePythonWriter takes python and compatible pythonPackages and produces python script writer, + # which validates the script with flake8 at build time. If any libraries are specified, + # python.withPackages is used as interpreter, otherwise the "bare" python is used. + makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [] }: + let + ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}"; + in + makeScriptWriter { + interpreter = + if libraries == [] + then python.interpreter + else (python.withPackages (ps: libraries)).interpreter + ; + check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' + exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" + ''); + } name; + + # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and + # returns an executable + # + # Example: + # writePyPy2 "test_pypy2" { libraries = [ pkgs.pypy2Packages.enum ]; } '' + # from enum import Enum + # + # class Test(Enum): + # a = "success" + # + # print Test.a + # '' + writePyPy2 = makePythonWriter pkgs.pypy2 pkgs.pypy2Packages buildPackages.pypy2Packages; + + # writePyPy2Bin takes the same arguments as writePyPy2 but outputs a directory (like writeScriptBin) + writePyPy2Bin = name: + writePyPy2 "/bin/${name}"; + + # writePython3 takes a name an attributeset with libraries and some python3 sourcecode and + # returns an executable + # + # Example: + # writePython3 "test_python3" { libraries = [ pkgs.python3Packages.pyyaml ]; } '' + # import yaml + # + # y = yaml.load(""" + # - test: success + # """) + # print(y[0]['test']) + # '' + writePython3 = makePythonWriter pkgs.python3 pkgs.python3Packages buildPackages.python3Packages; + + # writePython3Bin takes the same arguments as writePython3 but outputs a directory (like writeScriptBin) + writePython3Bin = name: + writePython3 "/bin/${name}"; + + # writePyPy3 takes a name an attributeset with libraries and some pypy3 sourcecode and + # returns an executable + # + # Example: + # writePyPy3 "test_pypy3" { libraries = [ pkgs.pypy3Packages.pyyaml ]; } '' + # import yaml + # + # y = yaml.load(""" + # - test: success + # """) + # print(y[0]['test']) + # '' + writePyPy3 = makePythonWriter pkgs.pypy3 pkgs.pypy3Packages buildPackages.pypy3Packages; + + # writePyPy3Bin takes the same arguments as writePyPy3 but outputs a directory (like writeScriptBin) + writePyPy3Bin = name: + writePyPy3 "/bin/${name}"; + + + makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [] }: nameOrPath: + let + fname = last (builtins.split "/" nameOrPath); + path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx"; + _nugetDeps = mkNugetDeps { name = "${fname}-nuget-deps"; nugetDeps = libraries; }; + + nuget-source = mkNugetSource { + name = "${fname}-nuget-source"; + description = "A Nuget source with the dependencies for ${fname}"; + deps = [ _nugetDeps ]; + }; + + fsi = writeBash "fsi" '' + export HOME=$NIX_BUILD_TOP/.home + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + script="$1"; shift + ${dotnet-sdk}/bin/dotnet fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script" + ''; + + in content: makeScriptWriter { + interpreter = fsi; + } path + '' + #i "nuget: ${nuget-source}/lib" + ${ content } + exit 0 + ''; + + writeFSharp = + makeFSharpWriter {}; + + writeFSharpBin = name: + writeFSharp "/bin/${name}"; + +} diff --git a/third_party/nixpkgs/pkgs/build-support/writers/test.nix b/third_party/nixpkgs/pkgs/build-support/writers/test.nix index 561c3e4ab0..2411f8c03a 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/test.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/test.nix @@ -12,29 +12,62 @@ }: with writers; let + expectSuccess = test: + runCommand "run-${test.name}" {} '' + if [[ "$(${test})" != success ]]; then + echo 'test ${test.name} failed' + exit 1 + fi - bin = { - bash = writeBashBin "test-writers-bash-bin" '' + touch $out + ''; + + expectSuccessBin = test: + runCommand "run-${test.name}" {} '' + if [[ "$(${lib.getExe test})" != success ]]; then + echo 'test ${test.name} failed' + exit 1 + fi + + touch $out + ''; + + expectDataEqual = { file, expected }: + let + expectedFile = writeText "${file.name}-expected" expected; + in + runCommand "run-${file.name}" {} '' + if ! diff -u ${file} ${expectedFile}; then + echo 'test ${file.name} failed' + exit 1 + fi + + touch $out + ''; +in +lib.recurseIntoAttrs { + bin = lib.recurseIntoAttrs { + bash = expectSuccessBin (writeBashBin "test-writers-bash-bin" '' if [[ "test" == "test" ]]; then echo "success"; fi - ''; + ''); - dash = writeDashBin "test-writers-dash-bin" '' + dash = expectSuccessBin (writeDashBin "test-writers-dash-bin" '' test '~' = '~' && echo 'success' - ''; + ''); - fish = writeFishBin "test-writers-fish-bin" '' + fish = expectSuccessBin (writeFishBin "test-writers-fish-bin" '' if test "test" = "test" echo "success" end - ''; + ''); - rust = writeRustBin "test-writers-rust-bin" {} '' + rust = expectSuccessBin (writeRustBin "test-writers-rust-bin" {} '' fn main(){ println!("success") } - ''; + ''); - haskell = writeHaskellBin "test-writers-haskell-bin" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = expectSuccessBin (writeHaskellBin "test-writers-haskell-bin" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -44,9 +77,9 @@ let main = case int of 18871 -> putStrLn $ id "success" _ -> print "fail" - ''; + ''); - js = writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } '' + js = expectSuccessBin (writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -54,59 +87,57 @@ let } else { console.log('fail') } - ''; + ''); - perl = writePerlBin "test-writers-perl-bin" { libraries = [ perlPackages.boolean ]; } '' + perl = expectSuccessBin (writePerlBin "test-writers-perl-bin" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; - ''; + ''); - pypy2 = writePyPy2Bin "test-writers-pypy2-bin" { libraries = [ pypy2Packages.enum ]; } '' + pypy2 = expectSuccessBin (writePyPy2Bin "test-writers-pypy2-bin" { libraries = [ pypy2Packages.enum ]; } '' from enum import Enum - class Test(Enum): a = "success" - print Test.a - ''; + ''); - python3 = writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = expectSuccessBin (writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); - pypy3 = writePyPy3Bin "test-writers-pypy3-bin" { libraries = [ pypy3Packages.pyyaml ]; } '' + pypy3 = expectSuccessBin (writePyPy3Bin "test-writers-pypy3-bin" { libraries = [ pypy3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); }; - simple = { - bash = writeBash "test-writers-bash" '' + simple = lib.recurseIntoAttrs { + bash = expectSuccess (writeBash "test-writers-bash" '' if [[ "test" == "test" ]]; then echo "success"; fi - ''; + ''); - dash = writeDash "test-writers-dash" '' + dash = expectSuccess (writeDash "test-writers-dash" '' test '~' = '~' && echo 'success' - ''; + ''); - fish = writeFish "test-writers-fish" '' + fish = expectSuccess (writeFish "test-writers-fish" '' if test "test" = "test" echo "success" end - ''; + ''); - haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = expectSuccess (writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -116,9 +147,9 @@ let main = case int of 18871 -> putStrLn $ id "success" _ -> print "fail" - ''; + ''); - js = writeJS "test-writers-js" { libraries = [ nodePackages.semver ]; } '' + js = expectSuccess (writeJS "test-writers-js" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -126,43 +157,41 @@ let } else { console.log('fail') } - ''; + ''); - perl = writePerl "test-writers-perl" { libraries = [ perlPackages.boolean ]; } '' + perl = expectSuccess (writePerl "test-writers-perl" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; - ''; + ''); - pypy2 = writePyPy2 "test-writers-pypy2" { libraries = [ pypy2Packages.enum ]; } '' + pypy2 = expectSuccess (writePyPy2 "test-writers-pypy2" { libraries = [ pypy2Packages.enum ]; } '' from enum import Enum - class Test(Enum): a = "success" - print Test.a - ''; + ''); - python3 = writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = expectSuccess (writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); - pypy3 = writePyPy3 "test-writers-pypy3" { libraries = [ pypy3Packages.pyyaml ]; } '' + pypy3 = expectSuccess (writePyPy3 "test-writers-pypy3" { libraries = [ pypy3Packages.pyyaml ]; } '' import yaml - y = yaml.load(""" + y = yaml.safe_load(""" - test: success """) print(y[0]['test']) - ''; + ''); - fsharp = makeFSharpWriter { + fsharp = expectSuccess (makeFSharpWriter { libraries = { fetchNuGet }: [ (fetchNuGet { pname = "FSharp.SystemTextJson"; version = "0.17.4"; sha256 = "1bplzc9ybdqspii4q28l8gmfvzpkmgq5l1hlsiyg2h46w881lwg2"; }) ]; @@ -183,31 +212,31 @@ let then "success" else "failed" |> printfn "%s" - ''; + ''); - pypy2NoLibs = writePyPy2 "test-writers-pypy2-no-libs" {} '' + pypy2NoLibs = expectSuccess (writePyPy2 "test-writers-pypy2-no-libs" {} '' print("success") - ''; + ''); - python3NoLibs = writePython3 "test-writers-python3-no-libs" {} '' + python3NoLibs = expectSuccess (writePython3 "test-writers-python3-no-libs" {} '' print("success") - ''; + ''); - pypy3NoLibs = writePyPy3 "test-writers-pypy3-no-libs" {} '' + pypy3NoLibs = expectSuccess (writePyPy3 "test-writers-pypy3-no-libs" {} '' print("success") - ''; + ''); - fsharpNoNugetDeps = writeFSharp "test-writers-fsharp-no-nuget-deps" '' + fsharpNoNugetDeps = expectSuccess (writeFSharp "test-writers-fsharp-no-nuget-deps" '' printfn "success" - ''; + ''); }; - - path = { - bash = writeBash "test-writers-bash-path" (writeText "test" '' + path = lib.recurseIntoAttrs { + bash = expectSuccess (writeBash "test-writers-bash-path" (writeText "test" '' if [[ "test" == "test" ]]; then echo "success"; fi - ''); - haskell = writeHaskell "test-writers-haskell-path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' + '')); + + haskell = expectSuccess (writeHaskell "test-writers-haskell-path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' import Data.Default int :: Int @@ -217,26 +246,27 @@ let main = case int of 18871 -> putStrLn $ id "success" _ -> print "fail" - ''); + '')); }; - writeTest = expectedValue: name: test: - writeDash "run-${name}" '' - if test "$(${test})" != "${expectedValue}"; then - echo 'test ${test} failed' - exit 1 - fi - ''; + data = { + json = expectDataEqual { + file = writeJSON "data.json" { hello = "world"; }; + expected = '' + { + "hello": "world" + } + ''; + }; -in runCommand "test-writers" { - passthru = { inherit writeTest bin simple path; }; - meta.platforms = lib.platforms.all; -} '' - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues simple)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues path)} - - echo 'nix-writers successfully tested' >&2 - touch $out -'' + toml = expectDataEqual { + file = writeTOML "data.toml" { hello = "world"; }; + expected = "hello = 'world'\n"; + }; + yaml = expectDataEqual { + file = writeYAML "data.yaml" { hello = "world"; }; + expected = "hello: world\n"; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix b/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix index f8944222a8..29b7fcf196 100644 --- a/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix +++ b/third_party/nixpkgs/pkgs/common-updater/unstable-updater.nix @@ -12,6 +12,7 @@ , branch ? null , stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD) , tagPrefix ? "" # strip this prefix from a tag name when using stable version +, shallowClone ? true }: let @@ -22,6 +23,7 @@ let branch="" use_stable_version="" tag_prefix="" + shallow_clone="" while (( $# > 0 )); do flag="$1" @@ -39,6 +41,9 @@ let --tag-prefix=*) tag_prefix="''${flag#*=}" ;; + --shallow-clone) + shallow_clone=1 + ;; *) echo "$0: unknown option ‘''${flag}’" exit 1 @@ -58,9 +63,12 @@ let cloneArgs=( --bare - --depth=1 ) + if [[ "$shallow_clone" == "1" ]]; then + cloneArgs+=(--depth=1) + fi + if [[ -n "$branch" ]]; then cloneArgs+=(--branch="$branch") fi @@ -101,7 +109,8 @@ let --rev="$commit_sha" ''; -in [ +in +[ updateScript "--url=${builtins.toString url}" ] ++ lib.optionals (branch != null) [ @@ -109,4 +118,6 @@ in [ ] ++ lib.optionals stableVersion [ "--use-stable-version" "--tag-prefix=${tagPrefix}" +] ++ lib.optionals shallowClone [ + "--shallow-clone" ] diff --git a/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix new file mode 100644 index 0000000000..87d5f9dab2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchzip +}: +stdenvNoCC.mkDerivation rec { + pname = "commit-mono"; + version = "1.132"; + + src = fetchzip { + url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip"; + sha256 = "sha256-a9zxzjfOFmqemSIb4Tav0l7YtKvbyizDy+1dwPuZ4d4="; + stripRoot = false; + }; + + dontConfigure = true; + dontPatch = true; + dontBuild = true; + dontFixup = true; + doCheck = false; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/opentype/ *.otf + runHook postInstall + ''; + + meta = with lib; { + description = "An anonymous and neutral programming typeface focused on creating a better reading experience"; + homepage = "https://commitmono.com/"; + license = licenses.ofl; + maintainers = [ maintainers.yoavlavi ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix index 7073c62156..192599c7e9 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.19.2"; + version = "1.22.0"; src = fetchzip { - url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - hash = "sha256-+TnKUgrAafR5irS9XeXWfb1a2PfUKOXf8CAmqJbf6y4="; + url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; + hash = "sha256-IB+YQcIpxYumJ5ETezqQ2yVlvdh+wllJ+MkVHPWZCEg="; }; installPhase = '' @@ -16,6 +16,8 @@ stdenvNoCC.mkDerivation rec { install -Dm644 *.otf -t $out/share/fonts/opentype install -Dm644 *.bdf -t $out/share/fonts/misc install -Dm644 *.otb -t $out/share/fonts/misc + install -Dm644 *.woff -t $out/share/fonts/woff + install -Dm644 *.woff2 -t $out/share/fonts/woff2 runHook postInstall ''; @@ -23,6 +25,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A bitmap programming font optimized for coziness"; homepage = "https://github.com/slavfox/cozette"; + changelog = "https://github.com/slavfox/Cozette/blob/v.${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ brettlyons marsam ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 719a9d0224..7e7a1ad33e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "25.0.1"; + version = "25.1.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 47081a05a0..6e15d96a10 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "25.0.1"; + version = "25.1.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-clbqr4hGtIkbgPYovYXHGW+FUTEjAn3Oq7aoPFMgGJU="; + hash = "sha256-IEP4xxL5rez15FVCKdgNBmCv9yHFqtHz/YKTQciQWMg="; }; - npmDepsHash = "sha256-TxMmUgwQPbSV+1qe0FEtSPAYwJRnpuQ+qOmWvrq9xKY="; + npmDepsHash = "sha256-E4dC3WCXvnx9qUxOM+f6/HfBxKhUvsD9TEVmPJGwbDs="; nativeBuildInputs = [ remarshal diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index aec3f2d289..7c3e2686ea 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0lmr4xqmyr4pz1xz0iw71zjwa9xn0nbkzxr1q3mdv3x12pdp0r11"; - iosevka-aile = "1l4bmn1cangjn91rq2w40np6dkcw34l8yvfbsqpmbzfqsz34ga61"; - iosevka-curly = "1sp8ig31s8rq91vl2ziv3ixqh50qdvnnlx6fjiccyxza079kxjw0"; - iosevka-curly-slab = "08jmmshflmhwwaa184aggxbmwfj4q1czynl52cz1may3cgvjr9za"; - iosevka-etoile = "1zvd8n7vm5za2jlply796hvzar92g73ibkhdc4r8d38148xxmwp2"; - iosevka-slab = "1xfrs95d1dzjz9dlgyn49xryyjzm711frxi45931l6i2jxppgz74"; - iosevka-ss01 = "0q9q5vx4p1r29l404yadbi4qslrjzgkisk6hk04xrhhrmkhh4b5j"; - iosevka-ss02 = "1nd7lyjcciirq146lj9crxrbxp82q29lclbhmxvkszlymif36vr5"; - iosevka-ss03 = "1rkgqhbh3c77jzysn0hdci2lgw1ss0f98zdnc2xfwhzimhlcsb2n"; - iosevka-ss04 = "17dcgbjhvyjcmk4jzf55faqwb30inhx98qldpjx66rkjg274dady"; - iosevka-ss05 = "1prpxj9hphhpmjpn001gznwmphijv4fkd1m5yr6zyyq10zyawx1j"; - iosevka-ss06 = "0narnyrfk88rclgm1caaqd7rmisbviizzrp4g54naxsmwhxj6zvd"; - iosevka-ss07 = "00v615vs6kmnxv7zql04b01dxc0ngdkpin51qi8fdld1nwy3gw4j"; - iosevka-ss08 = "1rzjpp82s2y2zybyh20406c131wk1mfazc4fzc766an87gip8409"; - iosevka-ss09 = "0amq785n58f1f92vi7xv4zsx91v5a3rkksk5yifysnc6pkxjs56w"; - iosevka-ss10 = "062x74l5df1ahxb7a27nrya6nh49dl0pi5c88v78hi2m85baviar"; - iosevka-ss11 = "06ak3wlxf472vpl5z02fg92z4hiycxvqj411g9cpfz7kg6y006fb"; - iosevka-ss12 = "1jny1y27swpzm2cqbavkkkbi3k1v2z2hy17l9arr9dv54bnm2d57"; - iosevka-ss13 = "0aylmsnhbrjckj012s7j6x0gikldiln60grjnp4h1z80nhs6md3a"; - iosevka-ss14 = "0j6v8bihckwp0bhs80zwr1rsrdf4bhaqjzwjx2mr9d63dnhj5lp9"; - iosevka-ss15 = "0xs52nbmj1g43x943vvb4pnms1i98ffidkad79f63nhw0x0ygr01"; - iosevka-ss16 = "0p9g432d44rdiv9bs5z0irdamqsknsi82snxyrmjplgy7m1frv9k"; - iosevka-ss17 = "1bvc9782yry9klkinfwrbn59mclcpizmv3yndz4b1ixv8dgym65z"; - iosevka-ss18 = "1a4m0drdg4f3rpxcjm899rzpym2m0hhiypwg61506nww1jcl8kk8"; - sgr-iosevka = "1xwpg3cq2587m8az2sfpd0k3pmvd8w4ci1jl7717fap38drl86ba"; - sgr-iosevka-aile = "0qjds4jhdzgnar0xdbz315kb2f4hxgh6xi8sdqpfbg84wjaj9872"; - sgr-iosevka-curly = "1qxyncllbbi1pcq7ajq63127k4q119cag76yyh3xpwl2f235ybrx"; - sgr-iosevka-curly-slab = "1bp44hgmc81avvpwdckjkmh049igfdfppnmmmpxmy55xzpmy30ik"; - sgr-iosevka-etoile = "0jvnlrz7mxrm0lg7wkdh3pz529xmssw63rgi0nfdy77zga3gv8r4"; - sgr-iosevka-fixed = "0bqdfq1xaanqpv1s9skapch184hcvbmdpcnjh7skms5ggcal7s3n"; - sgr-iosevka-fixed-curly = "0a7agrgi4qi3dk8yix3p9kbjvyqbxvm4lc0b75ywa8330g42khf5"; - sgr-iosevka-fixed-curly-slab = "0kxgkhvhz4l7ifc591c1n112wkcimfl417p49s3k5rx19yadz3rv"; - sgr-iosevka-fixed-slab = "1aq7qc6jjm7wkd5ng937gbv5l82gqx9snm4ffpp2k5zk8nnm38lv"; - sgr-iosevka-fixed-ss01 = "12gfppvi8vfp6y6y96zd6yvpb8xlr907gzhz04vm3j9m2dx8mdpz"; - sgr-iosevka-fixed-ss02 = "1ip6yx99rfa09bx64ah8bk5jp8w0x1qsdjknda7fwd8n1ian9qb1"; - sgr-iosevka-fixed-ss03 = "0cbayci1j0qj0xbydkxl4g8p4rdhjpdkjy6vb5zsxrx8rcxzmh6r"; - sgr-iosevka-fixed-ss04 = "1nm1wbax6xlxhsnw3522wi9dzzzr8k92464p9w31krrajlji46bn"; - sgr-iosevka-fixed-ss05 = "0y68rh0352idl0ncmx0lngbc6jj98incsnlh8xn55qggawah2g7l"; - sgr-iosevka-fixed-ss06 = "0x4azqmmznzaimg3ahv8kl0zcl3bdmrq4lqrvy94qz5ivgfnr7zv"; - sgr-iosevka-fixed-ss07 = "1l29i7q8zyw4cz21dqz2bc74c60grmmasiy3l31awrbwmabncqms"; - sgr-iosevka-fixed-ss08 = "1zlfqrkbsysi2nzfmvmz4yfbjngx3wpi3c68b4nkd8wdabll7a4m"; - sgr-iosevka-fixed-ss09 = "1631yavmr59lvmqhp3940n19200zsphy2fvq9kdg0xnrr9hgcgk0"; - sgr-iosevka-fixed-ss10 = "131crnfgvhxakggmvgk6apji8w3wkbgzm9ma77sz9ib9hcfrcn1f"; - sgr-iosevka-fixed-ss11 = "1gwz51ck1jdfww1g2yxzrjhyl3i41mqm6cykm2587r9kr5igxbyq"; - sgr-iosevka-fixed-ss12 = "198v6chwk948q7yikv06s4lydhyg4vq4s6ssl4fvay7d7jg33s5j"; - sgr-iosevka-fixed-ss13 = "1fg77lzw05qijap03l8f5k5lmfrn6phxpswvmzvlzzdscb5f2f3a"; - sgr-iosevka-fixed-ss14 = "1rhlja6vl1rdgp3r1ls3ycdr19x4bb0azyras7pamv2g5wbcrzv8"; - sgr-iosevka-fixed-ss15 = "03i2cr65368w8naqqyvhmry2sphihcdy3vw7pbq2mknn1ygrhafp"; - sgr-iosevka-fixed-ss16 = "1zxjik8z4jmq73fwfzg3y74wfp8a4yiy1dvm5g73b1r3jjc413dz"; - sgr-iosevka-fixed-ss17 = "0hxsa0bkf6yfh4hvs3h83myp3iil40c0629biys6h5a79nvqgxpr"; - sgr-iosevka-fixed-ss18 = "1zrnzrrzv1iw1aqa24khcxpwsg8fhvcbbs71j91j7yp5s070szar"; - sgr-iosevka-slab = "1d9lffq7xd6liglrr8kcymkq2bkvnz9cxnq4m5bby5h48vxr72j5"; - sgr-iosevka-ss01 = "1aa36415rpn4ihsd43mj1pgsjsiy4y2wr4ybckjyg7av1wi0n0rs"; - sgr-iosevka-ss02 = "0khj2j30q5zdygabmx45wn20g140zafifyg93fk9zp0ivs7xm13g"; - sgr-iosevka-ss03 = "0qvhlqc51bislhdhs61vv21dw0rvvf5sg9m7zk81d74harxba0qz"; - sgr-iosevka-ss04 = "0zpx6dpgivmk4gnf5w17978pd7cpq0f4j7ly53ykwa6ngjwq7cxq"; - sgr-iosevka-ss05 = "0jsaf52jydp4hah5q8l7sky1d7j3amkj7hs08qraw1h4bxbhqdq2"; - sgr-iosevka-ss06 = "0yh39c3bb59imysb0jyb0w006lhf5627ck4lkbv3pffa3jaskfrm"; - sgr-iosevka-ss07 = "1pm7pml2y9hfl8xpf0ggprvzc9yqxf2dpi64zsrbh950d41wmxyj"; - sgr-iosevka-ss08 = "11dqssnw6bhvsplc4sd8jvwhnmk6k8f506m8j26v2gr5iqk773kj"; - sgr-iosevka-ss09 = "014182zym2rw5zakpjaf921mpvxlr6ic24ag09c79c0w9mi2jnff"; - sgr-iosevka-ss10 = "0wzfxrhx173yga3s1ln1709wwxf4hbqym4sdg9jz3dn2hdn1f55j"; - sgr-iosevka-ss11 = "0wh1dy6w3sgw9xw2nda0xpa931v66nxv4kd4q4s8r9g6s5kbpj35"; - sgr-iosevka-ss12 = "1dnh7gs5lyyc4n7jmnl6c9qcsj7fnhzlyy8kxmsgn5hxfzjn42i8"; - sgr-iosevka-ss13 = "0g47da6ah2skrxs522q9w3aamrpyfhixg9cpqy0sgyxraw2iaq3d"; - sgr-iosevka-ss14 = "1if7hs8wjw7fs0j46camazmc93p0z1hz43i0rrkjxnai6cjqkaqj"; - sgr-iosevka-ss15 = "05h5yzpzx9xlf8xwkw8inp16x0arpdcfrklc62qdi87mdnfpkw8w"; - sgr-iosevka-ss16 = "01d3w7yblfbca3l2cmazh72f5a0z3wnb5d77rlw9wlvgw0drj8b0"; - sgr-iosevka-ss17 = "0sl94iaw038kljr78ms42vjqyj55pbyslxbm0b81fg6xkjy6q60n"; - sgr-iosevka-ss18 = "17395mrpjz1rmh5661s1v1ja53qhygf3zalqabya7cwfb1hz0xqy"; - sgr-iosevka-term = "10zg4365w5f554zdcdq4h7ixq3aq1lm21qndffp4q5c0kv57ggak"; - sgr-iosevka-term-curly = "19lkavcwpy7hsgmxz2jwlvbx9lsi8wm3xrypcb0wbcy80hjgkms2"; - sgr-iosevka-term-curly-slab = "1asdfglxskg6cikhhxx83jpwqsq3adrb5zgk94h1m2sv2xpcd65i"; - sgr-iosevka-term-slab = "0rsl048jzbf4fwindxxrlb2fwivjjayydc3fs8v92xg239y45m35"; - sgr-iosevka-term-ss01 = "17hin55idhzvcvrpvgpgjwkn29zsckmvjygbsjf560vy3cv48nlg"; - sgr-iosevka-term-ss02 = "0xnr89bdifbydgy7xbkg1msqxyjxp7l0rxby19bayd6f5lyh552s"; - sgr-iosevka-term-ss03 = "1ijz7qjym1fdrrjyi4g7lkl75frbcyh5ds548szwdavffh9ad74d"; - sgr-iosevka-term-ss04 = "1xrmlsp0gggqzgqckgp5r3h445xyglqid2g6f0fblcv5a79kp04w"; - sgr-iosevka-term-ss05 = "1d4llq2g6s9pp3ajl9spca5bpkk24kba4ki847gi55i7lpw4d1kl"; - sgr-iosevka-term-ss06 = "1wbqsgng4r3b588lnip0li321ibrnc4i39jjmvrs9c8xmgzswfjg"; - sgr-iosevka-term-ss07 = "0jxq4ygc6afq4vfgzrpsvhdw52535yqk6702nb5frlf9bllxpali"; - sgr-iosevka-term-ss08 = "1hqs6j38sghi1v86l83rhkyl7frsph7dp9jnhmzzb6w70ikbmajx"; - sgr-iosevka-term-ss09 = "0h8cf76s7dsa6gfsf9sxiri98d8crsdq2a2cjmn5iz9cxwnnrf0h"; - sgr-iosevka-term-ss10 = "0p3643d444r03y74djhpmgdz4f6ydwkhddgw4fpjhx4sg226yvfc"; - sgr-iosevka-term-ss11 = "0ak3w6h58wnpcxahdmdij52izvlq49allvrlq1syziaqd6b95qpz"; - sgr-iosevka-term-ss12 = "0km4sfg4q1z6b999piiiaiv6qxnvanw1s0jgrvy933fxyv7n4h7a"; - sgr-iosevka-term-ss13 = "0xhimnsspan0mcmspvz1r412q4rzririjnj744mgxs339w1bi6bh"; - sgr-iosevka-term-ss14 = "0h1v4lvf367p7w5m8s3mncp2ssfncxrixn1grj1nigijdc53m7ws"; - sgr-iosevka-term-ss15 = "1pppczbfv0dh7dnf39rw23qmr1h8ixkgw3gc6yashjni0jd9rr3r"; - sgr-iosevka-term-ss16 = "06fradackj5xi8j79sv16mnrxv91s596n04w6l3s29dcsmahf3yv"; - sgr-iosevka-term-ss17 = "0g4pv6v09n0xpxai3i79bhjspabvadv4wd4r1ryms6jyfdn9n367"; - sgr-iosevka-term-ss18 = "00zv631z48ifkpaw4idr9r6q2zdjv7m7i19xb33gv8yvfv96s3hz"; + iosevka = "1qs8z085mwg3ay0pn2b7ka21cb4xd1hf9yziiszajb94bkxwl77s"; + iosevka-aile = "12dg6s8bhx739y8slp2s783af3ysipdb640xl67v8jnznmj2vyg1"; + iosevka-curly = "1ypbfv41qvwpg7dc9hhsyqrnavd6926568rcnvj9j99j5dm8nl37"; + iosevka-curly-slab = "0r7n83ddq8w8ih6fsij7v9xkr8z5cvnfq6i921jsm0l5x03f7rxh"; + iosevka-etoile = "1gazc1vz54lgg3hxcqryh5nl1grlngpkph4l4i292k014ky32gf6"; + iosevka-slab = "02lgwmvzcpjz8n78vvxm7w7pff9s6008ca5i8fvl4m24k051jfdy"; + iosevka-ss01 = "07gir5wszdnzrh32978kwg8rhychkjjqqwhdgslrxjfwnlrzpjq3"; + iosevka-ss02 = "15sqkk0w39cj8lyjfhs70if7k1adgql18kkmyf3bx1h92xys18ca"; + iosevka-ss03 = "0gi3gm0byg8vhicgfxvcvja1cz9qs8ahryk9yn5896yiyps1djfa"; + iosevka-ss04 = "19l3g2vdms6nnyhpi5fjnsk0ym0b8ypa30riha1z8pkzhfk650gp"; + iosevka-ss05 = "1zl2mc0yxb4gwx47pzhcg8q8vk3k269sf8x2i6l4iki5qapi3436"; + iosevka-ss06 = "1d28ks82y74wyla8y7203bpdi6rz304glwmkbv2blfn3n4d5ncga"; + iosevka-ss07 = "1fw0n005b8lhy36qcy0a8flnv6y0mi7s4d9dx6gjbl1hsyykhppl"; + iosevka-ss08 = "1w0invhhwqy2braxm6n99g33l8sxdi0y5lbdxrhdypqrrg32bk2n"; + iosevka-ss09 = "1ai0r32s5y1sjsidxal1ah5bj6agh33ljiklnjs3ni9f6kxcqbds"; + iosevka-ss10 = "1qwzzndnhivs3m7kk3izhyd07vb3zx7pankkq0vdxiynpais9pjy"; + iosevka-ss11 = "14nw87kcidm9hds4z0rw3c5alnilgzrkgrbxg7kvsb0xxvw2xlha"; + iosevka-ss12 = "0gpy6pmirsp69vyyq7v3cxvn5dyv5k740qs76a13n5x0lvvapjyj"; + iosevka-ss13 = "1gsggzar1kqk1mqncp7jry8pp8nmr9p2ip309dl6di4b4c6cfplh"; + iosevka-ss14 = "1km4a6jhjmwl4wmapfhshqvf64dc87bfi89n5m34x91qlnw1xmfw"; + iosevka-ss15 = "02pj2mhyx3j4md9v2n1kbr4b1cx84rc5fcggl9i718qwryh55bg5"; + iosevka-ss16 = "0a4nwl4am410nklvzmr66z5vmbmq2v243div3r73nkwx6qzn7g64"; + iosevka-ss17 = "1hmdhp87qy0q4wnrfnc5vrv0n8dfn3cnlmc6j817pazra5lv0b09"; + iosevka-ss18 = "12jhd998m976cz65y8r12jaiy6ybrzc0zxb1i9sl72k9c9qdsy87"; + sgr-iosevka = "16n0y3qa7914xv1x8md12hfv1fz1alfgj16lsxcb8zmp8phbswqd"; + sgr-iosevka-aile = "1dmyx30yq1avdnr7f9hz9mjyi4awd6k0sr4svmhxihr4lmvzabhn"; + sgr-iosevka-curly = "0mgyh6qf5c85z9j8kcnfzyzmak6pj9s6k2da0ggyrhv1iqsjnpai"; + sgr-iosevka-curly-slab = "0va38lmja77mnnyr3xzdqa37xv4cz7jf8hcxr1p21yhd681gznbg"; + sgr-iosevka-etoile = "1r6ai6ph5nbqxyrrzs945y02mcd4kdj2ckaadar4mlc8hwmdvdkx"; + sgr-iosevka-fixed = "0dwk1gvszq0d8x22fa57ka3l0n7c6yga2k2vdk2kpv9aq2rlb6p9"; + sgr-iosevka-fixed-curly = "11vwsdhkqwzmifx6snxffn503bli0ikqnhc12q1y4j8rccn7xyhz"; + sgr-iosevka-fixed-curly-slab = "06r4rl696250ny0jw9v8z13f10yp64g09kk8hpcm3rq9xwvfkra4"; + sgr-iosevka-fixed-slab = "1wi92bykv4v7dsnm6qbhh5ydy3mwzxwjkvmycvwjac64hpicj2as"; + sgr-iosevka-fixed-ss01 = "1nacy9lr64v0lfhq61b442b9fr1q14bchydbh33fvk7wnkydkfnl"; + sgr-iosevka-fixed-ss02 = "1cb55b07f339q6mbv1v5rqh37m3b4zhlzz2fg08h97xvb3vd7n7d"; + sgr-iosevka-fixed-ss03 = "1sjwndp4zmqjc95da9al24g5nzzlv7x9lsm9dljpcznfw88wrhsy"; + sgr-iosevka-fixed-ss04 = "07p9fv5aarwrbl9b9gbfwi26px53zfw14472jrasp10cl0dha12a"; + sgr-iosevka-fixed-ss05 = "1hvdnyibzkjd89vm6ir3bpskhi75ijjcbpr7y2iir6z7xj11mzmn"; + sgr-iosevka-fixed-ss06 = "1ram41z53w2khzhhf472a9qyhk3ikd180vnzvfasa0510c7fp2n0"; + sgr-iosevka-fixed-ss07 = "1kkbch8zx3dzacwhkqi6yxihf3w2g0kblhdicdfhqfb57pb63ka8"; + sgr-iosevka-fixed-ss08 = "1lw4917p842yp21m73n1k6inbdqacnqcrqr6f9995qvl9ls9l8qg"; + sgr-iosevka-fixed-ss09 = "033wyyxyza0lvq53gaaxy1r4f9li6rmvqdqw66jq2c5mr75xajs6"; + sgr-iosevka-fixed-ss10 = "0x0by1hbc6x89ac44x47bxn5r07znnsykhf8wx9dy82kj841h2wk"; + sgr-iosevka-fixed-ss11 = "10rlp2xl9509rhaccyy2asi95idddzvllnwgnlr3ny9n27a9bakn"; + sgr-iosevka-fixed-ss12 = "0jljdyya4mxxjcmfxr1q37cy95wi56swjryvn99m0d5sahim3y28"; + sgr-iosevka-fixed-ss13 = "0524p8xrhbn0vgbc2ls3l0hpkidkksxqysrjm9c10m9z88l46laj"; + sgr-iosevka-fixed-ss14 = "13gpnjh54583r1kl3ra3l36zmvg81kknij9a8jrgp27d3dad95wq"; + sgr-iosevka-fixed-ss15 = "1gmwckl83r9lfizsdc5f806vism27g54wwn849dhgp8ckpp8w3sp"; + sgr-iosevka-fixed-ss16 = "0r5r9gpjzws9j6z5a64j3sjfii7c28vshmly47rj5npgrzflanmf"; + sgr-iosevka-fixed-ss17 = "1yyx48liizjbprfh2pi74c26sqggvnya5ajx7gyg7z4nwgw8hirv"; + sgr-iosevka-fixed-ss18 = "0lcjcl33qsd6xmldqv4s46l9isjfgnv2xd61c71swag0qsqavwr9"; + sgr-iosevka-slab = "1hy9ldl53slr30zcpj1bz1nbcx2316yycmwmrrmd5pjbplbbm1kj"; + sgr-iosevka-ss01 = "1kxzidydpr8y0fxhzm892zpl1nk3a1xdpdcx3ndnkbj99rhqbkfv"; + sgr-iosevka-ss02 = "02fzavi20m00l4rg995811x97x7bnv5hgc6bfllqy5x7vwry2a0g"; + sgr-iosevka-ss03 = "0vb863m8gxy7iq7b4a9lmphn39pz1v46x131isqd2n1d06bbn80r"; + sgr-iosevka-ss04 = "0fv506x069bgcvrhyzqw1vmd9s553k8pixsgyqy86dn3gy7hdaxz"; + sgr-iosevka-ss05 = "1mk8f5kk41dpf16hf44ikb2a4hx9i7k1y9dnxnd3f2j8wwizg9mw"; + sgr-iosevka-ss06 = "1v0llv8s98fihim8ay01qv4jc5dyn0hcczh9m63ap733m5rsi97d"; + sgr-iosevka-ss07 = "1rbb6imadzlwrraa4y4bs967h4lz6jvxqjrlr6xgrc11ndb1zfng"; + sgr-iosevka-ss08 = "13h027413rsx8x9snmjq4d4apsxwgjx6nqxrr3ndm16w3qqv6hwx"; + sgr-iosevka-ss09 = "162m4rnad25gsgc80jvf9ipzxf32ls4pr5279ffypjglxb37vfmx"; + sgr-iosevka-ss10 = "1jywagwqna5sw4q7973g85fj93gbhzmbhhwnz56yziywc52nh050"; + sgr-iosevka-ss11 = "0y7fr7hd1gd6cbfhnfdbhxsa46i1mlh86qkp3397knjqx81i6mi0"; + sgr-iosevka-ss12 = "1hd9p48mg4i4h8agyc9wbss0870g76mr8b9cvzf9dpn2p3nf7s96"; + sgr-iosevka-ss13 = "1x6wvl2v8alqk3iybw05z8k8fwwv4j3si5f2308db9r9phhh5qj0"; + sgr-iosevka-ss14 = "1rgk6g80x6gllk5zkragsnlv38jyzlisjcc802xwpq163lvq135q"; + sgr-iosevka-ss15 = "010fqzcfv9i5z23wbd393vgwcy22am2ly3i44np2ihbkb47aq6v9"; + sgr-iosevka-ss16 = "01f8827cx7nhflrvw2qflz3ahb2a5fdl832x18vaz81qbgkrn9lj"; + sgr-iosevka-ss17 = "11z67iwj6njlg35wm35wx8wpx2vmg1w8pl3fhncm25vi245mjd9g"; + sgr-iosevka-ss18 = "1h7ggiqvc169fk66kmxfpgbpmh7949smlanjcxamicsdllrr1ib8"; + sgr-iosevka-term = "0bdshfvapw0c0l6jd2fbkyfz07nxjhi4hjvc8r18r8i1ij8ak4w7"; + sgr-iosevka-term-curly = "1smkblav040fh7jslqa20p9zprcan5cfb8q0bi767rrnmnwndxf7"; + sgr-iosevka-term-curly-slab = "07si1d5vly2q88hmws4fjaia3758dllhqjvbv67hyhfxrvr17nbg"; + sgr-iosevka-term-slab = "1kw395l5xs674y9g55074rvv4p24qvy61yvjvx9vs51h5il0cvp0"; + sgr-iosevka-term-ss01 = "11i2fymlaz841vc1m05ig6qr49sks1zymg3wi8a63gx8nq0m0c0d"; + sgr-iosevka-term-ss02 = "06nffhxmyzz1x28i4cmp5g6a07wm8f91715lngajgm6jzm168vgp"; + sgr-iosevka-term-ss03 = "1yrdaqdpcxx7d6cljlmna9zc9avsmv94156q9yg1q638rxj34kp6"; + sgr-iosevka-term-ss04 = "186s3b8zqid0yj6a0qwvi5pxnfw54yzs4vvw94apka0yl4857ipk"; + sgr-iosevka-term-ss05 = "177z1hlrk5agrsh2sn6xmggpq7xfjlh5nz4azi71nzg60c0k6312"; + sgr-iosevka-term-ss06 = "0l69ajjil23qr3p4xw0578nj666ry0q370fyzb0mv9jk3q9yv3yc"; + sgr-iosevka-term-ss07 = "0hr9ls5l6ik5i5j6kx6imr3m9ymdbnkf6gmvswlikw21q609nvxm"; + sgr-iosevka-term-ss08 = "11bs0swb8vz138yb91gx901r3cg0snz7334hbdl4nxsa8wrphrmw"; + sgr-iosevka-term-ss09 = "1279gxl2j81shnh6s85p6xgb651mn83f9g0dr0bic53gbqfjxs26"; + sgr-iosevka-term-ss10 = "1v0x771pk0qdpb50hsihqvzf0q8fgg9z8fliwjpgjfkzgx85fl95"; + sgr-iosevka-term-ss11 = "1jg92awghy3qgziw7shizc35pwdxnm6xi3ss4381xbcmg3vhr64j"; + sgr-iosevka-term-ss12 = "1jy5nq0zpv6bnxd4c5vi13p8p4fgsc3q6b4wbzq30hipq4ikq9ci"; + sgr-iosevka-term-ss13 = "1hnqmfz82a39myzw93pwx5jcv6hh626plysmsxv96qds3qyzz646"; + sgr-iosevka-term-ss14 = "181d1alrk0amdbpg96s0qgzmqgmgs248wmrmkrzzamj4r5a981qp"; + sgr-iosevka-term-ss15 = "1a0naw45cjq6pdizy9sqq0lqbv7aawy7cjy2mf98f5059hmarqr2"; + sgr-iosevka-term-ss16 = "1a5lby135y5l65fpz5fcd7hdf7xy7dmi8mrjc68ihb1b52p1vp99"; + sgr-iosevka-term-ss17 = "00m0f1infr6qgd7126szbp4xkz3x0wpnybwbchyf28rm3jrjcnrr"; + sgr-iosevka-term-ss18 = "0i0kp7jfwlb73dx44q8pfwpyzzn24hinfhaxnvf78dv2k9623q5a"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/maple-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/maple-font/default.nix index 3c870abab6..af4746fa2c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/maple-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/maple-font/default.nix @@ -9,7 +9,7 @@ let rec{ inherit pname desc; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; inherit sha256; @@ -39,34 +39,40 @@ let in { Mono = maple-font { - pname = "MapleMono"; - sha256 = "sha256-Ap4OwP/QGFz9+xn12rekia1/pwRxZvv+H+ZmZiXcxcY="; - desc = "monospace"; + pname = "MapleMono-ttf"; + sha256 = "sha256-a06JLIP5aVb9SeEz6kw+LqKy0ydCgaUlPDFWA2Y0G8Q="; + desc = "monospace TrueType"; }; NF = maple-font { pname = "MapleMono-NF"; - sha256 = "sha256-WZHFQRG+81TF5YgOT249c8VA8vAvYowiQx/pqsDuJ4o="; + sha256 = "sha256-fy+hdUYZDW5nkMVirhkmys3tIkWezPDrlpNxnRMl4WU="; desc = "Nerd Font"; }; SC-NF = maple-font { pname = "MapleMono-SC-NF"; - sha256 = "sha256-26odkmMljEwstRywDYJ7Dst5pfOXrtQTcrFFxbRwHcA="; + sha256 = "sha256-SbXWkrpLJUrq+Jt1h3GBP9md5TbYpPchdiR0oEDMAgY="; desc = "Nerd Font SC"; }; opentype = maple-font { pname = "MapleMono-otf"; - sha256 = "sha256-u2IuymjiosoSbdIW7h2QalagTI+eDMRSuhLgXy5RdRA="; + sha256 = "sha256-fwfFlNbaWXFCjcno7NK3dZqAzsHLh9rdGkSq26xc9qw="; desc = "OpenType"; }; woff2 = maple-font { pname = "MapleMono-woff2"; - sha256 = "sha256-iv6Q/aYMlAkhaem8tFWAzqc9mVgWQXghBzcHJz1dg/Y="; + sha256 = "sha256-4akpZGGth4yZjI5wjO3ZXrXcWNxb7/6YChU7T5fNVKs="; desc = "WOFF2.0"; }; + + autohint = maple-font { + pname = "MapleMono-ttf-autohint"; + sha256 = "sha256-rSYIC42Bt+KFgxhwRhXS4sbh4etKYkCOo5nP2J2BHt4="; + desc = "ttf autohint"; + }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix index 9e393f8e39..11084b9025 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix @@ -13,6 +13,7 @@ "DaddyTimeMono" = "1w5n170l63hfxh1xclw3jpf8amj60br6py4yx12yhqanp2zg0shj"; "DejaVuSansMono" = "1j22f5jnpmyli686r67c4c07g07ac78aq9wg8hy1vwblxfzdvq9f"; "DroidSansMono" = "13r1sglgwf05swnbn0mha2gpdqammzlg0p6h7c33af1vr7n8cnca"; + "EnvyCodeR" = "1y03cb0kq548nm8qh4jh8yw2zpx6ahl0y8561c429p5f16707qxl"; "FantasqueSansMono" = "1k0p6gvas6mgwq0bbvpwbn3mm6yaaapgjqgk30fvpq9zvn4a26bf"; "FiraCode" = "14vbb3w6il32kd8my75vvv786azm7sxmdpba9np0qjx4rs8xdhbn"; "FiraMono" = "1iiz5cnhrb67793ww6pj5y5x9s1a5nlk9kqwbv92kxmbqakarlcb"; @@ -27,6 +28,7 @@ "Inconsolata" = "02rar6g3zbbpxxxz37v7d5qzafn59bhp04iv3wk16kqxy0havgx5"; "InconsolataGo" = "0nx6j3v2fvhdw3ygmz65zwlj6zwrkpmf59wfxirpzkcqqsdh4zwl"; "InconsolataLGC" = "00s2051fz3k6jnsfmnlqnd2cghr9sj2pddi5gpid1i5x006rig7a"; + "IntelOneMono" = "02cynzrpn93b1kmi21p60lhdai6rppmm3m1f872kvf08damc1660"; "Iosevka" = "1byrmfbsqi06fsy958364jy694dnm7a7pcjsv64w6mwfsi5vjn1r"; "IosevkaTerm" = "1k65jfa0c7c6pvns7vfcxcfc3i1qcr6wg16qafbp9zggabbvl7aa"; "JetBrainsMono" = "0mbzvfl36a6mgb2dnjf8n3kkm28sz0xhv7s5lww141wpgj5jb4a9"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix index 61f306c710..025c0a2ece 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "ruwudu"; - version = "2.000"; + version = "3.000"; src = fetchzip { url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; - hash = "sha256-FP+ZHm1fKlozAAI2PbJ4r4v5OwRxBtYMRLmRwPbqx2I="; + hash = "sha256-HuuH6AWD5gym73zSsuQdQD901J6r3PkUmUTtnRxYRyg="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix b/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix index 9960248b0d..ffaf8aeb78 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenvNoCC, fetchzip, version ? "3.300" }: +{ lib, stdenvNoCC, fetchzip, version ? "4.000" }: let new = lib.versionAtLeast version "3.000"; hash = { "2.100" = "sha256-d2UyOOOnmE1afCwyIrM1bL3lQC7XRwh03hzetk/4V30="; "3.300" = "sha256-LaaA6DWAE2dcwVVX4go9cJaiuwI6efYbPk82ym3W3IY="; + "4.000" = "sha256-FhgHlHCfojIl3Y11EDYhNTmLYwQ60OrwnA9nbZbZGJE="; }."${version}"; pname = "scheherazade${lib.optionalString new "-new"}"; in diff --git a/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix new file mode 100644 index 0000000000..77b352e33d --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchurl +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "sketchybar-app-font"; + version = "1.0.13"; + + src = fetchurl { + url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; + hash = "sha256-vlvSrN6yxabKnzPmqI9VNkOdR3yLa1QUieZjOOW6w3c="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/sketchybar-app-font.ttf + + runHook postInstall + ''; + + meta = { + description = "A ligature-based symbol font and a mapping function for sketchybar"; + longDescription = '' + A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. + ''; + homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/icons/banana-cursor/default.nix b/third_party/nixpkgs/pkgs/data/icons/banana-cursor/default.nix new file mode 100644 index 0000000000..b89213c6d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/icons/banana-cursor/default.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation rec { + pname = "banana-cursor"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ful1e5"; + repo = "banana-cursor"; + rev = "v${version}"; + sha256 = "sha256-PI7381xf/GctQTnfcE0W3M3z2kqbX4VexMf17C61hT8="; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/icons + mv themes/Banana $out/share/icons + ''; + + meta = with lib; { + homepage = "https://github.com/ful1e5/banana-cursor"; + description = "The banana cursor theme"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ yrd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index b06b6b35f3..daf8c44107 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.07.08"; + version = "23.07.21"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-JToou95HIrfqdT0IVh0colgGFXq3GR2D3FQU0Qc57Y4="; + sha256 = "sha256-QwbjJ38fWRkzd1nmsPWcwUQ7p96S/tGEvIfhLsOX1bg="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 2bb2aca73d..ecfea598a5 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.07.08"; + version = "23.07.21"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-wT71uGYaZ1URzDrtpWPvcMxuwoJoztJPCtnEOVJ1xUY="; + sha256 = "sha256-rHT4lD+RcwRmE63Dd7/oXVAltRTfpisptzyD1EQG4Aw="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 0548ac07ce..6df3087a79 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20230601"; + version = "20230801"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-p47Vt1nR94bXtpWjNaIWJNKbdgFFMc0qCBeh2V98CJg="; + hash = "sha256-sEfJKlGdogM0rOqg3Buytgd7vm0zEkmkSR343ZgGI2I="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix index f057531790..8faeef9d00 100644 --- a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230612"; + version = "20230712"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-uD+UzMjpQvuNMcIxm4iHLnJwhxXstE3W+0xCuf9j/i8="; + sha256 = "sha256-QXxY/WruYY09LL+OEKhd/EUb+GOI49KFnG75mbwMWoU="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix b/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix index 73c8d44145..60d5e332c2 100644 --- a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix @@ -1,16 +1,15 @@ { lib , stdenvNoCC , fetchurl -, dbip-country-lite }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2023-07"; + version = "2023-08"; src = fetchurl { - url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz"; - hash = "sha256-WVsyhopYbBlCWDq9UoPe1rcGU3pBYsXkqNWbaQXzRFA="; + url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-+IQSHgfVZ2codxkOKwi23CLjm+rYDZOQq5EWJs0OLiQ="; }; dontUnpack = true; @@ -24,7 +23,7 @@ stdenvNoCC.mkDerivation rec { runHook postBuild ''; - passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb"; + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb"; meta = with lib; { description = "The free IP to Country Lite database by DB-IP"; @@ -33,4 +32,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ nickcao ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 24d5110088..8864f3923f 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230707041058"; + version = "20230730120627"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-Utfi5eoFukpnB/JP9bsiVYBvh3REPt4CZUW+BRCiCpo="; + hash = "sha256-lnTP8KDYdIa7iq14h0TEVfAlJDtsURfSZaEdQ8L1TRM="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/third_party/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 2f9d22e57d..66ebf105ff 100644 --- a/third_party/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/third_party/nixpkgs/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -3,7 +3,7 @@ let common = { pname, sha256, suffix ? "" }: let - legacySuffix = if suffix == "-nons" then "" else "-ns"; + legacySuffix = lib.optionalString (suffix != "-nons") "-ns"; self = stdenv.mkDerivation rec { inherit pname; version = "1.79.2"; diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-plymouth/default.nix b/third_party/nixpkgs/pkgs/data/themes/catppuccin-plymouth/default.nix index 69a07f46d0..994c5ed0df 100644 --- a/third_party/nixpkgs/pkgs/data/themes/catppuccin-plymouth/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/catppuccin-plymouth/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; }; - sourceRoot = "source/themes/catppuccin-${variant}"; + sourceRoot = "${src.name}/themes/catppuccin-${variant}"; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-sddm-corners/default.nix b/third_party/nixpkgs/pkgs/data/themes/catppuccin-sddm-corners/default.nix new file mode 100644 index 0000000000..eca8bac5e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/catppuccin-sddm-corners/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "catppuccin-sddm-corners"; + version = "unstable-2023-02-17"; + + src = fetchFromGitHub { + owner = "khaneliman"; + repo = "catppuccin-sddm-corners"; + rev = "7b7a86ee9a5a2905e7e6623d2af5922ce890ef79"; + hash = "sha256-sTnt8RarNXz3RmYfmx4rD+nMlY8rr2n0EN3ntPzOurw="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/sddm/themes/" + cp -r catppuccin/ "$out/share/sddm/themes/catppuccin-sddm-corners" + + runHook postInstall + ''; + + meta = { + description = "Soothing pastel theme for SDDM based on corners theme."; + homepage = "https://github.com/khaneliman/sddm-catppuccin-corners"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix index 5376a618aa..ea5cf7a7d9 100644 --- a/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-09-02"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "PaqEkl0E3pUEJDEv1WwUqcjzAcQniN8rUGhVgbOxuhA="; + sha256 = "hymOqtwMk6Yja5le6ADZl04yjbOJjhairiH7a4m7gMk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/gruvbox-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/gruvbox-gtk-theme/default.nix index a221918ad1..b579f71d8b 100644 --- a/third_party/nixpkgs/pkgs/data/themes/gruvbox-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/gruvbox-gtk-theme/default.nix @@ -4,15 +4,15 @@ , gnome-themes-extra , gtk-engine-murrine }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "gruvbox-gtk-theme"; - version = "unstable-2022-12-09"; + version = "unstable-2023-05-26"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "c3172d8dcba66f4125a014d280d41e23f0b95cad"; - sha256 = "1411mjlcj1d6kw3d3h1w9zsr0a08bzl5nddkkbv7w7lf67jy9b22"; + rev = "c0b7fb501938241a3b6b5734f8cb1f0982edc6b4"; + hash = "sha256-Y+6HuWaVkNqlYc+w5wLkS2LpKcDtpeOpdHnqBmShm5Q="; }; propagatedUserEnvPkgs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix b/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix index a397906862..0e4bbdbe5a 100644 --- a/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/mojave/default.nix @@ -21,8 +21,27 @@ }: let + pname = "mojave-gtk-theme"; + version = "2023-06-13"; + + main_src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-0jb/VQ6Z0BGaEka57BWM0pBweP08cr4jfPRdEN/BJ1M="; + }; + + wallpapers_src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "0c4ae6ddff7e3fab4959469461c4d4042deb1b2f"; + hash = "sha256-7LSZSsRt6zTVPLWzuBgwRC1q1MHp5pN/pMl3x2wR8Ow="; + name = "wallpapers"; + }; + in + lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] buttonSizeVariants lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants @@ -30,29 +49,11 @@ lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityV lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants stdenvNoCC.mkDerivation rec { - inherit pname; - version = "2023-06-13"; + inherit pname version; - srcs = [ - (fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = version; - hash = "sha256-0jb/VQ6Z0BGaEka57BWM0pBweP08cr4jfPRdEN/BJ1M="; - }) - ] - ++ - lib.optional wallpapers - (fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = "0c4ae6ddff7e3fab4959469461c4d4042deb1b2f"; - hash = "sha256-7LSZSsRt6zTVPLWzuBgwRC1q1MHp5pN/pMl3x2wR8Ow="; - name = "wallpapers"; - }) - ; + srcs = [ main_src ] ++ lib.optional wallpapers wallpapers_src; - sourceRoot = "source"; + sourceRoot = main_src.name; nativeBuildInputs = [ glib diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix index b8444f72e1..1a51c3dfc1 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -58,14 +58,14 @@ stdenv.mkDerivation rec { pname = "budgie-control-center"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-z9apestNLEUKzrCMNo0BNAWeyE6FsUCAzcHIom8LcUs="; + sha256 = "sha256-7E23cgX7TkBJT/yansBfvMx0ddfAwrF7mGfqzbyLY4Q="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix index 533d2562e6..9f322efcbf 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix @@ -16,17 +16,17 @@ stdenv.mkDerivation rec { pname = "deepin-clone"; - version = "5.0.11"; + version = "5.0.15"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-ZOJc8R82R9q87Qpf/J4CXE+xL6nvbsXRIs0boNY+2uk="; + hash = "sha256-yxYmRSiw/pjgHftu75S9yx0ZXrWRz0VbU8jPjl4baqQ="; }; postPatch = '' - substituteInPlace app/{deepin-clone-ionice,deepin-clone-pkexec,deepin-clone.desktop,com.deepin.pkexec.deepin-clone.policy.tmp} \ + substituteInPlace app/{deepin-clone-ionice,deepin-clone-pkexec,com.deepin.pkexec.deepin-clone.policy.tmp} \ --replace "/usr" "$out" substituteInPlace app/src/corelib/ddevicediskinfo.cpp \ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 9f27dbaab9..5caa37bfea 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , fetchpatch +, nixosTests , dtkwidget , qt5integration , qt5platform-plugins @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { strictDeps = true; + passthru.tests.test = nixosTests.terminal-emulators.deepin-terminal; + meta = with lib; { description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; homepage = "https://github.com/linuxdeepin/deepin-terminal"; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix index f3023c7cb9..62e8399ff2 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -1,53 +1,40 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory , cmake , qttools , pkg-config , wrapQtAppsHook -, runtimeShell +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory , qtbase -, gtest +, qtsvg +, libical +, sqlite +, runtimeShell }: stdenv.mkDerivation rec { pname = "dde-calendar"; - version = "5.8.30"; + version = "5.10.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-8/UXq9W3Gb1Lg/nOji6zcHJts6lgY2uDxvrBxQs3Zio="; + hash = "sha256-oPrtPOCLZof4BysWfsCYeoqbJf30r7LijGEEXZlsAAY="; }; patches = [ - (fetchpatch { - name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; - url = "https://github.com/linuxdeepin/dde-calendar/commit/b9d9555d90a36318eeee62ece49250b4bf8acd10.patch"; - sha256 = "sha256-pvgxZPczs/lkwNjysNuVu+1AY69VZlxOn7hR9A02/3M="; - }) + ./fix-wrapped-name-not-in-whitelist.diff ]; postPatch = '' - substituteInPlace calendar-service/src/dbmanager/huanglidatabase.cpp \ - --replace "/usr/share/dde-calendar/data/huangli.db" "$out/share/dde-calendar/data/huangli.db" - substituteInPlace calendar-service/src/main.cpp \ - --replace "/usr/share/dde-calendar/translations" "$out/share/dde-calendar/translations" - substituteInPlace calendar-service/assets/data/com.deepin.dataserver.Calendar.service \ - --replace "/usr/lib/deepin-daemon/dde-calendar-service" "$out/lib/deepin-daemon/dde-calendar-service" - substituteInPlace calendar-client/assets/dbus/com.deepin.Calendar.service \ - --replace "/usr/bin/dde-calendar" "$out/bin/dde-calendar" - substituteInPlace calendar-service/{src/{csystemdtimercontrol.cpp,jobremindmanager.cpp},assets/{data/com.dde.calendarserver.calendar.service,dde-calendar-service.desktop}} \ - --replace "/bin/bash" "${runtimeShell}" - - substituteInPlace CMakeLists.txt \ - --replace "ADD_SUBDIRECTORY(tests)" " " + for file in $(grep -rl "/bin/bash"); do + substituteInPlace $file --replace "/bin/bash" "${runtimeShell}" + done ''; nativeBuildInputs = [ @@ -58,22 +45,19 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dtkwidget + qt5integration qt5platform-plugins + dtkwidget + qtbase + qtsvg dde-qt-dbus-factory - gtest + libical + sqlite ]; cmakeFlags = [ "-DVERSION=${version}" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - - postFixup = '' - wrapQtApp $out/lib/deepin-daemon/dde-calendar-service - ''; + strictDeps = true; meta = with lib; { description = "Calendar for Deepin Desktop Environment"; @@ -83,3 +67,4 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } + diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff new file mode 100644 index 0000000000..a139c4690a --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff @@ -0,0 +1,13 @@ +diff --git a/calendar-service/src/dbusservice/dservicebase.cpp b/calendar-service/src/dbusservice/dservicebase.cpp +index ac182881..93a9c2d8 100644 +--- a/calendar-service/src/dbusservice/dservicebase.cpp ++++ b/calendar-service/src/dbusservice/dservicebase.cpp +@@ -52,6 +52,8 @@ bool DServiceBase::clientWhite(const int index) + return true; + } + } ++ if (getClientName().contains("dde-calendar")) ++ return true; + return false; + #else + Q_UNUSED(index) diff --git a/third_party/nixpkgs/pkgs/desktops/expidus/default.nix b/third_party/nixpkgs/pkgs/desktops/expidus/default.nix new file mode 100644 index 0000000000..770050ba28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/expidus/default.nix @@ -0,0 +1,4 @@ +{ callPackage }: +{ + file-manager = callPackage ./file-manager {}; +} diff --git a/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix new file mode 100644 index 0000000000..ab22441984 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix @@ -0,0 +1,41 @@ +{ lib, flutter, fetchFromGitHub }: +flutter.buildFlutterApplication rec { + pname = "expidus-file-manager"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "ExpidusOS"; + repo = "file-manager"; + rev = version; + sha256 = "sha256-aAPmwzNPgu08Ov9NyRW5bcj3jQzG9rpWwrABRyK2Weg="; + }; + + depsListFile = ./deps.json; + vendorHash = "sha256-mPGrpMUguM9XAYWH8lBQuytxZ3J0gS2XOMPkKyFMLbc="; + + postInstall = '' + rm $out/bin/file_manager + ln -s $out/app/file_manager $out/bin/expidus-file-manager + + mkdir -p $out/share/applications + mv $out/app/data/com.expidusos.file_manager.desktop $out/share/applications + + mkdir -p $out/share/icons + mv $out/app/data/com.expidusos.file_manager.png $out/share/icons + + mkdir -p $out/share/metainfo + mv $out/app/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo + + substituteInPlace "$out/share/applications/com.expidusos.file_manager.desktop" \ + --replace "Exec=file_manager" "Exec=$out/bin/expidus-file-manager" \ + --replace "Icon=com.expidusos.file_manager" "Icon=$out/share/icons/com.expidusos.file_manager.png" + ''; + + meta = with lib; { + description = "ExpidusOS File Manager"; + homepage = "https://expidusos.com"; + license = licenses.gpl3; + maintainers = with maintainers; [ RossComputerGuy ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json b/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json new file mode 100644 index 0000000000..eb6c23b4e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json @@ -0,0 +1,1023 @@ +[ + { + "name": "file_manager", + "version": "0.1.2+1", + "kind": "root", + "source": "root", + "dependencies": [ + "collection", + "flutter", + "flutter_localizations", + "libtokyo", + "libtokyo_flutter", + "path_provider", + "url_launcher", + "bitsdojo_window", + "xdg_directories", + "udisks", + "path", + "shared_preferences", + "open_file_plus", + "permission_handler", + "win32", + "path_provider_windows", + "path_provider_platform_interface", + "ffi", + "sentry_flutter", + "pubspec", + "filesize", + "intl", + "provider", + "flutter_markdown", + "flutter_test", + "flutter_lints" + ] + }, + { + "name": "flutter_lints", + "version": "2.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "test_api", + "path", + "fake_async", + "clock", + "stack_trace", + "vector_math", + "async", + "boolean_selector", + "characters", + "collection", + "js", + "matcher", + "material_color_utilities", + "meta", + "source_span", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.17.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "material_color_utilities", + "version": "0.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "matcher", + "version": "0.12.15", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph", + "matcher" + ] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "characters", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "vector_math", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "flutter", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "characters", + "collection", + "js", + "material_color_utilities", + "meta", + "vector_math", + "sky_engine" + ] + }, + { + "name": "sky_engine", + "version": "0.0.99", + "kind": "transitive", + "source": "sdk", + "dependencies": [] + }, + { + "name": "flutter_markdown", + "version": "0.6.15", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "markdown", + "meta", + "path" + ] + }, + { + "name": "markdown", + "version": "7.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "args", + "version": "2.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "provider", + "version": "6.0.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "nested" + ] + }, + { + "name": "nested", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "intl", + "version": "0.18.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "meta", + "path" + ] + }, + { + "name": "filesize", + "version": "2.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "pubspec", + "version": "2.3.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path", + "pub_semver", + "yaml", + "uri" + ] + }, + { + "name": "uri", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher", + "quiver" + ] + }, + { + "name": "quiver", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "sentry_flutter", + "version": "7.7.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "sentry", + "package_info_plus", + "meta" + ] + }, + { + "name": "package_info_plus", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "flutter_web_plugins", + "http", + "meta", + "path", + "package_info_plus_platform_interface", + "win32" + ] + }, + { + "name": "win32", + "version": "3.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "ffi", + "version": "2.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "package_info_plus_platform_interface", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http", + "version": "0.13.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "js", + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math" + ] + }, + { + "name": "sentry", + "version": "7.7.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "http", + "meta", + "stack_trace", + "uuid" + ] + }, + { + "name": "uuid", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "path_provider_platform_interface", + "version": "2.0.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "platform", + "version": "3.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path_provider_windows", + "version": "2.1.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "permission_handler", + "version": "10.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "permission_handler_android", + "permission_handler_apple", + "permission_handler_windows", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_platform_interface", + "version": "3.9.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "permission_handler_windows", + "version": "0.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_apple", + "version": "9.0.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_android", + "version": "10.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "open_file_plus", + "version": "3.4.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "ffi" + ] + }, + { + "name": "shared_preferences", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_android", + "shared_preferences_foundation", + "shared_preferences_linux", + "shared_preferences_platform_interface", + "shared_preferences_web", + "shared_preferences_windows" + ] + }, + { + "name": "shared_preferences_windows", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_platform_interface", + "path_provider_windows", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_platform_interface", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "file", + "version": "6.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "shared_preferences_web", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_linux", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_linux", + "path_provider_platform_interface", + "shared_preferences_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.1.11", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "1.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "process" + ] + }, + { + "name": "process", + "version": "4.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "path", + "platform" + ] + }, + { + "name": "shared_preferences_foundation", + "version": "2.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_android", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "udisks", + "version": "0.4.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "dbus" + ] + }, + { + "name": "dbus", + "version": "0.7.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "ffi", + "meta", + "xml" + ] + }, + { + "name": "xml", + "version": "6.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "bitsdojo_window", + "version": "0.1.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "bitsdojo_window_platform_interface", + "bitsdojo_window_windows", + "bitsdojo_window_macos", + "bitsdojo_window_linux" + ] + }, + { + "name": "bitsdojo_window_linux", + "version": "0.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "bitsdojo_window_platform_interface", + "ffi" + ] + }, + { + "name": "bitsdojo_window_platform_interface", + "version": "0.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "bitsdojo_window_macos", + "version": "0.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "bitsdojo_window_platform_interface", + "ffi" + ] + }, + { + "name": "bitsdojo_window_windows", + "version": "0.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "bitsdojo_window_platform_interface", + "win32", + "ffi" + ] + }, + { + "name": "url_launcher", + "version": "6.1.11", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.17", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_macos", + "version": "3.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_linux", + "version": "3.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_ios", + "version": "6.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_android", + "version": "6.0.35", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "path_provider", + "version": "2.0.15", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.2.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.0.27", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "libtokyo_flutter", + "version": "0.1.0", + "kind": "direct", + "source": "git", + "dependencies": [ + "flutter", + "material_theme_builder", + "libtokyo", + "path", + "intl", + "filesize" + ] + }, + { + "name": "libtokyo", + "version": "0.1.0", + "kind": "direct", + "source": "git", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "material_theme_builder", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "material_color_utilities" + ] + }, + { + "name": "flutter_localizations", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "flutter", + "intl", + "characters", + "clock", + "collection", + "js", + "material_color_utilities", + "meta", + "path", + "vector_math" + ] + } +] diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix index ae17226a09..8d041b5511 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "44.0.1"; + version = "44.1"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "2SJAEnLN1BXCknA+UsazZEZqCyDuHbMgJRZEwoNgb9Q="; + sha256 = "XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix index 44b7659d30..97508ed418 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members ++ teams.pantheon.members; + mainProgram = "file-roller"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix index ee31ca4fa5..8e396cc3f9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.5"; + version = "44.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PEdeBO0qD0EMtEuWk3VjaXB5GTrJt6UMkUhfubCDFas="; + sha256 = "UzXdVzWB22HhJthU3BauUZZXpbh5B4mkfSXkPhfNOkM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix index bee1f9e86d..99ab7e4d5c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.3"; + version = "44.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Mlq7ciyrILaqZ/FY6i/y6omYMMoKiD4kWU2d74X9FiI="; + sha256 = "i1N2fvbMVKLbWI7xxZJoOLDWe42bIRc95ROc0PvSgJU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix index 6fe8432826..059fcde8ea 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.3"; + version = "0.42.4"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "D97CEoU36LVcPFQNCoDcfCSaspFT9L4Bl6XzECWlpaA="; + sha256 = "YxDfqi0zK2YRm5sCD61qS9J9m8Yfr3gMpcoLYoEzA/c="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix index c549533f8d..9c85e3d193 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "44.0"; + version = "44.1"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-mYbyu3IIF6pQz1oEqEWLe7jdR99M3LxiMiRR9x7qFh8="; + sha256 = "sha256-c/q8VTzFOz8nzidPB3qnYw9+AkdKfTdUD4AcxyHKrqo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix index 78c9bdd0ae..faf44e50e0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix @@ -41,6 +41,11 @@ gsmakeDerivation rec { revert = true; sha256 = "02awigkbhqa60hfhqfh2wjsa960y3q6557qck1k2l231piz2xasa"; }) + # https://github.com/gnustep/libs-base/issues/294 + (fetchpatch { + url = "https://github.com/gnustep/libs-base/commit/37913d006d96a6bdcb963f4ca4889888dcce6094.patch"; + sha256 = "PyOmzRIirSKG5SQY+UwD6moCidPb8PXCx3aFgfwxsXE="; + }) ]; meta = { diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix index 27869f6e92..4aa91bae9f 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix @@ -10,7 +10,9 @@ let #### Development tools / libraries cmake-extras = callPackage ./development/cmake-extras { }; deviceinfo = callPackage ./development/deviceinfo { }; + geonames = callPackage ./development/geonames { }; gmenuharness = callPackage ./development/gmenuharness { }; + libusermetrics = callPackage ./development/libusermetrics { }; lomiri-api = callPackage ./development/lomiri-api { }; }; in diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix new file mode 100644 index 0000000000..b3ee9dc25e --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix @@ -0,0 +1,122 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, buildPackages +, cmake +, docbook-xsl-nons +, docbook_xml_dtd_45 +, gettext +, glib +, glibcLocales +, withExamples ? true +, gtk3 +# Uses gtkdoc-scan* tools, which produces a binary linked against lib for hostPlatform and executes it to generate docs +, withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, gtk-doc +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geonames"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/geonames"; + rev = finalAttrs.version; + hash = "sha256-Mo7Khj2pgdJ9kT3npFXnh1WTSsY/B1egWTccbAXFNY8="; + }; + + outputs = [ + "out" + "dev" + ] ++ lib.optionals withExamples [ + "bin" + ] ++ lib.optionals withDocumentation [ + "doc" + ]; + + patches = [ + # Improves install locations of demo & docs + # Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/3 merged & in release + (fetchpatch { + name = "0001-geonames-Use-GNUInstallDirs-more.patch"; + url = "https://gitlab.com/OPNA2608/geonames/-/commit/e64a391fc213b2629da1c8bbf975fd62a2973c51.patch"; + hash = "sha256-HPYDtIy1WUrZLPzvKh4aezrT/LniZkNX+PeQ9YB85RY="; + }) + ]; + + postPatch = '' + patchShebangs src/generate-locales.sh tests/setup-test-env.sh + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + glib # glib-compile-resources + pkg-config + ] ++ lib.optionals withDocumentation [ + docbook-xsl-nons + docbook_xml_dtd_45 + gtk-doc + ]; + + buildInputs = [ + glib + ] ++ lib.optionals withExamples [ + gtk3 + ]; + + # Tests need to be able to check locale + LC_ALL = lib.optionalString finalAttrs.doCheck "en_US.UTF-8"; + nativeCheckInputs = [ + glibcLocales + ]; + + makeFlags = [ + # gtkdoc-scan runs ld, can't find qsort & strncpy symbols + "LD=${stdenv.cc.targetPrefix}cc" + ]; + + cmakeFlags = [ + "-DWANT_DOC=${lib.boolToString withDocumentation}" + "-DWANT_DEMO=${lib.boolToString withExamples}" + "-DWANT_TESTS=${lib.boolToString finalAttrs.doCheck}" + # Keeps finding & using glib-compile-resources from buildInputs otherwise + "-DCMAKE_PROGRAM_PATH=${lib.makeBinPath [ buildPackages.glib.dev ]}" + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # only for cross without native execute support because the canExecute "emulator" call has a format that I can't get CMake to accept + "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" + ]; + + preInstall = lib.optionalString withDocumentation '' + # gtkdoc-mkhtml generates images without write permissions, errors out during install + chmod +w doc/reference/html/* + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Parse and query the geonames database dump"; + homepage = "https://gitlab.com/ubports/development/core/geonames"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.all; + # Cross requires hostPlatform emulation during build + # https://gitlab.com/ubports/development/core/geonames/-/issues/1 + broken = stdenv.buildPlatform != stdenv.hostPlatform && !stdenv.hostPlatform.emulatorAvailable buildPackages; + pkgConfigModules = [ + "geonames" + ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/libusermetrics/default.nix new file mode 100644 index 0000000000..7ccaccfa39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/libusermetrics/default.nix @@ -0,0 +1,129 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, testers +, cmake +, cmake-extras +, dbus +, doxygen +, gsettings-qt +, gtest +, intltool +, json-glib +, libapparmor +, libqtdbustest +, pkg-config +, qdjango +, qtbase +, qtdeclarative +, qtxmlpatterns +, ubports-click +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libusermetrics"; + version = "1.3.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/libusermetrics"; + rev = finalAttrs.version; + hash = "sha256-yO9wZcXJBKt1HZ1GKoQ1flqYuwW9PlXiWLE3bl21PSQ="; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + postPatch = '' + substituteInPlace data/CMakeLists.txt \ + --replace '/etc' "$out/etc" + + # Tries to query QMake for QT_INSTALL_QML variable, would return broken paths into /build/qtbase- even if qmake was available + substituteInPlace src/modules/UserMetrics/CMakeLists.txt \ + --replace "\''${QT_IMPORTS_DIR}/UserMetrics" '${placeholder "out"}/${qtbase.qtQmlPrefix}/UserMetrics' + + substituteInPlace src/libusermetricsinput/CMakeLists.txt \ + --replace 'RUNTIME DESTINATION bin' 'RUNTIME DESTINATION ''${CMAKE_INSTALL_BINDIR}' + + substituteInPlace doc/CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_DATAROOTDIR}/doc/libusermetrics-doc" "\''${CMAKE_INSTALL_DOCDIR}" + '' + lib.optionalString (!finalAttrs.doCheck) '' + # Only needed by tests + sed -i -e '/QTDBUSTEST/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + intltool + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + cmake-extras + gsettings-qt + json-glib + libapparmor + qdjango + qtxmlpatterns + ubports-click + + # Plugin + qtbase + ]; + + nativeCheckInputs = [ + dbus + ]; + + checkInputs = [ + gtest + libqtdbustest + qtdeclarative + ]; + + cmakeFlags = [ + "-DGSETTINGS_LOCALINSTALL=ON" + "-DGSETTINGS_COMPILE=ON" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + checkPhase = '' + runHook preCheck + + export QT_PLUGIN_PATH=${lib.getBin qtbase}/lib/qt-${qtbase.version}/plugins/ + export QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/lib/qt-${qtbase.version}/qml/ + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf -- \ + make test "''${enableParallelChecking:+-j $NIX_BUILD_CORES}" + + runHook postCheck + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Enables apps to locally store interesting numerical data for later presentation"; + homepage = "https://gitlab.com/ubports/development/core/libusermetrics"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + mainProgram = "usermetricsinput"; + pkgConfigModules = [ + "libusermetricsinput-1" + "libusermetricsoutput-1" + ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix index 1c9a87b64a..a8769e3d26 100644 --- a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y"; }; - sourceRoot = "source/src-qt5"; + sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ qmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix index c102e20e79..0464287b96 100644 --- a/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6"; }; - sourceRoot = "source/src-qt5"; + sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ qmake qttools ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 8f38558e93..4f50def6cb 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -20,28 +19,20 @@ , libgee , libhandy , libical +, libportal-gtk3 }: stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "6.1.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "calendar"; rev = version; - sha256 = "sha256-psUVgl/7pmmf+8dP8ghBx5C1u4UT9ncXuVYvDJOYeOI="; + sha256 = "sha256-qZvSzhLGr4Gg9DSJ638IQRLlPiZkbJUCJ7tZ8ZFZZ1E="; }; - patches = [ - # build: support evolution-data-server 3.46 - # https://github.com/elementary/calendar/pull/758 - (fetchpatch { - url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch"; - sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -63,6 +54,7 @@ stdenv.mkDerivation rec { libgee libhandy libical + libportal-gtk3 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 388feb83cf..5a3233028c 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , appstream , desktop-file-utils @@ -9,7 +8,6 @@ , ninja , pkg-config , polkit -, python3 , vala , wrapGAppsHook , editorconfig-core-c @@ -28,24 +26,15 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc="; + sha256 = "sha256-Dtm0+NqDwfn5HUQEYtHTiyrpM3mHp1wUFOGaxH86YUo="; }; - patches = [ - # Fix global search action disabled at startup - # https://github.com/elementary/code/pull/1254 - (fetchpatch { - url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch"; - sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM="; - }) - ]; - nativeBuildInputs = [ appstream desktop-file-utils @@ -53,7 +42,6 @@ stdenv.mkDerivation rec { ninja pkg-config polkit # needed for ITS rules - python3 vala wrapGAppsHook ]; @@ -79,11 +67,6 @@ stdenv.mkDerivation rec { ) ''; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 40eec233f6..ca672cadae 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -10,7 +10,10 @@ , gtk3 , libxml2 , libhandy +, libportal-gtk3 , webkitgtk_4_1 +, elementary-gtk-theme +, elementary-icon-theme , folks , glib-networking , granite @@ -21,13 +24,13 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; rev = version; - sha256 = "sha256-dvDlvn8KvFmiP/NClRtHNEs5gPTUjlzgTYmgIaCfoLw="; + sha256 = "sha256-hBOogZ9ZNS9KnuNn+jNhTtlupBxZL2DG/CiuBR1kFu0="; }; nativeBuildInputs = [ @@ -41,6 +44,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-icon-theme evolution-data-server folks glib-networking @@ -48,6 +52,7 @@ stdenv.mkDerivation rec { gtk3 libgee libhandy + libportal-gtk3 webkitgtk_4_1 ]; @@ -56,6 +61,15 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # The GTK theme is hardcoded. + --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + # The icon theme is hardcoded. + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + ) + ''; + passthru = { updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index bba8fb4a72..d33242b77d 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -19,28 +18,20 @@ , libgee , libhandy , libical +, libportal-gtk3 }: stdenv.mkDerivation rec { pname = "elementary-tasks"; - version = "6.3.1"; + version = "6.3.2"; src = fetchFromGitHub { owner = "elementary"; repo = "tasks"; rev = version; - sha256 = "sha256-b8KUlfpZxRFDiBjgrV/4XicCcEw2fWaN78NaOq6jQBk="; + sha256 = "sha256-6Vwx+NRVGDqZzN5IVk4cQxGjSkYwrrNhUVoB8TRo28U="; }; - patches = [ - # Port to libsoup 3 - # https://github.com/elementary/tasks/pull/345 - (fetchpatch { - url = "https://github.com/elementary/tasks/commit/22e0d18693932e9eea3d2a22329f845575ce26e6.patch"; - sha256 = "sha256-nLJlKf4L7G12ZnCo4wezyMRyeAf+Tf0OGHyT8I1ZuDA="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -61,6 +52,7 @@ stdenv.mkDerivation rec { libgee libhandy libical + libportal-gtk3 ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 0b9c3213b3..154a8b65a5 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-DofAOv7sCe7RAJpgz9PEYm+C8RAl0a1KgFm9jToMsEY="; + sha256 = "sha256-X5EGDS8/EazIHiDBHCisd+XPE9dMx/0lQ8hrz9imUno="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 1b531d77c4..c8dd5428ed 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-GJjtGLCBRISaopZWli/MfqrPcG+xjY7nHZKS+S806GI="; + sha256 = "sha256-iq1QXC6eQ2w5j9RCxhTc0dApMfiDGcVuj8nocEFLFNk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 82ab908a38..cf53888edd 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix-update-script , meson -, python3 , ninja , pkg-config , vala @@ -21,20 +20,19 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-J3lUyLNyxlleD2jklXB2jMRvLY6WG5iccA2lIaJL3d4="; + sha256 = "sha256-2eQ89FpEMF85UmqVu9FJUvSlaVGmsrRBnhAW7oUiUqg="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala ]; @@ -51,11 +49,6 @@ stdenv.mkDerivation rec { zeitgeist ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index f7e2419422..c5b221e82e 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -7,6 +7,7 @@ , pkg-config , vala , libgee +, libhandy , granite , gtk3 , pulseaudio @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-a3GYtV0f+I9grnwndGI782/shpUWpR6GrRRD380Q6+o="; + sha256 = "sha256-JXt/S+vNzuRaRC0DMX13Lxv+OoAPRQmSLv9fsvnkWY4="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 libgee + libhandy pulseaudio switchboard ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 94a6e533dd..c3f31624ff 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.1.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "sha256-6rjZOX9JOTjZwqWVWTtKjGNy8KgWllE9VQZzwhuBAwE="; + sha256 = "sha256-m/xuaMCAPoqhl/M547mdafBPBu3UhHmVmBIUKQoS5L8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index 163351075c..a5a011fbaa 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-a11y"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-iS+xTCjbRZfaUiOtHbQ+/SaajfWWAlC9XiZbIGZPO9I="; + sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 298b89d7e9..4f44b337fd 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-i7fSKnP4W12cfax5IXm/Zgy5vP5z7S43S80gvzWpFCE="; }; + patches = [ + # Fix broken notification filter + # https://github.com/elementary/notifications/pull/207 + (fetchpatch { + url = "https://github.com/elementary/notifications/commit/4691ec869316be94598d8e55e1cd3bd525e8e149.patch"; + sha256 = "sha256-4x/Us92Mgws5v+ZQiKvjQ4ixfBnU8oTQ92rc+nf8Zdg="; + }) + ]; + nativeBuildInputs = [ glib # for glib-compile-schemas meson diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 6f4cf8cf8d..805956d332 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -10,6 +10,7 @@ , accountsservice , dbus , desktop-file-utils +, fwupd , geoclue2 , glib , gobject-introspection @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-5QdCj2Z31t7dxZi7ZZ5g6qLgsMyw7rM5dRw0G8uoC6o="; + sha256 = "sha256-mEmc9uLwUTObsP70P0G2vcRdQF6do/wMTQjvfLUU//o="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice dbus + fwupd geoclue2 glib gtk3 diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index c801199a72..95050843d0 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "kzones"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; rev = "v${version}"; - sha256 = "sha256-E5pi2ttar6bAt7s0m/NCw66Qgg5fL5p5QpXROWuUTvM="; + sha256 = "sha256-0f7Fv5cvRvqNrKjHpU/tLpjiBPN0ExwTDq1p9sdLd4o="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index adc97217ca..4acfa63193 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.6/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.7/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix index 88a1968d9d..837c2aeb7b 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -16,11 +16,22 @@ , ktexteditor , kwidgetsaddons , kdoctools +, fetchpatch }: mkDerivation { pname = "plasma-sdk"; + patches = [ + # remove duplicate doc entries, fix build + # FIXME: remove for next update + (fetchpatch { + url = "https://invent.kde.org/plasma/plasma-sdk/-/commit/e766c3c0483329f52ba0dd7536c4160131409f8e.patch"; + revert = true; + hash = "sha256-NoQbRo+0gT4F4G6YbvTiQulqrsFtnD7z0/0I4teQvUM="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index 562a1282ac..5af4c75f7a 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,475 +4,475 @@ { aura-browser = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/aura-browser-5.27.6.tar.xz"; - sha256 = "1ppsxzy6hdnnsrrhlx5b7vq1f8v2d1rhfg5j5ypa77ixvi1yglh2"; - name = "aura-browser-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/aura-browser-5.27.7.tar.xz"; + sha256 = "0pzb3wgqqq9sddc9ycwxhikc450s78v9287djb6p96mvprix205r"; + name = "aura-browser-5.27.7.tar.xz"; }; }; bluedevil = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/bluedevil-5.27.6.tar.xz"; - sha256 = "0x6zfcdw03kggd4mhkhva2b2v2w2ajzs7svslm1p1p8f41vzivvw"; - name = "bluedevil-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/bluedevil-5.27.7.tar.xz"; + sha256 = "0ddzcarn06rvhbmvm9x737ba9ycxcvg030892nh6izgfrjlaxhfb"; + name = "bluedevil-5.27.7.tar.xz"; }; }; breeze = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/breeze-5.27.6.tar.xz"; - sha256 = "0v3cz9phdalvawfjrg3yirn2n4z6h872p12g7hcf8706bdz8v6jx"; - name = "breeze-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/breeze-5.27.7.tar.xz"; + sha256 = "1wfclkg4d3wraz19kwpm87vwp9327s5y8n1a42qgrdh980qwzzdz"; + name = "breeze-5.27.7.tar.xz"; }; }; breeze-grub = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/breeze-grub-5.27.6.tar.xz"; - sha256 = "0lg2fba5v22z666wkbm5a6gzlq79jxski1cqnpp1z5laj7nrh8mv"; - name = "breeze-grub-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/breeze-grub-5.27.7.tar.xz"; + sha256 = "1c0096x75yhmr3irpbkz302gikqh2m1mz2s5j063db2ky72vlf9m"; + name = "breeze-grub-5.27.7.tar.xz"; }; }; breeze-gtk = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/breeze-gtk-5.27.6.tar.xz"; - sha256 = "1nkbhcsb359sqjampyc7cyl0hfnrx6gsrnqgaskdwk92p49snamc"; - name = "breeze-gtk-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/breeze-gtk-5.27.7.tar.xz"; + sha256 = "1s2qv51qa867b0bf29b7j90yzqmn3s2dwblczsb79h2i1gnr8ci9"; + name = "breeze-gtk-5.27.7.tar.xz"; }; }; breeze-plymouth = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/breeze-plymouth-5.27.6.tar.xz"; - sha256 = "0gjg3ddc3g45dnj0lv5k52bf1v403qpgv2nhqrx9z3x43kidb3vc"; - name = "breeze-plymouth-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/breeze-plymouth-5.27.7.tar.xz"; + sha256 = "1vm33di6aaj95pf45g4r3hp79ag1i75mi1b5fpipjgi4aiiqvddz"; + name = "breeze-plymouth-5.27.7.tar.xz"; }; }; discover = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/discover-5.27.6.tar.xz"; - sha256 = "1ici6p7bvvfszcy79lrr5xa6q1kfskxyijfr2pq9lkdhn8sdfq8n"; - name = "discover-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/discover-5.27.7.tar.xz"; + sha256 = "0025g1whq8z1s5915jhq83xsiz4klzqpayfzqkar8c6gni5s3v59"; + name = "discover-5.27.7.tar.xz"; }; }; drkonqi = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/drkonqi-5.27.6.tar.xz"; - sha256 = "04yam1xjwxi6jbh4r2k0ci7vdjc5cwfg4nn36lb64f5gj2bicppr"; - name = "drkonqi-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/drkonqi-5.27.7.tar.xz"; + sha256 = "1li1j85yvg2nj392rl1jmdqx3mzmrdj0lf72j37xd8r2bi0ic9z8"; + name = "drkonqi-5.27.7.tar.xz"; }; }; flatpak-kcm = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/flatpak-kcm-5.27.6.tar.xz"; - sha256 = "0ykzjaz45qxq7bl05chh3fg5b3qd0vdva5jf61dxnn7bksxr9vpw"; - name = "flatpak-kcm-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/flatpak-kcm-5.27.7.tar.xz"; + sha256 = "1crjxvfnx8jiaczwp7i96l75frcp866bv1rng8vizhi42pikbv52"; + name = "flatpak-kcm-5.27.7.tar.xz"; }; }; kactivitymanagerd = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kactivitymanagerd-5.27.6.tar.xz"; - sha256 = "0bdhqn809jxgrq6j4jx1vf4q3xicqj3yi6557qpqxy34mlr0n606"; - name = "kactivitymanagerd-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kactivitymanagerd-5.27.7.tar.xz"; + sha256 = "1d7vz8gwqa7nhfn62dsqircm0qbp9ryass82k2891mqj0qrlbwid"; + name = "kactivitymanagerd-5.27.7.tar.xz"; }; }; kde-cli-tools = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kde-cli-tools-5.27.6.tar.xz"; - sha256 = "1ahgpaa073lg6n7xnrkflqz9cj8sl7f77sla93415hc2pz1v3qmm"; - name = "kde-cli-tools-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kde-cli-tools-5.27.7.tar.xz"; + sha256 = "1br1i8ba4n7d2yl618ph4glsaasn3rxy4kjp48f12l9l2pk29nxa"; + name = "kde-cli-tools-5.27.7.tar.xz"; }; }; kde-gtk-config = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kde-gtk-config-5.27.6.tar.xz"; - sha256 = "087qj3c46f5wn7vh3nvf0pg40rspja3113phbzapf2sk09b3mwmk"; - name = "kde-gtk-config-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kde-gtk-config-5.27.7.tar.xz"; + sha256 = "13qwj3gdfvs0l6k01n8hf25kzrsksi3qi0b1rzpshcj1ix31wamf"; + name = "kde-gtk-config-5.27.7.tar.xz"; }; }; kdecoration = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kdecoration-5.27.6.tar.xz"; - sha256 = "1rllab85yzx9s3vfm2j31wxwi1s0js0a6jz7bcy8cv4sk91rpdlx"; - name = "kdecoration-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kdecoration-5.27.7.tar.xz"; + sha256 = "153j3w00zwj6gx9ndq46vkfwx3ayig80j0jsqbkajk8zsncs89pg"; + name = "kdecoration-5.27.7.tar.xz"; }; }; kdeplasma-addons = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kdeplasma-addons-5.27.6.tar.xz"; - sha256 = "11zhpb4gcz4yy2v0j8mfzihi9rj35f83i8bi7iirix0vm100sfrl"; - name = "kdeplasma-addons-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kdeplasma-addons-5.27.7.tar.xz"; + sha256 = "0l7g4lx6y10xfabfcgvh7zb7h08clj0g9yx8ajyg7rzwfa43visi"; + name = "kdeplasma-addons-5.27.7.tar.xz"; }; }; kgamma5 = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kgamma5-5.27.6.tar.xz"; - sha256 = "14nn3wsk9w9x8m0mbdmdi86xh6x2946zhzhwdbsfgynjrkn13wb1"; - name = "kgamma5-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kgamma5-5.27.7.tar.xz"; + sha256 = "0v5fynydjha9wx9j59ysw8vxx2h2gm55q27gnnhgyv0wxva8hpnl"; + name = "kgamma5-5.27.7.tar.xz"; }; }; khotkeys = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/khotkeys-5.27.6.tar.xz"; - sha256 = "0zixhdnsm3956w2bff6fk1ksvk61ywjkylg690b90l041rhfriyv"; - name = "khotkeys-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/khotkeys-5.27.7.tar.xz"; + sha256 = "1ipg71jz356jrngw7kqbjs7jplpnr8q3yz694rkhqklsqlfh91bd"; + name = "khotkeys-5.27.7.tar.xz"; }; }; kinfocenter = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kinfocenter-5.27.6.tar.xz"; - sha256 = "06whh4wzc292xvzabv7q6x8wm0gkyd2nsy50vlvk7iy85jayk5nd"; - name = "kinfocenter-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kinfocenter-5.27.7.tar.xz"; + sha256 = "15hm828ifrrzsbkvknqwf0l3qxr45pdi49z823cw421z45r8ivkj"; + name = "kinfocenter-5.27.7.tar.xz"; }; }; kmenuedit = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kmenuedit-5.27.6.tar.xz"; - sha256 = "15j63b2vg5dmgqfin4irv3pz3ws6wvji0b5fdi82fml5hgx4y549"; - name = "kmenuedit-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kmenuedit-5.27.7.tar.xz"; + sha256 = "0n60z44wbsjinrcrhs5cfnjs9szpsv2wzva2fiwwgh36j6zz5av7"; + name = "kmenuedit-5.27.7.tar.xz"; }; }; kpipewire = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kpipewire-5.27.6.tar.xz"; - sha256 = "12rjwkk272r9r583vgxb64p5nylkcqsfyvbn0lpa6ap8q2zm7mky"; - name = "kpipewire-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kpipewire-5.27.7.tar.xz"; + sha256 = "10j7sa8vv530c388z5rzafkdr4sx3agjqczlnkh7412whyw77lha"; + name = "kpipewire-5.27.7.tar.xz"; }; }; kscreen = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kscreen-5.27.6.tar.xz"; - sha256 = "0m7jidcs9xf5xzlnhx2s9qnzn6z80fxhssrxz8i2zqk7xhg6bl6y"; - name = "kscreen-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kscreen-5.27.7.tar.xz"; + sha256 = "03qa2qrwdjgb6va7akhwpdvzky608sq2lnwj3b1f310mn3hmbmrq"; + name = "kscreen-5.27.7.tar.xz"; }; }; kscreenlocker = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kscreenlocker-5.27.6.tar.xz"; - sha256 = "0pgmy4dw41kim7syk4xb2n4g4iz3jjikhwnh3bjianl9h87rc12x"; - name = "kscreenlocker-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kscreenlocker-5.27.7.tar.xz"; + sha256 = "11y3ksd29p8hdn8chaf8vscnc7fbh8xkjdsbakrb056p1r8kn0f2"; + name = "kscreenlocker-5.27.7.tar.xz"; }; }; ksshaskpass = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/ksshaskpass-5.27.6.tar.xz"; - sha256 = "1ig8qvjvrl27q1bg34c4lg34yx4pdvcjzxn4jxg6h9wbxdwssk45"; - name = "ksshaskpass-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/ksshaskpass-5.27.7.tar.xz"; + sha256 = "0vmydvj4c9c93y9wyyjs2hr9m0hygssk1asl4idbj7mcy6n7acg1"; + name = "ksshaskpass-5.27.7.tar.xz"; }; }; ksystemstats = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/ksystemstats-5.27.6.tar.xz"; - sha256 = "0xi3z8pk1byc4wcds0an2ndnw8j5zgq3wr0gm517rc8vck30m0gi"; - name = "ksystemstats-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/ksystemstats-5.27.7.tar.xz"; + sha256 = "1fx5b566xx32q7gxi8qnnx6vny7ip5r65zi2znnx3azmwsc8jgvw"; + name = "ksystemstats-5.27.7.tar.xz"; }; }; kwallet-pam = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kwallet-pam-5.27.6.tar.xz"; - sha256 = "0c38s7iqha94vz2d8dfch4qfb7zpc6k5z7wm33f5x190bw3g1bdp"; - name = "kwallet-pam-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kwallet-pam-5.27.7.tar.xz"; + sha256 = "1ac0hqpzqivg40jq7pfr2s1zydl600a3nyzfv97wc20i9myzafrb"; + name = "kwallet-pam-5.27.7.tar.xz"; }; }; kwayland-integration = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kwayland-integration-5.27.6.tar.xz"; - sha256 = "10rc14ggbs86bq0sky4i3kdwarwk8mh2yx4g77if8vr7z96xpdqh"; - name = "kwayland-integration-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kwayland-integration-5.27.7.tar.xz"; + sha256 = "1fvf64vx5m3h5v8h697ixkcifhva6a14wlz75kv6759ji9l9fy8y"; + name = "kwayland-integration-5.27.7.tar.xz"; }; }; kwin = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kwin-5.27.6.tar.xz"; - sha256 = "1v4r4h2zbandg43iyww5p66sgv2z90lrri1gijnwjlg9j5gbvmb2"; - name = "kwin-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kwin-5.27.7.tar.xz"; + sha256 = "0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb"; + name = "kwin-5.27.7.tar.xz"; }; }; kwrited = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/kwrited-5.27.6.tar.xz"; - sha256 = "153q38msna94wy8qbss02hzw7vabfghxs90bq9g9qjsr28428r86"; - name = "kwrited-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/kwrited-5.27.7.tar.xz"; + sha256 = "1a4g05ynblbz0j0lqclxf6628x6wcd3b52l0smic3rdvbis43v0n"; + name = "kwrited-5.27.7.tar.xz"; }; }; layer-shell-qt = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/layer-shell-qt-5.27.6.tar.xz"; - sha256 = "14w7kr5d5s9fg2qkybk5axg11cafc6rrxkivynj5v55zcp52jp76"; - name = "layer-shell-qt-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/layer-shell-qt-5.27.7.tar.xz"; + sha256 = "08glqqh7jmqrli4n7j04lz3w3c6192w8p7ki51ksmwivnxylxi17"; + name = "layer-shell-qt-5.27.7.tar.xz"; }; }; libkscreen = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/libkscreen-5.27.6.tar.xz"; - sha256 = "1ywyg1i9bg0nawndl4hzivd4yfsqk5snls8ak1vyr9xmm8zkgaf1"; - name = "libkscreen-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/libkscreen-5.27.7.tar.xz"; + sha256 = "1ary7qavz8vkzbvjx2mxv09h61hxa7i4f7rfgbykldbc83ripdc6"; + name = "libkscreen-5.27.7.tar.xz"; }; }; libksysguard = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/libksysguard-5.27.6.tar.xz"; - sha256 = "1nqv0gxq011acvmqc2rpqrw4l928mcmg4rq2g45qzfmnmas2rjwy"; - name = "libksysguard-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/libksysguard-5.27.7.tar.xz"; + sha256 = "066bjar4105bfyry6ni7nnikz66bqzy5nvssz6vm4np3aa996ak8"; + name = "libksysguard-5.27.7.tar.xz"; }; }; milou = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/milou-5.27.6.tar.xz"; - sha256 = "1il1sg7xi9p7snz9w3mygpydl6y02r5n24wa14yk23qhphwsgbpy"; - name = "milou-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/milou-5.27.7.tar.xz"; + sha256 = "0lq8m72nwink8x46m8qd5zdkadym1kc70ipnkb04b16mr7zhnsc1"; + name = "milou-5.27.7.tar.xz"; }; }; oxygen = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/oxygen-5.27.6.tar.xz"; - sha256 = "01h9vh8gk4ncgwa1p25ps5rm6m180081vh0ryw9x3z1qw893j1m9"; - name = "oxygen-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/oxygen-5.27.7.tar.xz"; + sha256 = "139rar9d36cvp6hl7857qkw9h0xbmk2i7x3mdgjpsabv5wpzq652"; + name = "oxygen-5.27.7.tar.xz"; }; }; oxygen-sounds = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/oxygen-sounds-5.27.6.tar.xz"; - sha256 = "0zijzkr6xqx3lqfccr9fkhmzmvqp5c8025nlh8sy94fi846g7smg"; - name = "oxygen-sounds-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/oxygen-sounds-5.27.7.tar.xz"; + sha256 = "132jaabfpj8k6xk6f1732a0qgjz1mzyyk74b1mm7q7pyhpypr2gq"; + name = "oxygen-sounds-5.27.7.tar.xz"; }; }; plank-player = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plank-player-5.27.6.tar.xz"; - sha256 = "1mjn2qvzav3c2sxfnfv2h9bj7cd00vidl85zmljm17nflv9cvwa8"; - name = "plank-player-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plank-player-5.27.7.tar.xz"; + sha256 = "0360affl3wl6aa6lmd7lc6lpzq2v8sqbr5ah2c5vmq0n0p4xxk4n"; + name = "plank-player-5.27.7.tar.xz"; }; }; plasma-bigscreen = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-bigscreen-5.27.6.tar.xz"; - sha256 = "097f5whppwla0y7zil7ykyp97glx2wdc05mwd7pk6y2l6d60fhl7"; - name = "plasma-bigscreen-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-bigscreen-5.27.7.tar.xz"; + sha256 = "0b2w0d5w1s2jm7al1nqdc1qh9fmrj8fw93wjbb2bsa9fabz2i81b"; + name = "plasma-bigscreen-5.27.7.tar.xz"; }; }; plasma-browser-integration = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-browser-integration-5.27.6.tar.xz"; - sha256 = "12hrd6mvhmi649n4jc9pmv116f2cpzd3j90hxlhljixnw4g6vy3j"; - name = "plasma-browser-integration-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-browser-integration-5.27.7.tar.xz"; + sha256 = "0c30pdlhl452bjpdc7mwxl01hqabahyc0j1cc54liy0hla9vir9y"; + name = "plasma-browser-integration-5.27.7.tar.xz"; }; }; plasma-desktop = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-desktop-5.27.6.tar.xz"; - sha256 = "10x68lqg6zxb8fajd277lm0qfrdg2jz7m58l3wna4nv9bni5wj72"; - name = "plasma-desktop-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-desktop-5.27.7.tar.xz"; + sha256 = "1njkjf3fhxfmwyviypxqzrn23klxiih82bazvd8y61cshqwai6i2"; + name = "plasma-desktop-5.27.7.tar.xz"; }; }; plasma-disks = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-disks-5.27.6.tar.xz"; - sha256 = "09v4hwx2q8sz0b4qak8xaxnyqj6ccjlgk28fijvmnv61nxb49h1w"; - name = "plasma-disks-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-disks-5.27.7.tar.xz"; + sha256 = "0jwjv20ra1mhwl2cm7x2jz8pasmkc58fd57qxhzzf84l4sgbda9v"; + name = "plasma-disks-5.27.7.tar.xz"; }; }; plasma-firewall = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-firewall-5.27.6.tar.xz"; - sha256 = "1jbcyz92q63gh1ihkrvs4ffp1xjav9miy6n5adhqik9qxpgkqqn8"; - name = "plasma-firewall-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-firewall-5.27.7.tar.xz"; + sha256 = "1n5ljkydhcx6qapwrshslq835zaf02gssp2zvzi3vwfy4asc7ind"; + name = "plasma-firewall-5.27.7.tar.xz"; }; }; plasma-integration = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-integration-5.27.6.tar.xz"; - sha256 = "1awd9l874gxxkbcfzb76xga1f6firaqpshrapg0492vq33r5vzd5"; - name = "plasma-integration-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-integration-5.27.7.tar.xz"; + sha256 = "1ahzckvc69wk2rx73sl40h0in1y7ny0vm0i7lbrrcggv1v36dwp3"; + name = "plasma-integration-5.27.7.tar.xz"; }; }; plasma-mobile = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-mobile-5.27.6.tar.xz"; - sha256 = "16djcga7ljq7zv979im8zd1l1fz7qfw9g2ya6kvdn9mf8li0l98j"; - name = "plasma-mobile-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-mobile-5.27.7.tar.xz"; + sha256 = "0f32xj9v32f89pdhwsmwm2xqfwcypq8r85jhj4zq887zxy1cgn0n"; + name = "plasma-mobile-5.27.7.tar.xz"; }; }; plasma-nano = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-nano-5.27.6.tar.xz"; - sha256 = "02qig2zh6py0i5phcyjln0yawbd6sdx4cm13l2kgi3bl1826kklb"; - name = "plasma-nano-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-nano-5.27.7.tar.xz"; + sha256 = "14wc76bxnwd0z51gz4zb88p5h9n2711ifr1wpx9lrj9r7y1llank"; + name = "plasma-nano-5.27.7.tar.xz"; }; }; plasma-nm = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-nm-5.27.6.tar.xz"; - sha256 = "1jfrd3xi4hyivkwrif6s87f9jasrnsihd7c80sqhwd1k2kl9wr0a"; - name = "plasma-nm-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-nm-5.27.7.tar.xz"; + sha256 = "1w9zclih2mh8gqwahsmbbm0nrg1b6gcr5w2w02szlw30iq8k92j8"; + name = "plasma-nm-5.27.7.tar.xz"; }; }; plasma-pa = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-pa-5.27.6.tar.xz"; - sha256 = "0kvfhpsiv0nkilirjwsplx67m5zdqc5w6zmp9gkgyym46ax0hxjf"; - name = "plasma-pa-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-pa-5.27.7.tar.xz"; + sha256 = "1vg28v5n648y94m6amcwmr0n7dw4a2kfx16kny7jb9bkmxrgnwsc"; + name = "plasma-pa-5.27.7.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-remotecontrollers-5.27.6.tar.xz"; - sha256 = "0ibngr1qy0vpdi6sx071225g354cdsag7j0gv3b6vrhq7s0z66b0"; - name = "plasma-remotecontrollers-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-remotecontrollers-5.27.7.tar.xz"; + sha256 = "0iswjkg93hf5vnvy5a4gpkc7p5d2d0b4nm74v2k9j23svipnzbah"; + name = "plasma-remotecontrollers-5.27.7.tar.xz"; }; }; plasma-sdk = { - version = "5.27.6.1"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-sdk-5.27.6.1.tar.xz"; - sha256 = "1byfknk60j4hajy1ibh25dv96irkpl4b5hyrrdg39m6fdx30wjrf"; - name = "plasma-sdk-5.27.6.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-sdk-5.27.7.tar.xz"; + sha256 = "1jbd2y1hryif8a2s3x74xjgm9nrx5ln0bszn94igi4g9p8vsdq86"; + name = "plasma-sdk-5.27.7.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-systemmonitor-5.27.6.tar.xz"; - sha256 = "07cwzcy7qd3b6rlyqjwhc2z567dn5j8gx701b57cs18z0rgv4vkr"; - name = "plasma-systemmonitor-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-systemmonitor-5.27.7.tar.xz"; + sha256 = "1qr8krc7d1hzxv0gx0ii0rxk9bm62rgh157mr8x785qqbd11nq8l"; + name = "plasma-systemmonitor-5.27.7.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-thunderbolt-5.27.6.tar.xz"; - sha256 = "1ikcbn9awh5zh9ivdm3ysi1dw208byj8d4ls5c9ckclvylkfx7v6"; - name = "plasma-thunderbolt-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-thunderbolt-5.27.7.tar.xz"; + sha256 = "0sgh5pafp9i0bhk7fhxc4fy20ldwidc1f5n4fcsya4aviy4cf2nn"; + name = "plasma-thunderbolt-5.27.7.tar.xz"; }; }; plasma-vault = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-vault-5.27.6.tar.xz"; - sha256 = "0wxa80m2ppjp8l8nchwcvrmx20j0rgm9ydn93x4w4d4rmi6mypr4"; - name = "plasma-vault-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-vault-5.27.7.tar.xz"; + sha256 = "1p5m5rlamb50cbd1qlx81m003sv8vdijkpy5airmy1pf6xmvl6hq"; + name = "plasma-vault-5.27.7.tar.xz"; }; }; plasma-welcome = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-welcome-5.27.6.tar.xz"; - sha256 = "0lvvxllhshawj7pjx3d9l53clcnr73x519khgf27fpblil1x0hm8"; - name = "plasma-welcome-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-welcome-5.27.7.tar.xz"; + sha256 = "0nz1hxz5nvgl3sbm6k3a76s0l3fy3j38i4plly2zhp5xqdk0ks1x"; + name = "plasma-welcome-5.27.7.tar.xz"; }; }; plasma-workspace = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-5.27.6.tar.xz"; - sha256 = "10w8ix9c29gvykr9970aax7jcz2fi99cafr1kknvj2drgc7zgrhw"; - name = "plasma-workspace-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-workspace-5.27.7.tar.xz"; + sha256 = "0pyf5vc466mfgicxpp76igdz58lpa0n7x2cl2hhaq4zmrlfr8hh6"; + name = "plasma-workspace-5.27.7.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-wallpapers-5.27.6.tar.xz"; - sha256 = "018vvxhs0rlc25hd5kafhzk6anl1yabggby7b5vsqvip2rsma0qk"; - name = "plasma-workspace-wallpapers-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plasma-workspace-wallpapers-5.27.7.tar.xz"; + sha256 = "181q0mmmp3dygzafgh4qq2pwi5w15vw6mwc21nkl98qf6z773ify"; + name = "plasma-workspace-wallpapers-5.27.7.tar.xz"; }; }; plymouth-kcm = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/plymouth-kcm-5.27.6.tar.xz"; - sha256 = "03qkrdin7s4kx14f518f6amvgd5adavgirjy8mk1zj62mz4f1sy5"; - name = "plymouth-kcm-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/plymouth-kcm-5.27.7.tar.xz"; + sha256 = "1y7ahb0wir10isls65yp5p164kiw3jn8bf8zn9bkkjqp649av9sw"; + name = "plymouth-kcm-5.27.7.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.27.6"; + version = "1-5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/polkit-kde-agent-1-5.27.6.tar.xz"; - sha256 = "0k7d9jz49fp4h7gxakqsmj16h5xdv8jw69068sz5mazzczi7lwyz"; - name = "polkit-kde-agent-1-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/polkit-kde-agent-1-5.27.7.tar.xz"; + sha256 = "0p6gnv59mnb5y6riiifyg98sk8zycchv8bkf7x1332qa7zqhcjcc"; + name = "polkit-kde-agent-1-5.27.7.tar.xz"; }; }; powerdevil = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/powerdevil-5.27.6.tar.xz"; - sha256 = "1dbz479ikjy6fi3l701hvhkwhbll1gkibay3vzimb13kyamhy8vb"; - name = "powerdevil-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/powerdevil-5.27.7.tar.xz"; + sha256 = "151qhpf5j33jk3jhhxsr4zaf0z3f8xlnw8inmzf2a8lficiq9060"; + name = "powerdevil-5.27.7.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/qqc2-breeze-style-5.27.6.tar.xz"; - sha256 = "02hxczlhyy2vwrsrw7hncmhcidany4xirlrw9caxsq4rylp7vszj"; - name = "qqc2-breeze-style-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/qqc2-breeze-style-5.27.7.tar.xz"; + sha256 = "0cjrjnj8iwjb9jxp28a30zxb56nhgslrbxzqy392b5sz2x5gbd04"; + name = "qqc2-breeze-style-5.27.7.tar.xz"; }; }; sddm-kcm = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/sddm-kcm-5.27.6.tar.xz"; - sha256 = "1qmmsvfs22byx5i48icgqh0cdh228yk40946yymacm39iwbsnw6w"; - name = "sddm-kcm-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/sddm-kcm-5.27.7.tar.xz"; + sha256 = "0hrw22ihrzph573lkwys6g5bnj72rwff1w1wjq0jzkcr3i8zai86"; + name = "sddm-kcm-5.27.7.tar.xz"; }; }; systemsettings = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/systemsettings-5.27.6.tar.xz"; - sha256 = "17bqdsaih11wpcmv7qzk701l67431pf2nm8nnrix1s8k3qglfb5w"; - name = "systemsettings-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/systemsettings-5.27.7.tar.xz"; + sha256 = "0vkcmb4sch97sq5xd8rj8z42qdcxy5ys758q6dl69kbv9hadl7bw"; + name = "systemsettings-5.27.7.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.27.6"; + version = "5.27.7"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.6/xdg-desktop-portal-kde-5.27.6.tar.xz"; - sha256 = "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf"; - name = "xdg-desktop-portal-kde-5.27.6.tar.xz"; + url = "${mirror}/stable/plasma/5.27.7/xdg-desktop-portal-kde-5.27.7.tar.xz"; + sha256 = "1k88zr073qj96wfbj500mwn8fxj39pxscc6wqhsfjpa6ssxgknyc"; + name = "xdg-desktop-portal-kde-5.27.7.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index d78a51660f..47c84b036e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -5,6 +5,7 @@ , gtk3 , gtksourceview4 , gspell +, enablePolkit ? true , polkit }: @@ -23,7 +24,8 @@ mkXfceDerivation { gtk3 gtksourceview4 gspell - polkit # optional polkit support + ] ++ lib.optionals enablePolkit [ + polkit ]; # Use the GSettings keyfile backend rather than DConf diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index 3820cae101..9f1373d7d9 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -3,15 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-volumed-pulse"; - version = "0.2.3"; + version = "0.2.4"; - sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc="; - - # https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/merge_requests/3 - postPatch = '' - substituteInPlace configure.ac.in \ - --replace "2.16" "2.26" - ''; + sha256 = "sha256-NDIJRjKV5aoM2sLhZ6WmoynOc4yz55KpuiTJDMLMA5Y="; buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index 8755234cbc..19b5529371 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -26,6 +26,14 @@ mkXfceDerivation { xfce4-panel ]; + # using /run/current-system/sw/bin instead of nix store path prevents polkit permission errors on + # rebuild. See https://github.com/NixOS/nixpkgs/issues/77485 + postPatch = '' + substituteInPlace src/org.xfce.power.policy.in2 --replace "@sbindir@" "/run/current-system/sw/bin" + substituteInPlace common/xfpm-brightness.c --replace "SBINDIR" "\"/run/current-system/sw/bin\"" + substituteInPlace src/xfpm-suspend.c --replace "SBINDIR" "\"/run/current-system/sw/bin\"" + ''; + meta = with lib; { description = "A power manager for the Xfce Desktop Environment"; maintainers = with maintainers; [ ] ++ teams.xfce.members; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index f86ab85f9a..1af46fd518 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.3"; - sha256 = "sha256-tnpQRYLV48NxKsWDjVSmypx6X1bVbx2U5Q8kQaP0AW8="; + version = "1.6.4"; + sha256 = "sha256-N/e97C6xWyF1GUg7gMN0Wcw35awypflMmA+Pdg6alEw="; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index ad0110a564..113d8b18f2 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -1,6 +1,7 @@ { lib , mkXfceDerivation , exo +, glib , gtk3 , libXtst , libxfce4ui @@ -13,13 +14,14 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-cpugraph-plugin"; - version = "1.2.7"; + version = "1.2.8"; rev-prefix = "xfce4-cpugraph-plugin-"; odd-unstable = false; - sha256 = "sha256-IgxljHJAg9Bp/OFFZiQ6QwE5vtAtQ0WmYHs78NVsmCw="; + sha256 = "sha256-GNoODnw9Z9MTlvxCOTeZt61A/0AGhMwjrRGdM35XU+M="; buildInputs = [ exo + glib gtk3 libXtst libxfce4ui diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 83fb651fc5..fae9523bfe 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -3,6 +3,7 @@ , automakeAddFlags , exo , gtk3 +, libcanberra , libpulseaudio , libnotify , libxfce4ui @@ -32,6 +33,7 @@ mkXfceDerivation { glib gtk3 keybinder3 + libcanberra libnotify libpulseaudio libxfce4ui diff --git a/third_party/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix index 6fe1385bb3..ebb059f6bb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/assemblyscript/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.5"; + version = "0.27.6"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3dWIYkiAA61xbUXJGmb/amjHmyXYoy16lLIAZR4sD5k="; + sha256 = "sha256-jN8P3EL3giDIZSExkjm5ZUwgkN3EIQhVpMqfx273yZU="; }; npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8="; diff --git a/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix b/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix index d75d4eeeef..1e5dea00f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix @@ -1,10 +1,8 @@ { dbus , fetchFromGitLab , gobject-introspection -, gtk4 , lib , libadwaita -, makeFontsConf , meson , ninja , python3 @@ -14,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-3lj9BMN5aNujbhhZjObdTOCQfH5ERQCgGqIAw5eZIQc="; + hash = "sha256-pPrQc2ID84N+50j/A6VAJAOK+D1hjaokhFckOnOaeTw="; }; nativeBuildInputs = [ @@ -42,23 +40,12 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ - xvfb-run dbus - gtk4 + xvfb-run ]; - env = { - # Fontconfig error: Cannot load default config file: No such file: (null) - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; - }; - doCheck = true; - preBuild = '' - # Fontconfig error: No writable cache directories - export XDG_CACHE_HOME="$(mktemp -d)" - ''; - checkPhase = '' runHook preCheck @@ -77,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A markup language for GTK user interface files"; homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ benediktbroich ranfdev ]; + maintainers = with maintainers; [ benediktbroich paveloom ranfdev ]; platforms = platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index b1fdde8d86..ed74dfd482 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: +{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null, testers }: let platform = with stdenv; @@ -8,30 +8,41 @@ let else if isSunOS then "solaris" else "linux"; # Should be a sane default in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chicken"; version = "5.3.0"; binaryVersion = 11; src = fetchurl { - url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; + url = "https://code.call-cc.org/releases/${finalAttrs.version}/chicken-${finalAttrs.version}.tar.gz"; sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY="; }; + # Disable two broken tests: "static link" and "linking tests" + postPatch = '' + sed -i tests/runtests.sh -e "/static link/,+4 { s/^/# / }" + sed -i tests/runtests.sh -e "/linking tests/,+11 { s/^/# / }" + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + # -fno-strict-overflow is not a supported argument in clang + hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; makeFlags = [ - "PLATFORM=${platform}" "PREFIX=$(out)" - ] ++ (lib.optionals stdenv.isDarwin [ - "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "PLATFORM=${platform}" + "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" + "TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" + ]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "HOSTSYSTEM=${stdenv.hostPlatform.config}" ]); nativeBuildInputs = [ @@ -44,24 +55,16 @@ stdenv.mkDerivation rec { bootstrap-chicken ]; - postInstall = '' - for f in $out/bin/* - do - wrapProgram $f \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} - done - ''; - doCheck = !stdenv.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ - -p "(assert (equal? \"${toString binaryVersion}\" (pathname-file (car (repository-path)))))" + -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" ''; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/chicken -version - ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "csi -version"; + }; meta = { homepage = "https://call-cc.org/"; @@ -77,4 +80,4 @@ stdenv.mkDerivation rec { Windows, and many Unix flavours. ''; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml index 7e351479aa..b61c38506b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml @@ -107,9 +107,9 @@ version = "0.6" [apropos] dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "0graywcx94xvn9m4lk86f3qipsvnvr3vww6mqr37kd0ykj2rwrb7" +sha256 = "1xnqfnbnac4pzm4j3mphq09p18q962dxg11cfyxqk8k6v8qrv5nh" synopsis = "CHICKEN apropos" -version = "3.7.0" +version = "3.7.2" [arcadedb] dependencies = ["uri-common", "medea"] @@ -303,9 +303,9 @@ version = "2.0.4" [bloom-filter] dependencies = ["iset", "message-digest-primitive", "message-digest-type", "message-digest-utils", "check-errors"] license = "bsd" -sha256 = "1ncxjfyv1hqbrls79pii7q4wxn0s8xkrp32khl3v0fq8mswbknzj" +sha256 = "1ljak0xscrywyl1sbv8yx9qkw1r2m94gyw3ag73p3z8m618valy3" synopsis = "Bloom Filter" -version = "2.3.1" +version = "2.3.4" [blosc] dependencies = ["srfi-13", "compile-file"] @@ -552,6 +552,13 @@ sha256 = "1047v7mk836mf4g6ba5a90lmgqql1ss1ap9kgk0mhzrffznjipgn" synopsis = "Download files (such as web comic images) by recursing on XPath" version = "1.21" +[commands] +dependencies = [] +license = "bsd" +sha256 = "13y49vrkd9rs98s9fk10g8w056xb9nnqxwn1372sayw64789i3ib" +synopsis = "Helpers for programs that dispatch commands" +version = "1.0.0" + [comparse] dependencies = ["lazy-seq", "trie", "matchable", "srfi-1", "srfi-13", "srfi-14", "srfi-69"] license = "bsd" @@ -576,9 +583,9 @@ version = "1.0" [condition-utils] dependencies = ["srfi-1", "srfi-69", "check-errors"] license = "bsd" -sha256 = "1srb3lgnfvlpwn31w72jcg5wlghlgpp0khgwlk8cqy9ll5piqwqk" +sha256 = "11mkmbyciyrqyakp1gyfvmbfayglhzx2x6j6zyp9kj31vhi2y4hd" synopsis = "SRFI 12 Condition Utilities" -version = "2.2.2" +version = "2.2.3" [continuations] dependencies = [] @@ -790,6 +797,13 @@ sha256 = "166qm2vx5gj7bc57s1bnnbp55zhv19hnimmivhhdhsnq32wi3511" synopsis = "EDN data reader/writer." version = "1.0" +[edward] +dependencies = ["r7rs", "srfi-1", "srfi-14", "srfi-37", "matchable", "posix-regex"] +license = "gplv3" +sha256 = "0gfvjgg6c6hl2xmh63067xkh0sd2vmczwisirgglcm2inz4hjll3" +synopsis = "An extensible implementation of the ed text editor as defined in POSIX.1-2008" +version = "1.0.1" + [egg-tarballs] dependencies = ["simple-sha1", "srfi-1", "srfi-13"] license = "bsd" @@ -1381,9 +1395,9 @@ version = "0.3" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "0kxir3f0f2w03wrsgdfn81hdmyzcrz6yglaqm369xrra2cpd4akb" +sha256 = "1cxjbl5kl4xk42a4p8j3av6ip0gqvp5yxahsccvm0snc98n3ngqg" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.11" +version = "0.0.12" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1437,9 +1451,9 @@ version = "7.0" [json-rpc] dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"] license = "mit" -sha256 = "0gh9w6mm6d3y2325m8cci743g1mh7q7bx3d4ygp47pj6mwjgihlz" +sha256 = "18qnp9ryp3s0i8363ny5c2v16csqq416smnzd3pls103zn47p44v" synopsis = "A JSON RPC library for R7RS scheme." -version = "0.3.0" +version = "0.4.0" [json-utils] dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"] @@ -1514,9 +1528,9 @@ version = "1.2" [levenshtein] dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"] license = "bsd" -sha256 = "1k32dfkn2m48icdgykm44a8c6y86qrim563y37c73rkxdzyjm9dy" +sha256 = "1v8g5ghilraz2lx0fif3yb1rlg3n51zvvik2l12ycqh0wj0pz59l" synopsis = "Levenshtein edit distance" -version = "2.2.5" +version = "2.2.8" [lexgen] dependencies = ["srfi-1", "utf8", "srfi-127"] @@ -1577,9 +1591,9 @@ version = "3.4" [lmdb] dependencies = ["srfi-1"] license = "openldap" -sha256 = "012gv5wblhaikd1r62dmjjqvyzxysbrs605hiw2xcfk1mx5ji7cz" +sha256 = "1ymy7ji9q7zvy8708f4zzavxkvajmq8l8m1z6v6873qkxgv6jkw8" synopsis = "Bindings to LMDB" -version = "1.0.5" +version = "1.0.6" [locale] dependencies = ["srfi-1", "utf8", "check-errors"] @@ -1612,9 +1626,9 @@ version = "3" [lsp-server] dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-130", "srfi-133", "srfi-18", "srfi-69", "uri-generic", "utf8"] license = "mit" -sha256 = "1jqdmzjdixmza3h3m363bdm1kmwpr2di14ig5a9rh4aw33zaax5v" +sha256 = "0wbigf0s37377hjfxspwydhvnds165mhp2qa14iskvsw5zbp8g80" synopsis = "LSP Server for CHICKEN." -version = "0.3.0" +version = "0.4.1" [macaw] dependencies = [] @@ -1836,9 +1850,9 @@ version = "5.0" [monocypher] dependencies = [] license = "bsd-2-clause" -sha256 = "15lpm5bmqn4b8mh5wws66jay5flwj9y185zdjxj5qc23i5q3cwh0" +sha256 = "09q33a6b8v306j93kd67wk5gisca7sij0p98i7pd10xnimllc5hh" synopsis = "Monocypher cryptographic library" -version = "4.0.1-0" +version = "4.0.1" [moremacros] dependencies = ["srfi-69", "miscmacros", "check-errors"] @@ -2221,9 +2235,9 @@ version = "0.1.1" [r7rs] dependencies = ["matchable", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "1lxby5hj8bwqdwys5324fvrj6q9j4dp10mlvla3qjfc9scppxj79" +sha256 = "1rwx52mjsylvbkmpg0z7jbawaf87dsxdgwgq8z5nh8k5nb03b6v5" synopsis = "R7RS compatibility" -version = "1.0.8" +version = "1.0.9" [rabbit] dependencies = ["srfi-1"] @@ -2316,6 +2330,13 @@ sha256 = "18d0f37a13nsknay6vw27xvr1k0s4p4ss2dc29fhx89hsv5ycjsq" synopsis = "RIPE Message Digest" version = "2.1.2" +[rlimit] +dependencies = ["srfi-13"] +license = "bsd" +sha256 = "0jmz98253k3q9a6kyyby6jm722w3s74c5y3km7ih9ybjjmcdkyzv" +synopsis = "Setting resource limits" +version = "1.0.1" + [rocksdb] dependencies = [] license = "bsd" @@ -2344,6 +2365,13 @@ sha256 = "1vngrvh2b7rv5n5zvksfg27zikpc7d8xb8n1kd0pyfr7hna00wf9" synopsis = "Serialization of arbitrary data." version = "0.9.12" +[s9fes-char-graphics] +dependencies = ["srfi-1", "utf8", "format"] +license = "public-domain" +sha256 = "1h12l59860cyv8xwvvpf96dnlqwd25mrq2qapj9nyxv0vbkcs4p6" +synopsis = "Scheme 9 from Empty Space Char Graphics" +version = "1.3.3" + [salmonella-diff] dependencies = ["salmonella", "salmonella-html-report", "srfi-1", "srfi-13", "sxml-transforms"] license = "bsd" @@ -3040,9 +3068,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "srfi-69", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "02348j6zdp1nyh0f8jw1j848qlm0dv7p7q6rw7jdfzqi4bq5myva" +sha256 = "14nyv6m67k2angmhg028rd50mq77qi1zfr5f0praiyy07k2pmcpz" synopsis = "Time Data Types and Procedures" -version = "4.7.2" +version = "4.7.3" [srfi-193] dependencies = [] @@ -3761,9 +3789,9 @@ version = "3.6.3" [uuid-lib] dependencies = ["record-variants"] license = "bsd" -sha256 = "1788c9wilnwa21r27g9cfwjypbzgmv6rs5i93yrywg2fry9v45nd" +sha256 = "0da71k0f3j1l9wjnfk9gqs9gw3v1192xhxbxv2gfmah3fvxf203p" synopsis = "OSF DCE 1.1 UUID" -version = "0.0.9" +version = "0.0.10" [uuid] dependencies = [] diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix index a85a98d46c..2d24623559 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -17,14 +17,16 @@ in (stdenv.mkDerivation ({ name = "chicken-${name}"; propagatedBuildInputs = buildInputs; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ chicken makeWrapper ]; buildInputs = [ chicken ]; + strictDeps = true; + CSC_OPTIONS = lib.concatStringsSep " " cscOptions; buildPhase = '' runHook preBuild - chicken-install -cached -no-install ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -no-install -host ${lib.escapeShellArgs chickenInstallFlags} runHook postBuild ''; @@ -33,7 +35,7 @@ in export CHICKEN_INSTALL_PREFIX=$out export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion} - chicken-install -cached ${lib.escapeShellArgs chickenInstallFlags} + chicken-install -cached -host ${lib.escapeShellArgs chickenInstallFlags} for f in $out/bin/* do diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/update.sh b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/update.sh index 32f5fbf560..59f5337dbb 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/update.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i oil -p oil chicken +#! nix-shell -I nixpkgs=../../../../.. -i oil -p oil chicken export URL_PREFIX="https://code.call-cc.org/egg-tarballs/5/" cd $(nix-prefetch-url \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix index 171419a39e..bc85f6e100 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.22.0-m1"; + version = "1.22.0-m7"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "sha256-p7QNSsDI8hVMPPfkX3PNjJo01hsPGKZ7jMR9Kmj2qxY="; + sha256 = "sha256-5LX+NVDAtdffQeLTD4Camp5aNm0K3Cwmavh7OF5XcZU="; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix index 7e7f6823bc..e53de0e4ee 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.45.0"; + version = "1.49.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-yzXYiqRIwV3bkMfvmduow3QWJASXhOspM8CHZPN2/uE="; + sha256 = "sha256-pHMysxnczKilfjJafobU18/gaWnfrHMpPUd6RQ+CXSg="; fetchSubmodules = true; }; @@ -54,6 +54,9 @@ stdenv.mkDerivation rec { preConfigure = '' find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; + # circt uses git to check its version, but when cloned on nix it can't access git. + # So this hard codes the version. + substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}" ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 8fe6748c08..48dd456bcb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -279,8 +279,8 @@ rec { }; crystal_1_9 = generic { - version = "1.9.0"; - sha256 = "sha256-FFpAL1U8WtfwDCLaUP+axSnJlGaKp/jzBs54rit9T2A="; + version = "1.9.2"; + sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; binary = binaryCrystal_1_2; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix index 2e15012452..1f934ef5d4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix @@ -24,6 +24,7 @@ args@ , libkrb5 , krb5 , makeWrapper +, markForCudatoolkitRootHook , ncurses5 , numactl , nss @@ -31,6 +32,7 @@ args@ , python3 # FIXME: CUDAToolkit 10 may still need python27 , pulseaudio , requireFile +, setupCudaHook , stdenv , backendStdenv # E.g. gcc11Stdenv, set in extension.nix , unixODBC @@ -80,11 +82,15 @@ backendStdenv.mkDerivation rec { addOpenGLRunpath autoPatchelfHook autoAddOpenGLRunpathHook + markForCudatoolkitRootHook ] ++ lib.optionals (lib.versionOlder version "11") [ libsForQt5.wrapQtAppsHook ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ]; + depsTargetTargetPropagated = [ + setupCudaHook + ]; buildInputs = lib.optionals (lib.versionOlder version "11") [ libsForQt5.qt5.qtwebengine freeglut @@ -129,10 +135,10 @@ backendStdenv.mkDerivation rec { (lib.getLib libtiff) qt6Packages.qtwayland rdma-core - ucx + (ucx.override { enableCuda = false; }) # Avoid infinite recursion xorg.libxshmfence xorg.libxkbfile - ] ++ (lib.optionals (lib.versionAtLeast version "12.1") (map lib.getLib ([ + ] ++ (lib.optionals (lib.versionAtLeast version "12") (map lib.getLib ([ # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for: # - `libcurl.so.4` curlMinimal @@ -177,7 +183,9 @@ backendStdenv.mkDerivation rec { "libcom_err.so.2" ]; - preFixup = '' + preFixup = if lib.versionOlder version "11" then '' + patchelf $out/targets/*/lib/libnvrtc.so --add-needed libnvrtc-builtins.so + '' else '' patchelf $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so ''; @@ -280,24 +288,12 @@ backendStdenv.mkDerivation rec { sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" '' + # Point NVCC at a compatible compiler - # FIXME: redist cuda_nvcc copy-pastes this code - # Refer to comments in the overrides for cuda_nvcc for explanation # CUDA_TOOLKIT_ROOT_DIR is legacy, # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the compiled - # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as - # the default set of CUDA capabilities we build can regularly cause this to occur (for - # example, with Magma). '' mkdir -p $out/nix-support cat <> $out/nix-support/setup-hook cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' - cmakeFlags+=' -DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin' - cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${backendStdenv.cc}/bin' - if [ -z "\''${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX=${backendStdenv.cc}/bin; - fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${backendStdenv.cc}/bin -Xfatbin=-compress-all' EOF # Move some libraries to the lib output so that programs that diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix index f14a55aa6c..93800a0dbc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/extension.nix @@ -38,10 +38,39 @@ final: prev: let cudaFlags = final.callPackage ./flags.nix {}; + # Internal hook, used by cudatoolkit and cuda redist packages + # to accommodate automatic CUDAToolkit_ROOT construction + markForCudatoolkitRootHook = (final.callPackage + ({ makeSetupHook }: + makeSetupHook + { name = "mark-for-cudatoolkit-root-hook"; } + ./hooks/mark-for-cudatoolkit-root-hook.sh) + { }); + + # Normally propagated by cuda_nvcc or cudatoolkit through their depsHostHostPropagated + setupCudaHook = (final.callPackage + ({ makeSetupHook, backendStdenv }: + makeSetupHook + { + name = "setup-cuda-hook"; + + substitutions.ccRoot = "${backendStdenv.cc}"; + + # Required in addition to ccRoot as otherwise bin/gcc is looked up + # when building CMakeCUDACompilerId.cu + substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++"; + } + ./hooks/setup-cuda-hook.sh) + { }); + in { inherit backendStdenv cudatoolkit - cudaFlags; + cudaFlags + markForCudatoolkitRootHook + setupCudaHook; + + saxpy = final.callPackage ./saxpy { }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh new file mode 100644 index 0000000000..5c18760a3a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh @@ -0,0 +1,8 @@ +# shellcheck shell=bash + +markForCUDAToolkit_ROOT() { + mkdir -p "${prefix}/nix-support" + touch "${prefix}/nix-support/include-in-cudatoolkit-root" +} + +fixupOutputHooks+=(markForCUDAToolkit_ROOT) diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh new file mode 100644 index 0000000000..89801eb7c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh @@ -0,0 +1,5 @@ +# shellcheck shell=bash + +# CMake's enable_language(CUDA) runs a compiler test and it doesn't account for +# CUDAToolkit_ROOT. We have to help it locate libcudart +export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh new file mode 100644 index 0000000000..89256e86f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh @@ -0,0 +1,68 @@ +# shellcheck shell=bash + +echo Sourcing setup-cuda-hook >&2 + +extendCUDAToolkit_ROOT() { + if [[ -f "$1/nix-support/include-in-cudatoolkit-root" ]] ; then + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$1" + + if [[ -d "$1/include" ]] ; then + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$1/include" + fi + fi +} + +addEnvHooks "$targetOffset" extendCUDAToolkit_ROOT + +setupCUDAToolkitCompilers() { + echo Executing setupCUDAToolkitCompilers >&2 + + if [[ -n "${dontSetupCUDAToolkitCompilers-}" ]] ; then + return + fi + + # Point NVCC at a compatible compiler + + # For CMake-based projects: + # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html + # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + + export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@" + export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" + + # For non-CMake projects: + # We prepend --compiler-bindir to nvcc flags. + # Downstream packages can override these, because NVCC + # uses the last --compiler-bindir it gets on the command line. + # FIXME: this results in "incompatible redefinition" warnings. + # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + if [ -z "${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX="@ccFullPath@"; + fi + + export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin" + + # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled + # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as + # the default set of CUDA capabilities we build can regularly cause this to occur (for + # example, with Magma). + # + # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix + if [[ -z "${dontCompressFatbin-}" ]]; then + export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all" + fi + + # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for + # CUDAToolkit_ROOT. We have to help it locate libcudart + if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then + export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" + fi +} + +setupCMakeCUDAToolkit_ROOT() { + export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" +} + +postHooks+=(setupCUDAToolkitCompilers) +preConfigureHooks+=(setupCMakeCUDAToolkit_ROOT) diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 3a6a16b1d7..ec2c9cf72a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -4,6 +4,7 @@ , fetchurl , autoPatchelfHook , autoAddOpenGLRunpathHook +, markForCudatoolkitRootHook }: pname: @@ -28,6 +29,7 @@ backendStdenv.mkDerivation { # directory to the rpath of all ELF binaries. # Check e.g. with `patchelf --print-rpath path/to/my/binary autoAddOpenGLRunpathHook + markForCudatoolkitRootHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 7b8e02de24..b962b6caa1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -27,35 +27,27 @@ in inherit (prev.backendStdenv) cc; in { + # Required by cmake's enable_language(CUDA) to build a test program + # When implementing cross-compilation support: this is + # final.pkgs.targetPackages.cudaPackages.cuda_cudart + env.cudartRoot = "${prev.lib.getDev final.cuda_cudart}"; + # Point NVCC at a compatible compiler - # FIXME: non-redist cudatoolkit copy-pastes this code - # For CMake-based projects: - # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html - # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html - - # For non-CMake projects: - # We prepend --compiler-bindir to nvcc flags. - # Downstream packages can override these, because NVCC - # uses the last --compiler-bindir it gets on the command line. - # FIXME: this results in "incompatible redefinition" warnings. - # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin - # NOTE: We unconditionally set -Xfatbin=-compress-all, which reduces the size of the - # compiled binaries. If binaries grow over 2GB, they will fail to link. This is a problem - # for us, as the default set of CUDA capabilities we build can regularly cause this to - # occur (for example, with Magma). - postInstall = (oldAttrs.postInstall or "") + '' - mkdir -p $out/nix-support - cat <> $out/nix-support/setup-hook - cmakeFlags+=' -DCUDA_HOST_COMPILER=${cc}/bin' - cmakeFlags+=' -DCMAKE_CUDA_HOST_COMPILER=${cc}/bin' - if [ -z "\''${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX=${cc}/bin; - fi - export NVCC_PREPEND_FLAGS+=' --compiler-bindir=${cc}/bin -Xfatbin=-compress-all' - EOF - ''; + # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to + # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the + # setupCudaHook, i.e. we want it the hook to be propagated into the + # same nativeBuildInputs. + # + # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, + # so that the final offsets for the propagated hook would be `(-1, 0) + + # (0, 0) = (-1, 0)`. + # + # In practice, TargetTarget appears to work: + # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 + depsTargetTargetPropagated = [ + final.setupCudaHook + ]; }); cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt new file mode 100644 index 0000000000..a6954e6e8b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.25) +project(saxpy LANGUAGES CXX CUDA) + +find_package(CUDAToolkit REQUIRED COMPONENTS cudart cublas) + +add_executable(saxpy saxpy.cu) +target_link_libraries(saxpy PUBLIC CUDA::cublas CUDA::cudart m) +target_compile_features(saxpy PRIVATE cxx_std_14) +target_compile_options(saxpy PRIVATE $<$: + --expt-relaxed-constexpr>) + +install(TARGETS saxpy) diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/default.nix new file mode 100644 index 0000000000..f347b43d1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/default.nix @@ -0,0 +1,50 @@ +{ autoAddOpenGLRunpathHook +, backendStdenv +, cmake +, cuda_cccl +, cuda_cudart +, cudaFlags +, cuda_nvcc +, lib +, libcublas +, setupCudaHook +, stdenv +}: + +backendStdenv.mkDerivation { + pname = "saxpy"; + version = "unstable-2023-07-11"; + + src = ./.; + + buildInputs = [ + libcublas + cuda_cudart + cuda_cccl + ]; + nativeBuildInputs = [ + cmake + + # NOTE: this needs to be pkgs.buildPackages.cudaPackages_XX_Y.cuda_nvcc for + # cross-compilation to work. This should work automatically once we move to + # spliced scopes. Delete this comment once that happens + cuda_nvcc + + # Alternatively, we could remove the propagated hook from cuda_nvcc and add + # directly: + # setupCudaHook + autoAddOpenGLRunpathHook + ]; + + cmakeFlags = [ + "-DCMAKE_VERBOSE_MAKEFILE=ON" + "-DCMAKE_CUDA_ARCHITECTURES=${with cudaFlags; builtins.concatStringsSep ";" (map dropDot cudaCapabilities)}" + ]; + + meta = { + description = "A simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; + license = lib.licenses.mit; + maintainers = lib.teams.cuda.members; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu new file mode 100644 index 0000000000..912a6d1647 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu @@ -0,0 +1,68 @@ +#include +#include +#include + +#include + +static inline void check(cudaError_t err, const char *context) { + if (err != cudaSuccess) { + fprintf(stderr, "CUDA error at %s: %s\n", context, cudaGetErrorString(err)); + std::exit(EXIT_FAILURE); + } +} + +#define CHECK(x) check(x, #x) + +__global__ void saxpy(int n, float a, float *x, float *y) { + int i = blockIdx.x * blockDim.x + threadIdx.x; + if (i < n) + y[i] = a * x[i] + y[i]; +} + +int main(void) { + setbuf(stderr, NULL); + fprintf(stderr, "Start\n"); + + int rtVersion, driverVersion; + CHECK(cudaRuntimeGetVersion(&rtVersion)); + CHECK(cudaDriverGetVersion(&driverVersion)); + + fprintf(stderr, "Runtime version: %d\n", rtVersion); + fprintf(stderr, "Driver version: %d\n", driverVersion); + + constexpr int N = 1 << 10; + + std::vector xHost(N), yHost(N); + for (int i = 0; i < N; i++) { + xHost[i] = 1.0f; + yHost[i] = 2.0f; + } + + fprintf(stderr, "Host memory initialized, copying to the device\n"); + fflush(stderr); + + float *xDevice, *yDevice; + CHECK(cudaMalloc(&xDevice, N * sizeof(float))); + CHECK(cudaMalloc(&yDevice, N * sizeof(float))); + + CHECK(cudaMemcpy(xDevice, xHost.data(), N * sizeof(float), + cudaMemcpyHostToDevice)); + CHECK(cudaMemcpy(yDevice, yHost.data(), N * sizeof(float), + cudaMemcpyHostToDevice)); + fprintf(stderr, "Scheduled a cudaMemcpy, calling the kernel\n"); + + saxpy<<<(N + 255) / 256, 256>>>(N, 2.0f, xDevice, yDevice); + fprintf(stderr, "Scheduled a kernel call\n"); + CHECK(cudaGetLastError()); + + CHECK(cudaMemcpy(yHost.data(), yDevice, N * sizeof(float), + cudaMemcpyDeviceToHost)); + + float maxError = 0.0f; + for (int i = 0; i < N; i++) + maxError = max(maxError, abs(yHost[i] - 4.0f)); + fprintf(stderr, "Max error: %f\n", maxError); + + CHECK(cudaFree(xDevice)); + CHECK(cudaFree(yDevice)); +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix index 2640f3df85..12de25fb6c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.0.5"; in +let version = "3.0.6"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0c9a4fwwf5r4as4k1fa66ddmrjwlz5wr3j5fw1d26406hmw8m1qw"; + sha256 = "0adasw9niwbsyk912330c83cqnppk56ph7yxalml23ing6x8wq32"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1636yggn4ynq7axw79m2n8i8v193kx38zxc6iybagcv9hld8jck4"; + sha256 = "0wj58cygjra1qq0ivsbjb710n03zi0jzx0iw5m2p8nr7w8ns551c"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "0cq5q94fcj9v5y3bhq9dzwhpmvfw8flpq4rwlcif5js46icpjyv6"; + sha256 = "06wqq97d2v0bxp2pmc940dhbh8n8yf6p9r0sb1sldgv7f4r47qiy"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0v5nn9j5rbvgnmkkj866mpwnp03ndc8lbg8bx7ydycj9srra7yq5"; + sha256 = "1hg1g4pyr8cgy6ak4n9akidrmj6s5n86dqrx3ybi81c8z5lqw4r2"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "03drn7s6w6xz1szk6x4gny0kv4hcbwqvcz8yxxmqkinpgsf1ap4a"; + sha256 = "1hbh3gahnny2wfs31r64940z5scrgd8jf29mrzfadkpz54g0aizz"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh index 9ffe00437e..9fa296842e 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I nixpkgs=../../../../. -i bash -p curl jq nix gnused # shellcheck shell=bash -set -euo pipefail +set -Eeuo pipefail release () { local content="$1" @@ -64,6 +64,11 @@ generate_package_list() { local url hash url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" hash="$(nix-prefetch-url "$url")" + if [[ -z "$hash" ]]; then + echo "Failed to fetch hash for $url" >&2 + exit 1 + fi + echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" done } @@ -327,6 +332,10 @@ Examples: channel_version=$(jq -r '."channel-version"' <<< "$content") support_phase=$(jq -r '."support-phase"' <<< "$content") + + result=$(mktemp) + trap "rm -f $result" TERM INT EXIT + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v$channel_version ($support_phase) @@ -349,7 +358,9 @@ $(aspnetcore_packages "${aspnetcore_version}") $(sdk_packages "${runtime_version}") ]; }; -}" > "./versions/${sem_version}.nix" +}" > "${result}" + + cp "${result}" "./versions/${sem_version}.nix" echo "Generated ./versions/${sem_version}.nix" done } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix index 57b420f93b..30cffb04d6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.19"; + version = "6.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fb0913f6-79a8-40b6-b604-bda42b60d0c2/eb98e78d3d75c16326a54cd0277b5406/aspnetcore-runtime-6.0.19-linux-x64.tar.gz"; - sha512 = "537e4b1be4fcaa5e69013b99c86808e0a13994c87d7542367b3eb18196206d1c27e46a865d89784229a04f69dadbe0b283d7adf1e7848c8d3c7998ee80c9e765"; + url = "https://download.visualstudio.microsoft.com/download/pr/972dc929-4c16-4456-a7c8-64014f80678d/a3b62252f98a0d7e0c0a9a01ede18776/aspnetcore-runtime-6.0.20-linux-x64.tar.gz"; + sha512 = "891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/86b5e7ea-d316-4b44-a543-95cbfeafadd9/7e7b8ed4c007d9290c2099b5bcd144af/aspnetcore-runtime-6.0.19-linux-arm64.tar.gz"; - sha512 = "739acf3966e32092243f9a2ede241a16b2ae7c26bccdbcd53e63149429c4fad7d7166beca8c54ef1e79f18b43d3a5334bab42128a534aae7499cd137b833e888"; + url = "https://download.visualstudio.microsoft.com/download/pr/a8a1a993-ddd9-4bcd-8386-d9defcf0fd29/4b471f72c8253fa1462ea923d0fe39a2/aspnetcore-runtime-6.0.20-linux-arm64.tar.gz"; + sha512 = "83b1825c80cabfa5bbbd8c3e69b3525fa5cebef773957f96fee9319d60285155817973a176d47348c9b22bff5af24044f0f06b59229c067ce8adad4f3d4123de"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ff5fcf0c-64a2-4b7c-a406-06ac6e0369ec/7edc4ca9309235eb554cfd580aa6ca37/aspnetcore-runtime-6.0.19-osx-x64.tar.gz"; - sha512 = "405f3ef158ae0d8bbf755628b6d3131618255170885164422107955d94ee8483adbd6cedf4e5b414413cefcb15945efa2b44675b1f851647ffb4d92eea7505b0"; + url = "https://download.visualstudio.microsoft.com/download/pr/5fe2084e-1538-4193-9eb6-54b0f8470574/258915bac675b1dea6aa0b5435f64981/aspnetcore-runtime-6.0.20-osx-x64.tar.gz"; + sha512 = "5f6efea102c20805430815228070461216d8c5b928d090ec9d6d245eecbe23298920d1834276a0ce77bba524a14c83d97464580c72660bf3a2367a02f1872e31"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/af7c7c1e-4bcc-494e-b454-fcca9577426f/53d486a54766bc79208f72bb60beda29/aspnetcore-runtime-6.0.19-osx-arm64.tar.gz"; - sha512 = "6cff56c4da0d55eafb334775792b92ff22d1b3b6aea85375f90e55e4f850330f70eccab3d8bc8755c8a5895df4d7db9c3099f63982a1ec58ada196d2fcb574f5"; + url = "https://download.visualstudio.microsoft.com/download/pr/14d8afd0-2635-4f3c-96fa-63edccafe16f/317d19d4f625bdae211d428ab880a331/aspnetcore-runtime-6.0.20-osx-arm64.tar.gz"; + sha512 = "fbc4033b79a651923dc205b923ef6c9ef048c862113ebcaeb8fa6388827245039369e261e89ac371e895c538aa78fdfc07a5a1c1cbc41713f54a15bdc0ffdf5d"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.19"; + version = "6.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/59b2fb63-9075-4ee8-9120-d6d048226aa0/fe92c70fec406174fa2585c9b668900b/dotnet-runtime-6.0.19-linux-x64.tar.gz"; - sha512 = "6e8e1db8b247c92c8de4b476e06ad464b0bd664919394afd5fb3962db477490e54865abd2510c29457efdef3be23f0ea4683d6caabcc74a6d7abddce4b4a154d"; + url = "https://download.visualstudio.microsoft.com/download/pr/26b4797f-d3f2-40c7-8f4a-91120ab87469/4677c3c4e3ee7919836c3a5336e04509/dotnet-runtime-6.0.20-linux-x64.tar.gz"; + sha512 = "3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/5428b024-2cca-483c-b103-429b04611e0c/8db2a6abdd0abbb00714d700e8acccd8/dotnet-runtime-6.0.19-linux-arm64.tar.gz"; - sha512 = "7698ae2a9f7bc32f99cb2a945cc58b47e173720412604807c09c682cc03edec8e4a7cf19d73e087733437da77e7f05ecc8618296f7f9165ac8ff5dfe51dda346"; + url = "https://download.visualstudio.microsoft.com/download/pr/f45ea605-cd0d-446b-9d79-b9c033c10c11/ba7fd32581bb5f448abdd317d8d55b3f/dotnet-runtime-6.0.20-linux-arm64.tar.gz"; + sha512 = "bf9cd8b13ebe15bbe41d4f3229cc902c3de2eb4f0008f4b239f3d0ec5aa01254adb8a98742c0e32e98f4ba95923611ed9f54963225b462a829c184301bc98ef1"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a9559a9f-3e72-4fde-bc55-b5fd2260ad5f/f501dba0830e7cfdbf73c7d9780abaac/dotnet-runtime-6.0.19-osx-x64.tar.gz"; - sha512 = "c0b7738b198789ba0fe4e2b301aed2b129eb8b09e826c35b6e56b9a205d4d7650841cc0870bb3629c3aef58e03b59cbc37da6495bea4ad674b62d81240639b4d"; + url = "https://download.visualstudio.microsoft.com/download/pr/810c2cf6-c3a3-4f35-91f4-facf1ac24ef1/3ecedc1a0888b571d272c0dd64080c52/dotnet-runtime-6.0.20-osx-x64.tar.gz"; + sha512 = "f21cb044df7d1f57ad45b7ed65893a103cd6fe15b78ed3865380044207136d42deddde29872458e70fae9c8e7f254dd032f7539b4b9820995a075d92b907d49f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9e22fdfd-02df-4b83-ae80-933ab45da241/678caea6e30c0c4673f398cd42288f2f/dotnet-runtime-6.0.19-osx-arm64.tar.gz"; - sha512 = "9a7d0d2c493dcb0cccfd2ff9dcb234a6886f7c261a1a403aa896ccb3e6d76be6d7ad865e18e8f040f769833cc41f1caad7cce2909f9c4ded5ba3bba219c76071"; + url = "https://download.visualstudio.microsoft.com/download/pr/0f3ecdea-c85c-423b-ab55-d97061a3d9f0/b01dd205c4d6ffdb6266e4540c82621d/dotnet-runtime-6.0.20-osx-arm64.tar.gz"; + sha512 = "27297a16bf1eec0e5a4154d8575b66008227a595cdd77277ae9796a53522b143ff51e063a7aa53a6c57717061cb2e5836c314ee43eeb86d465341fcdf834d773"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.411"; + version = "6.0.412"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1f26cd3a-af60-4140-9cab-b661cfe0a1ed/4d533d26ef5d55fa17f23c207f6d3330/dotnet-sdk-6.0.411-linux-x64.tar.gz"; - sha512 = "dc8aa1f84ad97cf25a979bfc243c200b7a8e73b930b68d5eed782743d88aad823c32c267c83d7a19d3c4f910a8fae7f12d07ea5a35a1d3a97e13a8674d29037b"; + url = "https://download.visualstudio.microsoft.com/download/pr/62181759-93ce-4512-8de1-92de74a6ba3f/f83ea41c3161f301d3584598f9c31801/dotnet-sdk-6.0.412-linux-x64.tar.gz"; + sha512 = "ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/43eb599e-df6d-4303-b266-b96a9f77a8ca/a5c595017960d21f6d7b89530bff173f/dotnet-sdk-6.0.411-linux-arm64.tar.gz"; - sha512 = "e10aed4470087f30e48bf2c3d7e98a680cb7b5f5cfaaf2f7e5029c648e4df9ab140bfcef3b84195f6f8984b56b4156b7afde957b3695e68e9ed24934414a62d9"; + url = "https://download.visualstudio.microsoft.com/download/pr/daff8399-d60f-4bde-97bb-c6e350c03e90/5eeb0b21bf1ad11b5f5a7b4ac217c381/dotnet-sdk-6.0.412-linux-arm64.tar.gz"; + sha512 = "669c19665f657de00fda41e5ffff8d80395618dc1cc7d6ec50cd06668b135b5fcca193919172c65394210b7c060eae146fd6d8d57deed889ca8fafddca66d06d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d53a8cc3-7c70-4374-8072-5ddd6a75ff5b/0b64e3ca7c14755bd4d806ca235a2760/dotnet-sdk-6.0.411-osx-x64.tar.gz"; - sha512 = "11068da9ae996d0f0c2410ab2fc0a6637d5daa25ef9c152cbd509ee9ef51e452134a787b5214e8122a797b3cd00771fa3bd54c2e4aacbb3cf8ef103dc85b0a99"; + url = "https://download.visualstudio.microsoft.com/download/pr/094020b2-7fcd-45aa-a122-42ad85b25d15/969de8f0d024a5bee5260271e097519b/dotnet-sdk-6.0.412-osx-x64.tar.gz"; + sha512 = "0aa713780c4b7f4e0ea72a0813715883f57174f04386b85f3a6dda1a66d9cf6d24c76cd1e0fc0a0991b80b7868b39c719d5b98254e4f683b6bc89a9b4043be9c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5288044c-41cd-43f1-af79-9aa29f6e5a10/aaf4fa836481a4ff3a0f9bf79c4ffffc/dotnet-sdk-6.0.411-osx-arm64.tar.gz"; - sha512 = "0095606938cf1b6d5c54516ccc4d9ff276c567e569d2644dfc2f00c8a20c88ca8b09cfa1bb1254c04463887cb9c2bc057e62afde026948ca326998048c4d5d0d"; + url = "https://download.visualstudio.microsoft.com/download/pr/6a6555e3-06ff-4124-aad5-497a2940398b/47bda2f1324f867ae0da2099c5702769/dotnet-sdk-6.0.412-osx-arm64.tar.gz"; + sha512 = "3086e027b94ab8bc5b27e2dfaa7d16484efa2f6a7c1e291f420313021b3e6f65a5208de4b0d86271c3b83d05d784f29e231176dc6f5ba04e567336b7d7b7b871"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.19"; sha256 = "00y8riq5mvgyazbp7x9wijn3kxv7r88hwlyfv9f6a7vkp7w1d011"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.19"; sha256 = "0djzym7lil7p0v4h3x077vjbbh7k8dvij6swn7dk83xmyf87bfca"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.19"; sha256 = "0gy5r2p9l0wwc7lz4pn4ja2wcaw1cwy4w1j4qf0iv6057xmqbikq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.19"; sha256 = "1rmngjkdq9f7zflxy3fgznchjh67g3zd5wv9a7vdl7b6z07psjnk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "1izm1kx4rwi6cp6r6qzjn9h1lmqdcx87yj4gnf291gnabgwpdg9i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.19"; sha256 = "0z4f9jwb6g7xix9xiwldadxr00scbl7qcyvs5j7xsidmwk9dcaiv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.19"; sha256 = "0av7ia56k22scyy0s45v6sv584n6mcpbyibn76pka2ah6jhq7dnl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.19"; sha256 = "1lnqljdakd8hrrq2hxay2ycagpbdlpbj3ck2j41vyddlnn53vf6b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.19"; sha256 = "1c8g5gy0x8bp75ff0nssvcsq2axwvi26jkzxip30y3r12jh6jw52"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.19"; sha256 = "0vm7d5dp8rgy5ic4qdvj59hifyy8g1b45j1w40w0sbrqbmak89na"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.19"; sha256 = "1r41m93kacyyhgjxmhx84n9wv9c2ckwa8295qa4kj8rn73gg4x28"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.19"; sha256 = "12zmayccdmhwci83xgvmylp13xl96ddw85r6cyccqxfk21x1dhd8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.19"; sha256 = "1wsjgz3kgxifzc8f6jrgyb89rbngffj9skadqacy4bw158aklps9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.19"; sha256 = "0bv39s9854b7kp9w5068qq5dgyzdfbr5hq0i80cbpj6srxndf9im"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.19"; sha256 = "0ixizxdp0hg98frrka85x37ly0ji006ix9a52dxas3463hdmcazb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.19"; sha256 = "0bdprwa1vklf32w2hpnb0h316pqihy9gfx9z1xgiwljfkdjhin6k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.19"; sha256 = "1a062b09klc0xxkgb7qlxxpl52cmh7vmicy1227ch8qdkwf82nia"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.19"; sha256 = "0xf920dcy92gyf1a4ply370m1k82ja9srql5sq7wm2prl1y77wxp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.19"; sha256 = "0ib7fyl91av9vv734k73l9i37b3iph1gidvg37s556f09s61xg4g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.19"; sha256 = "0lbnhfh3xh92gzpgpvmbyk1af3rcva7annayd65v4m27pcixdszv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.19"; sha256 = "04vnz3izwk42igr6p569yas08g6j0ims0ryfsi3qbma095117lq6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.19"; sha256 = "1xl4xrijlkia4vxqyg77sf2gb0r5bgwrzc6yidivwxijmaxmvx3z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.19"; sha256 = "1148n1shzmyxyqq1fqr7f55z6r0z55vjzyj4px80vjf46rs97h8h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.19"; sha256 = "1635s0h8z55blb8bd1y8ppwac6w19f0w6hmx2nqz433968w74fk4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.19"; sha256 = "0448b8lfv770qijzxxn3mv4xlw7cp00z52i7qqmmzf2b3vgwcr1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.19"; sha256 = "1cx8vkwdgh9ai85ps46yb43x5mvxzk579mkyblxsn4b0nm5gqmsc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.19"; sha256 = "0xjiny4vmk621f8h35vl6wlikzjq9xrhw0j6sgrs0k0ylphwmp2a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "0slhgkjlwcmz4xjl0x6rwhhcdc6f7hz0vb4lg5ak85inl5m98xa9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.19"; sha256 = "01hhi86mh3wjr6i31p5kbcqn6ks7kyhc06gfg1xaqyjrf0hkiiwc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.19"; sha256 = "04pjx9r8ahv3c73l6rl5vm9sj7qml1yiav9w5v5kiyvk6sz8agk0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.19"; sha256 = "1rf27fgqz4xyqi8kxn3hcxwzngdpdpcyjhxc512z21f914pvfz4q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.19"; sha256 = "1j9hp3a74spw9srhyxx36lkgvyqvyckmssl7q72vwamwih4jkdbp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.19"; sha256 = "10irl9p2vszfrxn9s0x1kdcgdjzqvk365452632g9adpz0m96wkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1bq00ff77dj8a87paxxhg9qg3x44hs93vmddms2z2rbcv49wh2ra"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1dk2sqd4j2lr4xaidl99q1gygly52dz5hjpfqhvzkwq5rhm1q2sx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1iarfzmjb6rdwkp4s0j8zqk0jjmllii1hhrfkmgjhrf9j7zz4qli"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0d3l3bbfzqzxrwgif6z7a4h0788nm68m5viz9r3jk4cpkc1p8l5r"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1qxcsdixcf66pg8hyjwb5k2yl1srnm4l6ylhs4nbv9s86kfbafp4"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0s34svz8dm533nl6g8cbpia6ap0rbimifwraswc20lgj1vi0f30p"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0mxwikpy61b4kqa8a01gfzzy5nymyk9z6r4br51y43dzqrmi461k"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0k5mv3m91r19gv3f8hgn558694szpag9d2a5w29xvdy8h3mm6vp2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0ipq0a9ij6jn469wd37pnc7np38hxip7452lkm07f6nkihvkg0m3"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1ps5imiyxcy7rf6cgpkn9p6mz74w606nxb2sbs675yrn3c473kls"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1729vshl38927sy4bcbx48l3037x9hwjnxjnpp22v31fzjj1gr2x"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1wv9lqa3lgzqlhqkgcbr0w70g7g3la9j5i84wa6rqsc21y276gqq"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0lknp6kpb09k6flnv887nv4y7q4nhbblk5bdv4wz6gpswd1b8mck"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0yl201gy9bilz6zn0xa3lybv3lcpnycmrp8r5kjc6yh73qc32p26"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1fzawxv0nql0i62najx9gsq396w60cnairxysfm9312m4x5bfcxp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0jjnzhqxv00lnmjp49w998rrjhjm1ca7vlir0yv7jpbvhpx2c3g0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0gvin96ly03zik2wxabi9m1q3xg20myankp18awmwydmvma5my8f"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1dgd764pic3s6y4kzy2amxi42rb8bgbkknmg7gc5yz4wi8k2rm7g"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "11lbnzqdzalmqmbqkd4xn2nhx5n8kfjpv2akj76476dhanxfb0l8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "082jyxig3v9ah4f5rz6d4flwqm20dn999zsy6kp8ri6bkvmap2ww"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0ky58h37lprp3idwayvrcyn613pdzli24fx472iql5qvhgcgxg5y"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0g2dhi7sh7gbwrwcinlkzpal6mys12rw6114scyh8xghfswggshi"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1nrijf8czcbjpkd3ay2czwxa26cl07mv7sbbz9q32ywfqdw16xpj"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0flz92scm9a3m08fgq99axh02qjhy14dzivzzf702xm9ipa37gds"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0cwqwlhbvc310hkqkfq1kx0vv77lkj1s4mda2ks4w05s3il42k1l"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1qwzh3rq4xg44kgyhqxnhddr9d1nmcm11nhj73m091xk0mnz26p9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0l66w1h3w6vqd9a8jag4dah6x929sc6684h8321mwy9d5wldx03w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "15483p2z4lyp2wir0lwlsjk5009nvp0j348ffnhqq115xadb1zz9"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1q08v78m9z02zmrrq19bjpbsfjzw4am82shj6mnkvhqy6r4aafh6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1fh221gf6bl7qcmklhhv58i81h6q33ivh6g46hx70hl96gz62dp9"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0y6pwh3psknbf2wz03fh1kamyc2xjgazncg76z7msj1sbm3898ac"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "117qw21q6xbvnji6nz79yfqi2i1wdk7kln02102vkl5gficz75y4"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1qypjwc7918v8qgzz3w2ypl6bsr3anqgb92bajbx4ha0cfrjmmfa"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1ybqpy5p7424allxgiqjccqx2wyidgylxy368d0n70w3jysyyxg7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "11xmb1gilncaj1d3i5ry7kbsszjyrqjlaws6n7nnr7rgw26jixrk"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "10nphwf6iibkx37z0prwww6bxi0ks22rm48k4sjksif7rp54mzrl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "16vpwyp3z1k9f58i9w8k6dfgdw9y4vqb9jb1qvgr6fdvaz40vnxa"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0whr0rkd9izqhm0bggj27xirwsi8sajiz8imvz34s65ka7q3vsz0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0a0sx27pjq282f9iky4djvlfhi3isnfy3fa033xv4in4lsml47gr"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0p0s6i2s5xqdzcpb0xb1xb0lg8jnn2v91yyawgckj5c0bhvxl5jv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "130r44f2if0mgjjknbrbqs02gjvaqnixc1hgpj52gm1fpwmydh46"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1m1z7sl9ivz7ks5clsa7mgwx7ak41a3gg1rap4c4q24w5avk08m3"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "10pq2smssbny6nbgrhb97mnhxqz0xh7rhscx18isqcammkpk4hsg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "17xk04myv6j3ij28frg2vkr3y35s501gx1c8dngzd30k3n029icw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.19"; sha256 = "1mm2czg8mczkdayx0z58qs91xbrqh9frmlmfd64b7424rayayrfd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.19"; sha256 = "03y87q5mx0bz0lc63barh0r4gymfv11190jgfdxph2cvd4ir7bdn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.19"; sha256 = "11wpx1386cjg78c5jqqh2jgwkp597yrnvy92icyh6ibiy0107wfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.19"; sha256 = "1lpx76v6113jppqn56pwqan9lgkqw7xd0x95fpyilczc52l3s46i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.19"; sha256 = "1ww8w5r3yvps19sc0nj2giqpsn64y807zw0ayshzn9shpba4gbbn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.19"; sha256 = "0r0q5jd7a0dbc2w767clz460pn6lhvrmimsrn3jqw9irgm7g2xns"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.19"; sha256 = "1k4m171nsb9m407izsnkayzalhdq6g5kwy5s8f7d2hd53azisb0z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.19"; sha256 = "1q977pxaxnm79lm9ma2hbbll7jnrpkp89pbb41jr4aywp34x151b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.19"; sha256 = "0j6h8w3vrgr4fps3bhycqpzlajyqlrm467p0gpq98ali07ckfrb0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.19"; sha256 = "0r3zdg1rapknp94m2hx42mx8wvyarq24cqdcvzd37wf6nmxmaigb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.19"; sha256 = "1adwrmr618bnc72gab4kg1sqnvvyp3zlzlaafh4n38xyi2hjihs7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.19"; sha256 = "0rmn0i1sy0q91dijw5k20gcbvqg840rqiihv89qqvpdw99al3xgh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.19"; sha256 = "1ck1ws817svrpf5xa100fw74s3mpscds67kjslw57ddi4gh0p07w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.19"; sha256 = "0xvmpr2vg7cknkzb172zqx8sj3a5fy7j0xxdxxc441hc8xyywh5i"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1l5zs4c975r6s1qp99yjvygil9w2r324r5v7i15x37bzc3xkr61f"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1zv2vhi7krnibrm0khr0vk99wlxn9dgvhg0lvx9h0didfn94c71v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0x2d8hm8lffy3gc0lxd7njcdggclnvd48i1ybwq78ll07930mlky"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1ra6gvs7xk2iz9in8641ls30pbxlcmk493q3vcbg30acvm335nzh"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0q8md416zfk3swpv9j4fn00rxpfj6hgkxxsl57qr9pavsximknhp"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "11vyd6rr47dwfyraz86clza3i6nl8kakj6dys1g436d56mc9qxl0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1kg0g83sh4kvxda508mav7xkfd56c3nsxj181hsgdz995yrnpmwz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1x86splyckv4zxxj39maq7ppjpvfs8zdq98cbrpk0apb2m20clia"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.19"; sha256 = "0q5dp89vh189wa0yzhn9msgxs0d6ch822kz3dx8wpg523xwcf700"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.19"; sha256 = "0jy52i7smi8gsddmbd2isc9l1c4vyir6bb6q4pdwk8nrspl9v153"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.19"; sha256 = "1piir71cvir9xjdmmsais4q00gy64lllbcmzrlmjbip2hvxqbi2b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.19"; sha256 = "01v4w53jaq8fbrlf1dd08b0xmlf34qgchlavf8l7l4qzfzk1zc1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.19"; sha256 = "1apazbfb96gc3lhj9yq4n1yczsbgjnfrc2a36yqkacfkrzcz5sdb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.19"; sha256 = "03mgjj0sq8h5k7rhi3g4xvc6w129l99fzipqcpri87gq2v2rq9bc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.19"; sha256 = "023bmkhi489932srjpjgni96nifvj04556b1cb69ysqcw2blyjlh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.19"; sha256 = "0gr4y4wmkv8hvrv7j93cdxyaifgm5shslswy237xb3bi2rn91f2j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "1jncn2n75vrhsmh22f5ij5rhdr2ninnz0z8clsi3pmk8ba2jzgsh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "1ssakq877f2wn51di8v64b3ij0izyr5glc37i238y9jm6l84kpyg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0a6d269chp0126sx2igjhsrn7x6q03n5qwhwk7fy6ci1jddrk960"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "13b3yr8y54g5ypnsrr7870csbnl9avwa7r6gk7553sjab255rar4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1js58646f4233g6a9lkwwwhg0kb2x3r60a66lbzapk253x00fnrm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "1cwn0dkwk2wvddfraqh28yqy3p5cyrnfkprilgy3bqbnq82mfdxj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1paf9f3kmprw09nh1garni8rswcq7cs5m1ib6hkrkqccdis4hfy8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zr589pkivak83gjd7f15rc9g4whxmywjj1xyymbbaz46ain89gy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "0azf6q99aplbca8p2ijf9ccwrigz9r2aaplczj8byi0jd5dgya1m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "134a4yszz8gvba2zm8lrds39qfxrf42mziy4niihd4r9n44ksrdn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.20"; sha256 = "0ijdgv1yczfppra6p770vf48vjgmrmcjxfnphah8rrlidssja1dj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0k4ivzwbj67n4rr56fmi4jh2y3kdjhbgc376gk0ld50qwpghczxh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1yiq9ihh71d8zlfsdf9xdnapzilxiyk987z9ld7w605sq6b45719"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.20"; sha256 = "039hs39abf1ngrgw1ali8pgzqqpwl6aiq7hqig85gj6phy5l8wbk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.20"; sha256 = "0xivyv70kzpj4pc4ln1rk48bm9z9zy3bck1m4vg161rrd58ry16a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.20"; sha256 = "06a211fjm9i9ipgh7y6fsp2si41mdr8hp5wpsvd083ybyyfsy32z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.20"; sha256 = "00vz5r4l5p78fkvlglvhhvx80qlv5szzdz9scf0qm8hf1v01wivi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.20"; sha256 = "1g0x96f8i8hiflzpb20h9wkn784zzlvd0413y8xlxgf187hj20yn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.20"; sha256 = "11sdzb1lrpmmfbd14b3may8d1n8smm1rmfsqamp7bni408j16cfc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.20"; sha256 = "0w69cfyww088v29bs6diy9jq0sl6bpiaildvq6rayl9vwid71qpi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.20"; sha256 = "1bi8bmil8wc42lp5b7a44c70mazycgxn2ag02r3r4wradwawfrmw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.20"; sha256 = "1c3qz6h1w5wfpl52ys7s29kj338n3wy7w5sn9ghdz5x5vgflah9l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.20"; sha256 = "1zzpj7czk28xip45i3fhhlh3ar0hh3ldar34c6w2vp4psvbdkm40"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "06yzy9spp8d9pz7jihsrcx4rq3n9rcq2j0gq23yhfzp9iip2986b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "0bs2hxyjyhnzvcgx4lplwlvlk7rr5lk0xbncbn8in74pvvjw44qn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0ra55v67748rr0acd22vgg2b31wmkaaghiifi26vwnrhihky9gma"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "1mjj0bfm57anpywknshx8hc1z4xdinjxrxv3zim295w3dpz46y36"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1rqniyhv0i9zim6plbmrhcd9ykwabm5cm7p3mddxr8cgybm1vyfg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "0wdqbzma9fc5sh74a3mcxlrby33qz2hs47kb5c9834qvbjf38fcz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1q5bk01briqlp5bzvkvrq978dzb52np2sp8lv67wjdm7xcbpnfjz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zmsd13dd7vzwxqiznffvk99jqc3fdq3l382ixbr440a006splcr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "1s1girqjlrkz2kqijasmbpfh2fngqiz2i3424i7k9snrzjgnn6ml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "0vmlhgywjhb8k6gi1624fk3q21gy5gsnjxl4f4w8lmaf22zkllvb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "04p7m6csfjqgndi81hpg51gr8pgzqqscnqwgrkkj7nas2ffdxlfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0ky38wy91pprdhbvxp64hz2fmf4kkchw9ldk0i68dnwg190lkjqk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1vs4jirn78v65fn97zx4vz4msq2zrlmiiinh7zl0dpyn0dp68br7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "157z5liy55z3h3qvg9kkmapnldbw7v6qamxdfbk89l3dh7r3m5hw"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "11yv6flr0l49rfa222p35dqv3qbc5jbf7yf28q3x09kv0x2571dn"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0nc1mbdk3kafgqayq4zmq0gb5ff0hd9bbn660haadmncn8j44njm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1xzk2kpmps01srj0zyllfc8m65y2l27gpqcmvkh2llkv881kbdfm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qxiv3a7cgga8xnsq8xkvm5qy1spvgwsk57lm54wc6jyhc13fp2j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "14xfisjj5yrqcvy84f30jzvmchp2513afg633bq26irbcy6ilslc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0zdm7bd1z90hn1rvz2k8vwxrzgl7lirmxx4k2ih0gjyp5yz8pkjp"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "18icvgf5avz03qv26ivnmn01fmz345lls0lzgl8n3qr93v40bjf7"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00i7adsd6inpgxlr69xgvhsb7sg9g5sscwdmq46z0dp47s1vphli"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1wf0fgz84n6ag81ry4mydkwdzjrsxsfy7rix73hl8ihfy5f2jhci"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0aq5yii9i52i70nkgzm4sb2gcv8i3lw61wl3wbws3lak2van75nh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0glzhxnd4fjf9qjn6knj9gw8j9svxf265sb3qxyl5wnwyqx7rfdx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0ygdldk7xaa12y3y1mrid8v0045j7d2r9gg509m04r2xvan7rhj8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18nmnsh51pslli999g99d52ivsld67nq8kqxccylwj9qmj6cs218"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "14iz67jr1xrshb5vqph3wk5ngnx4a6ingcv868fb98gx13r7wfc8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "00khxrlvfy49s5yxn5611vs24lqhmclzks3pf6wy51rw0fy540q2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00ws9fi2b5wy3jly5pxmgxcjkfmjixmy0m4lw4vp9h4rb8q6prja"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1lp4km2sxjb791srirywf11nyj69654i2s4x4jadbp1kb2r7hp18"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hbxd5nyzngynqvj7n0css7xca7kra5zrdz1g40wvz7hgdacd7j3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0s3g5610m1asz410pp57rlkbcdnsf6rpr9mp8lz34la34w19gkpw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0d509bdgmpjnkxz0gnbssdvdq3rs05k6frs8wpjzm6i5469pxjch"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1ilbsss1w9940wf2jqfgkirf5hn1lqw0p4hpd68r9yryai2s2wnx"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "16sc3gfc3dd0mh86xh3qg00lbdz3yq7f7iyan33rl01z6ljkb3w8"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vd3dh0k192r5wf6k11p44sywjkgg4yag3a14y0v8f3lnxm7zqfm"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qdxvknp6ns263r2gvd5iprcdcjvzcwdn2xlkhyy9ihhszkciv3h"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "08pjmzx8qlknq7dci8m5xlldm3jxcj28zlwjs295951zqifzdajb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "17ygzmbcsj1xv5dx63rxb0rvn0laakng7asx0nxsa5pgx28isqdx"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vw0wk0j5alk4ffnp9960cdca2gmlvh9dj553nfxdmnil4vpj7wq"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0k68kxzr0y113rasi0br3jh2f7qjvay61yk6hyizwiz7hikmg12l"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0kdb86h8adc5alsfbh7mii69yc1iyn2k21wf2j90izk8g63qdzsb"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "19327qki08nnvvpqd1lkvisy2wrpcaj3v8d3qq10hyyf21in1ly7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1b8wsdkhpkkm046v9yj23x3jdqygs64bzi9vjslbxg69h6andf2j"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0b0w27az1c97ailrjzdwlpzy7255nmq326gic51vp3p5a05pasrj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18r7k5m6j7xpz4d0cnk74b0alxcgz6v2nz08zdkz1f473s6hdkvl"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hi2kg5ka1biczyvg0pk7rvbfb08z5nib7yd18yxzjs7i7hb385j"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1w53abjj2cv39lgc8h4xwf42593cjhiah7vmfi4fc6iyl6q91qg3"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "185vk80j81vckacp0hangng9r2rcw884nirwyvi4p1v0jk66i9g9"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1d01hrwkvf9a64lmv293xf829imghmy4g59s6lkh2dcg96m7byba"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "082zbwg2z2p6fgqy0svd6iahawn1riiqdn4dn63zs6zvjwwc26wg"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "16zmi46nkhld8lq1hm5kqndwm0l0w94g352mzammyvrpwsn0wyhn"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "1i9ghy6hvslnh53xdk0xwiq0j92cjim2nyaw3asrqk7rkcynsxz0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.20"; sha256 = "1xh5yqlpwhv1xwng93kw7v345dsmlwpg651zmi1mj95l3qd0p9km"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.20"; sha256 = "0r8s132mgx3283gf1xsg5m4fhc5yy6rkzmii56g52wxpl4si0i50"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.20"; sha256 = "1m8gi6nfy0x5ha2cja7f37237ybb6hd81dcspsb0shmbgag141ab"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0n4fkn7g1zknyalzs9vf3z6x19vrw594qxk1pnianw6db39c9qf1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1nzpshl551sbmpdz8im2rvr8spi0rvdqb2js1kd1988qx2x2jwiz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.20"; sha256 = "00jnmbljs3qhb03d16hh5pqy9na9lij77kgb1wa982lmb80hj7np"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.20"; sha256 = "0c33yyrzfl3p1db7vvd287g7pq3zk14cq1hc8ggpkfr3z3kih8lm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.20"; sha256 = "0fggkfpr591pk5867q01qhijhmj4wks04a77fldjv4iv8azlsn8p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.20"; sha256 = "08fa4s35c08rkj4nk7y2k9flliajvw20i2z7fp4a9dbpsjvkaj9a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.20"; sha256 = "149l8qsjms1zk20xazy6ggcnyhvlbp3rd03lhipd28787jy69d3m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.20"; sha256 = "1wj9piipky41s5z7zwi76ksf8snzk8z9q4vdbl146kkcnaxrkrkm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.20"; sha256 = "19vxwiakqlp299fj62f2ijh8hv67vlk9iz1dg876gvvp06k9mkyg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.20"; sha256 = "1mb4kl2jlk6zsavl979j4z2xmml8kjxnnp3gfmv6rynk7b9m5cwg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.20"; sha256 = "1nz5krmsx7l087gsfpfsmrbwvjjw8qsmb8wcwn5aynljfl4jq7pz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0k9i48w2lh2shfxz0w0qh19yd6y9qg05izhmqb89zpr7m5sccp5v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1xvrmb12fdcrd64bqrs111x170p712aazaqdspbbn5v3j1nbzal4"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0dp54dk7x8zwcgsydfmgn462ynl1809avmn6s22brip0iy7wrz5g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "05h8bg0655scv6crqkygc9iac5vf18cfa2slm52bcsvfvic8ad6n"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0yli4v5nxxizxfz24vk504bvjhngcvvk1ab3jcdirrg9z8pcp73j"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "07indvjgrygh674k50k4isjpr3171h06hfxz2gy99bw3fm0y8lm0"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1qzzxdps0h7dpzz3ks43wzqvb9sqhbrdywzi883ipy7zwndl1avw"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "08hfm9xjj6rl1c7zvcxfwsc8qb0d9l66l5j48k311apdc4jjsgg4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.20"; sha256 = "0nz759z6sgmrq29vjr2y04brfjmddr4ga7l5vrsv1k16vf39g3fq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.20"; sha256 = "02wqksvir4r22785w1rrnd4aqjav7asz8wji9v3955acrnhdg81g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.20"; sha256 = "07gsm1p1ccb3f1vc4n024ilz9hc7qnqxj6mwk3k8jbvw228nwi89"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.20"; sha256 = "1p74mcsbq92cbbd5i83clxigcmmhi825q7izpzsypdpd46v73hmv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.20"; sha256 = "13pya2yy68r247fc4r3dbkq2hwaq5909n8v47cr7bvz07mk8isnb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.20"; sha256 = "1xidixl08nys9jzi17w5f89kq9wiwc135ddcbnhpfyhllhrn03kc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.20"; sha256 = "0ypcdzhr3v48iy6c3z6vhi2yfl7rzp85p0smq2pn625c1v1xgmgh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.20"; sha256 = "0py3ydy5pbxzvgi2lmkgcm1f15p6kikcym0hmlaj58ag796b1kff"; }) ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix index 206a1ed917..ca35bdef1a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.8"; + version = "7.0.9"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f452e148-b4ef-4ca7-9d97-59b709c55221/852e848f9fbd345445a0de43efa4e7ec/aspnetcore-runtime-7.0.8-linux-x64.tar.gz"; - sha512 = "b75cb42ecd1936b1b2af5ed59d7f3ef3eb0a602b23f5a272e62c42de9c75db1ae54878b2f9f28d72dac15bdbeaece81cc6344d0df5eae845bc130534ef1bfbb0"; + url = "https://download.visualstudio.microsoft.com/download/pr/c1348fca-4ef4-46bc-9f6e-04f2315e0d3e/50fe6b7c2df482cdc880b66bd46834c7/aspnetcore-runtime-7.0.9-linux-x64.tar.gz"; + sha512 = "aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/04dc0f8d-880d-4722-bd51-6669e6cd1e72/cd5689508f2da5395bc70473018ff165/aspnetcore-runtime-7.0.8-linux-arm64.tar.gz"; - sha512 = "ce521f56d95c39be6b8428086fb4e0b13ec49b08431bee151a625aeb2366622e6c688abc79b76810bf5c17a8547b894d5ae57539e15ddb3bfbb0e11022c995ea"; + url = "https://download.visualstudio.microsoft.com/download/pr/9aca092c-f9c0-48d7-a01f-3c1c2eaac903/01b345ddecc7a90d5c99d016fa5180a6/aspnetcore-runtime-7.0.9-linux-arm64.tar.gz"; + sha512 = "447ebbd115b8d38eeba70f531010832db535cf3a17404491f552e99a5a59c8c63525640694a6753d27e9a7ed5bf1064998491c1983361c1c37b152b01a3b8f8a"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/755a7169-d77c-42e1-a1a5-1eea4213675d/1375f947547134e9297aba032c3760b5/aspnetcore-runtime-7.0.8-osx-x64.tar.gz"; - sha512 = "46d4e2f36240efa316c15992646d8b93d6750b987aa6bde88529e50c9cbfa69f250148ed6dfbda93c28664c555bda62fac7182a76e8ddddfa1962716169ac152"; + url = "https://download.visualstudio.microsoft.com/download/pr/7e6cb756-70e3-4974-b96c-dc9b9d138306/9b0ea50c629660a565db33e74a69fe8c/aspnetcore-runtime-7.0.9-osx-x64.tar.gz"; + sha512 = "b2cf51cff120abda9b5ae213e294f73debd620bc8f3e6b12e1bb628df31457a5bb8c6dbb12cb1dcec24a2c04edd5ebe807d6761f6095e7a90441f1930acb8185"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/787adeb9-d6c1-4db3-8c72-63653dd939c4/a7aafd0908cf7866c6908a14a78ac994/aspnetcore-runtime-7.0.8-osx-arm64.tar.gz"; - sha512 = "31b9806f7c3d327008fe505dbd627bcccebcc7db7179b7010ac814844782d054975cb4c1a35f6ae447fbed3227d39def95bc99169032f4fcffd35916896ed4cd"; + url = "https://download.visualstudio.microsoft.com/download/pr/f967c09c-7a90-4da9-b933-926ed7870b16/0e5fbf15f170ceaee7e3d1865b856a99/aspnetcore-runtime-7.0.9-osx-arm64.tar.gz"; + sha512 = "fbe725a764b765f9954ae771b3d043d6d1a53e53149d0b4c89a4138793d9471f2924f68a5b8e1c107d9faa07946f2ac00584ded9b179ed8d40cf230ac7d34750"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.8"; + version = "7.0.9"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c9514df2-f03a-45a3-9a6d-65b2260accd1/0f59516ed5bc603ee95ae91301090ebb/dotnet-runtime-7.0.8-linux-x64.tar.gz"; - sha512 = "50463de25360aba18c29ab8a3d31896793a7bcf899b40249fcac77efab24888e93ac906dac04ea5b72026c89c07dd371247ff89e8613123dead7e889906aa876"; + url = "https://download.visualstudio.microsoft.com/download/pr/ecc0d5e3-61f5-49b1-ac1f-3b46956e1139/1ec7760b1697363667623f22a16c67b5/dotnet-runtime-7.0.9-linux-x64.tar.gz"; + sha512 = "09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fc0cbb05-48d1-4f9d-aa78-8f2bf6423f1b/f06a3e717b95abf8ca5f40504cd63dee/dotnet-runtime-7.0.8-linux-arm64.tar.gz"; - sha512 = "92835372558bc9913e81617d0c396a60427fa30eb2dc9249bf73772ee8c221cce7358aaa4cfe5a261849f9b1303225f6052d29187cfbb15cbe3caffbad4fe3dd"; + url = "https://download.visualstudio.microsoft.com/download/pr/f693db81-adb6-4481-862a-887993824572/9bd6d12296a5b07d8b4b0190afab4152/dotnet-runtime-7.0.9-linux-arm64.tar.gz"; + sha512 = "271396af3adf881a4c5c8c28a812f9a0a30e11497bb0c9cec12bee4d726ed9151b2d35eb9146b5938611ab60ccc249d5ce5c870f721f791d19a3b08545dbfa97"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5b7cd80a-49dc-4364-a4e8-a760219548aa/6ba0a83c6da3897dab16ba709acfcc9e/dotnet-runtime-7.0.8-osx-x64.tar.gz"; - sha512 = "e2c01f09a7532d72578dbbc27ea0156b5e0ee0c636eb0503ec34bf4445b0263857063dbd7701a29baa5e74129ec9c7593566f66cb33cccd40ae64ec888d7ba3c"; + url = "https://download.visualstudio.microsoft.com/download/pr/f12bda3f-cef0-4d22-8ffe-89f553b0e5ed/a0ff4b2aeae50d5192e0e6f47075345b/dotnet-runtime-7.0.9-osx-x64.tar.gz"; + sha512 = "104e724bcec68fd77e8f07b71ed364cbcb40394c9ca0d8ef52e1eaab867b579f06ed7b0b203a50bad3df45634d52b6be60829d87a48c1800467f242879f8884e"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/11db4f76-fbe9-4692-ba1e-9edd2b5e0eb4/9204a2e30c58c8a01a8a6f7185e6175e/dotnet-runtime-7.0.8-osx-arm64.tar.gz"; - sha512 = "bad440aac7e065c88685de902e5328990d44e60fa8f583d2fcaa38cc9d3cbaf01810cbc40b7cf9275e53f386b59cd88e563f96e907c8b0c0668fa6a905a5eaa4"; + url = "https://download.visualstudio.microsoft.com/download/pr/20e6ef57-7686-4115-b7e6-ac561dcbf4fa/e2bf64248953cb06d5bafd6919f48905/dotnet-runtime-7.0.9-osx-arm64.tar.gz"; + sha512 = "1aae7726b89c0398f29bc49fe9cc4c2c3f27f1114d5ab140c998fe74b13caa3eed05cf5ae28eb389f37de2023b35c3bb864be64a2e596bde673e27ce749c53a2"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.305"; + version = "7.0.306"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/87a55ae3-917d-449e-a4e8-776f82976e91/03380e598c326c2f9465d262c6a88c45/dotnet-sdk-7.0.305-linux-x64.tar.gz"; - sha512 = "c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b"; + url = "https://download.visualstudio.microsoft.com/download/pr/0be7a87e-3a3f-4500-8301-49ccd6f24887/e9e36f35dbaf6625fec3e18f5c2b613f/dotnet-sdk-7.0.306-linux-x64.tar.gz"; + sha512 = "62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e2ca71f5-17e9-4dbd-aaf4-1e0fa225a212/61c440dae017c7129de10cfbfe36fd90/dotnet-sdk-7.0.305-linux-arm64.tar.gz"; - sha512 = "451622fe88ed6c6619be6c27f3e9eeee94ae61db3c9a0b8eab7cf1b14a62d41681181748d823a1207ffb6da6e3a098615aa2f59be8e60d403ba4cb98ab267a50"; + url = "https://download.visualstudio.microsoft.com/download/pr/fb648e91-a4b9-4fc1-b6a3-acd293668e75/ccdc8a107bdb8b8f59ae6bb66ebecb6e/dotnet-sdk-7.0.306-linux-arm64.tar.gz"; + sha512 = "1500927cd2b1e048de8ee5339937fd41073a85a82b7a175220a411212d22e4906b4e5e6d29b51d068157d2ecde33238d540508c700793dca8b04b4d1dcd5c89e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/42115a70-7082-41db-bffa-b54ba38d3a76/5dc32fb8dbd24f358947e96400792bca/dotnet-sdk-7.0.305-osx-x64.tar.gz"; - sha512 = "27762a9104c5f44c189fad2cf81984369503add9c6cbca604a4e539f9957db81d807981ce23c025a74feac1a978b9d679eda66f4078af2de7e0bad5992177700"; + url = "https://download.visualstudio.microsoft.com/download/pr/3d615bde-bfce-4ee0-a3b9-73dc4ea5a472/907ac9c03d971c7577ce60932456b3e3/dotnet-sdk-7.0.306-osx-x64.tar.gz"; + sha512 = "1ba293a9e07819aeb646c86f0db8280394c4a2b62f828d57a5ae80416cbafb1649a22e27cb12cc315dec1600cb825be645777d15e2f7c8d858fac3c55d0ed057"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5514f57a-bdd3-4bf8-aeee-9469379dff7b/8b14cea61057408b04bef7cd94123e66/dotnet-sdk-7.0.305-osx-arm64.tar.gz"; - sha512 = "4567aab659a1900d60f2dc07f6c24954b9fc2c49ea54a75c17825d2b9e131860de33bd79195ae529af1df884a25c7e626d7463d13e340ce6e99a74c8ffe60653"; + url = "https://download.visualstudio.microsoft.com/download/pr/0e57f35a-00e6-49ab-aa75-7ae6711f0a8e/f28c04285b8bfd3f975731a186e23c23/dotnet-sdk-7.0.306-osx-arm64.tar.gz"; + sha512 = "ac8c0b6e9d2235c8ee639c6c50b2f412f808a16f1616964f6166c7c57d899be2a0d8e83dd6f3010634f8f252da483c5d99cb083703996a99a6b9238cdc2cda6f"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.8"; sha256 = "0c6m32c18j2xznkszg85kdik3pc5r07yfxiki4l5i0a4y54ypbjp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.8"; sha256 = "19r888q35cac4rn6mr4fis0y4k3yvsbm117l7a10qgfdglgirxfq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.8"; sha256 = "1nimaxj9f582y0v5ifxcjyhjrv71yl2hqhszpvhgl4js9bj962gk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.8"; sha256 = "1val93qfr2hdas1fsz9f2kifyn6g60np0c4k2kw8a5wl8fmw0kfd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.8"; sha256 = "1w4x1spgb4x57qn3d1m9a3gyqnwwfk952kaxg8bqrki20a7qkhl4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.8"; sha256 = "115yh52g223b45mrlfhspm5jlziq4kcaks20dgk596v0k98mzk64"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.8"; sha256 = "0h4yirhfjsim0qpfh6sh46s6abqilcr2gby4c8aq9zicm8mrilpx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.8"; sha256 = "1mgj49vppwmxmsn4pvlfl72y4cljfc6cyl8difbih5ccg6z1a768"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.8"; sha256 = "1vgl2g9ffppgzac05zacrik9n65y2zr0p09b1ddb31nwkvmw6d9j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.8"; sha256 = "07x477l3l96qp8s5l428a9yl709pp2k0j6ims7ih2wlvcv00yrxf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.8"; sha256 = "02ha9xmgiqqsa20h349gp1gr0i283mpnw9z5639gmg42f5n9bnjh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.8"; sha256 = "0ksdh5vcp7w7cc28cdbw86yxxac2vggl91r84jfc61z0xpry73p7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.8"; sha256 = "0wyq9jhqzy5rzczlbi4fr48z5w3s4v63bjzjq2g7m4j04xp4747a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.8"; sha256 = "1399yd0cjj87i3ihw59dflc3rwlkmlg4562i0fjidj25aidppdm6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.8"; sha256 = "1a6g0rpc78z0fjs4qmsgk5kjxxik9x0ca6czrl26179y8kxqba3z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.8"; sha256 = "1i2mw89q809h4swnhmv33p3wh2sskbkgjkilbvrk01ljbrhi0y30"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.8"; sha256 = "0aw3d5d8hfhk2hsqq776syq6lsqhxcd811zjdyzak7gswbbjgmw5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.8"; sha256 = "0f7mi7109pjlmwhky3y813zs3c9579s2xgyfc500y7vs9d0780bs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.8"; sha256 = "1mvh93rq4syp147dz5175dbrbw58lf42hk9mbjinmr6aa1ahxr28"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.8"; sha256 = "1br7fc155k7blg0xnazgimh9szz49lri4gn8jcwqsjzfclanac6k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.8"; sha256 = "02qac81akznxacy4v89bmkcxjr9vfa98c40cmagynb6vd60rnzca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.8"; sha256 = "1jlprsgya94lv6agy0s4llcffi3cpv59i2m6aha1m2nh6kd1dawh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.8"; sha256 = "1iygmgc5xrkclkqb0wd7s5ga2as2vy8pnd7j8jdwjnv81m2p778d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.8"; sha256 = "064n292hxr4w3246vfj45v8k8pxghj4cjh02k7rvpjn6g3nnpwhq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.8"; sha256 = "0l209jnikhqc1br5gjwv98pzp7h4amsv7341skzixy7lwamay79f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.8"; sha256 = "1z3n5xw2a8zjvy4w7y6yr1yaig4wdda231yhinkbmhpc80s904sn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.8"; sha256 = "17rh26xs78pmcf9yc3zi3rxx9k3s5fg35xgqq80fvvp88jg9hr5n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.8"; sha256 = "0hp2dsjxg2q3wqnrs8mhfna7pyn9yq55n4rqdydyz2v4d6nsp00l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.8"; sha256 = "0mfgdx7w9l98a1q31mpzcz11p2bxcz5b6ijhrlg3sjkj0wkga7x7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.8"; sha256 = "02xqwf6dry4hrp7agd9av5jmwb7i66bdkzhdq8ngy73zkk5ap1q1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.8"; sha256 = "1whmyzs05751yx5708grmgmiv5i6nbfajhfpryx0h5ipb21csp6k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.8"; sha256 = "1rxy9hah8r2l7bkikj6lp36frfvmvz93v96d12k9s7rgxaqzw3p9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.8"; sha256 = "0rl96iw2lp62sxzc2f0y58gj57rwwzq4l1sb2pn8wsrxhjmj0w26"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0jq12zpbwgnwz9hhr269y74m6c8hli311h9km5jwr75kzwbf9rk8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0xplwfghd8mnpmcmvzdrhx78149r3wvsadp3g3k6fvqd2jh6ncky"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0l5viqkvm2w5p13dcvpnxpb7g5fsn46p8ay59vcpjmr0k9w8bsis"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0hgb6c235fbapz8h5w3x0jjqgg9ahj4xd3829bm8ziyrv3kq2nrg"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "07z788q2hn2iwb3x1lxblj243ncwif1955hzv4qga5h5a5j97yfr"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0g8g5irxlp5wnrrc7gffac33j6azlig8i0fn0088xhm1lliyaj3z"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1vhgfz5iv0vhn2g970x3zwaa03z7dq63cfv6v6cbrp5l7c640zzd"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "08fs6v4sjws0sq3jpy9p12gxg720fq6lvkggj18b4xqz07fmz055"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0br6psv8srk3vxy3swj84in7b1qd030j8y6i0lhd0pjvxmjhqk1y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "11gfspry6l8hnn5mll51p57bdncy72sswcf2544ldig43znawzq4"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0y25h674gvf07x1yvvh7x381b7qx5nlgk3xxyj4awqn6hr0m6rny"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "01rzsnaq9jd2wajmyp28bbxhx318hrkixd8h3vvy3ymanhd5sp74"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "1lfww3pgg8flfgpqi7vjl736k68b12v5iakc67a9nm4kml4z2gsj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "02p3nyyz7mm65vmlafyxrpm1pw4wzryj9z5a4zhvzdlwlddncvya"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "099issp7vpm00ild23571g559mszw11d0za6z5g36n7blywhlj2s"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0zpj8y89qsf2w31api8pj2rjkq5qscvwpr7mwgn2vbh4fl26f63x"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0rwn6lhx5q7ya451dfnlxla9z83lcz87ccxx509qkkdmz7lx3ia2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0n7xwdvacd4dbss1czpwl2z34jyagpkvf1618g59fif0yg29pwv8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "18a2iycwmailkcq0ygac1cpysx2kvp2pdp5z02r6s9jx3mgjpb37"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0gky5dr5b8nzh5f60ik3rr6s2wnbwck4rkalyhgbcbyxkkvcffa7"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0czvd8s0rw7iql4ggwair5wgcvar2sa9rp7m8xcg1bz88dlpswlg"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "16rfmdwqkbmgq286viqmffqd0sm59iw68gf62rw61ab9gdahdfg4"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1nqvcpl5jrqw6gh32palk8dn02asp2q77ss91v1v14pdxsx6sc1c"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0bj4wxhdcdlxs5cvdkn6fzqwrry7a9kx3cz7ad744qjhhm01lspl"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "096svf8b1v5ki24072y9bx0mjnr3zmpbivhnpxqbnji571nw0cax"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1179n7jg0dz7iik5jdpsfrr2jmzpqd95rw19m1vyqb68qbffy54z"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "00wmjvxdasv24jwhzw6dmyv6rdgd0yz6f1h90yz0yfdxrdbzwipi"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1y8lb60vgiiw7y10qshhm8y7k21q5jz09f8f1sks4p7v987h5l35"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0nnbvn0rxrcq2lisb0a7mn01lb9xk2ixyj9p1xbfrlzgyarl2xvx"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1dnn81sa5wrvvdcnnlzg1gf3b5137va8vxfr95lcxd55wh77l71h"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0lgzbv71lbh8bj0v260nk4qzkiyvn1bm2kz8as0nq6vlnzvvmnxc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1yxhvx23mn53s37pyz6q370gp056z2hmqd6n0ns8ayxcrr4yx93r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0cf9mx8yk9v2s5hrv1a603sxq0qvd0mxwwi63l9r1g8x7chc432r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "09ymhv03h8ws8idmdj1yff0j1r3hxzbdz7n0n9gpqqdyfj2zs762"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "00byqz0f7dz1ncywzbjiqw6vsia7ia05927xm5h6ykv2a9l635j5"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0sy9kn6n7ccx619fyhyafwgh66rmnyv1s2gz5668hywlcwnbbrhx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "05xim0a1ppzbf7ny6vdfjlrcnh11lqcwydlrdf2l12224kvcmdgm"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0k46q68yp88hj0gkm6q1m4y08vpl49w2pdis160q5jx11fh2bvwf"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0jcx69rq6h6jwlz735qr0pynyadz2nshc6s1xpis6hwc7ysgv0ig"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1prxn6b80nawq8ixqbmdhj6fzsh4mjhhvrkam6r60an38q8pjmqn"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "1xp91d7pkgcrpwalrfl9z9qa72vxg01kbc1k01d7n88ndpair032"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1hl7q1mrp85khz192kqs7lgnhqbl6wv34m2pyj97plm3sqvyfchq"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1sjrs0sc8f9hdqvg94njn3012bcmz87f90ab5dgalhj8m5in394j"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1k5xw1imhsrvj0b8s0zbg1gzbr0r3ja0cql81pq73nc2yk4x5559"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.8"; sha256 = "0sdm16nvckm4xakarnrfb5l075vzbv8vfxz4lk8vy828iqh9sqmd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.8"; sha256 = "16bs4w9gj09zxjmq94l3526mk277360zj6mwapq5mvpn0q9ll275"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.8"; sha256 = "1d3idyw795rpmaklhdn181v3pq9b3m1994jakgmvh2b9hpb4s6x6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.8"; sha256 = "0qx8czk5x0xxx3f6piz4f6nc43j9hkf0i1yidk5pgshk0l5cjgb3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.8"; sha256 = "0mbj34898p2ci2fcdk90gky9abf1kl8jydqgi6czj87hmk4kfdpf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.8"; sha256 = "00l3nvqxpjhhnmdp5yzk2mcm83ibbhcm1dlfxfzbc635f4zqmqrs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.8"; sha256 = "1xcl7sfx3g1zgvj2kwaffh0gqj3cfh641lma25d8mprqw3kms1l0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.8"; sha256 = "1s9khkkmziz63g48afhqh2dsqx6yvwcca0ai83diz4k8zg0wlwya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.8"; sha256 = "0jkxmi3lc5qpgk748mfj9vk5x58j8q60zcrv636xpj06qsm70z6x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.8"; sha256 = "1dflhc1dfral612bdqxhm8dznyphvnl56ywjjak6s9nsjc4q8h0s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.8"; sha256 = "1bp114hzsimjhdwyahph8xlp5aji2in6an6da39i6rwg4j52kgbb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.8"; sha256 = "0sxcmaqrdlvfjwcs7gipyf28r4m93q5059nxjp12pblq4cnsyjpx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.8"; sha256 = "173ld6nc66l1lc7g2j9xkvp3nf8d2w15g05rx8waiksl4k2q8rai"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.8"; sha256 = "1rz3m8x5pnn83z503s4smx775bpap1w43c3a7xvqgnhnqi08pqrn"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0x5rh5y073d2fx3cwbmw1i4rzvyxg8dlgzlny4vy87ycf2qjf2yp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0cg54bp7zx4kfiglbdz4kn767vlii55gzgg8dx0m0zpgcbwnnnsb"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "17jrrw8nkvayjfp4yl0ay8sxg7p46vl9hyx8xbn036clbm1g3ykw"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0fn9jb7kr6y7vhcfzmykgf21kpn6xwfxzc487ynx4rmqvhd24ck1"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0hb9ia3s9llppjnqbzb8cy1zvdbxx1vxcrrj77bmphhmd7rm0582"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1zynb95vlr46zra82dshnmizgq46hg2n1gh3rfwdkdfzznqghbpz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0s4d61ibgs4hvjipp2kqrqafarh561vr5ynyyfrg3vmq2dxl4dgb"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "183yrnyypy3smrvhl1p7srivirbv82f74qizf3sm3259x6cy7h3p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.8"; sha256 = "1m028vv06hx4rnjccm0fya0s888dr2n95qy50alajg2yfsjx5z5d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.8"; sha256 = "0x914n20l9ymszd9zkxfjgkcql8yxpkkywyiqnr47fapnckg9k1s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.8"; sha256 = "065v85x5n2ml7b0zq5aq0n7w941i226alvywxmlr3npskd4dxf1x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.8"; sha256 = "04yaar4msmng1kv5irfhk33093x9wy9j886ba6a2b875fv8bccvx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.8"; sha256 = "1shcpziwrjs8s6w6c8k35ksaynqj50w50mxbaz5x0abx8zm0171w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.8"; sha256 = "1855g78y2xr55l8wg6g3268bs99v4yky3ablyskbzh9fcd69f12n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.8"; sha256 = "1z4z1vwfx8lim0k754wn4l6smx2wbfn3izmla32zbp7azf7wz4mf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.8"; sha256 = "0z636krp140rz3gvd7n2aqvsr9wlg3r05fl1nal81aaplazpjllc"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "108ifhifj7dv0650xciylgnm3y1405mrkfvk21b0bbjva6ng59sx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "07qljs56khdm4jlh3ack12xx7jp0dxmihdihcnv653bllys1ay9f"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1lghi90zb4xswp3v03vbb7hbjixr2jq3s1cxhl35qrg5qm1rib5g"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1yva9fnnrs1cn4n3y0k0ji24nnysg7x0grj54qknf3anv3nsl8z9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "0ng2ck1na9v25an5b3jwk1ahr5n5habp0sg2fzqdyjms1y1bx7c0"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "03iw2kk1w2bk2jgi76bfw5xq8pjv6fzxac3ll5b3vfxc2b0wn8p6"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1c9289fprnb4xhf3ayj2rnhmc5z7narrxxfrjfsr8skprkdcidfs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "09d86p5r8wbv03f89cylkg6czwf71m50fkxmav9qp3p5cscayzql"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "01nkzvwgrlmgw57llabdgfxqz7jp54a2p3fd83zdlajqmmf54wi5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1z0cbmff7kmv8yg9x9j4jzga689fy4434z8jy8s3vjsvmcj96wmc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "0059ldcym4lwrifibhb8qlra2f3ygzb95laxjgxj3jbdh78fy3i8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "12wkvz1mwyxv7zcr18bsyfa93p0wjmxqyz26va34xrfws699ip1v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "1spnj5n5l0hksrq89blj0xcsp1cnk2dw8n0giqrmq790yssvzn16"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "0paqgqbddlnz6p0q1rmc8rdxhgwhs2gqnhbq8b53c0pn8dv554nz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "0zw8bqj770gzk03ddxxh2y69krgxvrxn646878lf0l8ssllbsp5v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "0zm2gly0pkm5x0zngcbbz060i2p5xssrb154pnix9xbhpxf9bab7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "019fpgx8vminim43x3j4ym0m3fg42r8igw4yhh6ivbfkzyy5jnkb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.9"; sha256 = "1vsrymzxfrsa3dvmia9wgvyyz1s8h3n76qwcysa78dqf6lkas77s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "19wzv0rwddcnrkz0g10gqya0l1brpajkg1krpcf8br0ly0n6fddi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1l3g7l5xzcw3hpk3mcwsl6g72qfrs0m3blazrngma73z4cj3k9bi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.9"; sha256 = "1cl0xj4aafsfsvms4il6nrx8dyfwx0wdykwzrr2azy2yxvymqslr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.9"; sha256 = "1ckgzrwi67prsab6zrjjm0zmf6mbk7wzjjg197nnrjfd6sp5dpq2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.9"; sha256 = "0ymj65d1fjn7mm5w2myrhrq465xsr1nggnvpmbfr5md9g9zz78h9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.9"; sha256 = "0jhcajp4dy3770y5394rapsjl6z7jfdw8c2wnsqdr2cgzwjcjr3s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.9"; sha256 = "1rprrl8qbdn9v3j7k2dkh0krmr9bak8k3r5lm9v43f1h85gcicsk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.9"; sha256 = "0vgn0gd31xfk4j7a8grnnbn3sc8afbncxzcfykzlrpqmzn61plvm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.9"; sha256 = "00v7yivfj6vl2w0cxnw03pdqwbqz55ds32nanqmni069466x8aya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.9"; sha256 = "139lkp92clq50d3jcpdlv79mx72fi46q7bb9skbgc6svz9d40x4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.9"; sha256 = "0dbwkh60f4sbfxsfzi5kyhc7aiz6f9bx3p0m5h897pp94xz7gqrl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.9"; sha256 = "0v6ln2cbh09nsglkcclay9jkxchnlg89qkzxmw2ml353b42an1ca"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "0kp2zhxq7dhsclb57ah3xw7ahp23n2xx1lxxmqkmw8gqgan99jwf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "0d380v98ncgbjzhrd3pf6ff2155rbl173sr686ifs8djl1w86q24"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1f1cjqw2wxdykynj2vkxlhqk7kw058219yydyjsgpczrxpdqmcqa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "1kd4xdwwck1yjb2j4zwj6xq7b6skbc5x565mpzki8s0x2pncid7s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "15fw7ywbn28asnn6d23rl5bljzx6crxq8nj0iv7l24c96l41pi55"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "0k5iqm0hq9f9nwq9sazld3ada7zx2wypcf5k2ddhrwr53wr3rb2v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "1nmb8hjln8y061381rii1q0m8ipbip51wciypdgvngzvjsibhsgs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "16advlismh4qki0dslnycicy73xlhjm3cv595v8yldrvynam2bdp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "1lxn13pvg2zynwnzxriw6izdq778w004m5ijxircn1mhzrziipz9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "1659734dxb42pcyjsbdg1r9m13z59qm1kd6c23dpix2dwfn2jnrw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zyrafkqv54fd03m8pn7gly2svh8lpsfkbf8cr962w56g7m900qd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zsshmfjm8ivh34qgb6jcmrd5lv9c8lb40k9splg0d3vi9769kdk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0lgfaqqjsijvjspz2as5c5wjcgpl38pqyvy016b6bq0pii3008xg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1v1vq51isgmj15x6p9jmilvgh8kv75748ga7ba9d9azjcia6dj18"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "14z8nr5h8aw5090xwd5ll82c9j936fhadf9k0skb8rghkwqlak0n"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "10vkpyfp5v9nv2rcwbi20874a6swqzgzn7w4y5zkx51q9a2r80yb"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "064yry4gplxjsxn46ardi9jzvpmm77b0pgv9izhdlp5jgnxp8hrf"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1jzasfcy1rmn6vmsm5i96srp04ha6nv4a564p09wam1xjqspm3fc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1gri5l2gbxkbhhjxkzwa4wnyrm522pimpl8ad2nhq2mpa62kmk20"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1jimxwgx5b311y1nxchyxg7yabkns6xlhx9sc0ha6nyv9m9bbn4y"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1ml6kb8m6l64gvf2igh0cqbhgk51n1alqq1zn1hfcg695wm0ldxy"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "17ls7hkmmiagdfrvrh2w089pi24xjyg5w5xbxzwagv65aff0m50z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "02n69ki00djz3504sfz26akgyk2m0bqd3cmpl3553sh68igqaqnr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1cwsl8abvb5bvkciyb29jv0cbc9yr5gbsv4d16q7sifhmhsj7ccj"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "17vfj41qza3l6vslq5zb8d8wj9mn23d3z6g2flb8spdlvvrc23mn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0lcx0zwdryw2jzv61jaqhslc3iglg2kc6lcxqs746vhwsqd40fcd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1cmjc993gfrxijk4mkfjvhz2zs146353rhg3948gal2r6gdqnqba"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1pp2fgk7c0gdjqmdxddj0xw99akrqpw8hx1wsj4x6yx5f3p3hgay"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p06lmfip9iz934sdvql4iir9ln6n59f0bwwg40i4fldvpfgrf6x"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1gzfypb84x6wr3rrywr5m1lv0a77wz56vzczb6c5kgad9dgjxnhz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "062xbr09j64bh8qmq77mhdpkd12b1xn8282xyvbxb9svpgy5q3in"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1mjvzpsbr8ikbd6417y81bwfn1fa5g4i1hb6yv3spxgl45rpqy7j"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1fpl01yq1ha0912sr5wj3rwg29q3jknhdaibw92ql8jdmbwp6z1b"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1zxcy12nbpfhc7a0p3vmi645p79gnqi7g4jjd9ap7rg57b56wd0b"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "15qvi3x575976hs2xqrr0z68mi8v8cpal64sc669njlfprk0rsw5"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zr89aaxz4qlqk0fi4xqwv138k54lskwm219iacpkjvci88brc82"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "07dasy4d7bnirkb61mirnjvgvw7l2266wi4bb69vfiq0gzfzbzr7"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1iiba4mkvhcbf1lc9ydmafxzd75mfxw16d3q4nm3mravf88hga4j"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1pvrz3gd1p7ihnhfgl1hlhxy6f90238alw4v0gdwcfqbxlnnfvyh"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ammp0lxban03aam1i5mhfqh0lpc31d9qpy08i1qzs8dpy0qy8kc"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1gl2j9n3h0fhx4dpcq3lwvcnx5xirdsjs4vq0jph01zfxsvn9rh5"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0zkdalcb30dpv0682cdf0ib5hyz8ic4yksp0kj1ybrgj6wmnhgr7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "0m0m7cja0s1sza51qz2300c8m4397ii5p5nppm9nvx1cqhhrxyq1"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ds54pnkn9x5nyngdkkymwkg8k0wy3g4jpb098h0hm8pv1pikvz8"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p20jsz3h5rssiq6wdf1i0m5fb52y3l2a7d83j5s3fllvf1hpv5m"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0s6i21a8raazrw4cm4cs1jjxmpqmazrdjsa7xgk8j6r71galml9h"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zxkvw32d099pjnkdza7jmfyxs8q9j46qhn3i0g2b01m7rla1nh4"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ckx746lmb7m952c27hwrnf4ngzx5zk310rpgdk1v74n767n2l4q"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0jrh9507aa2m82i7b8i4ws7rx3fpbdlcfgr7qrv6046myipx847x"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1arfqghv2v13knh95k300vllx3rnb6rjfn8h0k5qyvgcha5dxjhs"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1qvr9xd8564bg6zq4qzgjvs1yy6cvpb6k6rbzcrffa0ql6mp5whh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1vnb8719i9j1x3nkl7hc6wrcc0w98xiwj2bhaxxwcxjhnqid2kjv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0d9czhxn25322iqmn5lhv9bwnznlcnr1rsvq52y6h3ks4lqbpx6d"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1k3abndg0gxji09wwvnnbi4d8m3xk51yc2hir08vb064i28x0vwd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.9"; sha256 = "1phh09w8x6i4w15rjrgc74pljaqrrh4cc2g2vaymffx32nbd8b0p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.9"; sha256 = "10h6gmf8f600qir9b282d9c3890b1jjkqkiv2h1x899cibx3r4xz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.9"; sha256 = "1199dqdkd9q568scprvbjpqqnjh7476vwykjj3wl242ljc9lzv07"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "06q2r3sfj2g7r564q1ys0ny11dg3qz6nifrby9phijs1pwcrsf7l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1cw4cm7hr4x3niynbxc0z4lwn8lmd78x00vmb1kq52gvy24vnpvz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.9"; sha256 = "1jkv8a4apfjq7xjlw7mkap3h1znrmwb7kb175krslp9arldh9lc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.9"; sha256 = "128gc9zy607ybhs58hc49lvwg1ddlmz3s6ak4qdibpjzxgaxd444"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.9"; sha256 = "0cgbxm4w10kxdjil8bl04d7py0gbccs5npaxnji0xi45977ajs32"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.9"; sha256 = "1vz7a4jk3l1xgihv812y198c0kwgbvl9fh21r32jm363dxrd2lrb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.9"; sha256 = "05vhl80v3m3jql0r72ba15gd1q4p1zzc709klzr3wv50zsjqpcgp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.9"; sha256 = "1sn6qxc57fr5w9hh9x37v6z0pgwch8hhm5jzjchyflkdj9g60zc6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.9"; sha256 = "1kxjwrqbrkwyigyynlcl8lip10rmp029qikiifq5mm6j0ifyashr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.9"; sha256 = "15h20x40x14grk7d9jacgi3kfrrlkszg5mxf5mcm0ycphp9cq4h7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.9"; sha256 = "0x9zkfp3917wwaz20c1x6yp22iv4zj6778l38m9xbhynsjiak33m"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "025znra1878vbq7ywchjnc2jq1xsqnl3lkij5qacjh13a7zg8jcs"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1aaxyyg4f7apb5naj8fj72mh3jzh6v0rdmmgjrx467z471y0ccss"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "11gj2kk8h4jpzgs0hyxa1pgsxw29y04q33c3n70bgsnjd6qrrprl"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0x58n7zl28973w2rbl7zjpwqvfq3vpr639zi78654sj0xjvqgd9f"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "08p00883gf1xinwp36axld678ab039raqj6gbyya0bh8wcybwksz"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ck7fqjp6xgnl399lhdp2lqz7zj2awx13dvxbyvql0iv2iyim986"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1257h215aa87irl6pd64sa1600kmhhdv1l545jlv4x7hm0jqy63p"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "139ccsmjg8bgh7f318h921lv8g4nbhrycj0b3h7r8nxpg484inls"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.9"; sha256 = "0jg2qnm2wj7bwzgdw656sbvn8radsg9r7nvbsk06w6kn053kpnzs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.9"; sha256 = "1d633c6a8qyj5lsv6sjl1yb9j8pinkyv4m6qysffzz1swkzg2fn2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.9"; sha256 = "190n60bzlwsrrs1pr79va4qxbh0vj2zshjpw8wa3ypbfgw9nwfqr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.9"; sha256 = "0lg0hncd3f79z5rpldk3751q1k08dmn4nyzmg85ivci5xp2glmc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.9"; sha256 = "0ldwqi394i7dancwz46d1g5w7w2d681k0qbb21wnn0l8llairmsz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.9"; sha256 = "1s6g2agg0yjzxppzrq06zg53ik3nk40pv2py3r91vvm9as10l0la"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.9"; sha256 = "1a3yv46jkpakpd35qbnyx0rik1w90wmpbffd2sx919pl77l262kq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.9"; sha256 = "1p7rmjsjyginrx6ml3j0pmlvghp6rhi7p2myn6di1lawi4c245sp"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0hpbb13459izw1c5qw7lh1sy5fbnmg7n8977jci5far584zbf3im"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "162pjnjp7k5y1xckl0l7h06yv2d65lczwspqfcyy1ix7whx8l5fm"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0kikz4mgymxdjpg3xwlzwb5b7qdq550qf4rknaik2qklwr2xv7xr"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0crf80nb3pw4wr83bvsx7f48i63f2l1b2zc18sny4xhqlvbcfick"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1370mahfnshdy63vlxbyqpbhmv5rby5azfbnyc72xb7zglf9aqcb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1v3knzlfb6ik4306lhk5d37pfmpxczl0d4h2flvvzs61ap1jpgh6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "10a0gk0nqx3p9xjaxlwlx6hkvnjps2dyfih91nf10dw31w40q4h9"; }) ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix index 4b6b142310..8706c05feb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.16"; + version = "0.6.17"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-HBi9QDSrAkBORswoNXDGZaABQYFDQGC8WKdzhk4KKhw="; + hash = "sha256-KHfKV0i3jYwzD/PQ0TSOlxjUnc08pk0yKrLQlg5eQvg="; }; - cargoHash = "sha256-YQYyH+iypORcAEyVhHqYw0aHi1QtCgNuwyg/SnmGVIE="; + cargoHash = "sha256-PD1C3IsupjyQndD971zbfHYxizOQd/t770u48o/aGmk="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix index 7493231f2d..667dbaf109 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.38.0"; + version = "0.39.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-KiN7qpyAd1svRWWRtuj/lRXyHoLNM2FaTWVgFC4aPrg="; + sha256 = "sha256-kIH5vv/7pKgfAL1BaWYH6PSyEaKVONcccUczsudyfO4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix index a29f45a4e7..753938e95a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/bootstrap.nix @@ -6,11 +6,11 @@ gccStdenv.mkDerivation { pname = "gambit-bootstrap"; - version = "4.9.3"; + version = "4.9.5"; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; - sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; + url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; + sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; }; buildInputs = [ autoconf ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix index 0292256291..9481078fd9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -1,5 +1,5 @@ { gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, - src, version, git-version, + src, version, git-version, stampYmd ? 0, stampHms ? 0, gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, @@ -26,6 +26,7 @@ gccStdenv.mkDerivation rec { bootstrap = gambit-support.gambit-bootstrap; nativeBuildInputs = [ git autoconf ]; + # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. @@ -39,11 +40,14 @@ gccStdenv.mkDerivation rec { "--enable-targets=${gambit-params.targets}" "--enable-single-host" "--enable-c-opt=${optimizationSetting}" + "--enable-c-opt-rts=-O2" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-openssl" + #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" + # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -58,9 +62,9 @@ gccStdenv.mkDerivation rec { # "--enable-coverage" # "--enable-inline-jumps" # "--enable-char-size=1" # default is 4 - ] ++ - # due not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 - lib.optional (!gccStdenv.isDarwin) "--enable-poll"; + ] ++ gambit-params.extraOptions + # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 + ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ @@ -71,31 +75,35 @@ gccStdenv.mkDerivation rec { XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ${gambit-params.fix-stamp git-version} + ${gambit-params.fixStamp git-version stampYmd stampHms} ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - --replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}" \ - --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" + ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ + --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" ./config.status ''; buildPhase = '' - # Make bootstrap compiler, from release bootstrap + # The MAKEFLAGS setting is a workaround for https://github.com/gambit/gambit/issues/833 + export MAKEFLAGS="--output-sync=recurse" + echo "Make bootstrap compiler, from release bootstrap" mkdir -p boot cp -rp ${bootstrap}/gambit/. boot/. chmod -R u+w boot cd boot cp ../gsc/makefile.in ../gsc/*.scm gsc/ + echo > include/stamp.h # No stamp needed for the bootstrap compiler ./configure for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done cd .. cp boot/gsc/gsc gsc-boot - # Now use the bootstrap compiler to build the real thing! + echo "Now use the bootstrap compiler to build the real thing!" make -j$NIX_BUILD_CORES from-scratch ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"} ''; @@ -107,6 +115,7 @@ gccStdenv.mkDerivation rec { ''; doCheck = true; + dontStrip = true; meta = gambit-support.meta; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix index 8f77daa417..cb4f5f9501 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./build.nix rec { - version = "4.9.3"; + version = "4.9.5"; git-version = version; src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; - sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; + url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; + sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix index be745367ec..f78c99a507 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix @@ -3,37 +3,38 @@ rec { stable-params = { stable = true; - defaultRuntimeOptions = "f8,-8,t8"; - buildRuntimeOptions = "f8,-8,t8"; - fix-stamp = git-version : ""; - targets = "java,js,php,python,ruby"; - modules = false; - }; - - unstable-params = { - stable = false; defaultRuntimeOptions = "iL,fL,-L,tL"; buildRuntimeOptions = "i8,f8,-8,t8"; - fix-stamp = git-version : '' + targets = "js"; # arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64 + #fixStamp = _: _: _: ""; + fixStamp = git-version: stampYmd: stampHms: '' + echo "Fixing timestamp recipe in Makefile" substituteInPlace configure \ --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + substituteInPlace include/makefile.in \ + --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; ''; - targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest - modules = false; + modules = true; + extraOptions = []; + }; + + unstable-params = stable-params // { + stable = false; + extraOptions = ["--enable-trust-c-tco"]; }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; gambit-bootstrap = import ./bootstrap.nix ( pkgs ); - meta = { + meta = with lib; { description = "Optimizing Scheme to C compiler"; homepage = "http://gambitscheme.org"; - license = lib.licenses.lgpl21; # dual, also asl20 - # NB regarding platforms: continuously tested on Linux, - # tested on macOS once in a while, *should* work everywhere. - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + license = licenses.lgpl21Only; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux x86_64 and regularly tested on macOS x86_64. + # *should* work everywhere. + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index a689991a1e..26761d67d3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,15 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-09-20"; - git-version = "4.9.3-1234-g6acd87df"; + version = "unstable-2023-07-30"; + git-version = "4.9.5-3-ge059fffd"; + stampYmd = 20230730; + stampHms = 151945; src = fetchFromGitHub { - owner = "feeley"; + owner = "gambit"; repo = "gambit"; - rev = "6acd87dfa95bfca33082a431e72f023345dc07ee"; - sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r"; + rev = "e059fffdfbd91e27c350ff2ebd671adefadd5212"; + sha256 = "0q7hdfchl6lw53xawmmjvhyjdmqxjdsnzjqv9vpkl2qa4vyir5fs"; }; gambit-params = gambit-support.unstable-params; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 739b6d2e2c..c61093c67c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -214,10 +214,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 362bdf0193..92abdebe49 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -228,10 +228,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix index ebc1796ec3..9665c2a9fe 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix @@ -271,10 +271,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/13/default.nix index 5fb78cfd7b..1b73c251ce 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/13/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/13/default.nix @@ -265,10 +265,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 3625257efe..fa856eff96 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -232,10 +232,7 @@ lib.pipe (stdenv.mkDerivation ({ '' else null; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler langJava withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index e433e66b9f..bab79f968d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -253,10 +253,7 @@ lib.pipe (stdenv.mkDerivation ({ '' else null; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler langJava withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index f64963b906..f443babb4b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -269,10 +269,7 @@ lib.pipe (stdenv.mkDerivation ({ )) ); - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler langJava withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 90785143f0..5b6ea7ead5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -218,10 +218,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index 29f0a88c95..f903e264b0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -199,10 +199,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 29e4117fc6..289212a136 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -213,10 +213,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh index 5147df1e4c..d9016c45e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh @@ -135,7 +135,7 @@ if test "$noSysDirs" = "1"; then ) fi - if test "$crossStageStatic" == 1; then + if test "$withoutTargetLibc" == 1; then # We don't want the gcc build to assume there will be a libc providing # limits.h in this stage makeFlagsArray+=( @@ -167,7 +167,7 @@ preConfigure() { rm -Rf zlib fi - if test -n "$crossMingw" -a -n "$crossStageStatic"; then + if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then mkdir -p ../mingw # --with-build-sysroot expects that: cp -R $libcCross/include ../mingw @@ -185,8 +185,9 @@ preConfigure() { postConfigure() { - # Don't store the configure flags in the resulting executables. - sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile + # Avoid store paths when embedding ./configure flags into gcc. + # Mangled arguments are still useful when reporting bugs upstream. + sed -e "/TOPLEVEL_CONFIGURE_ARGUMENTS=/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i Makefile } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix index 626b14835c..b14d111e36 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix @@ -46,6 +46,13 @@ lib.optional (lib.versionAtLeast version "11.0") enableShared ; + # For some reason libgcc_s.so has major-version "2" on m68k but + # "1" everywhere else. Might be worth changing this to "*". + libgcc_s-version-major = + if targetPlatform.isM68k + then "2" + else "1"; + in (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) { outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ]; @@ -75,9 +82,9 @@ in # move libgcc from lib to its own output (libgcc) mkdir -p $libgcc/lib mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/ - mv $lib/${targetPlatformSlash}lib/libgcc_s.so.1 $libgcc/lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ - ln -s $libgcc/lib/libgcc_s.so.1 $lib/${targetPlatformSlash}lib/ + ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: @@ -134,7 +141,7 @@ in # another eliminates the ability to make these queries. # + '' - patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.1 + patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} ''); })))) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix index 2561246a66..e386693b22 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -117,10 +117,35 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/ # https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff + lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared) - (lib.optionalString (!stdenv.targetPlatform.isPower) '' - echo 'libgcc.a: crti.o crtn.o' >> libgcc/Makefile.in - '' + '' - echo 'SHLIB_LC=' >> libgcc/Makefile.in + (let + + # crt{i,n}.o are the first and last (respectively) object file + # linked when producing an executable. Traditionally these + # files are delivered as part of the C library, but on GNU + # systems they are in fact built by GCC. Since libgcc needs to + # build before glibc, we can't wait for them to be copied by + # glibc. At this early pre-glibc stage these files sometimes + # have different names. + crtstuff-ofiles = + if targetPlatform.isPower + then "ecrti.o ecrtn.o ncrti.o ncrtn.o" + else "crti.o crtn.o"; + + # Normally, `SHLIB_LC` is set to `-lc`, which means that + # `libgcc_s.so` cannot be built until `libc.so` is available. + # The assignment below clobbers this variable, removing the + # `-lc`. + # + # On PowerPC we add `-mnewlib`, which means "libc has not been + # built yet". This causes libgcc's Makefile to use the + # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the + # versions which have been repackaged in libc as `crt{n,i}.o` + # + SHLIB_LC = lib.optionalString targetPlatform.isPower "-mnewlib"; + + in '' + echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in + echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in '') + lib.optionalString (!enableMultilib && hostPlatform.is64bit && !hostPlatform.isMips64n32) '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index 5dd4a2e4a4..ea82d72a48 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, git, pkg-config, openssl, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, git +, pkg-config +, openssl +, Security +, libiconv +, nix-update-script +}: rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.30.0"; + version = "0.30.5"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-74QYiT67Xn2nBZx5R3f3qGSI2pDD09bEuDy98tf0Bsg="; + hash = "sha256-DOQhuSNIyP6K+M9a/uM8Cn6gyzpaH23+n4fux8otPWQ="; }; nativeBuildInputs = [ git pkg-config ]; @@ -16,7 +26,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoHash = "sha256-42N9bmoLh6XUwpJTG5ZJ4iepYdW91baF9OqsBKgp/WI="; + cargoHash = "sha256-CkMUconCw94Jvy7FhrOZvBbA8DAi91Ae5GFxGFBcEew="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix index 53da9af553..0ce8fcc659 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.11"; + version = "1.19.12"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-4lyaty2BEUK39B/22lFl/sLRvl/uw+8sZrwL3stDFIk="; + hash = "sha256-7l1Q4Kf9dLobE3y4eWCaqu+YgL9ytdF0IQDjiucrtVc="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix index 7eb40c2369..18fa8db987 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20.5"; + version = "1.20.6"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-mhXBM7os+v55ZS9IFbYufPwmf2jfG5RUxqsqPKi5aog="; + hash = "sha256-Yu5bxvtVuLro9wXgy434bWRTYmtOz5MnnihnCS4Lf3A="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix index e22d279fd9..770f26ca44 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.41-r5"; + version = "6.41-r6"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-JsLufRmqUmJ4if1XURi9swS0upw+Hj827T27A9qDANg="; + sha256 = "sha256-YJ3k9c+uYRzI5vMzPXAWvbLoAv45CWxZ21DFsx4UtVc="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix index b06282495c..f124cb4d4e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc="; + sha256 = "sha256:0yhcgyzjlrgs920lm0l6kygj2skanfb6qkxbdgm69r8c2xkzkaa3"; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index ce31fe0819..8e723cdb82 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_GTEST=ON" "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" + ] ++ lib.optionals (!stdenv.isDarwin) [ "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix index 901830ffb7..aec856e47d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix @@ -4,19 +4,18 @@ , parsec, process, regex-compat, text, time }: let - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-+evs5g0qrplUMr8zC51GvUx2JXQBYJb39IaI4rC6CSA="; + sha256 = "sha256-sVjaIzOxNuBtDswpDl5gLB10Sw945TQAf2ywrKumqqk="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { pname = "kklib"; inherit version; src = "${src}/kklib"; - patches = [ ./kklib-mimalloc-macos-fix.diff ]; nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff b/third_party/nixpkgs/pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff deleted file mode 100644 index 7d77bfd18a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/koka/kklib-mimalloc-macos-fix.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- kklib/mimalloc/src/random.c 1969-12-31 18:00:01.000000000 -0600 -+++ kklib/mimalloc/src/random.c.new 2022-01-16 19:43:54.000000000 -0600 -@@ -195,6 +195,7 @@ - #elif defined(__APPLE__) - #include - #if defined(MAC_OS_X_VERSION_10_10) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 -+#include - #include - #endif - static bool os_random_buf(void* buf, size_t buf_len) { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix index f1a3e74fa6..5e06e85c02 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix @@ -10,7 +10,7 @@ let inherit version; inherit src; - sourceRoot = "source/clang"; + sourceRoot = "${src.name}/clang"; nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index faa123312b..18be4499d0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { inherit version; inherit src; - sourceRoot = "source/compiler-rt"; + sourceRoot = "${src.name}/compiler-rt"; nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix index b18c9da18f..994ec7dd5a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/libcxx"; + sourceRoot = "${src.name}/libcxx"; outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 06137ab067..b1b57b3050 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix index b6017e7417..d837bc60de 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libunwind/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix index c8c3e0b448..d506f396f6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix index 59c3edb9e2..827e528581 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation (rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix index 71362be1fd..8eca980d60 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix index 0442e6a040..7e14f9a91d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "minimacy"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ambermind"; repo = pname; rev = version; - hash = "sha256-cpxKZ77Noe/2et3ROAQwG2LJxrlsEfi+bmUj+QaPkk0="; + hash = "sha256-VqcMdlptoMJEsPTny/E6ly7/xmHKcljIsSeZDzaA+ig="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 692f5331d0..131a27b6f5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -285,9 +285,6 @@ in { "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" # Use the custom configuration - - ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"'' - # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds. ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix new file mode 100644 index 0000000000..d6f11798f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix @@ -0,0 +1,67 @@ +{ lib +, fetchFromGitHub +, llvmPackages_15 +, lld_15 +, rocm-device-libs +, python3 +, rocm-runtime +, cmake +, boost +, libxml2 +, libffi +, makeWrapper +, hip +, rocmSupport ? false +}: +let + inherit (llvmPackages_15) stdenv; +in +stdenv.mkDerivation rec { + pname = "OpenSYCL"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "OpenSYCL"; + repo = "OpenSYCL"; + rev = "v${version}"; + sha256 = "sha256-5YkuUOAnvoAD5xDKxKMPq0B7+1pb6hVisPAhs0Za1ls="; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + buildInputs = [ + libxml2 + libffi + boost + llvmPackages_15.openmp + llvmPackages_15.libclang.dev + llvmPackages_15.llvm + ] ++ lib.optionals rocmSupport [ + hip + rocm-runtime + ]; + + # opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually + cmakeFlags = [ + "-DCLANG_INCLUDE_PATH=${llvmPackages_15.libclang.dev}/include" + ]; + + postFixup = '' + wrapProgram $out/bin/syclcc-clang \ + --prefix PATH : ${lib.makeBinPath [ python3 lld_15 ]} \ + --add-flags "-L${llvmPackages_15.openmp}/lib" \ + --add-flags "-I${llvmPackages_15.openmp.dev}/include" \ + '' + lib.optionalString rocmSupport '' + --add-flags "--rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" + ''; + + meta = with lib; { + homepage = "https://github.com/OpenSYCL/OpenSYCL"; + description = "Multi-backend implementation of SYCL for CPUs and GPUs"; + maintainers = with maintainers; [ yboettcher ]; + license = licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/otus-lisp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/otus-lisp/default.nix new file mode 100644 index 0000000000..5338734e6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/otus-lisp/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, xxd }: + +stdenv.mkDerivation rec { + pname = "otus-lisp"; + version = "2.4"; + + src = fetchFromGitHub { + owner = "yuriy-chumak"; + repo = "ol"; + rev = version; + sha256 = "sha256-+6qH1BhvMkuG2rUOfo9qMjMjhCib9KONQTBWS27c3Ts="; + }; + + nativeBuildInputs = [ xxd ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A purely functional dialect of Lisp"; + homepage = "https://yuriy-chumak.github.io/ol/"; + license = with lib.licenses; [ mit lgpl3Only ]; # dual licensed + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nagy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix index 5c27ac26d6..99ec78c6ec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix @@ -25,15 +25,15 @@ let toCMakeBoolean = v: if v then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "p4c"; - version = "1.2.4.0"; + version = "1.2.4.1"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; - rev = "v${version}"; - sha256 = "sha256-nIPvB6nwa55dKNeoNRrjhnnmoYLYTviaoL79+hT6gGs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-Whdryz1Gt0ymE7cj+mI95lW3Io9yBvLqcWa04gu5zEw="; fetchSubmodules = true; }; @@ -78,12 +78,12 @@ stdenv.mkDerivation rec { python3 ]; - meta = with lib; { - homepage = "https://github.com/p4lang/p4c"; + meta = { changelog = "https://github.com/p4lang/p4c/releases"; description = "Reference compiler for the P4 programming language"; - platforms = platforms.linux; - maintainers = with maintainers; [ raitobezarius govanify ]; - license = licenses.asl20; + homepage = "https://github.com/p4lang/p4c"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ raitobezarius govanify ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index d7c8394a57..872f16549d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -7,10 +7,7 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; patchelf = libPath : - if stdenv.isDarwin - then "" - else - '' + lib.optionalString (!stdenv.isDarwin) '' chmod u+w $PURS patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS chmod u-w $PURS @@ -18,7 +15,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.9"; + version = "0.15.10"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -28,17 +25,17 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "16ci26pgrw0zmnyn1zj129y9624cqwzrhqglc8mgfg4k7rxvqy2a"; + sha256 = "1pk6mkjy09qvh8lsygb5gb77i2fqwjzz8jdjkxlyzynp3wpkcjp7"; } else fetchurl { - url = "https://123.github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; + sha256 = "14yd00v3dsnnwj2f645vy0apnp1843ms9ffd2ccv7bj5p4kxsdzg"; }) else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "0rabinklsd8bs16f03zv7ij6d1lv4w2xwvzzgkwc862gpqvz9jq3"; + sha256 = "03p5f2m5xvrqgiacs4yfc2dgz6frlxy90h6z1nm6wan40p2vd41r"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_70.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_70.nix index 8c91ed0100..2a22c4643e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_70.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_70.nix @@ -15,7 +15,6 @@ , CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform -, llvmPackages_11 , llvmPackages_16, llvm_16 } @ args: @@ -27,8 +26,6 @@ import ./default.nix { llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; - llvmBootstrapForDarwin = llvmPackages_11; - # For use at runtime llvmShared = llvm_16.override { enableSharedLibraries = true; }; @@ -60,4 +57,4 @@ import ./default.nix { rustcPatches = [ ]; } -(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_16" "llvm_16"]) +(builtins.removeAttrs args [ "pkgsBuildTarget" "pkgsBuildBuild" "pkgsBuildHost" "llvmPackages_16" "llvm_16"]) diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix index 0324aca1e4..35f5ab79c1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -5,7 +5,6 @@ , bootstrapHashes , selectRustPackage , rustcPatches ? [] -, llvmBootstrapForDarwin , llvmShared , llvmSharedForBuild , llvmSharedForHost @@ -16,7 +15,6 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild , makeRustPlatform }: @@ -69,11 +67,6 @@ in # Use boot package set to break cycle inherit (bootstrapRustPackages) cargo rustc; - } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) { - stdenv = llvmBootstrapForDarwin.stdenv; - pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; - pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; - pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix index 493186389f..8fcb1c7c04 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix @@ -22,13 +22,13 @@ let # The loosely held nixpkgs convention for SBCL is to keep the last two # versions. # https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841 - "2.3.5" = { - sha256 = "sha256-ickHIM+dBdvNkNaQ44GiUUwPGAcVng1yIiIMWowtUYY="; - }; - "2.3.6" = { sha256 = "sha256-tEFMpNmnR06NiE19YyN+LynvRZ39WoSEJKnD+lUdGbk="; }; + + "2.3.7" = { + sha256 = "sha256-aYFE+4BaMZGaYQ3pmauYOR1S62mK2qjKGbKPxu0Nmfc="; + }; }; in with versionMap.${version}; diff --git a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix index cd0b7620a6..f34992c8a3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook -, ncurses5, zlib, gmp -, makeWrapper +{ lib +, autoPatchelfHook +, fetchurl +, gmp , less +, makeWrapper +, ncurses6 +, stdenv +, zlib }: stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - milestone_id = "M4i"; - version = "1.0.${finalAttrs.milestone_id}-alpha"; + version = "M5b"; - src = if (stdenv.isDarwin) then + src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-macos.tar.gz"; - hash = "sha256-1Qp1SB5rCsVimZzRo1NOX8HBoMEGlIycJPm3zGTUuOw="; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; + hash = "sha256-Uknt1NrywmGs8YovlnN8TU8iaYgT1jeYP4SQCuK1u+I="; } else fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.milestone_id}/ucm-linux.tar.gz"; - hash = "sha256-Qx8vO/Vaz0VdCGXwIwRQIuMlp44hxCroQ7m7Y+m7aXk="; + url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; + hash = "sha256-CZLGA4fFFysxHkwedC8RBLmHWwr3BM8xqps7hN3TC/g="; }; # The tarball is just the prebuilt binary, in the archive root. @@ -25,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; dontConfigure = true; - nativeBuildInputs = [ makeWrapper ] ++ (lib.optional (!stdenv.isDarwin) autoPatchelfHook); - buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; + buildInputs = lib.optionals (!stdenv.isDarwin) [ ncurses6 zlib gmp ]; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 9588e718b3..9ad5d3b4a3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -10,17 +10,15 @@ let withGraphviz ? false }: let - # Patches from the openembedded-core project to build vala without graphviz - # support. We need to apply an additional patch to allow building when the - # header file isn't available at all, but that patch (./gvc-compat.patch) - # can be shared between all versions of Vala so far. + # Build vala (valadoc) without graphviz support. Inspired from the openembedded-core project. + # https://github.com/openembedded/openembedded-core/blob/a5440d4288e09d3e/meta/recipes-devtools/vala/vala/disable-graphviz.patch graphvizPatch = { "0.48" = ./disable-graphviz-0.46.1.patch; "0.54" = ./disable-graphviz-0.46.1.patch; - "0.56" = ./disable-graphviz-0.46.1.patch; + "0.56" = ./disable-graphviz-0.56.8.patch; }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); @@ -47,7 +45,7 @@ let # If we're disabling graphviz, apply the patches and corresponding # configure flag. We also need to override the path to the valac compiler # so that it can be used to regenerate documentation. - patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ]; + patches = lib.optionals disableGraphviz [ graphvizPatch ]; configureFlags = lib.optional disableGraphviz "--disable-graphviz"; # when cross-compiling ./compiler/valac is valac for host # so add the build vala in nativeBuildInputs @@ -103,8 +101,8 @@ in rec { }; vala_0_56 = generic { - version = "0.56.7"; - sha256 = "PTnHWW1fqa6L/q5HZmn4EfcFe397kwhHiie2hEPYsAM="; + version = "0.56.9"; + sha256 = "VVeMfE8Ges4CjlQYBq8kD4CEy2/wzFVMqorAjL+Lzi8="; }; vala = vala_0_56; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch b/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch index 8c3e54b6a9..7c2ded4c8e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch @@ -259,3 +259,22 @@ index 5aa4afdea..e79b0b8f5 100644 return this; } +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index 8dc398cf1..a5d8a45b4 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -176,9 +176,13 @@ endif + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +- gvc-compat.c \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ ++ gvc-compat.c ++endif ++ + valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp + libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + $(VALA_V)$(VALAC) \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.56.8.patch b/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.56.8.patch new file mode 100644 index 0000000000..37c5ba504e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.56.8.patch @@ -0,0 +1,173 @@ +diff --git a/configure.ac b/configure.ac +index 088e8f3b5..bded3c54c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -196,13 +196,15 @@ AC_SUBST(GMODULE_LIBS) + + AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check) + AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) + AS_IF([test "$VALAC" != :], [FOUND_VALAC_VERION=`$VALAC --version | sed 's/Vala *//'` + AS_VERSION_COMPARE(["$FOUND_VALAC_VERION"], ["$VALAC_VALADOC_REQUIRED"], [ + AC_MSG_WARN([Force disable build of valadoc, valac >= $VALAC_VALADOC_REQUIRED is required]) + enable_valadoc=no + ]) + ]) +-if test x$enable_valadoc = xyes; then ++if test x$enable_valadoc = xyes && test x$enable_graphviz = xyes; then ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" + PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) + AC_MSG_CHECKING([for CGRAPH]) + cgraph_tmp_LIBADD="$LIBADD" +@@ -244,6 +246,7 @@ if test x$enable_valadoc = xyes; then + fi + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") + AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + + AC_PATH_PROG([G_IR_COMPILER], [g-ir-compiler], :) + AM_CONDITIONAL(HAVE_G_IR_COMPILER, test "$G_IR_COMPILER" != :) +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am +index dad9a9e99..e23266606 100644 +--- a/libvaladoc/Makefile.am ++++ b/libvaladoc/Makefile.am +@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -149,19 +145,34 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +- gvc-compat.c \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ ++ gvc-compat.c ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp + libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + $(VALA_V)$(VALAC) \ +@@ -174,7 +185,7 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ ++ $(LIBGVC_PKG) \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ +@@ -206,6 +217,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -213,6 +227,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala +index f4999efd4..03871d687 100644 +--- a/libvaladoc/html/basicdoclet.vala ++++ b/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1028,6 +1034,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1047,6 +1054,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala +index 5aa4afdea..e79b0b8f5 100644 +--- a/libvaladoc/html/htmlmarkupwriter.vala ++++ b/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public unowned MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public unowned MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch b/third_party/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch deleted file mode 100644 index 8c0d25098f..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/gvc-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am -index 8dc398cf1..a5d8a45b4 100644 ---- i/libvaladoc/Makefile.am -+++ w/libvaladoc/Makefile.am -@@ -176,9 +176,13 @@ endif - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -- gvc-compat.c \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ -+ gvc-compat.c -+endif -+ - valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp - libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - $(VALA_V)$(VALAC) \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 213a476262..a25142fa9f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.30"; + version = "0.31"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-qhMcXJFEuBPl7vh+gYTu7PnSWi+L3YMLrBMQyYqfc0w="; + hash = "sha256-BGeqI0U2AdKgsQQw3f/C0l1ENPTlQ3Eoa8TaLRE+aWI="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix new file mode 100644 index 0000000000..df6304a343 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/hook.nix @@ -0,0 +1,17 @@ +{ lib +, makeSetupHook +, zig +}: + +makeSetupHook { + name = "zig-hook"; + + propagatedBuildInputs = [ zig ]; + + passthru = { inherit zig; }; + + meta = { + description = "A setup hook for using the Zig compiler in Nixpkgs"; + inherit (zig.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/zig/setup-hook.sh new file mode 100644 index 0000000000..f514180692 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/setup-hook.sh @@ -0,0 +1,90 @@ +# shellcheck shell=bash disable=SC2154,SC2086 + +# This readonly zigDefaultBuildFlagsArray below is meant to avoid CPU feature +# impurity in Nixpkgs. However, this flagset is "unstable": it is specifically +# meant to be controlled by the upstream development team - being up to that +# team exposing or not that flags to the outside (especially the package manager +# teams). + +# Because of this hurdle, @andrewrk from Zig Software Foundation proposed some +# solutions for this issue. Hopefully they will be implemented in future +# releases of Zig. When this happens, this flagset should be revisited +# accordingly. + +# Below are some useful links describing the discovery process of this 'bug' in +# Nixpkgs: + +# https://github.com/NixOS/nixpkgs/issues/169461 +# https://github.com/NixOS/nixpkgs/issues/185644 +# https://github.com/NixOS/nixpkgs/pull/197046 +# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 +# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + +readonly zigDefaultFlagsArray=("-Drelease-safe=true" "-Dcpu=baseline") + +function zigSetGlobalCacheDir { + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR +} + +function zigBuildPhase { + runHook preBuild + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + ) + + echoCmd 'build flags' "${flagsArray[@]}" + zig build "${flagsArray[@]}" + + runHook postBuild +} + +function zigCheckPhase { + runHook preCheck + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigCheckFlags "${zigCheckFlagsArray[@]}" + ) + + echoCmd 'check flags' "${flagsArray[@]}" + zig build test "${flagsArray[@]}" + + runHook postCheck +} + +function zigInstallPhase { + runHook preInstall + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + $zigInstallFlags "${zigInstallFlagsArray[@]}" + ) + + if [ -z "${dontAddPrefix-}" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'install flags' "${flagsArray[@]}" + zig build install "${flagsArray[@]}" + + runHook postInstall +} + +addEnvHooks "$targetOffset" zigSetGlobalCacheDir + +if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=zigBuildPhase +fi + +if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=zigCheckPhase +fi + +if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=zigInstallPhase +fi diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix index c62e20a5a2..c459ef2ea5 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix @@ -3,11 +3,17 @@ mkCoqDerivation { pname = "bignums"; owner = "coq"; - displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if lib.versions.isGe "8.6" coq.coq-version - then "${coq.coq-version}.0" else null; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.13" "8.17"; out = "9.0.0+coq${coq.coq-version}"; } + { case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; } + ] null; + release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY="; + release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE="; + release."9.0.0+coq8.15".sha256 = "sha256-2oGOANn3XULHNIlyqjZ5ppQTQa2QF1zzf3YjHAd/pjo="; + release."9.0.0+coq8.14".sha256 = "sha256-qTU152Dz34W6nFZ0pPbja9ouUm/714ZrLQ/Z4N/HIC4="; + release."9.0.0+coq8.13".sha256 = "sha256-zvAqV3VAB7cN+nlMhjSXzxuDkdd387ju2VSb2EUthI0="; release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw="; release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4="; release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns"; @@ -21,7 +27,7 @@ mkCoqDerivation { release."8.7.0".sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; release."8.6.0".rev = "v8.6.0"; release."8.6.0".sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; - releaseRev = v: "V${v}"; + releaseRev = v: "${if lib.versions.isGe "9.0" v then "v" else "V"}${v}"; mlPlugin = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix index 75d57936ff..78f76bd1b8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix @@ -7,9 +7,15 @@ mkCoqDerivation { owner = "Lysxia"; inherit version; - defaultVersion = if lib.versions.range "8.8" "8.16" coq.version then "0.4.0" else null; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.14" "8.17"; out = "0.4.1"; } + { case = range "8.8" "8.16"; out = "0.4.0"; } + ] null; + release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA="; release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; + useDuneifVersion = lib.versions.isGe "0.4.1"; + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix index acde0cdb84..ebb227f292 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix @@ -14,7 +14,7 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.16"; out = "3.12"; } + { case = range "8.14" "8.17"; out = "3.13"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -26,6 +26,7 @@ let compcert = mkCoqDerivation rec { "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; "3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A="; "3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0="; + "3.13".sha256 = "sha256-ZedxgEPr1ZgKIcyhQ6zD1l2xr6RDNNUYq/4ZyR6ojM4="; }; strictDeps = true; @@ -153,6 +154,15 @@ compcert.overrideAttrs (o: }) ]; } + { cases = [ (isEq "8.17") (isEq "3.13") ]; + out = [ + # Support for Coq 8.17.0 & Coq 8.17.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/030a0fafe6a1a315bb13c5276e0af536e4f713ce.patch"; + hash = "sha256-iRdmgYuun1wp6chRoDy99KKmFyvY79NGWzrltyQaW1o="; + }) + ]; + } ] []; } ) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index 8991787873..297beaf950 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.17"; out = "0.11.7"; } + { case = range "8.11" "8.17"; out = "0.11.8"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } @@ -13,6 +13,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7"; release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix index 00a56496a2..1a015ce83d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix @@ -7,13 +7,13 @@ mkCoqDerivation rec { useDune = true; - release."0.1.6.1+8.16".sha256 = "sha256-aX8/pN4fVYaF7ZEPYfvYpEZLiQM++ZG1fAhiLftQ9Aw="; - release."0.1.6.1+8.17".sha256 = "sha256-je+OlKM7x3vYB36sl406GREAWB4ePmC0ewHS6rCmWfk="; + release."0.1.7+8.16".sha256 = "sha256-ZBxwrnnCmT5q4C7ocQ+M+aSJQNnEjeN2HFw4bzPozYs="; + release."0.1.7+8.17".sha256 = "sha256-f671wzGQannGjRbmBRHFKXz24BTPX7oVeHUxnv4Vd6Y="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = isEq "8.16"; out = "0.1.6.1+8.16"; } - { case = isEq "8.17"; out = "0.1.6.1+8.17"; } + { case = isEq "8.16"; out = "0.1.7+8.16"; } + { case = isEq "8.17"; out = "0.1.7+8.17"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix index 91b2022724..a56a8c6324 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,12 +7,13 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.17"; out = "3.3.1"; } + { case = range "8.12" "8.17"; out = "3.4.0"; } { case = range "8.12" "8.17"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } ] null; + release."3.4.0".sha256 = "sha256-LIj2SwTvVBxSAO58VYCQix/uxQQe8ey6hqFOSh3PNcg="; release."3.3.1".sha256 = "sha256-YCvd4aIt2BxLKBYSWzN7aqo0AuY7z8oADmKvybhYBQI="; release."3.3.0".sha256 = "sha256-bh9qP/EhWrHpTe2GMGG3S2vgBSSK088mFfhAIGejVoU="; release."3.2.0".sha256 = "07w7dbl8x7xxnbr2q39wrdh054gvi3daqjpdn1jm53crsl1fjxm4"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix index 9e8a691fca..1e31323f2e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -7,13 +7,14 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.17"; out = "4.7.0"; } + { case = range "8.12" "8.17"; out = "4.8.0"; } { case = range "8.12" "8.16"; out = "4.6.0"; } { case = range "8.8" "8.16"; out = "4.5.2"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.8.0".sha256 = "sha256-YPQ1tuUgGixAVdQUJ9a3lZUNVgm2pKK3RKvl3m+/8rY="; release."4.7.0".sha256 = "sha256-Cel25w4BeaNqu9KAW3N2KYO2IGY0EOAK5FQ6VHBPmFQ="; release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0="; release."4.6.0".sha256 = "sha256-n9ECKnV0L6XYcIcbYyOJKwlbisz/RRbNW5YESHo07X0="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix index f72dd69f36..81d9e21d8d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.16"; out = "4.0.0"; } + { case = range "8.13" "8.17"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix index e0197db71b..19a36c9692 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, version ? null }: -mkCoqDerivation { +(mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; @@ -12,10 +12,10 @@ mkCoqDerivation { release."8.15".sha256 = "0wbp058zwa4bkdjj38aysy2g1avf9nrh8q23a3dil0q00qczi616"; release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; - sourceRoot = "source/Metalib"; - meta = with lib; { license = licenses.mit; maintainers = [ maintainers.jwiegley ]; }; -} +}).overrideAttrs (oldAttrs: { + sourceRoot = "${oldAttrs.src.name}/Metalib"; +}) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix index cbc947092a..92a4aa229d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix @@ -5,11 +5,13 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.13" "8.17"; out = "4.2.0"; } { case = range "8.12" "8.17"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } { case = isEq "8.5"; out = "1.2.8"; } ] null; + release."4.2.0".sha256 = "sha256-YHYtiz9hium96n3owL/C99AjJAFTlTCmmb2+ttevgMY="; release."4.1.2".sha256 = "sha256:1l8mwakqp4wnppsldl8wp2j24h1jvadnvrsgf35xnvdyygypjp2v"; release."4.1.1".sha256 = "1qap8cyv649lr1s11r7h5jzdjd4hsna8kph15qy5fw24h5nx6byy"; release."4.0.2".sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix index 8a30fbeb96..a2c9ea3ded 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix @@ -11,9 +11,11 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.14" "8.17"; out = "0.1.2"; } { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; + release."0.1.2".sha256 = "sha256-QN0h1CsX86DQBDsluXLtNUvMh3r60/0iDSbYam67AhA="; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix index ba66c4f86e..e08d7b8d50 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix @@ -4,12 +4,16 @@ mkCoqDerivation { pname = "trakt"; owner = "ecranceMERCE"; - release."1.0".rev = "d1c9daba8fe0584b526047862dd27ddf836dbbf2"; release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY="; + release."1.1".sha256 = "sha256-JmrtM9WcT8Bfy0WZCw8xdubuMomyXmfLXJwpnCNrvsg="; + release."1.2".sha256 = "sha256-YQRtK2MjjsMlytdu9iutUDKhwOo4yWrSwhyBb2zNHoE="; + release."1.2+8.13".sha256 = "sha256-hozms4sPSMr4lFkJ20x+uW9Wqt067bifnPQxdGyKhQQ="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version ] [ - { cases = [ (range "8.13" "8.17") ]; out = "1.0"; } + { cases = [ (range "8.15" "8.17") ]; out = "1.2"; } + { cases = [ (isEq "8.13") ]; out = "1.2+8.13"; } + { cases = [ (range "8.13" "8.17") ]; out = "1.1"; } ] null; propagatedBuildInputs = [ coq-elpi ]; @@ -17,7 +21,7 @@ mkCoqDerivation { meta = with lib; { description = "A generic goal preprocessing tool for proof automation tactics in Coq"; maintainers = with maintainers; [ siraben ]; - license = licenses.cecill-b; + license = licenses.lgpl3Plus; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix b/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix index 64bfb8f859..556db9dc30 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "avrdude"; - version = "7.1"; + version = "7.2"; src = fetchFromGitHub { owner = "avrdudes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pGjOefWnf11kG/zFGwYGet1OjAhKsULNGgh6vqvIQ7c="; + sha256 = "sha256-/JyhMBcjNklyyXZEFZGTjrTNyafXEdHEhcLz6ZQx9aU="; }; nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [ diff --git a/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix b/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix new file mode 100644 index 0000000000..9758b6a2bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, argtable +, cmake +, libserialport +, pkg-config +, IOKit +}: + +stdenv.mkDerivation { + pname = "blisp"; + version = "unstable-2023-06-03"; + + src = fetchFromGitHub { + owner = "pine64"; + repo = "blisp"; + rev = "048a72408218788d519a87bcdfb23bcf9ed91a84"; + hash = "sha256-hipJrr0D4uEN2hk8ooXeg0gv0X3w4U9ReXbC4oPEPwI="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + argtable + libserialport + ] ++ lib.optional stdenv.isDarwin IOKit; + + cmakeFlags = [ + "-DBLISP_BUILD_CLI=ON" + "-DBLISP_USE_SYSTEM_LIBRARIES=ON" + ]; + + meta = with lib; { + description = "ISP tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs"; + license = licenses.mit; + homepage = "https://github.com/pine64/blisp"; + maintainers = [ maintainers.fortuneteller2k ]; + }; +} +# TODO: update when next stable release supports building without vendored +# libraries diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix index 06a8c3e987..4872111b81 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix @@ -15,7 +15,7 @@ with python3Packages; buildPythonApplication rec { sha256 = "0zbrvvb957z2lwbfd39ixqdsnd2w4wfjirwkqdrqm27bjz308731"; }; - sourceRoot = "source/programmer"; + sourceRoot = "${src.name}/programmer"; propagatedBuildInputs = [ pyserial diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix index 2bee41af04..3ed308de46 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-commonmark/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-commonmark/default.nix index 113fad1360..c103635d37 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-commonmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-commonmark/default.nix @@ -4,22 +4,24 @@ , autoreconfHook , guile , pkg-config +, texinfo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "guile-commonmark"; - version = "0.1.2"; + version = "unstable-2020-04-30"; src = fetchFromGitHub { owner = "OrangeShark"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo="; + repo = "guile-commonmark"; + rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468"; + hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI="; }; nativeBuildInputs = [ autoreconfHook pkg-config + texinfo # for makeinfo ]; buildInputs = [ guile diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix index 7b46f51a98..cbad7323f5 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-fibers/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , autoreconfHook , guile +, libevent , pkg-config , texinfo }: @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ guile + libevent texinfo ]; @@ -34,6 +36,6 @@ stdenv.mkDerivation rec { description = "Concurrent ML-like concurrency for Guile"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix index 6b1af4048a..2b4fd46ea2 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://notabug.org/cwebber/guile-gcrypt"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix index 5487116b53..84d53b66e1 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; - doCheck = true; + doCheck = !stdenv.isDarwin; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/guile-git/guile-git"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix index 22a899ffa5..91151e3437 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "Guile bindings for GnuTLS library"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ foo-dogsquared ]; - platforms = platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix index b5c358373f..2678bcb2c0 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix @@ -6,8 +6,6 @@ , texinfo }: -assert stdenv ? cc && stdenv.cc.isGNU; - stdenv.mkDerivation rec { pname = "guile-lib"; version = "0.2.7"; @@ -25,7 +23,9 @@ stdenv.mkDerivation rec { texinfo ]; - doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + doCheck = !stdenv.isDarwin; preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu ++ platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix index 1e6418b0c3..f982ff600b 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "guile-ncurses"; - version = "1.7"; + version = "3.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q="; + hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM="; }; nativeBuildInputs = [ @@ -25,16 +25,20 @@ stdenv.mkDerivation rec { ncurses ]; - preConfigure = '' - configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" - ''; + configureFlags = [ + "--with-gnu-filesystem-hierarchy" + ]; - postFixup = '' - for f in $out/share/guile/site/ncurses/**.scm; do \ - substituteInPlace $f \ - --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \ - done - ''; + postFixup = + let + guileVersion = lib.versions.majorMinor guile.version; + in + '' + for f in $out/share/guile/site/ncurses/**.scm; do \ + substituteInPlace $f \ + --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \ + done + ''; # XXX: 1 of 65 tests failed. doCheck = false; @@ -50,6 +54,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu ++ platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix index 1675ac0e33..7387dbc208 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , gperf , guile , guile-lib @@ -46,6 +45,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.gnu; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix index a704ff74d0..6cf9f5e4ef 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/artyom-poptsov/guile-ssh"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix index ba66635be5..19a790db77 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, autoreconfHook , guile , pkg-config , texinfo @@ -8,16 +9,17 @@ stdenv.mkDerivation rec { pname = "guile-xcb"; - version = "1.3"; + version = "unstable-2017-05-29"; src = fetchFromGitHub { owner = "mwitmer"; repo = pname; - rev = version; - hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs="; + rev = "db7d5a393cc37a56f66541b3f33938b40c6f35b3"; + hash = "sha256-zbIsEIPwNJ1YXMZTDw2DfzufC+IZWfcWgZHbuv7bhJs="; }; nativeBuildInputs = [ + autoreconfHook pkg-config ]; buildInputs = [ @@ -30,11 +32,15 @@ stdenv.mkDerivation rec { "--with-guile-site-ccache-dir=$out/share/guile/site" ]; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; + meta = with lib; { homepage = "https://github.com/mwitmer/guile-xcb"; description = "XCB bindings for Guile"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; + platforms = guile.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 50e1ac5059..09eb1512f4 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3061,7 +3061,6 @@ broken-packages: - l-bfgs-b - LC3 - lcs - - ldgallery-compiler - ldif - ld-intervals - leaf diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 32c72dba6c..83824730c8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -327,8 +327,6 @@ package-maintainers: - tasty-expected-failure - lhs2tex - rec-def - pacien: - - ldgallery-compiler peti: - cabal2spec - funcmp diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-tensorflow.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-tensorflow.nix index 3f9dc16432..634f521e5a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -18,7 +18,7 @@ let setTensorflowSourceRoot = dir: drv: (overrideCabal (drv: { src = tensorflow-haskell; }) drv) - .overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); + .overrideAttrs (_oldAttrs: { sourceRoot = "${tensorflow-haskell.name}/${dir}"; }); in { tensorflow-proto = doJailbreak (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto); diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index beb81a58d8..fa0446148b 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -9,8 +9,6 @@ self: super: { dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { }; - ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { }; - # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated # from the latest master instead of the current version on Hackage. cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index dc8308267f..c31e0dbe67 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postBuild = '' $CXX -shared -o ${libname} \ - ${if stdenv.cc.isClang then "" else "-Wl,-soname,${libname}"} \ + ${lib.optionalString (!stdenv.cc.isClang) "-Wl,-soname,${libname}"} \ ipasirglucoseglue.o libipasirglucose4.a ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix index 97a209f208..4953daf710 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -22,13 +22,13 @@ resholve.mkDerivation rec { pname = "bats"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-nKBNbqJYRd/3tO85E6KrOh32yOaNKpLXxz5gQ5Uvmcc="; + sha256 = "sha256-gy4dyoKRlf2WFmH1/mSNwhVR3df92BgpT4TjTpV4FyQ="; }; patchPhase = '' @@ -93,6 +93,7 @@ resholve.mkDerivation rec { "${placeholder "out"}/libexec/bats-core/bats-exec-test" = true; "$BATS_LINE_REFERENCE_FORMAT" = "comma_line"; "$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock"; + "$parallel_binary_name" = "${parallel}/bin/parallel"; }; execer = [ /* diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix index f7871f6546..6c23d3d326 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.15.2"; - sha256 = "sha256-JLDjLO78p1i3FqGCbgl22SZFGPxJxKGKskzAJhHV8NE="; + version = "1.15.4"; + sha256 = "sha256-0DrfKQPyFX+zurCIZ6RVj9vm1lHSkJSfhiUaRpa3FFo="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; escriptPath = "lib/elixir/scripts/generate_app.escript"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix index af69821561..9007ab12d7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix @@ -50,14 +50,14 @@ stdenv.mkDerivation ({ # to PATH so the scripts can run without problems. for f in $out/bin/*; do - b=$(basename $f) + b=$(basename $f) if [ "$b" = mix ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" done substituteInPlace $out/bin/mix \ - --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir" + --replace "/usr/bin/env elixir" "${coreutils}/bin/env $out/bin/elixir" ''; pos = builtins.unsafeGetAttrPos "sha256" args; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix index b6e69bc3fc..3644c12fd4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.3"; - sha256 = "TX63ju8WxqA+cBKg/0veYL0XtVgf4s/BlaNY5Pjuybw="; + version = "25.3.2.5"; + sha256 = "fnyWyJ+QsaJk2/LK8jOuxZmt3AFXmeubdeoYSGid/0A="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 5219992e26..21fba0864a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-s8zM1vxEeJYcRek1rqUmrBfvB2zCAF3iLG8UVA7WABI="; + sha256 = "sha256-IQM/uKDxt18rVOd6MOKhQZC26vjxVe+3Yn479ITFDFs="; }; - cargoSha256 = "sha256-wMo5Fq6aMiE6kg8mZoz1T3KPwKSdJcej83MB+/GRM5w="; + cargoHash = "sha256-6kyxAHxphZjwfHo7OHrATSKFzrpXIRHVTjynDawlWew="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index a7f89c1f87..545f7de95b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.28.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QfW17BDP+xa+Qy9FuIioe8UY6BBGsvbSyyz6GFODg5g="; + sha256 = "sha256-waBOPrcZ1mNsvb2PrivYUmbUKv1mxD/rMFOCZXslyKA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix index ab2ac80574..511cf691e2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-ERkK4T+nUTf18OoEctSugeK4i/f6k0naBKxzn+6pe38="; + sha256 = "sha256-hNwDX2yg7J8rcR9QRSGgqFTeqH+ydyDtPbIGC2nK5RI="; }; - vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA="; + vendorHash = "sha256-DrVtT2OBNquWVp/8Je45dBPDXafEc2Q+jffwY2S8J80="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix index 0987205f59..99d9bb8710 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-0sU2zOk5I69lQyrn1g0qsae7S/IBT6eA/911qp0GNkk="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildInputs = [ libedit zlib ncurses ] ++ lib.optionals stdenv.isDarwin ([ Accelerate diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix index a6c468a1fb..8fe3578203 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.584"; + version = "0.588"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-yRKx+hKbi9T8O7kFnEmLYbMwhLaiWh0fHRieZzgYPSI="; + hash = "sha256-iRYVmRnEpLBtBJ5EjN88EmWM88FNU4CyFvgnBaqDSz4="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix index d74bfbc4f3..ea69852b7a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , python3 , nix-update-script +, stdenv }: rustPlatform.buildRustPackage rec { pname = "nickel"; version = "1.1.1"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "refs/tags/${version}"; @@ -24,6 +25,9 @@ rustPlatform.buildRustPackage rec { python3 ]; + # Disable checks on Darwin because of issue described in https://github.com/tweag/nickel/pull/1454 + doCheck = !stdenv.isDarwin; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/intepreter.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/intepreter.nix index be869c2a4e..96d6430c14 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/intepreter.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/intepreter.nix @@ -195,9 +195,11 @@ stdenv.mkDerivation (rec { substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \ --replace "${libcInc}" /no-such-path \ --replace "${ - if stdenv.hasCC then stdenv.cc.cc else "/no-such-path" + if stdenv.hasCC then stdenv.cc else "/no-such-path" }" /no-such-path \ - --replace "${stdenv.cc}" /no-such-path \ + --replace "${ + if stdenv.hasCC && stdenv.cc.cc != null then stdenv.cc.cc else "/no-such-path" + }" /no-such-path \ --replace "$man" /no-such-path '' + lib.optionalString crossCompiling '' @@ -230,6 +232,7 @@ stdenv.mkDerivation (rec { maintainers = [ maintainers.eelco ]; platforms = platforms.all; priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` + mainProgram = "perl"; }; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix index 1be51b03f1..c05ac442ce 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.21"; - hash = "sha256-bqSegzXWMhd/VrUHFgqhUcewIBhXianBSFn85dSgd20="; + version = "8.1.22"; + hash = "sha256-mSNU44LGxhjQHtS+Br7qjewxeLFBU99k08jEi4Xp+8I="; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix index b4995031a3..a12feb9c4e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0alpha3"; + version = "8.3.0beta2"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~jakub/php-8.3.0alpha3.tar.xz"; - hash = "sha256-Ko0SR5ZIsdMyEmeM65zFU4bCU7f7xpiDBMf0od/kv8k="; + url = "https://downloads.php.net/~jakub/php-8.3.0beta2.tar.xz"; + hash = "sha256-ND1OlmSMtBxTE/0qfgy3Cz/gF08eIzydU2W/eKg58wQ="; }; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index ff103373a1..f84cca760f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -572,5 +572,6 @@ in with passthru; stdenv.mkDerivation { license = licenses.psfl; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ fridh ]; + mainProgram = "python3"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 3eab5e54b2..8ea1c14c71 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -96,9 +96,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "b3"; + suffix = "b4"; }; - hash = "sha256-kWDGBl6YhbN8LleGXQuyf8flSqqcGGx2HaMNK928ye4="; + hash = "sha256-8FcQw2ruWFD1wnab52uAvyEq7DUUOP34rcIMOMg2H6w="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index 17b5667e8e..79e45b8dc3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -118,7 +118,7 @@ let optionalLocation = let pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs; - in if pos == null then "" else " at ${pos.file}:${toString pos.line}:${toString pos.column}"; + in lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}"; leftPadName = name: against: let len = lib.max (lib.stringLength name) (lib.stringLength against); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix index b36662335a..f5f9b03e0f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/wrapper.nix @@ -42,7 +42,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 4091fc7dc8..73c3a9b8bf 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -349,4 +349,11 @@ in { sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w="; cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; }; + + ruby_3_3 = generic { + version = rubyVersion "3" "3" "0" "preview1"; + sha256 = "sha256-w0VKkRd5uNdHqw6ocEEDDQAtUz7ayySF/lWLcITaJe0="; + cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; + }; + } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 54293b3768..e99155f0f3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.16"; + version = "3.4.17"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-T58wDLMOCPPwoPuXdZvpXeF7yERXvW1lPxVqe8zFs6M="; + hash = "sha256-SvqqlGPiqHeZQ0Mvulbgc5bM7E1O3HK7BtnbiscG0vE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix index 82a3c25bd0..2fc3da0578 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix @@ -16,13 +16,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.22.11"; + version = "2.23.35"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-w91mVdTVXWCAtY0eFyYVxrSKydiqHgsbkl+MQxHt13E="; + hash = "sha256-yCVBjxO9tEKlyWo6RlK4EdyUxCkxp0z2EzJ2np0xOUU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix index 8506871e6e..41c688c3a4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - sourceRoot = "source/product-mini/platforms/linux"; + sourceRoot = "${finalAttrs.src.name}/product-mini/platforms/linux"; meta = with lib; { description = "WebAssembly Micro Runtime"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 23874b3ff2..d121f61b52 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "10.0.1"; + version = "11.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-UqjJVAmqITh7ixo71jfdQNZ5OLjmmmrk4b0saU2kyYo="; + hash = "sha256-uHnHtviGieNyVQHMHsvHocJqC/n9bc6Mv0Uy6lBIuuQ="; fetchSubmodules = true; }; - cargoHash = "sha256-fEDvxstvBP/e2G8KbTVQKdxafQXxz4mnqCAso16HYaY="; + cargoHash = "sha256-XTpXVBsZvgY2SnTwe1dh/XYmXapu+LQ0etelO8fj7Nc="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix index 46a186d949..f72f4be1fc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wazero/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "wazero"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tetratelabs"; repo = "wazero"; rev = "v${version}"; - hash = "sha256-jZCh7RMJKKEPsirxNFZAtm0T0EGpmWIoQrkXYR95Krg="; + hash = "sha256-gLiUEJdO/2btZb5D9O1r+uF3ZVBN4Oy3dFwqUNQRoW8="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix b/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix index 23449e6f05..2506d8974f 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet }: +{ coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet, xcbuild, darwin }: { jogl_2_4_0 = @@ -27,8 +27,15 @@ unpackCmd = "cp -r $curSrc \${curSrc##*-}"; - nativeBuildInputs = [ ant jdk11 git xmlstarlet ]; - buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ]; + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml + rm -r jogl/oculusvr-sdk + ''; + + nativeBuildInputs = [ ant jdk11 git xmlstarlet ] + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + buildInputs = lib.optionals stdenv.isLinux [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Cocoa ]; # Workaround build failure on -fno-common toolchains: # ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of @@ -48,6 +55,10 @@ ( cd jogl/make + # prevent looking for native libraries in /usr/lib + substituteInPlace build-*.xml \ + --replace 'dir="''${TARGET_PLATFORM_USRLIBS}"' "" + # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers # if arm/aarch64 support will be added, this block might be commented out on those platforms # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so @@ -63,83 +74,16 @@ installPhase = '' mkdir -p $out/share/java - cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/ - cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/ - cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-amd64,-os-drm,-os-x11}.jar $out/share/java/ + cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-*}.jar $out/share/java/ + cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-*}.jar $out/share/java/ + cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-*,-os-drm,-os-x11}.jar $out/share/java/ ''; meta = with lib; { description = "Java libraries for 3D Graphics, Multimedia and Processing"; homepage = "https://jogamp.org/"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - }; - }; - - jogl_2_3_2 = - let - version = "2.3.2"; - - gluegen-src = fetchgit { - url = "git://jogamp.org/srv/scm/gluegen.git"; - rev = "v${version}"; - sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0"; - fetchSubmodules = true; - }; - in stdenv.mkDerivation { - pname = "jogl"; - inherit version; - - src = fetchgit { - url = "git://jogamp.org/srv/scm/jogl.git"; - rev = "v${version}"; - sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3"; - fetchSubmodules = true; - }; - - postPatch = '' - find . -type f -name '*.java' \ - -exec sed -i 's@"libGL.so"@"${libGL}/lib/libGL.so"@' {} \; \ - -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \; - ''; - - # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731 - nativeBuildInputs = [ jdk8 ant git ]; - buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; - - # Workaround build failure on -fno-common toolchains: - # ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of - # `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = '' - cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen - chmod -R +w $NIX_BUILD_TOP/gluegen - ( cd ../gluegen/make - ant ) - - ( cd make - - # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers - # if arm/aarch64 support will be added, this block might be commented out on those platforms - # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so - cp build-newt.xml build-newt.xml.old - fgrep -v 'if="setup.addNativeBroadcom"' build-newt.xml.old > build-newt.xml - - ant ) - ''; - - installPhase = '' - mkdir -p $out/share/java - cp $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/ - cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar $out/share/java/ - ''; - - meta = with lib; { - description = "Java libraries for 3D Graphics, Multimedia and Processing"; - homepage = "https://jogamp.org/"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix index 0ec0aa312e..9b8a163b20 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_audiolib/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Audio decoding, resampling and mixing library for SDL"; homepage = "https://github.com/realnc/SDL_audiolib"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 1ccfbcd81a..178b9cf15e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.18.1"; + version = "5.18.2"; src = fetchurl { - sha256 = "sha256-/t173pr1urrrByv3rrIGXZAhwmFj3tY5yHoy1nN5VHI="; + sha256 = "sha256-zT3z7C95HUf0NRvA5dX5iAwiCkUaMYIO2/g5li7IQwo="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix index d5096a951a..c1b0baa489 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.27"; + version = "0.8.28"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-QxI/+2mtX9d4UTkbFFVh5N4JqTMqygGUgz08XWxAQac="; + sha256 = "sha256-EgKZcylg3Nx320BdeEz8PVadwo2pE6a3h0vt7YT4LVA="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index f4a910b427..d5ee431e2b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.4.1"; + version = "12.6.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-gSdjXSffuZb6tJXeb/nOhL2bXgTePAA3/CrG3pbc85c="; + hash = "sha256-tBAqOEeRrxbZ5fuzBvEf41ar+8oKfXynq7yaipRmECo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix index 8692aa3017..2c1caf0bbb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix @@ -19,7 +19,8 @@ , clblas , doxygen , buildDocs ? false -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudatoolkit , darwin }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index cf6cf4f93b..d4c3cd394c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -32,6 +33,14 @@ stdenv.mkDerivation rec { sha256 = "NzFt9DypmJzlOdVM9CmnaMKLs4oLNJUL6t0EIYJ+31U="; }; + patches = [ + # Fix implicit declaration of `strcasecmp`, which is an error on clang 16. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/147.patch"; + hash = "sha256-UU2n//Z9F1SyUGyuDKsiwZDyThsp/tJprz/zolDDTyw="; + }) + ]; + nativeBuildInputs = [ glib meson diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix index 02ed9af632..9f5a68187c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-EliMTjED5/RKHgWrWD8d0Era9qEKov1z4cz1kEVTX5I="; + sha256 = "sha256-nx+ZqXsmcS0tQ/5+ck8Z19vdXO81R4uuRqGSDfIEV/U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 52f29287f8..e2b4aa8804 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -4,7 +4,4 @@ callPackage ./generic.nix (args // { baseVersion = "2.19"; revision = "3"; sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; - postPatch = '' - sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt - ''; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix new file mode 100644 index 0000000000..139c002bb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix @@ -0,0 +1,9 @@ +{ callPackage, fetchpatch, lib, ... } @ args: + +callPackage ./generic.nix (args // { + baseVersion = "3.1"; + revision = "1"; + sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; + # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. + badPlatforms = lib.platforms.darwin; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix index 8c9c1a88a8..795cd5189e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -4,10 +4,11 @@ , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , extraPatches ? [ ] +, badPlatforms ? [ ] , postPatch ? null , knownVulnerabilities ? [ ] -, CoreServices -, Security +, CoreServices ? null +, Security ? null , ... }: @@ -28,12 +29,13 @@ stdenv.mkDerivation rec { patches = extraPatches; inherit postPatch; - buildInputs = [ python3 bzip2 zlib gmp boost ] + nativeBuildInputs = [ python3 ]; + buildInputs = [ bzip2 zlib gmp boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' runHook preConfigure - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ${lib.optionalString stdenv.hostPlatform.isAarch64 " --cpu=aarch64"} runHook postConfigure ''; @@ -54,9 +56,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cryptographic algorithms library"; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin thillux ]; platforms = platforms.unix; license = licenses.bsd2; + inherit badPlatforms; inherit knownVulnerabilities; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix index 706d2becbe..2c1a5f9ae7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake -, boost +, boost179 , eigen , opencv , tbb @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + boost179 eigen opencv ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix index ece7ab2f69..8bece077f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes +{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes, python3 , # build, install and link to a CDI library [default=no] enable_cdi_lib ? false , # build a completely statically linked CDO binary @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "2.0.5"; + version = "2.2.0"; # Dependencies - buildInputs = [ curl netcdf hdf5 ]; + buildInputs = [ curl netcdf hdf5 python3 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/26823/${pname}-${version}.tar.gz"; - sha256 = "sha256-7e678cOxofDGQtrmvIx2JODFS6vkYQZNxcfaykpbDc4="; + url = "https://code.mpimet.mpg.de/attachments/download/28013/${pname}-${version}.tar.gz"; + sha256 = "sha256-Z5yNEFcGyv/LoJYOxd3EoTMsG0DFL4LDk3NWmZ2PrfI="; }; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { There are more than 600 operators available. ''; homepage = "https://code.mpimet.mpg.de/projects/cdo/"; - license = licenses.gpl2; + license = licenses.bsd3; maintainers = [ maintainers.ltavard ]; platforms = with platforms; linux ++ darwin; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix index cb302f3381..c56c59d02a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cegui/default.nix @@ -1,19 +1,53 @@ -{ lib, stdenv, fetchurl, cmake, ogre, freetype, boost, expat, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ogre +, freetype +, boost +, expat +, darwin +, libiconv +, unstableGitUpdater +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cegui"; - version = "0.8.7"; + version = "unstable-2023-03-18"; - src = fetchurl { - url = "mirror://sourceforge/crayzedsgui/${pname}-${version}.tar.bz2"; - sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk"; + src = fetchFromGitHub { + owner = "paroj"; + repo = "cegui"; + rev = "186ce900e293b98f2721c11930248a8de54aa338"; + hash = "sha256-RJ4MnxklcuxC+ZYEbfma5RDc2aeJ95LuTwNk+FnEhdo="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ogre freetype boost expat ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + strictDeps = true; - cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + ogre + freetype + boost + expat + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Foundation + libiconv + ]; + + cmakeFlags = [ + "-DCEGUI_OPTION_DEFAULT_IMAGECODEC=OgreRenderer-0" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" + ]; + + passthru.updateScript = unstableGitUpdater { + branch = "v0"; + }; meta = with lib; { homepage = "http://cegui.org.uk/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.0.nix new file mode 100644 index 0000000000..ab438eb6a8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.0.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cereal"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "USCiLab"; + repo = "cereal"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NwyUVeqXxfdyuDevjum6r8LyNtHa0eJ+4IFd3hLkiEE="; + }; + + patches = [ + (fetchpatch { + name = "CVE-2020-11105.patch"; + url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; + hash = "sha256-CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; + + meta = { + homepage = "https://uscilab.github.io/cereal/"; + description = "A header-only C++11 serialization library"; + changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.2.nix b/third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.2.nix new file mode 100644 index 0000000000..5a44b26426 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cereal/1.3.2.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cereal"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "USCiLab"; + repo = "cereal"; + rev = "v${finalAttrs.version}"; + hash = "sha256-HapnwM5oSNKuqoKm5x7+i2zt0sny8z8CePwobz1ITQs="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; + + meta = { + homepage = "https://uscilab.github.io/cereal/"; + description = "A header-only C++11 serialization library"; + changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cereal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cereal/default.nix deleted file mode 100644 index 958a92dec3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/cereal/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: -stdenv.mkDerivation rec { - pname = "cereal"; - version = "1.3.0"; - - nativeBuildInputs = [ cmake ]; - - src = fetchFromGitHub { - owner = "USCiLab"; - repo = "cereal"; - rev = "v${version}"; - sha256 = "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p"; - }; - - patches = [ - # https://nvd.nist.gov/vuln/detail/CVE-2020-11105 - # serialized std::shared_ptr variables cannot always be expected to - # serialize back into their original values. This can have any number of - # consequences, depending on the context within which this manifests. - (fetchpatch { - name = "CVE-2020-11105.patch"; - url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; - sha256 = "CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; - }) - ]; - - cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; - - meta = with lib; { - description = "A header-only C++11 serialization library"; - homepage = "https://uscilab.github.io/cereal/"; - platforms = platforms.all; - license = licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix index 1158fa01cf..4ecca1290e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cjose"; - version = "0.6.2.1"; + version = "0.6.2.2"; src = fetchFromGitHub { owner = "zmartzone"; repo = "cjose"; rev = "v${version}"; - sha256 = "sha256-QgSO4jFouowDJeUTT4kUEXD+ctQ7JiY/5DkiPyb+Z/I="; + sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix index 8af7a57e65..824449b0fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' sed -i '/-m64/d;/-m32/d' CMakeLists.txt diff --git a/third_party/nixpkgs/pkgs/development/libraries/clipper2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clipper2/default.nix index 7d9437da7a..f7bb635e63 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clipper2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clipper2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-u/4GG1A2PAlk8VEWgJX8+EnZ5hpGhu1QbvHwct58sF4="; }; - sourceRoot = "source/CPP"; + sourceRoot = "${src.name}/CPP"; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index 4cf7dec674..650913fc38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.11"; + version = "0.29.0.gfm.13"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-2jkMJcfcOH5qYP13qS5Hutbyhhzq9WlqlkthmQoJoCM="; + sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 45a87690e1..c3731c0e7a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin [ iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; + + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files preCheck = '' checkFlagsArray+=( diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index 5dbd959b5e..e512321c50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.16.1"; + version = "3.17.1"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-6K4TQnm9va+oxwWuKfV+txF7rRBRzE6PoUEDA2v3lEM="; + hash = "sha256-aSYE8+vhCsgZf1gBqJFRK8cn91AxrRutJc3LzHQQHVc="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix index 273bfef319..4228a3cb58 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeCheckInputs = [ python3Packages.ply ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dab_lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dab_lib/default.nix index f90c6633d7..0d236c36aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dab_lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dab_lib/default.nix @@ -2,7 +2,7 @@ , faad2, fftwFloat, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "dab_lib"; version = "unstable-2023-03-02"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; }; - sourceRoot = "source/library/"; + sourceRoot = "${finalAttrs.src.name}/library/"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 fftwFloat zlib ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ alexwinter ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/db/db-4.8.nix b/third_party/nixpkgs/pkgs/development/libraries/db/db-4.8.nix index 9f2a916317..8170537438 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/db/db-4.8.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/db/db-4.8.nix @@ -3,8 +3,11 @@ import ./generic.nix (args // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ] - ++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes-4.8.patch ]; + extraPatches = [ + ./clang-4.8.patch + ./CVE-2017-10140-4.8-cwd-db_config.patch + ./darwin-mutexes-4.8.patch + ]; drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/db/db-5.3.nix b/third_party/nixpkgs/pkgs/development/libraries/db/db-5.3.nix index 3fd08c510c..2362cc9eec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/db/db-5.3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,9 @@ import ./generic.nix (args // { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ] - ++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes.patch ]; + extraPatches = [ + ./clang-5.3.patch + ./CVE-2017-10140-cwd-db_config.patch + ./darwin-mutexes.patch + ]; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/db/db-6.0.nix b/third_party/nixpkgs/pkgs/development/libraries/db/db-6.0.nix index a9b748e349..94c8d89761 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/db/db-6.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/db/db-6.0.nix @@ -4,6 +4,9 @@ import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ] - ++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes.patch ]; + extraPatches = [ + ./clang-6.0.patch + ./CVE-2017-10140-cwd-db_config.patch + ./darwin-mutexes.patch + ]; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/db/db-6.2.nix b/third_party/nixpkgs/pkgs/development/libraries/db/db-6.2.nix index 4b3a3c6129..e526555b06 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/db/db-6.2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/db/db-6.2.nix @@ -4,6 +4,9 @@ import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ] - ++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes.patch ]; + extraPatches = [ + ./clang-6.0.patch + ./CVE-2017-10140-cwd-db_config.patch + ./darwin-mutexes.patch + ]; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix index 5bd5ed44b3..d715c1ffc8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/db/generic.nix @@ -10,9 +10,6 @@ , drvArgs ? {} }: -let - shouldReconfigure = stdenv.cc.isClang; -in stdenv.mkDerivation (rec { pname = "db"; inherit version; @@ -24,16 +21,16 @@ stdenv.mkDerivation (rec { # The provided configure script features `main` returning implicit `int`, which causes # configure checks to work incorrectly with clang 16. - nativeBuildInputs = lib.optionals stdenv.cc.isClang [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; patches = extraPatches; outputs = [ "bin" "out" "dev" ]; # Required when regenerated the configure script to make sure the vendored macros are found. - autoreconfFlags = lib.optionalString shouldReconfigure [ "-fi" "-Iaclocal" "-Iaclocal_java" ]; + autoreconfFlags = [ "-fi" "-Iaclocal" "-Iaclocal_java" ]; - preAutoreconf = lib.optionalString shouldReconfigure '' + preAutoreconf = '' pushd dist # Upstream’s `dist/s_config` cats everything into `aclocal.m4`, but that doesn’t work with # autoreconfHook, so cat `config.m4` to another file. Otherwise, it won’t be found by `aclocal`. @@ -43,7 +40,7 @@ stdenv.mkDerivation (rec { # This isn’t pretty. The version information is kept separate from the configure script. # After the configure script is regenerated, the version information has to be replaced with the # contents of `dist/RELEASE`. - postAutoreconf = lib.optionalString shouldReconfigure '' + postAutoreconf = '' ( declare -a vars=( "DB_VERSION_FAMILY" diff --git a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix index 7595eae7d4..642cfa3052 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, cmake }: stdenv.mkDerivation rec { pname = "doctest"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw="; }; + patches = [ + # Suppress unsafe buffer usage warnings with clang 16, which are treated as errors due to `-Werror`. + # https://github.com//doctest/doctest/pull/768 + (fetchpatch { + url = "https://github.com/doctest/doctest/commit/9336c9bd86e3fc2e0c36456cad8be3b4e8829a22.patch"; + hash = "sha256-ZFCVk5qvgfixRm7ZFr7hyNCSEvrT6nB01G/CBshq53o="; + }) + ]; + nativeBuildInputs = [ cmake ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix index 3fa471b30b..3aa6024fc3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "easyloggingpp"; - version = "9.97.0"; + version = "9.97.1"; src = fetchFromGitHub { owner = "amrayn"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; + sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E="; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix index 65e83437f6..ec108adc61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -4,10 +4,11 @@ , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support , avx512Support ? stdenv.hostPlatform.avx512Support +, config # Enable NIVIA GPU support # Note, that this needs to be built on a system with a GPU # present for the tests to succeed. -, enableCuda ? false +, enableCuda ? config.cudaSupport # type of GPU architecture , nvidiaArch ? "sm_60" , cudatoolkit diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index d4a923add7..4f47c3df8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -17,14 +17,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "sha256-3gsaXnflGiGOpIkqDQe5u6x8d18x67/dc4Hh1iU89+o="; + sha256 = "0cfyxf3xcj552bhd5awv5j0lb8xk3xhz87iixp3wnbvsgvl6dpwq"; }; depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 7e11c60beb..a1ca20f948 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -34,7 +34,7 @@ , withCaca ? withFullDeps # Textual display (ASCII art) , withCelt ? withFullDeps # CELT decoder , withCrystalhd ? withFullDeps -, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch)) +, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch && !hostPlatform.isRiscV)) , withCudaLLVM ? withFullDeps , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) @@ -58,8 +58,8 @@ , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer -, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 -, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 +, withNvdec ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) +, withNvenc ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps @@ -330,7 +330,7 @@ assert buildPostproc -> buildAvutil; assert buildSwscale -> buildAvutil; stdenv.mkDerivation (finalAttrs: { - pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}"); + pname = "ffmpeg" + (optionalString (ffmpegVariant != "small") "-${ffmpegVariant}"); inherit version; src = fetchgit { diff --git a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix index f6ea2f0182..4c439717ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitHub, fetchpatch , cmake , enableShared ? !stdenv.hostPlatform.isStatic @@ -69,5 +69,12 @@ in fmt_10 = generic { version = "10.0.0"; sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8="; + patches = [ + # fixes a test failure on pkgsMusl.fmt + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/eaa6307691a9edb9e2f2eacf70500fc6989b416c.diff"; + hash = "sha256-PydnmOn/o9DexBViFGUUAO9KFjVS6CN8GVDHcl/+K8g="; + }) + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix index ed847cb3ff..d96b0e1401 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which makeWrapper ] + nativeBuildInputs = [ pkg-config which ] + ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ lib.optional (!stdenv.isLinux) gnumake; @@ -60,7 +61,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - postInstall = glib.flattenInclude + '' + postInstall = glib.flattenInclude + # pkgsCross.mingwW64.pkg-config doesn't build + # makeWrapper doesn't cross-compile to windows #120726 + + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' substituteInPlace $dev/bin/freetype-config \ --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} diff --git a/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix index dbf5b9c237..0215b82a82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix @@ -7,7 +7,7 @@ , opencv , pcre , pkg-config -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix index b6c7767a8d..a3f70c062e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk="; }; - sourceRoot = "source/fuzzylite"; + sourceRoot = "${src.name}/fuzzylite"; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 66299001f1..4b29d8f618 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -1,6 +1,8 @@ { lib , stdenv +, callPackage , fetchFromGitHub + , bison , cmake , gtest @@ -61,15 +63,15 @@ , zstd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "v${version}"; - hash = "sha256-hAuhftIuF9W0bQx73Mz8bAEegrX9g40ippqwv9mdstg="; + rev = "v${finalAttrs.version}"; + hash = "sha256-RXX21tCq0xJQli3NTertM9IweONrJfGeaFj3utMFjpM="; }; nativeBuildInputs = [ @@ -89,7 +91,7 @@ stdenv.mkDerivation rec { "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}" "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ lib.optionals doInstallCheck [ + ] ++ lib.optionals finalAttrs.doInstallCheck [ "-DBUILD_TESTING=ON" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so @@ -213,14 +215,18 @@ stdenv.mkDerivation rec { popd # autotest ''; + passthru.tests = { + gdal = callPackage ./tests.nix { gdal = finalAttrs.finalPackage; }; + }; + __darwinAllowLocalNetworking = true; meta = with lib; { - changelog = "https://github.com/OSGeo/gdal/blob/${src.rev}/NEWS.md"; + changelog = "https://github.com/OSGeo/gdal/blob/v${finalAttrs.version}/NEWS.md"; description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; license = licenses.mit; maintainers = with maintainers; teams.geospatial.members ++ [ marcweber dotlambda ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/tests.nix new file mode 100644 index 0000000000..37b958706b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/tests.nix @@ -0,0 +1,46 @@ +{ runCommand, gdal }: + +let + inherit (gdal) pname version; + +in +runCommand "${pname}-tests" { + nativeBuildInputs = [ gdal ]; + meta.timeout = 60; +} '' + # test version + ogrinfo --version \ + | grep 'GDAL ${version}' + + gdalinfo --version \ + | grep 'GDAL ${version}' + + + # test formats + ogrinfo --formats \ + | grep 'GPKG.*GeoPackage' + + gdalinfo --formats \ + | grep 'GTiff.*GeoTIFF' + + + # test vector file + echo -e "Latitude,Longitude,Name\n48.1,0.25,'Test point'" > test.csv + ogrinfo ./test.csv + + + # test raster file + gdal_create \ + -a_srs "EPSG:4326" \ + -of GTiff \ + -ot UInt16 \ + -a_nodata 255 \ + -burn 0 \ + -outsize 800 600 \ + -co COMPRESS=LZW \ + test.tif + + gdalinfo ./test.tif + + touch $out + '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 7be4c30204..9d8f0fd823 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.14.1"; + version = "0.14.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "7D7j7DhguceJWKVdqJz3auIwWEjhL0GUW3tSEk2PbPk="; + sha256 = "Kgyc9I++izQ1AIhm/9QLjt2wZn0iErQjlv32iOk84L4="; }; nativeBuildInputs = [ @@ -54,11 +54,6 @@ stdenv.mkDerivation rec { "-Dtests=true" ]; - # Needed for darwin due to std::auto_ptr in exiv2 header files & enabling C++ 17 - # https://github.com/Exiv2/exiv2/issues/2359 - # https://gitlab.gnome.org/GNOME/gexiv2/-/issues/73 - env.NIX_CFLAGS_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"; - doCheck = true; preCheck = let diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 3db1a36e3f..55425c6aa7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.76.0"; + version = "1.76.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pj8VaWSxNgU+q1HqATEU59fBk7dRjSjAQLawLDyTOm0="; + sha256 = "sha256-99jJ1lPqb9eK/kpQcg4EaqK/wHj9pjXdEwZ90ZnGJdQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 35091bcbcf..8b7c18cf13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.76.0"; + version = "2.76.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FJoFoXnmKaU4viVmKqMktJnXxFScUVHbU3PngKG/G5o="; + sha256 = "XGmKmZTd5R79+xAmpWaYoiHWJQ6J3FDrzd2nuBSApCs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index c3955bc10e..8a1ba46f50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -56,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.76.3"; + version = "2.76.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "wL5ETkA9fDGE0fOU+J8LZEcQtekzG1T6TotQN4E60yo="; + sha256 = "WloZHJaDbhZqd3H36myisAacYDx9o8uhzTjRaUo5Xdo="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gr-framework/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gr-framework/default.nix new file mode 100644 index 0000000000..415d9c4033 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gr-framework/default.nix @@ -0,0 +1,65 @@ +{ cairo +, cmake +, fetchFromGitHub +, ffmpeg +, freetype +, ghostscript +, glfw +, lib +, libjpeg +, libtiff +, nix-update-script +, qhull +, qtbase +, stdenv +, wrapQtAppsHook +, xorg +, zeromq +}: + +stdenv.mkDerivation rec { + pname = "gr-framework"; + version = "0.72.9"; + + src = fetchFromGitHub { + owner = "sciapp"; + repo = "gr"; + rev = "v${version}"; + hash = "sha256-4rOcrMn0sxTeRQqiQMAWULzUV39i6J96Mb096Lyblns="; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + cairo + ffmpeg + freetype + ghostscript + glfw + libjpeg + libtiff + qhull + qtbase + xorg.libX11 + xorg.libXft + xorg.libXt + zeromq + ]; + + preConfigure = '' + echo ${version} > version.txt + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GR framework is a graphics library for visualisation applications"; + homepage = "https://gr-framework.org"; + maintainers = [ lib.maintainers.paveloom ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix index d3ddb25ed0..fa7eb93fe0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.12.1"; + version = "1.12.2"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jsRPMgUuiW/N1JJuuBSjJuOaUEfiUe7HuQVvvZREsPE="; + sha256 = "tOmTvYJ+TOtqdwsbXolQ/OO+nIsrDL6yL9+ZKAjdITk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 3aebf03b8c..f10d90a045 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -192,6 +192,7 @@ stdenv.mkDerivation rec { libfreeaptx zxing-cpp usrsctp + wildmidi ] ++ lib.optionals opencvSupport [ opencv4 ] ++ lib.optionals enableZbar [ @@ -212,9 +213,6 @@ stdenv.mkDerivation rec { wayland wayland-protocols ] ++ lib.optionals (!stdenv.isDarwin) [ - # wildmidi requires apple's OpenAL - # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin mjpegtools @@ -318,7 +316,6 @@ stdenv.mkDerivation rec { "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf - "-Dwildmidi=disabled" # see dependencies above ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64) [ "-Dqsv=disabled" # Linux (and Windows) x86 only ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index aabd0058b2..bf847987a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -45,7 +45,9 @@ , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: -assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); +# MMAL is not supported on aarch64, see: +# https://github.com/raspberrypi/userland/issues/688 +assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; @@ -156,9 +158,11 @@ stdenv.mkDerivation rec { "-Dpulse=disabled" # TODO check if we can keep this enabled "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only - ] ++ lib.optionals (!raspiCameraSupport) [ + ] ++ (if raspiCameraSupport then [ + "-Drpi-lib-dir=${libraspberrypi}/lib" + ] else [ "-Drpicamsrc=disabled" - ]; + ]); postPatch = '' patchShebangs \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index f7ef0018cb..b03dd953e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = [ + "-Wno-error" # gstcameradeinterlace.cpp:55:10: fatal error: gst/video/video.h: No such file or directory "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock index e935313f18..976126eecb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -112,15 +112,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[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", ] @@ -131,7 +131,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -141,14 +141,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arbitrary" @@ -178,9 +178,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" +checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" dependencies = [ "flate2", "futures-core", @@ -197,7 +197,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -208,13 +208,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -264,7 +264,7 @@ checksum = "6f6ca6f0c18c02c2fbfc119df551b8aeb8a385f6d5980f1475ba0255f1e97f1e" dependencies = [ "anyhow", "arrayvec", - "itertools", + "itertools 0.10.5", "log", "nom", "num-rational", @@ -674,15 +674,15 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -724,12 +724,6 @@ dependencies = [ "serde", ] -[[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" @@ -737,10 +731,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitstream-io" -version = "1.6.0" +name = "bitflags" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "bitstream-io" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82704769cb85a22df2c54d6bdd6a158b7931d256cf3248a07d6ecbe9d58b31d7" [[package]] name = "block-buffer" @@ -820,7 +820,7 @@ name = "cairo-rs" version = "0.17.10" source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", @@ -877,9 +877,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" dependencies = [ "smallvec", "target-lexicon", @@ -917,9 +917,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.4" +version = "4.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d" dependencies = [ "clap_builder", "clap_derive", @@ -928,27 +928,26 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.4" +version = "4.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -1044,9 +1043,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -1136,12 +1135,6 @@ dependencies = [ "cfg-if", ] -[[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" @@ -1168,7 +1161,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d49045d7365f5c2cadb1f20932189a0da101ac86c8dbe891975814b2348d57d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "csound-sys", "libc", "va_list", @@ -1184,16 +1177,6 @@ dependencies = [ "va_list", ] -[[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" @@ -1226,11 +1209,11 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "dav1d" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02ab20a37bcd596fb85c3185c3286f983fc6125755c74625c7849c2ba0b7bb3" +checksum = "87ca43c8e58ee931086b5fd9a4b6a8cc40c1346592246c4fe3d299eca1684c75" dependencies = [ - "bitflags", + "bitflags 2.3.3", "dav1d-sys", ] @@ -1272,12 +1255,12 @@ dependencies = [ [[package]] name = "dssim-core" -version = "3.2.6" +version = "3.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60aa0237471586cfb40481b3855a897b86d380eae78fe852d844ab1e3d1d896b" +checksum = "1388544389475fcfd718b35a286af17cb215202af26bf2067d0e1024adbc3fe9" dependencies = [ "imgref", - "itertools", + "itertools 0.11.0", "rayon", "rgb", ] @@ -1288,7 +1271,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12aebdd6b6b47b5880c049efb0e77f8762178a0745ef778878908f5981c05f52" dependencies = [ - "bitflags", + "bitflags 1.3.2", "dasp_frame", "dasp_sample", "smallvec", @@ -1343,6 +1326,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -1351,7 +1340,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1364,22 +1353,6 @@ dependencies = [ "libc", ] -[[package]] -name = "exr" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.7.1", - "rayon-core", - "smallvec", - "zune-inflate", -] - [[package]] name = "fastrand" version = "1.9.0" @@ -1437,7 +1410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -1553,7 +1526,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -1591,7 +1564,7 @@ name = "gdk-pixbuf" version = "0.17.10" source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1616,7 +1589,7 @@ name = "gdk4" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1664,6 +1637,32 @@ dependencies = [ "system-deps", ] +[[package]] +name = "gdk4-win32" +version = "0.6.6" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +dependencies = [ + "gdk4", + "gdk4-win32-sys", + "gio", + "glib", + "khronos-egl", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4-win32-sys" +version = "0.6.6" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "glib-sys", + "libc", + "system-deps", +] + [[package]] name = "gdk4-x11" version = "0.6.6" @@ -1740,7 +1739,7 @@ name = "gio" version = "0.17.10" source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1771,7 +1770,7 @@ name = "glib" version = "0.17.10" source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -1853,7 +1852,7 @@ name = "gsk4" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -1880,7 +1879,7 @@ dependencies = [ [[package]] name = "gst-plugin-audiofx" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "atomic_refcell", @@ -1902,7 +1901,7 @@ dependencies = [ [[package]] name = "gst-plugin-aws" -version = "0.10.9" +version = "0.10.11" dependencies = [ "async-tungstenite", "atomic_refcell", @@ -1943,7 +1942,7 @@ dependencies = [ [[package]] name = "gst-plugin-cdg" -version = "0.10.9" +version = "0.10.11" dependencies = [ "cdg", "cdg_renderer", @@ -1959,7 +1958,7 @@ dependencies = [ [[package]] name = "gst-plugin-claxon" -version = "0.10.9" +version = "0.10.11" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -1973,7 +1972,7 @@ dependencies = [ [[package]] name = "gst-plugin-closedcaption" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "atomic_refcell", @@ -2000,7 +1999,7 @@ dependencies = [ [[package]] name = "gst-plugin-csound" -version = "0.10.9" +version = "0.10.11" dependencies = [ "byte-slice-cast", "csound", @@ -2014,7 +2013,7 @@ dependencies = [ [[package]] name = "gst-plugin-dav1d" -version = "0.10.9" +version = "0.10.11" dependencies = [ "dav1d", "gst-plugin-version-helper", @@ -2027,7 +2026,7 @@ dependencies = [ [[package]] name = "gst-plugin-fallbackswitch" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gio", "gst-plugin-gtk4", @@ -2045,7 +2044,7 @@ dependencies = [ [[package]] name = "gst-plugin-ffv1" -version = "0.10.9" +version = "0.10.11" dependencies = [ "byte-slice-cast", "ffv1", @@ -2058,7 +2057,7 @@ dependencies = [ [[package]] name = "gst-plugin-file" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2069,7 +2068,7 @@ dependencies = [ [[package]] name = "gst-plugin-flavors" -version = "0.10.9" +version = "0.10.11" dependencies = [ "byteorder", "flavors", @@ -2086,7 +2085,7 @@ dependencies = [ [[package]] name = "gst-plugin-fmp4" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "chrono", @@ -2104,7 +2103,7 @@ dependencies = [ [[package]] name = "gst-plugin-gif" -version = "0.10.9" +version = "0.10.11" dependencies = [ "atomic_refcell", "gif", @@ -2117,9 +2116,10 @@ dependencies = [ [[package]] name = "gst-plugin-gtk4" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gdk4-wayland", + "gdk4-win32", "gdk4-x11", "gst-plugin-version-helper", "gstreamer", @@ -2131,11 +2131,12 @@ dependencies = [ "gstreamer-video", "gtk4", "once_cell", + "windows-sys", ] [[package]] name = "gst-plugin-hlssink3" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gio", "glib", @@ -2151,7 +2152,7 @@ dependencies = [ [[package]] name = "gst-plugin-hsv" -version = "0.10.9" +version = "0.10.11" dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", @@ -2166,7 +2167,7 @@ dependencies = [ [[package]] name = "gst-plugin-json" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2178,7 +2179,7 @@ dependencies = [ [[package]] name = "gst-plugin-lewton" -version = "0.10.9" +version = "0.10.11" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -2192,7 +2193,7 @@ dependencies = [ [[package]] name = "gst-plugin-livesync" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gio", "gst-plugin-gtk4", @@ -2209,7 +2210,7 @@ dependencies = [ [[package]] name = "gst-plugin-mp4" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "gst-plugin-version-helper", @@ -2225,7 +2226,7 @@ dependencies = [ [[package]] name = "gst-plugin-ndi" -version = "0.10.9" +version = "0.10.11" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -2242,7 +2243,7 @@ dependencies = [ [[package]] name = "gst-plugin-onvif" -version = "0.10.9" +version = "0.10.11" dependencies = [ "cairo-rs", "chrono", @@ -2260,7 +2261,7 @@ dependencies = [ [[package]] name = "gst-plugin-png" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2273,7 +2274,7 @@ dependencies = [ [[package]] name = "gst-plugin-raptorq" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2287,7 +2288,7 @@ dependencies = [ [[package]] name = "gst-plugin-rav1e" -version = "0.10.9" +version = "0.10.11" dependencies = [ "atomic_refcell", "gst-plugin-version-helper", @@ -2300,7 +2301,7 @@ dependencies = [ [[package]] name = "gst-plugin-regex" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2311,7 +2312,7 @@ dependencies = [ [[package]] name = "gst-plugin-reqwest" -version = "0.10.9" +version = "0.10.11" dependencies = [ "futures", "gst-plugin-version-helper", @@ -2328,7 +2329,7 @@ dependencies = [ [[package]] name = "gst-plugin-rtp" -version = "0.10.9" +version = "0.10.11" dependencies = [ "bitstream-io", "chrono", @@ -2341,7 +2342,7 @@ dependencies = [ [[package]] name = "gst-plugin-sodium" -version = "0.10.9" +version = "0.10.11" dependencies = [ "clap", "gst-plugin-version-helper", @@ -2361,7 +2362,7 @@ dependencies = [ [[package]] name = "gst-plugin-spotify" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "futures", @@ -2376,7 +2377,7 @@ dependencies = [ [[package]] name = "gst-plugin-textahead" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2385,7 +2386,7 @@ dependencies = [ [[package]] name = "gst-plugin-textwrap" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2397,7 +2398,7 @@ dependencies = [ [[package]] name = "gst-plugin-threadshare" -version = "0.10.9" +version = "0.10.11" dependencies = [ "async-task", "cc", @@ -2427,7 +2428,7 @@ dependencies = [ [[package]] name = "gst-plugin-togglerecord" -version = "0.10.9" +version = "0.10.11" dependencies = [ "either", "gio", @@ -2443,7 +2444,7 @@ dependencies = [ [[package]] name = "gst-plugin-tracers" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "gst-plugin-version-helper", @@ -2455,7 +2456,7 @@ dependencies = [ [[package]] name = "gst-plugin-tutorial" -version = "0.10.9" +version = "0.10.11" dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", @@ -2469,7 +2470,7 @@ dependencies = [ [[package]] name = "gst-plugin-uriplaylistbin" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "clap", @@ -2491,7 +2492,7 @@ dependencies = [ [[package]] name = "gst-plugin-videofx" -version = "0.10.9" +version = "0.10.11" dependencies = [ "atomic_refcell", "cairo-rs", @@ -2511,7 +2512,7 @@ dependencies = [ [[package]] name = "gst-plugin-webp" -version = "0.10.9" +version = "0.10.11" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2524,7 +2525,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtc" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "async-tungstenite", @@ -2558,7 +2559,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtc-signalling" -version = "0.10.9" +version = "0.10.11" dependencies = [ "anyhow", "async-tungstenite", @@ -2581,7 +2582,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtc-signalling-protocol" -version = "0.10.9" +version = "0.10.11" dependencies = [ "serde", "serde_json", @@ -2589,7 +2590,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtchttp" -version = "0.10.9" +version = "0.10.11" dependencies = [ "async-recursion", "bytes", @@ -2606,10 +2607,10 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "futures-channel", "futures-core", @@ -2632,10 +2633,10 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-core", "futures-sink", "glib", @@ -2648,8 +2649,8 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -2660,10 +2661,10 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "glib", "gstreamer", @@ -2675,8 +2676,8 @@ dependencies = [ [[package]] name = "gstreamer-audio-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gobject-sys", @@ -2688,22 +2689,23 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "atomic_refcell", - "bitflags", + "bitflags 1.3.2", "cfg-if", "glib", "gstreamer", "gstreamer-base-sys", "libc", + "once_cell", ] [[package]] name = "gstreamer-base-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gobject-sys", @@ -2714,10 +2716,10 @@ dependencies = [ [[package]] name = "gstreamer-check" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-check-sys", @@ -2725,8 +2727,8 @@ dependencies = [ [[package]] name = "gstreamer-check-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gobject-sys", @@ -2737,10 +2739,10 @@ dependencies = [ [[package]] name = "gstreamer-gl" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-base", @@ -2752,8 +2754,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-egl" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib", "gstreamer", @@ -2764,8 +2766,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-egl-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2775,8 +2777,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gobject-sys", @@ -2789,8 +2791,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-wayland" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib", "gstreamer", @@ -2801,8 +2803,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-wayland-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2812,8 +2814,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib", "gstreamer", @@ -2824,8 +2826,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2835,8 +2837,8 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "gio", "glib", @@ -2846,8 +2848,8 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "gio-sys", "glib-sys", @@ -2858,10 +2860,10 @@ dependencies = [ [[package]] name = "gstreamer-pbutils" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-audio", @@ -2873,8 +2875,8 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gobject-sys", @@ -2887,10 +2889,10 @@ dependencies = [ [[package]] name = "gstreamer-rtp" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-rtp-sys", @@ -2900,8 +2902,8 @@ dependencies = [ [[package]] name = "gstreamer-rtp-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -2912,8 +2914,8 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib", "gstreamer", @@ -2922,8 +2924,8 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gstreamer-sys", @@ -2933,8 +2935,8 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gobject-sys", @@ -2944,8 +2946,8 @@ dependencies = [ [[package]] name = "gstreamer-utils" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "gstreamer", "gstreamer-app", @@ -2956,10 +2958,10 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "futures-channel", "glib", @@ -2973,8 +2975,8 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gobject-sys", @@ -2986,8 +2988,8 @@ dependencies = [ [[package]] name = "gstreamer-webrtc" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib", "gstreamer", @@ -2998,8 +3000,8 @@ dependencies = [ [[package]] name = "gstreamer-webrtc-sys" -version = "0.20.6" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#f17ef98d4a73df014ae0eed2fe1fbc56ddd3facc" +version = "0.20.7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" dependencies = [ "glib-sys", "gstreamer-sdp-sys", @@ -3013,7 +3015,7 @@ name = "gtk4" version = "0.6.6" source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -3063,9 +3065,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -3073,22 +3075,13 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "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" @@ -3098,6 +3091,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "headers" version = "0.3.8" @@ -3105,7 +3104,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", @@ -3140,18 +3139,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", -] - -[[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" @@ -3248,9 +3238,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", @@ -3409,14 +3399,8 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", "num-rational", "num-traits", - "png", - "qoi", - "tiff", ] [[package]] @@ -3445,7 +3429,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "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]] @@ -3474,27 +3468,26 @@ 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", + "windows-sys", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +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", - "rustix", - "windows-sys 0.48.0", + "hermit-abi 0.3.2", + "rustix 0.38.4", + "windows-sys", ] [[package]] @@ -3507,10 +3500,19 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -3521,15 +3523,6 @@ dependencies = [ "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - [[package]] name = "js-sys" version = "0.3.64" @@ -3539,18 +3532,21 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", +] + [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "lewton" version = "0.10.2" @@ -3564,9 +3560,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libfuzzer-sys" @@ -3585,7 +3581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3821,6 +3817,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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + [[package]] name = "lock_api" version = "0.4.10" @@ -3859,7 +3861,7 @@ 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]] @@ -3923,15 +3925,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3950,7 +3943,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4022,7 +4015,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", @@ -4097,6 +4090,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -4132,19 +4136,19 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] [[package]] name = "object" -version = "0.30.4" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -4172,11 +4176,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[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", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -4193,7 +4197,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -4204,9 +4208,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", @@ -4223,15 +4227,6 @@ dependencies = [ "paste", ] -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "outref" version = "0.5.1" @@ -4249,7 +4244,7 @@ name = "pango" version = "0.17.10" source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio", "glib", "libc", @@ -4273,7 +4268,7 @@ name = "pangocairo" version = "0.17.10" source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "glib", "libc", @@ -4333,9 +4328,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -4360,34 +4355,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -4407,11 +4402,11 @@ version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -4427,13 +4422,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]] @@ -4450,13 +4445,11 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[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", ] @@ -4476,7 +4469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" dependencies = [ "autocfg", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -4515,9 +4508,9 @@ dependencies = [ [[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", ] @@ -4563,20 +4556,11 @@ dependencies = [ "psl-types", ] -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quote" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] @@ -4642,7 +4626,7 @@ dependencies = [ "cc", "cfg-if", "interpolate_name", - "itertools", + "itertools 0.10.5", "libc", "libfuzzer-sys", "log", @@ -4650,7 +4634,7 @@ dependencies = [ "nasm-rs", "new_debug_unreachable", "noop_proc_macro", - "num-derive", + "num-derive 0.3.3", "num-traits", "once_cell", "paste", @@ -4701,7 +4685,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4710,18 +4694,19 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", ] [[package]] @@ -4733,6 +4718,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -4741,9 +4737,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -4898,16 +4894,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", ] [[package]] @@ -4936,18 +4945,18 @@ 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 = "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 = "same-file" @@ -4960,18 +4969,18 @@ dependencies = [ [[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" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -4989,7 +4998,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5008,47 +5017,47 @@ 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" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -5057,9 +5066,9 @@ dependencies = [ [[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", ] @@ -5137,9 +5146,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[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", @@ -5186,9 +5195,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 = "smawk" @@ -5213,7 +5222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -5274,9 +5283,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -5285,22 +5294,22 @@ 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", "pkg-config", - "toml 0.7.4", + "toml 0.7.6", "version-compare", ] [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tempfile" @@ -5312,8 +5321,8 @@ dependencies = [ "cfg-if", "fastrand 1.9.0", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", + "rustix 0.37.23", + "windows-sys", ] [[package]] @@ -5346,7 +5355,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -5363,22 +5372,22 @@ dependencies = [ [[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.18", + "syn 2.0.26", ] [[package]] @@ -5402,17 +5411,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tiff" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - [[package]] name = "time" version = "0.1.45" @@ -5468,11 +5466,12 @@ 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", @@ -5482,7 +5481,7 @@ dependencies = [ "signal-hook-registry", "socket2 0.4.9", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -5493,7 +5492,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -5553,9 +5552,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -5565,20 +5564,20 @@ 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.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -5628,13 +5627,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8803eee176538f94ae9a14b55b2804eb7e1441f8210b1c31290b3bccdccff73b" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -5726,9 +5725,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-linebreak" @@ -5736,7 +5735,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", "regex", ] @@ -5792,23 +5791,22 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", ] [[package]] name = "v_frame" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148c23ce3c8dae5562911cba1c264eaa5e31e133e0d5d08455409de9dd540358" +checksum = "bec8189c996a12ac77c50065f9c9f64961e56eb940d0ae1a4ccc7bea238bb4bc" dependencies = [ "cfg-if", - "new_debug_unreachable", "noop_proc_macro", - "num-derive", + "num-derive 0.4.0", "num-traits", "rust_hawktracer", ] @@ -5837,7 +5835,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "chrono", "rustc_version", ] @@ -5918,7 +5916,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", "wasm-bindgen-shared", ] @@ -5952,7 +5950,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6029,21 +6027,6 @@ dependencies = [ "windows-targets", ] -[[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.48.0" @@ -6055,97 +6038,55 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +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", + "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" -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" @@ -6154,9 +6095,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] @@ -6172,9 +6113,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" +checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" [[package]] name = "xmlparser" @@ -6223,12 +6164,3 @@ name = "zeroize" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index ba4f04714f..c16118926c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -114,7 +114,7 @@ let invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins; # TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138 - cargo-c' = cargo-c.overrideAttrs (oldAttrs: { + cargo-c' = (cargo-c.__spliced.buildHost or cargo-c).overrideAttrs (oldAttrs: { patches = (oldAttrs.patches or []) ++ [ (fetchpatch { name = "cargo-c-test-rlib-fix.patch"; @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { pname = "gst-plugins-rs"; - version = "0.10.9"; + version = "0.10.11"; outputs = [ "out" "dev" ]; @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { owner = "gstreamer"; repo = "gst-plugins-rs"; rev = version; - hash = "sha256-pUvcPazg6/SsD7sqML2tb+ZVWDqO1MRIcj3CQioePZY="; + hash = "sha256-oOoUGzbg/ib1pA0T81hxgLlHnTRlNCWH5qZUNAutn8U="; # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2 postFetch = '' sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g' @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE="; "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk="; "gdk4-0.6.6" = "sha256-1WPXxsZJoYEQxVuP/CSpGs2XEZSJD//JJz4Ka2hxXHM="; - "gstreamer-0.20.6" = "sha256-nG+4nak0l1j29S5rddrMu38lfFq12Bjw16uaj61QiQs="; + "gstreamer-0.20.7" = "sha256-o4o4mPFAZOshNNkCkykjG/b+UtT2z6TNLOEzJsfs+Mk="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index 92fc02bfa2..4fbf6f3a6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -15,9 +14,9 @@ , vala }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.0"; + version = "0.8.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,25 +24,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; - rev = "v${version}"; - sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM="; }; - patches = [ - # https://github.com/wmww/gtk-layer-shell/pull/146 - # Mark wayland-scanner as a build-time dependency - (fetchpatch { - url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch"; - hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM="; - }) - # https://github.com/wmww/gtk-layer-shell/pull/147 - # Remove redundant dependency check for gtk-doc - (fetchpatch { - url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch"; - hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs="; - }) - ]; - strictDeps = true; depsBuildBuild = [ @@ -74,8 +58,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; + homepage = "https://github.com/wmww/gtk-layer-shell"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ eonpatapon ]; + maintainers = with maintainers; [ eonpatapon donovanglover ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix index 1627e66d27..c43f69fd97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp-av/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { libxml2 ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + ]; + mesonFlags = [ "-Dgtk_doc=true" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix index 2b3cd2566b..da830a6366 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , meson , ninja @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.3"; + version = "1.6.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg="; + sha256 = "sha256-1sPQNYOET6UqvgAwQxhgB/DIQUX+OwD6slmVvtqb5Vo="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/32 - name = "gi-docgen-as-native-dep.patch"; - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/11d4a33cff1f5d8b8ad4b80c4506246a9e0dff8f.diff"; - hash = "sha256-+p4vzUG2v+7mxtQ5AUcEI7SW0cDX6XlzqlyegF+I1Go="; - }) - ]; - depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix index bebf109d27..4bff529a51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -33,6 +34,13 @@ stdenv.mkDerivation rec { patches = [ # Bring .pc file in line with our patched pkg-config. ./0001-pkg-config-Declare-header-dependencies-as-public.patch + + # Fix build against libxml2 2.11 + # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; + hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; + }) ]; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix index 65eacd7fff..3e84432cd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/herqq/default.nix @@ -9,7 +9,7 @@ mkDerivation rec { outputs = [ "out" "dev" ]; - sourceRoot = "source/herqq"; + sourceRoot = "${src.name}/herqq"; src = fetchFromGitHub { owner = "ThomArmax"; repo = "HUPnP"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix new file mode 100644 index 0000000000..ad07025cc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, icu +, libarchive +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hfst-ospell"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "hfst"; + repo = "hfst-ospell"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k="; + }; + + buildInputs = [ + icu + libarchive + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + # libxmlxx is listed as a dependency but Darwin build fails with it, + # might also be better in general since libxmlxx in Nixpkgs is 8 years old + # https://github.com/hfst/hfst-ospell/issues/48#issuecomment-546535653 + configureFlags = [ + "--without-libxmlpp" + "--without-tinyxml2" + ]; + + meta = with lib; { + homepage = "https://github.com/hfst/hfst-ospell/"; + description = "HFST spell checker library and command line tool "; + license = licenses.asl20; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/hfst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hfst/default.nix new file mode 100644 index 0000000000..41707bbd49 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/hfst/default.nix @@ -0,0 +1,53 @@ +{ lib +, autoreconfHook +, bison +, flex +, foma +, fetchFromGitHub +, gettext +, icu +, stdenv +, swig +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hfst"; + version = "3.16.0"; + + src = fetchFromGitHub { + owner = "hfst"; + repo = "hfst"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU="; + }; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + swig + ]; + + buildInputs = [ + foma + gettext + icu + zlib + ]; + + configureFlags = [ + "--enable-all-tools" + "--with-foma-upstream=true" + ]; + + meta = with lib; { + description = "FST language processing library"; + homepage = "https://github.com/hfst/hfst"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipfort/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hipfort/default.nix index e22d09fbee..5c5f0f61e8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hipfort/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "5.4.3"; + version = "5.6.0"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-cXzNOvWIU388AU5hzLwmIGaX5DvzIJJCvgkP2BA4jao="; + hash = "sha256-x1pF9md7RIcobE/4UxHxOaURbljFZGOashW1KM0lmo0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/hnswlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hnswlib/default.nix new file mode 100644 index 0000000000..c3a543972e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/hnswlib/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +}: +let + python = python3.withPackages(ps: with ps; [ + numpy + ]); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "hnswlib"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "nmslib"; + repo = "hnswlib"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-XXz0NIQ5dCGwcX2HtbK5NFTalP0TjLO6ll6TmH3oflI="; + }; + + # this is a header-only library, so we don't need to build it + # we need `cmake` only to run tests + nativeBuildInputs = lib.optionals finalAttrs.doCheck [ + cmake + python + ]; + + # we only want to run buildPhase when we run tests + dontBuild = !finalAttrs.doCheck; + + installPhase = '' + runHook preInstall + + install -Dm644 $src/hnswlib/*.h -t $out/include/hnswlib + + runHook postInstall + ''; + + doCheck = true; + + preCheck = '' + pushd ../tests/cpp + ${python.interpreter} update_gen_data.py + popd + ''; + + checkPhase = '' + runHook preCheck + + ./test_updates + + runHook postCheck + ''; + + meta = with lib; { + description = "Header-only C++/python library for fast approximate nearest neighbors"; + homepage = "https://github.com/nmslib/hnswlib"; + changelog = "https://github.com/nmslib/hnswlib/releases/tag/${finalAttrs.src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix index fbef44bf67..b0c632b69c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -2,7 +2,8 @@ , x11Support ? false , libX11 , cairo -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudaPackages }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index 3ebba3c50d..c0e20ba7f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation rec { pname = "igraph"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk="; + hash = "sha256-HNc+xU7Gcv9BSpb2OgyG9tCbk/dfWw5Ix1c2gvFZklE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 4ed72f4acd..cb014ed80b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { patches = [ # fix platform detection (fetchpatch { - url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; - sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; + url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/04ffb03f744780a55aba311c612d708b00584bb7/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; + sha256 = "sha256-o/Pg0S53SYh3O7L+AwxOPl1Bx4TS6iKB8ql8GhhHI/o="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix index 17e5ed4821..7fce11d21a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation { ]; NIX_CFLAGS_COMPILE = [ + "-Wno-error" "-I${lib.getDev ipu6-camera-bin}/include/ia_imaging" "-I${lib.getDev ipu6-camera-bin}/include/ia_camera" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix index aca509b3b0..f5a4c46f57 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "4.11.0"; + version = "4.15.0"; src = fetchurl { url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "sha256-QI95nfQTVGj6fKNetrBcQAS+pEPYHKWLibLkgkAagrs="; + sha256 = "sha256-uDtUudfdbrh3OAs+xG83CwXa8sv6ExxhLwNZjWVMDvg="; }; nativeBuildInputs = [ gettext python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 2637ababbd..73bbe1782b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -1,21 +1,21 @@ -{ ffmpeg_5-full -, nv-codec-headers-11 +{ ffmpeg_6-full +, nv-codec-headers-12 , chromaprint , fetchFromGitHub , lib }: -(ffmpeg_5-full.override { - nv-codec-headers = nv-codec-headers-11; +(ffmpeg_6-full.override { + nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-8"; + version = "6.0-4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-0ne9Xj9MnB5WOkPRtPX7W30qG1osHd0tyua+5RMrnQc="; + sha256 = "sha256-o0D/GWbSoy5onbYG29wTbpZ8z4sZ2s1WclGCXRMSekA="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 41e9a2d0a0..59572afc62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -40,19 +40,13 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" + "-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}" ] # the test's won't compile if secureMemory is used because there is no # comparison operators and conversion functions between # std::basic_string<..., Json::SecureAllocator> vs. # std::basic_string<..., [default allocator]> - ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF" - ++ lib.optional (!enableStatic) "-DBUILD_STATIC_LIBS=OFF"; - - # this is fixed and no longer necessary in 1.9.5 but there they use - # memset_s without switching to a different c++ standard in the cmake files - postInstall = lib.optionalString enableStatic '' - (cd $out/lib && ln -sf libjsoncpp_static.a libjsoncpp.a) - ''; + ++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF"; meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix index 7fb8520348..e6b8ced1a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.25"; + version = "1.26"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-NEmkgKTm+R4lzqjbQTyQ6TDpjoTQtMKiTpzn25HUfYk="; + sha256 = "sha256-LkV5bi1kMRP2ofBIe+hbOzbSRStWyr3afnNdZqpVDBA="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix index 72ae892dca..95547fb638 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.6.2"; + version = "2.7.2"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - hash = "sha256-XLxjw1KTwjSzn5S6n/yonW0HiSXX+QIfgIZz3t8tkl4="; + hash = "sha256-Ju5y1keFTmYtmWQ+srLTQWVavzH0mQg41mUPtc+SCcg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index 993e1c8423..a117863aa3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.12.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-9XfvU01nVcY2NpCqjUyPEJ+F/+A4YjjE0ktMQyEkr3Q="; + hash = "sha256-qV2OM41+DkuT3lDCTHOyNkHixD/HITfCiItBQX6Ewio="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix index 79572e4300..5247aa5a94 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A simple header-only C++ argument parser library"; homepage = "https://github.com/Taywee/args"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix index a807226f75..60c13040ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libassuan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libassuan"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-jowvzJgvnKZ9y7HZXi3HRrFzmkZovCCzo8W+Yy7bNOQ="; + sha256 = "sha256-6f0nIY1TlJBOTjl4j5sXQnEcPmtBaJoxqjOAvVqk9CY="; }; outputs = [ "out" "dev" "info" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index aebb995039..9851514943 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -1,18 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc -, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted -, cryptsetup, lvm2, util-linux, libbytesize, libndctl, nss, volume_key -, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive -, thin-provisioning-tools, makeWrapper, e2fsprogs, libnvme, keyutils +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gtk-doc +, docbook_xml_dtd_43 +, python3 +, gobject-introspection +, glib +, udev +, kmod +, parted +, cryptsetup +, lvm2 +, util-linux +, libbytesize +, libndctl +, nss +, volume_key +, libxslt +, docbook_xsl +, gptfdisk +, libyaml +, autoconf-archive +, thin-provisioning-tools +, makeBinaryWrapper +, e2fsprogs +, libnvme +, keyutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; - rev = "${version}-1"; - sha256 = "sha256-WnHcRKRxfdSRmOW2K/vn1WQ4iPm0uS0Td0cWXaeo5hk="; + rev = "${finalAttrs.version}-1"; + hash = "sha256-tqF96yeBPilF0zQ53RNN7IZ2wVgWQOwbGkvoywN/i+0="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -22,13 +47,35 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook pkg-config gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 - python3 gobject-introspection autoconf-archive makeWrapper + autoconf-archive + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gobject-introspection + gtk-doc + libxslt + makeBinaryWrapper + pkg-config + python3 ]; buildInputs = [ - e2fsprogs glib udev keyutils kmod parted gptfdisk cryptsetup lvm2 util-linux libbytesize - libndctl libnvme nss volume_key libyaml + cryptsetup + e2fsprogs + glib + gptfdisk + keyutils + kmod + libbytesize + libndctl + libnvme + libyaml + lvm2 + nss + parted + udev + util-linux + volume_key ]; postInstall = '' @@ -36,12 +83,12 @@ stdenv.mkDerivation rec { ${lib.makeBinPath [ thin-provisioning-tools ]} ''; - meta = with lib; { + meta = { + changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; description = "A library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; - changelog = "https://github.com/storaged-project/libblockdev/raw/${src.rev}/NEWS.rst"; - license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils - maintainers = with maintainers; [ johnazoidberg ]; - platforms = platforms.linux; + license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils + maintainers = with lib.maintainers; [ johnazoidberg ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix index e648492b55..0c9efaf69f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "1lymwdc0199nx46ah617hig85nghjwp4m97rcagfjb490rsn4kpg"; - platforms."x86_64-linux".sha256 = "0nh3rknnirm59ppcndifpzmay16018ahp2vxmfbkyx54pl10n3d9"; + platforms."aarch64-linux".sha256 = "1348821cprfy46fvzipqfy9qmv1jw48dsi2nxnk3k1097c6xb9zq"; + platforms."x86_64-linux".sha256 = "0w58bqys331wssfqrv27v1fbvrgj4hs1kyjanld9vvdlna0x8kpg"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "114.2.12"; - gitRevision = "7c09f21"; - chromiumVersion = "114.0.5735.199"; + version = "115.3.11"; + gitRevision = "a61da9b"; + chromiumVersion = "115.0.5790.114"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix index a0b8cb8efa..9148deeee6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "llvmorg-${version}"; hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; }; - sourceRoot = "source/libclc"; + sourceRoot = "${src.name}/libclc"; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix index 57d30124a6..8ea080ef10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix index 379f5397ec..9ca5581b3b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libdc1394"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${pname}-${version}.tar.gz"; - sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; + sha256 = "sha256-U3zreN087ycaGD9KF2GR0c7PhfAlUg5r03WLDhnmYJ8="; }; buildInputs = [ libusb1 ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix index c7a5a85ae6..9c1a10f9f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -1,13 +1,12 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , callPackage -# for passthru.tests + # for passthru.tests , imagemagick , libheif , imlib2Full @@ -15,29 +14,16 @@ }: stdenv.mkDerivation (finalAttrs: rec { - version = "1.0.11"; + version = "1.0.12"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; - rev = "v${version}"; - sha256 = "sha256-0aRUh5h49fnjBjy42A5fWYHnhnQ4CFoeSIXZilZewW8="; + rev = "refs/tags/v${version}"; + hash = "sha256-pl1r3n4T4FcJ4My/wCE54R2fmTdrlJOvgb2U0MZf1BI="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-27102.patch"; - url = "https://github.com/strukturag/libde265/commit/0b1752abff97cb542941d317a0d18aa50cb199b1.patch"; - sha256 = "sha256-q0NKuk2r5RQT9MJpRO3CTPj6VqYRBnffs9yZ+GM+lNc="; - }) - (fetchpatch { - name = "CVE-2023-27103.patch"; - url = "https://github.com/strukturag/libde265/commit/d6bf73e765b7a23627bfd7a8645c143fd9097995.patch"; - sha256 = "sha256-vxciVzSuVCVDpdz+TKg2tMWp2ArubYji5GLaR9VP4F0="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix index 8f8354ae85..ba1b3c05f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libdmapsharing"; - version = "3.9.12"; + version = "3.9.13"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4="; + sha256 = "oR9lpOFxgGfrtzncFT6dbmhKQfcuH/NvhOR/USHAHQc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix index bd5edec68a..782d86f1f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = lib.optional (!sslSupport) "--disable-openssl"; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix index 628f4dca8c..6b5e395efb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgeotiff/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - sourceRoot = "source/libgeotiff"; + sourceRoot = "${src.name}/libgeotiff"; configureFlags = [ "--with-jpeg=${libjpeg.dev}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix index 29543cae2e..6cba6bcf8a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.69"; + version = "1.0.71"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-+4aAujSmdrcRMnTd6wHHbyQBfC1LRskZ+8MA2d3hDnI="; + sha256 = "sha256-I58XN1Ku5VVmxuTZ6yPm8jWGKscwLOhetWC+6B6EZRE="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch deleted file mode 100644 index f2ee8e8d3d..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001 -From: Johannes Lode -Date: Thu, 14 Nov 2019 10:44:00 +0100 -Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as - regular functions. - -While cross-compiling there occurred "undefined reference to -`rpl_malloc'", the suggested change fixes the problem. - -Tested for native X86_64 and armv7a-unknown-linux-gnueabihf. ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 008499d..b492dc4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX], - - # This is always checked (library needs this) - AC_HEADER_STDC --AC_FUNC_MALLOC -+# AC_FUNC_MALLOC -- does not work while cross-compiling -+AC_CHECK_FUNC([malloc realloc]) - AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])]) - AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) - AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) --- -2.25.1 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index ce5a4ac283..4392d18752 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -4,19 +4,13 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.6.4"; + version = "2.0.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; + hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk="; }; - patches = [ - # cross compiling fix - # https://github.com/brgl/libgpiod/pull/45 - ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch - ]; - buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 59df64e635..5098bd9f65 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , pkg-config , meson @@ -9,42 +10,23 @@ , vala , gobject-introspection , fetchpatch +, glibcLocales +, umockdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgudev"; - version = "237"; + version = "238"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; + url = "mirror://gnome/sources/libgudev/${lib.versions.majorMinor finalAttrs.version}/libgudev-${finalAttrs.version}.tar.xz"; + hash = "sha256-YSZqsa/J1z28YKiyr3PpnS/f9H2ZVE0IV2Dk+mZ7XdE="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/27 - (fetchpatch { - name = "gir-dep"; - url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/6bdde16a0cfde462502fce1d9a7eb6ec33f388bb.diff"; - sha256 = "sha256-bDtLUxOLEgyJURshqEQC4YCBTUVzQQP4qoWL786b3Z8="; - }) - (fetchpatch { - name = "vapi-dep"; - url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/d1f6457910842ba869c9871e7a2131fbe0d6b6be.diff"; - sha256 = "sha256-/PY8ziZST/vQvksJm69a3O6/YesknIxCDvj0z40piik="; - }) - (fetchpatch { - name = "gtk-doc-dep"; - url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/34336cbadbcaac8b9b029f730eed0bdf4c633617.diff"; - sha256 = "sha256-Bk05xe69LGqWH1uhLMZhwbVMSsCTyBrrOvqWic2TTd4="; - }) - ]; - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config meson @@ -59,14 +41,17 @@ stdenv.mkDerivation rec { glib ]; - mesonFlags = [ - # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway - "-Dtests=disabled" + checkInputs = [ + glibcLocales + umockdev ]; + doCheck = true; + mesonFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-Dtests=disabled"; + passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgudev"; versionPolicy = "none"; }; }; @@ -78,4 +63,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl2Plus; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix index df53e7d294..2150bbd24b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Library to easily check a domain against the Chromium HSTS Preload list"; homepage = "https://gitlab.com/rockdaboot/libhsts"; license = with licenses; [ mit bsd3 ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix index 3f9632bbe0..4d2c116011 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "sha256-as4tqvRY559Q2R3s4GZHovqsCboXNz/NcV5lo+qCeOk="; + sha256 = "sha256-5hbmEen31lB6Xdv5WU+8InKa0+1OsuB8QG0jVa1+a2w="; }; buildInputs = [ jansson openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix index 45bb7f5b60..b91b6ea709 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix @@ -1,19 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, expat, icu }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, expat +, icu +}: stdenv.mkDerivation rec { pname = "liblcf"; - version = "0.7.0"; + version = "0.8"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "sha256-69cYZ8hJ92gK39gueaEoUM0K7BDWIQ/0NvcQ/6e3Sg8="; + hash = "sha256-jJGIsNw7wplTL5FBWGL8osb9255o9ZaWgl77R+RLDMM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - propagatedBuildInputs = [ expat icu ]; + dtrictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + propagatedBuildInputs = [ + expat + icu + ]; + enableParallelBuilding = true; + enableParallelChecking = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmatheval/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmatheval/default.nix index b0fe1c35ef..fcf4167c19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmatheval/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, guile, flex, fetchpatch }: +let + guileVersion = lib.versions.majorMinor guile.version; +in stdenv.mkDerivation rec { version = "1.1.11"; pname = "libmatheval"; - nativeBuildInputs = [ pkg-config autoconf flex ]; + nativeBuildInputs = [ pkg-config flex ]; buildInputs = [ guile ]; src = fetchurl { @@ -14,19 +17,23 @@ stdenv.mkDerivation rec { # Patches coming from debian package # https://packages.debian.org/source/sid/libs/libmatheval - patches = [ (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/002-skip-docs.patch"; - sha256 = "1nnkk9aw4jj6nql46zhwq6vx74zrmr1xq5ix0xyvpawhabhgjg62"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch"; - sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch"; - sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm"; - } ) - ]; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/002-skip-docs.patch"; + hash = "sha256-wjz54FKQq7t9Bz0W3EOu+ZPTt8EcfkMotkZKwlWa09o="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/003-guile3.0.patch"; + hash = "sha256-H3E/2m4MfQAbjpXbVFyNhikVifi3spVThzaVU5srmjI="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/disable_coth_test.patch"; + hash = "sha256-9XeMXWDTzELWTPcsjAqOlIzp4qY9yupU+e6r0rJEUS0="; + }) + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guileVersion}"; + env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guileVersion}"; meta = { description = "A library to parse and evaluate symbolic expressions input as text"; @@ -40,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libmatheval/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix index afbfa53495..747c8893eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.2.5"; + version = "1.2.6"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-lm3gqBIMilPbhZiJdJNov7LLoMTwtMGjDSZOzMRfEiY="; + hash = "sha256-zurqLNkhR9oZ8To1p/GkvCdn/4l+g45LR5z1S1nHd/Q="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix index 679de601aa..b2b095f560 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-pkg-config-paths.patch + # Some tests time out easily on slower machines + ./test-timeout.patch # Fix meson build for arm64. Remove with next release # https://gitlab.xiph.org/xiph/opus/-/merge_requests/59 (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch b/third_party/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch new file mode 100644 index 0000000000..e20f12cc1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch @@ -0,0 +1,16 @@ +diff --git a/tests/meson.build b/tests/meson.build +index 5f3ac9d..74b2de7 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -1,8 +1,8 @@ + # Tests that link to libopus + opus_tests = [ +- ['test_opus_api'], +- ['test_opus_decode', [], 60], +- ['test_opus_encode', 'opus_encode_regressions.c', 120], ++ ['test_opus_api', [], 60], ++ ['test_opus_decode', [], 120], ++ ['test_opus_encode', 'opus_encode_regressions.c', 240], + ['test_opus_padding'], + ['test_opus_projection'], + ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix index 86624a1ecc..8e798e4a38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tfw5nGy3A3zLtVuyHn+8jzXPySRNwBx0opwkE+0k+RA="; + sha256 = "sha256-ZjxC7W4U8T68mZy/OvWj/e4W9pJIj2lVDoEjxXYr/G8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix index e2c7fcea19..62aa346e00 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch2 , meson , ninja , pkg-config @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.32.2"; + version = "1.32.4"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; @@ -34,18 +33,9 @@ stdenv.mkDerivation rec { owner = "mobile-broadband"; repo = "libqmi"; rev = version; - hash = "sha256-XIbeWgkPiJL8hN8Rb6KFt5Q5sG3KsiEQr0EnhwmI6h8="; + hash = "sha256-cczGvoD+2+G6uiAt0Iv1BO4/FqzO9bkqhFsEwOfp7qw="; }; - patches = [ - # Fix pkg-config file missing qrtr in Requires. - # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/99 - (fetchpatch2 { - url = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/7d08150910974c6bd2c29f887c2c6d4a3526e085.patch"; - hash = "sha256-LFrlm2ZqLqewLGO2FxL5kFYbZ7HaxdxvVHsFHYSgZ4Y="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix index 3c6a1f407f..bb3053e19d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librclone/default.nix @@ -8,7 +8,9 @@ let ext = stdenv.hostPlatform.extensions.sharedLibrary; in buildGoModule rec { pname = "librclone"; - inherit (rclone) version src patches vendorSha256; + inherit (rclone) version src vendorHash; + + patches = rclone.patches or [ ]; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix index b085e08080..4503a0cc43 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { url = "https://github.com/dajobe/raptor/commit/fa1ef9a27d8762f5588ac2e92554a188e73dee9f.diff"; sha256 = "sha256-zXIbrYGgC9oTpiD0WUikT4vRdc9b6bsyfnDkwUSlqao="; }) + # pull upstream fix for libxml2-2.11 API compatibility: + # https://github.com/dajobe/raptor/pull/58 + (fetchpatch { + name = "libxml2-2.11.patch"; + url = "https://github.com/dajobe/raptor/commit/4dbc4c1da2a033c497d84a1291c46f416a9cac51.patch"; + hash = "sha256-fHfvncGymzMtxjwtakCNSr/Lem12UPIHAAcAac648w4="; + }) ]; nativeBuildInputs = [ pkg-config cmake perl bison flex ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix index cfe7fb89bd..aec9cfaaf9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -13,7 +13,7 @@ , glfw , libGLU , curl -, cudaSupport ? config.cudaSupport or false, cudaPackages ? {} +, cudaSupport ? config.cudaSupport, cudaPackages ? { } , enablePython ? false, pythonPackages ? null , enableGUI ? false, }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 57ed620fbf..9974826573 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -30,30 +30,32 @@ , nix }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.55.1"; + version = "2.56.2"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a69IqdOlb9E7v7ufH3Z1myQLcKH6Ig/SOEdNZqkm+Yw="; + url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; + sha256 = "PsPE2Pc+C6S5EwAmlp6DccCStzQpjTbi/bPrSvzsEgA="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-nRmOB9Jo+mmB0+wXrQvoII4e0ucV7bNCDeuk6CbcPdk="; + inherit (finalAttrs) src; + name = "librsvg-deps-${finalAttrs.version}"; + hash = "sha256-GIEpZ5YMvmYQLcaLXseXQ6gIF7ICtUKq28JCVJ3PEYk="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; strictDeps = true; - depsBuildBuild = [ pkg-config ]; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ gdk-pixbuf @@ -100,6 +102,12 @@ stdenv.mkDerivation rec { ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders ''; + # librsvg only links Foundation, but it also requiers libobjc. The Framework.tbd in the 11.0 SDK + # reexports libobjc, but the one in the 10.12 SDK does not, so link it manually. + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + NIX_LDFLAGS = "-lobjc"; + }; + preConfigure = '' PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" export PKG_CONFIG_VAPIGEN_VAPIGEN @@ -137,6 +145,13 @@ stdenv.mkDerivation rec { # Merge gdkpixbuf and librsvg loaders cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache + + mkdir -p "$out/share/bash-completion/completions/" + $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" + mkdir -p "$out/share/zsh/site-functions/" + $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" + mkdir -p "$out/share/fish/vendor_completions.d/" + $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" ''; postFixup = lib.optionalString withIntrospection '' @@ -189,4 +204,4 @@ stdenv.mkDerivation rec { mainProgram = "rsvg-convert"; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix index 3274f22d65..e449a9085b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.4"; + version = "1.0.5"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "yiPHrI0QU6AcyPWlJoMlI3GvGZU+7+3mFcyR3ViJGzc="; + sha256 = "mHfhCKzLfP1BkqM+FiLUlo/I0TCe3G8C0lmO6007pMY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspelling/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspelling/default.nix new file mode 100644 index 0000000000..32c1af55a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libspelling/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, glib +, gtk4 +, gtksourceview5 +, enchant +, icu +}: + +stdenv.mkDerivation { + pname = "libspelling"; + version = "unstable-2023-07-17"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "chergert"; + repo = "libspelling"; + rev = "65185023db95ec464970aeaeab766fe3ba26ae7d"; + hash = "sha256-R3nPs16y8XGamQvMSF7wb52h0jxt17H2FZPwauLDI/c="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + buildInputs = [ + glib + gtk4 + gtksourceview5 + enchant + icu + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + meta = with lib; { + description = "Spellcheck library for GTK 4"; + homepage = "https://gitlab.gnome.org/chergert/libspelling"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chuangzhu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix index 4274ad0479..ca97bdbec8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsvm/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libsvm"; - version = "3.31"; + version = "3.32"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "sha256-AKtWH0jfX8kqhCCa2P5Rmery5Rmzwnm6z8k1l4p1zx8="; + sha256 = "sha256-hkTMZRjKiLvFDYyOrRc08aubbxcBcEXvmuOHc6plPa0="; }; patches = lib.optionals withOpenMP [ ./openmp.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix index 7755fffc7a..eceaf8c08f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libthai/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Set of Thai language support routines"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix new file mode 100644 index 0000000000..782a5ae486 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libtermkey +, unibilium +, libtool +}: +stdenv.mkDerivation rec { + pname = "libtickit"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "leonerd"; + repo = "libtickit"; + rev = "v${version}"; + hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; + }; + + makeFlags = [ + "PREFIX=$(out)" + "LIBTOOL=${lib.getExe libtool}" + ]; + + nativeBuildInputs = [ pkg-config libtool ]; + buildInputs = [ libtermkey unibilium ]; + + meta = with lib; { + description = "A terminal interface construction kit"; + longDescription = '' + This library provides an abstracted mechanism for building interactive full-screen terminal + programs. It provides a full set of output drawing functions, and handles keyboard and mouse + input events. + ''; + homepage = "https://www.leonerd.org.uk/code/libtickit/"; + license = licenses.mit; + maintainers = with maintainers; [ onemoresuza ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index 8d602a8c70..7796ec2515 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-VD+CTF0QLfzrUr4uFiyDlZux3MqsyyuJF/cXuhOFzwo="; + sha256 = "sha256-M6mAHvGl4d9EqdkDBSxSbpZUCUcrkpnf+hfo16L3eHs="; }; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 55a08d59ed..79b2e2ec29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TkMy2tEdG1FPPWfH/wPnVbs5kocqe4Y0jU4yvbiRZ9k="; }; - sourceRoot = "source/libvmaf"; + sourceRoot = "${src.name}/libvmaf"; patches = [ # Backport fix for non-Linux, non-Darwin platforms. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvoikko/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvoikko/default.nix new file mode 100644 index 0000000000..3f5f4ef5c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libvoikko/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, autoreconfHook +, hfst-ospell +, fetchFromGitHub +, pkg-config +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libvoikko"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "voikko"; + repo = "corevoikko"; + rev = "refs/tags/rel-libvoikko-${finalAttrs.version}"; + hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M="; + }; + + sourceRoot = "${finalAttrs.src.name}/libvoikko"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + hfst-ospell + ]; + + meta = with lib; { + homepage = "https://voikko.puimula.org/"; + description = "Finnish language processing library"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix index e45e36b0b5..d45155e800 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxcrypt"; - version = "4.4.35"; + version = "4.4.36"; src = fetchurl { url = "https://github.com/besser82/libxcrypt/releases/download/v${finalAttrs.version}/libxcrypt-${finalAttrs.version}.tar.xz"; - hash = "sha256-qMk1UFtV8d8NF/i/1ZRox8Zwmh0xgxsPjj4EWrj9RV0="; + hash = "sha256-5eH0yu4KAd4q7ibjE4gH1tPKK45nKHlm0f79ZeH9iUM="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix index a5eafa0fde..d670f8e969 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -34,7 +34,7 @@ in let libxml = stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.10.4"; + version = "2.11.4"; outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" @@ -43,24 +43,9 @@ libxml = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - sha256 = "7QyRxYRQCPGTZznk7uIDVTHByUdCxlQfRO5m2IWUjUU="; + sha256 = "c34df4qz8TlynKE6JJT9F78w3bS3pCfPM2JSyrV/V/c="; }; - patches = [ - # Upstream bugs: - # https://bugzilla.gnome.org/show_bug.cgi?id=789714 - # https://gitlab.gnome.org/GNOME/libxml2/issues/64 - # Patch from https://bugzilla.opensuse.org/show_bug.cgi?id=1065270 , - # but only the UTF-8 part. - # Can also be mitigated by fixing malformed XML inputs, such as in - # https://gitlab.gnome.org/GNOME/gnumeric/merge_requests/3 . - # Other discussion: - # https://github.com/itstool/itstool/issues/22 - # https://github.com/NixOS/nixpkgs/pull/63174 - # https://github.com/NixOS/nixpkgs/pull/72342 - ./utf8-xmlErrorFuncHandler.patch - ]; - strictDeps = true; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch b/third_party/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch deleted file mode 100644 index 9f4c99b093..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: libxml2-2.9.5/python/libxml.c -=================================================================== ---- libxml2-2.9.5.orig/python/libxml.c -+++ libxml2-2.9.5/python/libxml.c -@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU - PyObject *message; - PyObject *result; - char str[1000]; -+ unsigned char *ptr = (unsigned char *)str; - - #ifdef DEBUG_ERROR - printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); -@@ -1636,10 +1637,16 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU - str[999] = 0; - va_end(ap); - -+#if PY_MAJOR_VERSION >= 3 -+ /* Ensure the error string doesn't start at UTF8 continuation. */ -+ while (*ptr && (*ptr & 0xc0) == 0x80) -+ ptr++; -+#endif -+ - list = PyTuple_New(2); - PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); - Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); -- message = libxml_charPtrConstWrap(str); -+ message = libxml_charPtrConstWrap(ptr); - PyTuple_SetItem(list, 1, message); - result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); - Py_XDECREF(list); diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix index 054e0c4b9f..3a5c895574 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.37"; + version = "1.1.38"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Oksn3IAnzNYUZyWVAzbx7FIJKPMg8UTrX6eZCuYSOrQ="; + sha256 = "HzJFBCWBmgmsr/Krelp/ii7HlW5QXXvutF6EPQ4eyrE="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix index 0f2ad84063..f9bcdeb933 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzim/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Xh1SQNmG4lQ3f/g+i5m36LJO9JlPzP4bNqhyyKT7NEA="; + hash = "sha256-bhztigbiIGdVxBV5cpuHuuRGBN5UgC39w51uwLEq47w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix index 6ba8eaf6f1..3b71167cde 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzip/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.9.2"; + version = "1.10.0"; src = fetchurl { url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8="; + sha256 = "sha256-UqYLRhglh+CDtx4rgvyqumTdXrAcWx8bxxBpo4WOQP4="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix index 7ac716b326..25cb21a314 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true -, cudaSupport ? config.cudaSupport or false, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false +, cudaSupport ? config.cudaSupport, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false , rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }: assert doCheck -> mpiSupport != true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix index fb5409a7e7..d1a8c48872 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: +{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib, darwin }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; - patches = [ - ]; - configureFlags = [ "--with-ssl=openssl" ]; propagatedBuildInputs = [ openssl libidn glib zlib ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Foundation + ]; + meta = with lib; { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix index 71fb4214b8..a13b365506 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -13,6 +13,7 @@ , libsamplerate , libvorbis , libxml2 +, makeWrapper , movit , opencv4 , rtaudio @@ -20,7 +21,7 @@ , sox , vid-stab , darwin -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages ? { } , enableJackrack ? stdenv.isLinux , ladspa-sdk @@ -39,19 +40,20 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.16.0"; + version = "7.18.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik="; + hash = "sha256-3qvMuBr2w/gedTDIjG6ezatleXuQSnKX4SkBShzj6aw="; }; nativeBuildInputs = [ cmake pkg-config which + makeWrapper ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals enablePython [ @@ -102,11 +104,13 @@ stdenv.mkDerivation rec { "-DSWIG_PYTHON=ON" ]; - qtWrapperArgs = [ - "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - ] ++ lib.optionals enableJackrack [ - "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" - ]; + preFixup = '' + wrapProgram $out/bin/melt \ + --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 \ + ${lib.optionalString enableJackrack "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"} \ + ${lib.optionalString enableQt "\${qtWrapperArgs[@]}"} + + ''; postFixup = '' substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix new file mode 100644 index 0000000000..ef6134c3e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, mongoc +, cmake +, validatePkgConfig +, testers +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mongocxx"; + version = "3.8.0"; + + src = fetchFromGitHub { + owner = "mongodb"; + repo = "mongo-cxx-driver"; + rev = "refs/tags/r${finalAttrs.version}"; + hash = "sha256-7pMVBWMIGV6k04/0rKULwNcl0NMO4hqMnOzWv+0/DrA="; + }; + + postPatch = '' + substituteInPlace src/bsoncxx/config/CMakeLists.txt \ + src/mongocxx/config/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + ''; + + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; + + buildInputs = [ + mongoc + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=20" + "-DBUILD_VERSION=${finalAttrs.version}" + "-DENABLE_UNINSTALL=OFF" + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "The official C++ client library for MongoDB"; + homepage = "http://mongocxx.org"; + license = licenses.asl20; + maintainers = with maintainers; [ adriandole ]; + pkgConfigModules = [ "libmongocxx" "libbsoncxx" ]; + platforms = platforms.all; + badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14 + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix index a8dd555cb9..4601e04f03 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/movit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "movit"; - version = "1.6.3"; + version = "1.7.1"; src = fetchurl { url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; - sha256 = "164lm5sg95ca6k546zf775g3s79mgff0az96wl6hbmlrxh4z26gb"; + sha256 = "sha256-szBztwXwzLasSULPURUVFUB7QLtOmi3QIowcLLH7wRo="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix new file mode 100644 index 0000000000..fca89f8d0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/mqtt_cpp/default.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mqtt_cpp"; + version = "13.2.1"; + + src = fetchFromGitHub { + owner = "redboltz"; + repo = "mqtt_cpp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-E5dMZ0uJ1AOwiGTxD4qhbO72blplmXHh1gTYGE34H+0="; + }; + + nativeBuildInputs = [cmake]; + + buildInputs = [boost]; + + meta = with lib; { + description = "MQTT client/server for C++14 based on Boost.Asio"; + homepage = "https://github.com/redboltz/mqtt_cpp"; + license = licenses.boost; + maintainers = with maintainers; [spalf]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix index ded03015f3..fed8cee332 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix @@ -6,14 +6,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msgpack-c"; version = "6.0.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; - rev = "refs/tags/c-${version}"; + rev = "refs/tags/c-${finalAttrs.version}"; hash = "sha256-TfC37QKwqvHxsLPgsEqJYkb7mpRQekbntbBPV4v4FO8="; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built - ] ++ lib.optional (!doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + ] ++ lib.optional (!finalAttrs.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; checkInputs = [ gtest @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MessagePack implementation for C"; homepage = "https://github.com/msgpack/msgpack-c"; - changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.boost; maintainers = with maintainers; [ nickcao ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix index 50f7b1ed55..198593df50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/msgpack-cxx/default.nix @@ -6,14 +6,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msgpack-cxx"; version = "6.1.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; - rev = "refs/tags/cpp-${version}"; + rev = "refs/tags/cpp-${finalAttrs.version}"; hash = "sha256-VqzFmm3MmMhWyooOsz1d9gwwbn/fnnxpkCFwqKR6los="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built - ] ++ lib.optional doCheck "-DMSGPACK_BUILD_TESTS=ON"; + ] ++ lib.optional finalAttrs.doCheck "-DMSGPACK_BUILD_TESTS=ON"; checkInputs = [ zlib @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MessagePack implementation for C++"; homepage = "https://github.com/msgpack/msgpack-c"; - changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.boost; maintainers = with maintainers; [ nickcao ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix index f2d3a55955..f8e02b6577 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mutest/default.nix @@ -1,20 +1,22 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , meson , ninja +, unstableGitUpdater }: stdenv.mkDerivation { pname = "mutest"; - version = "unstable-2019-08-26"; + version = "0-unstable-2023-02-24"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "ebassi"; repo = "mutest"; - rev = "e6246c9ae4f36ffe8c021f0a80438f6c7a6efa3a"; - sha256 = "0gdqwq6fvk06wld4rhnw5752hahrvhd69zrci045x25rwx90x26q"; + rev = "18a20071773f7c4b75e82a931ef9b916b273b3e5"; + sha256 = "z0kASte0/I48Fgxhblu24MjGHidWomhfFOhfStGtPn4="; }; nativeBuildInputs = [ @@ -24,8 +26,12 @@ stdenv.mkDerivation { doCheck = true; + passthru = { + updateScript = unstableGitUpdater { }; + }; + meta = with lib; { - homepage = "https://ebassi.github.io/mutest/mutest.md.html"; + homepage = "https://github.com/ebassi/mutest"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix index c79f1c9089..cb8333704f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -139,6 +139,13 @@ stdenv.mkDerivation (finalAttrs: { done done + # add pkg-config aliases for libraries that are built-in to libncurses(w) + for library in tinfo tic; do + for suffix in "" w; do + ln -svf ncurses$suffix.pc $dev/lib/pkgconfig/$library$suffix.pc + done + done + # move some utilities to $bin # these programs are used at runtime and don't really belong in $dev moveToOutput "bin/clear" "$out" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index c7977ed89d..d7b31426c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -6,7 +6,7 @@ , python3 , python3Packages , wafHook -, boost +, boost179 , openssl , sqlite }: @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - buildInputs = [ boost openssl sqlite ]; + buildInputs = [ boost179 openssl sqlite ]; wafConfigureFlags = [ "--with-openssl=${openssl.dev}" - "--boost-includes=${boost.dev}/include" - "--boost-libs=${boost.out}/lib" + "--boost-includes=${boost179.dev}/include" + "--boost-libs=${boost179.out}/lib" "--with-tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 9dc9503694..05b51d73b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-jbD//8BNqzX2T2F0JH+Vsoi/D+8HZIPXGnHoj3hzqPk="; + hash = "sha256-ypoq+wXBaA5p5ZjRC8SNn9jHcMHHLJZLDLNOFMoua0g="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix index 4be20ad1ff..dfe3b066c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.91"; - hash = "sha256-hL1GN23xcRjFX21z0w/ZOgryEpbGbnaQRxVH5YmPxLM="; + version = "3.92"; + hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix b/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix new file mode 100644 index 0000000000..1ad0076eeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, fetchgit +}: + +stdenv.mkDerivation rec { + pname = "nv-codec-headers"; + version = "12.0.16.0"; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + sha256 = "sha256-8YZU9pb0kzat0JBVEotaZUkNicQvLNIrIyPU9KTTjwg="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "FFmpeg version of headers for NVENC"; + homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; + license = licenses.mit; + maintainers = with maintainers; [ MP2E ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix index 679b2c61c4..f68b57f193 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nvidia-thrust/default.nix @@ -8,7 +8,7 @@ , symlinkJoin , tbb , hostSystem ? "CPP" -, deviceSystem ? if config.cudaSupport or false then "CUDA" else "OMP" +, deviceSystem ? if config.cudaSupport then "CUDA" else "OMP" }: # Policy for device_vector diff --git a/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix index 40e81e195a..6b1816d8ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/octomap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; }; - sourceRoot = "source/octomap"; + sourceRoot = "${src.name}/octomap"; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix b/third_party/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix deleted file mode 100644 index 73f15b744b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, cmake -, pkg-config -, boost -, freeimage -, freetype -, libpng -, ois -, zziplib -, freeglut -, libGL -, libGLU -, libICE -, libSM -, libX11 -, libXaw -, libXmu -, libXrandr -, libXrender -, libXt -, libXxf86vm -, xorgproto -, darwin -, withNvidiaCg ? false -, nvidia_cg_toolkit -, withSamples ? false -}: - -let - inherit (darwin.apple_sdk.frameworks) AGL Cocoa; -in -stdenv.mkDerivation rec { - pname = "ogre"; - version = "1.10.11"; - - src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v${lib.replaceStrings ["."] ["-"] version}.tar.gz"; - sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; - }; - - patches = [ - # aarch64-darwin support - (fetchpatch { - url = "https://github.com/OGRECave/ogre/commit/bd5fbe3482c56e58c6c3b3bf439b1eab8c1be258.patch"; - includes = [ "OgreMain/include/OgrePlatform*.h" ]; - sha256 = "sha256-ELeCklQkltz7DeDaGl78Jk1H3Wdfu8fMUiMZaJM4s/Y="; - }) - (fetchpatch { - url = "https://github.com/OGRECave/ogre/commit/0873244cc06b613ca2afbcb5522fe9ef89f111c5.patch"; - sha256 = "sha256-xGvlMB55B2rdthxNMIM5iFf9p/6zuE8bGL9P04qtweQ="; - }) - # aarch64-linux support - (fetchpatch { - name = "fix-build-on-aarch64-linux.patch"; - url = "https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69.patch"; - sha256 = "sha256-22wlJPZ7lRIPAMqvpI/2YI0neQjGi1UXt8y5zNSpxCw="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost - freeimage - freetype - libpng - ois - zziplib - ] ++ lib.optionals stdenv.isLinux [ - freeglut - libGL - libGLU - libICE - libSM - libX11 - libXaw - libXmu - libXrandr - libXrender - libXt - libXxf86vm - xorgproto - ] ++ lib.optionals stdenv.isDarwin [ - AGL - Cocoa - ] ++ lib.optionals withNvidiaCg [ - nvidia_cg_toolkit - ]; - - cmakeFlags = [ - "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" - "-DOGRE_BUILD_SAMPLES=${toString withSamples}" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" - ]; - - meta = { - description = "3D Object-Oriented Graphics Rendering Engine"; - homepage = "https://www.ogre3d.org/"; - maintainers = with lib.maintainers; [ raskin wegank ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix index ce49519371..6bac6c5a42 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -27,72 +27,85 @@ , libXxf86vm , xorgproto # darwin -, Cocoa +, darwin # optional , withNvidiaCg ? false , nvidia_cg_toolkit , withSamples ? false }: -stdenv.mkDerivation rec { - pname = "ogre"; - version = "13.6.4"; +let + common = { version, hash }: stdenv.mkDerivation { + pname = "ogre"; + inherit version; - src = fetchFromGitHub { - owner = "OGRECave"; - repo = "ogre"; - rev = "v${version}"; - hash = "sha256-MSBWCO0s46t+ExWDdmqi16OxmcQXnduhgFt6I4BG1g8="; + src = fetchFromGitHub { + owner = "OGRECave"; + repo = "ogre"; + rev = "v${version}"; + inherit hash; + }; + + nativeBuildInputs = [ + cmake + pkg-config + unzip + ]; + + buildInputs = [ + SDL2 + boost + freeimage + freetype + libpng + ois + pugixml + zziplib + ] ++ lib.optionals stdenv.isLinux [ + freeglut + libGL + libGLU + libICE + libSM + libX11 + libXaw + libXmu + libXrandr + libXrender + libXt + libXxf86vm + xorgproto + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ] ++ lib.optionals withNvidiaCg [ + nvidia_cg_toolkit + ]; + + cmakeFlags = [ + "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" + "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + ]; + + meta = { + description = "3D Object-Oriented Graphics Rendering Engine"; + homepage = "https://www.ogre3d.org/"; + maintainers = with lib.maintainers; [ raskin wegank ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + }; + }; +in +{ + ogre_14 = common { + version = "14.0.1"; + hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU="; }; - nativeBuildInputs = [ - cmake - pkg-config - unzip - ]; - - buildInputs = [ - SDL2 - boost - freeimage - freetype - libpng - ois - pugixml - zziplib - ] ++ lib.optionals stdenv.isLinux [ - freeglut - libGL - libGLU - libICE - libSM - libX11 - libXaw - libXmu - libXrandr - libXrender - libXt - libXxf86vm - xorgproto - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ] ++ lib.optionals withNvidiaCg [ - nvidia_cg_toolkit - ]; - - cmakeFlags = [ - "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" - "-DOGRE_BUILD_DEPENDENCIES=OFF" - "-DOGRE_BUILD_SAMPLES=${toString withSamples}" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" - ]; - - meta = { - description = "3D Object-Oriented Graphics Rendering Engine"; - homepage = "https://www.ogre3d.org/"; - maintainers = with lib.maintainers; [ raskin wegank ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; + ogre_13 = common { + version = "13.6.5"; + hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE="; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix new file mode 100644 index 0000000000..d6d0f1741d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, autoreconfHook +, cg3 +, fetchFromGitHub +, hfst +, hfst-ospell +, icu +, libvoikko +, makeWrapper +, pkg-config +, python3 +, zip +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "omorfi"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "flammie"; + repo = "omorfi"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; + }; + + # Fix for omorfi-hyphenate.sh file not found error + postInstall = '' + ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} + ''; + + nativeBuildInputs = [ + autoreconfHook + cg3 + makeWrapper + pkg-config + python3 + zip + python3.pkgs.wrapPython + ]; + + buildInputs = [ + python3.pkgs.hfst + hfst-ospell + libvoikko + ]; + + # Supplied pkg-config file doesn't properly expose these + propagatedBuildInputs = [ + hfst + icu + ]; + + # Wrap shell scripts so they find the Python scripts + # omorfi.bash inexplicably fails when wrapped + preFixup = '' + wrapPythonProgramsIn "$out/bin" "$out ${python3.pkgs.hfst}" + for i in "$out/bin"/*.{sh,bash}; do + if [ $(basename "$i") != "omorfi.bash" ]; then + wrapProgram "$i" --prefix "PATH" : "$out/bin/" + fi + done + ''; + + # Enable all features + configureFlags = [ + "--enable-labeled-segments" + "--enable-lemmatiser" + "--enable-segmenter" + "--enable-hyphenator" + ]; + + meta = with lib; { + description = "Analysis for Finnish text"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Darwin build fails due to hfst not being found + broken = stdenv.isDarwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 0d36ce7ae4..99e45c1013 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -1,59 +1,98 @@ { stdenv , lib , fetchFromGitHub +, fetchFromGitLab , fetchpatch , fetchurl -, pkg-config -, cmake -, python3Packages -, libpng -, zlib -, eigen -, protobuf -, howard-hinnant-date -, nlohmann_json -, boost -, oneDNN_2 +, Foundation , abseil-cpp -, gtest -, pythonSupport ? false +, cmake +, libpng +, nlohmann_json , nsync -, flatbuffers +, pkg-config +, python3Packages +, re2 +, zlib +, microsoft-gsl +, iconv +, gtest +, protobuf3_21 +, pythonSupport ? true }: -# Python Support -# -# When enabling Python support a wheel is made and stored in a `dist` output. -# This wheel is then installed in a separate derivation. -assert pythonSupport -> lib.versionOlder protobuf.version "3.20"; +let + howard-hinnant-date = fetchFromGitHub { + owner = "HowardHinnant"; + repo = "date"; + rev = "v2.4.1"; + sha256 = "sha256-BYL7wxsYRI45l8C3VwxYIIocn5TzJnBtU0UZ9pHwwZw="; + }; + eigen = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = "d10b27fe37736d2944630ecd7557cefa95cf87c9"; + sha256 = "sha256-Lmco0s9gIm9sIw7lCr5Iewye3RmrHEE4HLfyzRkQCm0="; + }; + + mp11 = fetchFromGitHub { + owner = "boostorg"; + repo = "mp11"; + rev = "boost-1.79.0"; + sha256 = "sha256-ZxgPDLvpISrjpEHKpLGBowRKGfSwTf6TBfJD18yw+LM="; + }; + + safeint = fetchFromGitHub { + owner = "dcleblanc"; + repo = "safeint"; + rev = "ff15c6ada150a5018c5ef2172401cb4529eac9c0"; + sha256 = "sha256-PK1ce4C0uCR4TzLFg+elZdSk5DdPCRhhwT3LvEwWnPU="; + }; + + pytorch_cpuinfo = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + # There are no tags in the repository + rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; + sha256 = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A="; + }; + + flatbuffers = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + rev = "v1.12.0"; + sha256 = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg="; + }; + + gtest' = gtest.overrideAttrs (oldAttrs: rec { + version = "1.13.0"; + src = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "v${version}"; + hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; + }; + }); +in stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.13.1"; + version = "1.15.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "sha256-paaeq6QeiOzwiibbz0GkYZxEI/V80lvYNYTm6AuyAXQ="; + sha256 = "sha256-SnHo2sVACc++fog7Tg6f2LK/Sv/EskFzN7RZS7D113s="; fetchSubmodules = true; }; - patches = [ - # Use dnnl from nixpkgs instead of submodules - (fetchpatch { - name = "system-dnnl.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=9c392fb542979981fe0026e0fe3cc361a5f00a36"; - sha256 = "sha256-+kedzJHLFU1vMbKO9cn8fr+9A5+IxIuiqzOfR2AfJ0k="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config python3Packages.python - gtest + protobuf3_21 ] ++ lib.optionals pythonSupport (with python3Packages; [ setuptools wheel @@ -64,18 +103,26 @@ stdenv.mkDerivation rec { buildInputs = [ libpng zlib - howard-hinnant-date nlohmann_json - boost - oneDNN_2 - protobuf - ] ++ lib.optionals pythonSupport [ nsync + re2 + microsoft-gsl + ] ++ lib.optionals pythonSupport [ python3Packages.numpy python3Packages.pybind11 python3Packages.packaging + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + iconv ]; + nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [ + gtest' + pytest + sympy + onnx + ]); + # TODO: build server, and move .so's to lib output # Python's wheel is stored in a separate dist output outputs = [ "out" "dev" ] ++ lib.optionals pythonSupport [ "dist" ]; @@ -85,15 +132,23 @@ stdenv.mkDerivation rec { cmakeDir = "../cmake"; cmakeFlags = [ - "-Donnxruntime_PREFER_SYSTEM_LIB=ON" - "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_ENABLE_LTO=ON" - "-Donnxruntime_BUILD_UNIT_TESTS=ON" - "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" - "-Donnxruntime_USE_MPI=ON" - "-Deigen_SOURCE_PATH=${eigen.src}" + "-DCMAKE_BUILD_TYPE=RELEASE" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + "-DFETCHCONTENT_QUIET=OFF" "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" - "-Donnxruntime_USE_DNNL=YES" + "-DFETCHCONTENT_SOURCE_DIR_DATE=${howard-hinnant-date}" + "-DFETCHCONTENT_SOURCE_DIR_EIGEN=${eigen}" + "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers}" + "-DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${nsync.src}" + "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" + "-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}" + "-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}" + "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" + "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" + "-Donnxruntime_BUILD_SHARED_LIB=ON" + "-Donnxruntime_BUILD_UNIT_TESTS=ON" + "-Donnxruntime_ENABLE_LTO=ON" + "-Donnxruntime_USE_FULL_PROTOBUF=OFF" ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" ]; @@ -103,6 +158,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ + '' + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' + # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 + rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc ''; postBuild = lib.optionalString pythonSupport '' @@ -118,7 +176,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit protobuf; + protobuf = protobuf3_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; @@ -140,6 +198,6 @@ stdenv.mkDerivation rec { # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ jonringer puffnfresh ck3d ]; + maintainers = with maintainers; [ jonringer puffnfresh ck3d cbourjau ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix index 58307198f7..3732103d73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix @@ -100,7 +100,7 @@ let description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; license = licenses.ncsa; platforms = platforms.all; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 40614f489b..0188e5e1ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -14,7 +14,7 @@ , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true -, enableCuda ? (config.cudaSupport or false) && +, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 , cudaPackages ? { } , enableUnfree ? false diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 3f120e2558..c82f0a0065 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -37,7 +37,7 @@ , blas , enableContrib ? true -, enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix index 03a89db088..d1966b1a4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/tests.nix @@ -39,7 +39,7 @@ let "stitching" "video" ] ++ lib.optionals (!stdenv.isAarch64 && enableGStreamer) [ "gapi" ]; - testRunner = if stdenv.isDarwin then "" else "${lib.getExe xvfb-run} -a "; + testRunner = lib.optionalString (!stdenv.isDarwin) "${lib.getExe xvfb-run} -a "; testsPreparation = '' touch $out # several tests want a write access, so we have to copy files diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix index 048d91432b..1a135fa6d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/default.nix @@ -41,11 +41,13 @@ stdenv.mkDerivation rec { ./gcc-13.patch ]; - # tests are determined to use /var/tmp on unix postPatch = '' + # tests are determined to use /var/tmp on unix find . -name tmpDir.h | while read -r f ; do substituteInPlace $f --replace '/var/tmp' "$TMPDIR" done + # On slower machines this test can take more than the default 1500 seconds + echo 'set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 3000)' >> OpenEXR/IlmImfTest/CMakeLists.txt ''; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index 0f659654e2..eded5f1b5b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,9 @@ { lib , stdenv , fetchurl -, fetchpatch # dependencies , cyrus_sasl -, db , groff , libsodium , libtool @@ -19,11 +17,11 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - hash = "sha256-1RcE5QF4QwwGzz2KoXTaZrrfVZdHpH2SC7VLLUqkCZE="; + hash = "sha256-Lieo1PTCr4/oQLVzJxwgqhY+JJh/l2UhRkQpD1vrONk="; }; # TODO: separate "out" and "bin" @@ -46,7 +44,6 @@ stdenv.mkDerivation rec { (cyrus_sasl.override { inherit openssl; }) - db libsodium libtool openssl diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index e9a0fece56..937669fc58 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx - +, config # Enable CUDA support -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport, cudatoolkit # Enable the Sun Grid Engine bindings , enableSGE ? false diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch new file mode 100644 index 0000000000..d1622977b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch @@ -0,0 +1,54 @@ +From 6a83f0c958811f07e0d11dfc6b5a6a98edfd5bdc Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Tue, 4 Jul 2023 17:30:35 +0200 +Subject: [PATCH] Do not ignore empty associated data with AES-SIV mode + +The AES-SIV mode allows for multiple associated data items +authenticated separately with any of these being 0 length. + +The provided implementation ignores such empty associated data +which is incorrect in regards to the RFC 5297 and is also +a security issue because such empty associated data then become +unauthenticated if an application expects to authenticate them. + +Fixes CVE-2023-2975 + +Reviewed-by: Matt Caswell +Reviewed-by: Paul Dale +(Merged from https://github.com/openssl/openssl/pull/21384) + +(cherry picked from commit c426c281cfc23ab182f7d7d7a35229e7db1494d9) +--- + .../implementations/ciphers/cipher_aes_siv.c | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c +index 45010b90db2a..b396c8651a32 100644 +--- a/providers/implementations/ciphers/cipher_aes_siv.c ++++ b/providers/implementations/ciphers/cipher_aes_siv.c +@@ -120,14 +120,18 @@ static int siv_cipher(void *vctx, unsigned char *out, size_t *outl, + if (!ossl_prov_is_running()) + return 0; + +- if (inl == 0) { +- *outl = 0; +- return 1; +- } ++ /* Ignore just empty encryption/decryption call and not AAD. */ ++ if (out != NULL) { ++ if (inl == 0) { ++ if (outl != NULL) ++ *outl = 0; ++ return 1; ++ } + +- if (outsize < inl) { +- ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); +- return 0; ++ if (outsize < inl) { ++ ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL); ++ return 0; ++ } + } + + if (ctx->hw->cipher(ctx, out, in, inl) <= 0) diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 548b5ee1f2..fae2c5f1cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -142,7 +142,19 @@ let # trying to build binaries statically. ++ lib.optional static "no-ct" ++ lib.optional withZlib "zlib" - ; + ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [ + # This is necessary in order to avoid openssl adding -march + # flags which ultimately conflict with those added by + # cc-wrapper. Openssl assumes that it can scan CFLAGS to + # detect any -march flags, using this perl code: + # + # && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}}) + # + # The following bogus CFLAGS environment variable triggers the + # the code above, inhibiting `./Configure` from adding the + # conflicting flags. + "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}" + ]; makeFlags = [ "MANDIR=$(man)/share/man" @@ -224,8 +236,8 @@ in { # the permitted insecure version to ensure it gets cached for our users # and backport this to stable release (23.05). openssl_1_1 = common { - version = "1.1.1u"; - sha256 = "sha256-4vjYS1I+7NBse+diaDA3AwD7zBU4a/UULXJ1j2lj68Y="; + version = "1.1.1v"; + sha256 = "sha256-1ml+KHHncjhGBALpNi1H0YOCsV758karpse9eA04prA="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -251,6 +263,9 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch + # https://www.openssl.org/news/secadv/20230714.txt + ./3.0/CVE-2023-2975.patch + (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 9511f4f56f..4cd398e639 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 -, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudaSupport ? config.cudaSupport, cudatoolkit # For visibility mostly. The whole approach to cuda architectures and capabilities # will be reworked soon. , cudaArch ? "compute_37" diff --git a/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix index c60d79fd49..05a3cefaec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - sourceRoot = "source/orocos_kdl"; + sourceRoot = "${src.name}/orocos_kdl"; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 1f2646a036..7f545958e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - hash = "sha256-1QIMEGBZsqLYU3v5ZswD5K9VcIGLBovJlC10lBHhH7c="; + hash = "sha256-paLiRYgYshuedgDgW2nEsv4/Loq6qFyQMjfBJwqtHzw="; }; outputs = [ "out" "bin" "dev"]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix index 61c4d7b134..3264469340 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.5.8"; + version = "4.5.9"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-aL/icjoP0SQIWXiR0pCrSevkQYDdzPfZGx4xjmPr0AU="; + hash = "sha256-2Q49+T1RH0DaQ8u0ypbvFdcPrLoO1G+XpVuYn9/4jRk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index e0614c7374..fc0afbe218 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -7,14 +7,6 @@ stdenv.mkDerivation rec { pname = "phonon-backend-gstreamer"; version = "4.10.0"; - meta = with lib; { - homepage = "https://phonon.kde.org/"; - description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21; - }; - src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"; @@ -34,17 +26,16 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - env.NIX_CFLAGS_COMPILE = - let gstPluginPaths = - lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" - (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ]); + env.NIX_CFLAGS_COMPILE = let + gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" + (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]); in toString [ # This flag should be picked up through pkg-config, but it isn't. "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" @@ -70,4 +61,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; + + meta = with lib; { + homepage = "https://phonon.kde.org/"; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 3048a1a51a..0916eae246 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.309"; + version = "8.310"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-W9r9nyxKHEf9ik6C+58Nj8+6TeEAO44Uvk4DR0NtbDM="; + sha256 = "sha256-kMgRq+ej0v/b+bSuq1HPbgpai++04++oBvPVucMR4ic="; }; nativeBuildInputs = [ rsync ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix index e04b79c16d..12b4cb021c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # SDK contains libraries and build-system to develop projects for RP2040 chip # We only need to compile pioasm binary - sourceRoot = "source/tools/pioasm"; + sourceRoot = "${src.name}/tools/pioasm"; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix b/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix new file mode 100644 index 0000000000..fd1c1ae34b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub + +# build +, cmake +, pkg-config + +# runtime +, espeak-ng +, onnxruntime +}: + +let + espeak-ng' = espeak-ng.overrideAttrs (oldAttrs: { + version = "1.52-dev"; + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "espeak-ng"; + rev = "61504f6b76bf9ebbb39b07d21cff2a02b87c99ff"; + hash = "sha256-RBHL11L5uazAFsPFwul2QIyJREXk9Uz8HTZx9JqmyIQ="; + }; + + patches = [ + ./espeak-mbrola.patch + ]; + }); +in +stdenv.mkDerivation rec { + pname = "piper-phonemize"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "piper-phonemize"; + rev = "refs/tags/v${version}"; + hash = "sha256-cMer7CSLOXv3jc9huVA3Oy5cjXjOX9XuEXpIWau1BNQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + espeak-ng' + onnxruntime + ]; + + passthru = { + espeak-ng = espeak-ng'; + }; + + meta = with lib; { + description = "C++ library for converting text to phonemes for Piper"; + homepage = "https://github.com/rhasspy/piper-phonemize"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch b/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch new file mode 100644 index 0000000000..9d3f0aeb4a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch @@ -0,0 +1,26 @@ +diff --git a/src/libespeak-ng/mbrowrap.c b/src/libespeak-ng/mbrowrap.c +index ae137873..9015cc01 100644 +--- a/src/libespeak-ng/mbrowrap.c ++++ b/src/libespeak-ng/mbrowrap.c +@@ -206,7 +206,7 @@ static int start_mbrola(const char *voice_path) + signal(SIGTERM, SIG_IGN); + + snprintf(charbuf, sizeof(charbuf), "%g", mbr_volume); +- execlp("mbrola", "mbrola", "-e", "-v", charbuf, ++ execlp("@mbrola/bin/mbrola", "mbrola", "-e", "-v", charbuf, + voice_path, "-", "-.wav", (char *)NULL); + /* if execution reaches this point then the exec() failed */ + snprintf(mbr_errorbuf, sizeof(mbr_errorbuf), +diff --git a/src/libespeak-ng/synth_mbrola.c b/src/libespeak-ng/synth_mbrola.c +index 734631b7..46d1f13e 100644 +--- a/src/libespeak-ng/synth_mbrola.c ++++ b/src/libespeak-ng/synth_mbrola.c +@@ -85,7 +85,7 @@ espeak_ng_STATUS LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, + if (!load_MBR()) + return ENS_MBROLA_NOT_FOUND; + +- sprintf(path, "%s/mbrola/%s", path_home, mbrola_voice); ++ sprintf(path, "@mbrola@/share/mbrola/voices/%s/%s", mbrola_voice, mbrola_voice); + #if PLATFORM_POSIX + // if not found, then also look in + // usr/share/mbrola/xx, /usr/share/mbrola/xx/xx, /usr/share/mbrola/voices/xx diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix index 2593c04fa1..2fa5a4d268 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am"; }; - sourceRoot = "source/scripts"; + sourceRoot = "${src.name}/scripts"; buildPhase = '' $CC nad2bin.c -o nad2bin diff --git a/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index bd6ebbd8e3..378b6babd7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qtquick1 +, qmake +, qtmultimedia +, utmp +}: stdenv.mkDerivation { - version = "2018-11-24"; - pname = "qmltermwidget-unstable"; + pname = "qmltermwidget"; + version = "unstable-2022-01-09"; src = fetchFromGitHub { repo = "qmltermwidget"; owner = "Swordfish90"; - rev = "48274c75660e28d44af7c195e79accdf1bd44963"; - sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6"; + rev = "63228027e1f97c24abb907550b22ee91836929c5"; + hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ="; }; - buildInputs = [ qtbase qtquick1 qtmultimedia ] - ++ lib.optional stdenv.isDarwin utmp; nativeBuildInputs = [ qmake ]; + buildInputs = [ + qtbase + qtquick1 + qtmultimedia + ] ++ lib.optional stdenv.isDarwin utmp; + patches = [ - (fetchpatch { - name = "fix-missing-includes.patch"; - url = "https://github.com/Swordfish90/qmltermwidget/pull/27/commits/485f8d6d841b607ba49e55a791f7f587e4e193bc.diff"; - sha256 = "186s8pv3642vr4lxsds919h0y2vrkl61r7wqq9mc4a5zk5vprinj"; - }) + # Some files are copied twice to the output which makes the build fails + ./do-not-copy-artifacts-twice.patch ]; postPatch = '' @@ -28,7 +37,7 @@ stdenv.mkDerivation { --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" ''; - installFlags = [ "INSTALL_ROOT=$(out)" ]; + installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ]; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch new file mode 100644 index 0000000000..a10c4b1605 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch @@ -0,0 +1,10 @@ +diff --git a/qmltermwidget.pro b/qmltermwidget.pro +index c9594a9..aa1a804 100644 +--- a/qmltermwidget.pro ++++ b/qmltermwidget.pro +@@ -62,4 +62,4 @@ kblayouts2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts/historic + scrollbar.files = $$PWD/src/QMLTermScrollbar.qml + scrollbar.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH + +-INSTALLS += target qmldir assets colorschemes colorschemes2 kblayouts kblayouts2 scrollbar ++INSTALLS += target qmldir assets diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix index eeb830d3fe..53ed6eeb80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix @@ -3,18 +3,18 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qrcodegen"; version = "1.8.0"; src = fetchFromGitHub { owner = "nayuki"; repo = "QR-Code-generator"; - rev = "v${version}"; - sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY="; }; - sourceRoot = "source/c"; + sourceRoot = "${finalAttrs.src.name}/c"; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm.out @@ -22,23 +22,31 @@ stdenv.mkDerivation rec { makeFlags = lib.optionals stdenv.cc.isClang [ "AR=llvm-ar" ]; + doCheck = true; + checkPhase = '' + runHook preCheck + + ./qrcodegen-test + + runHook postCheck + ''; + installPhase = '' runHook preInstall - mkdir -p $out/lib $out/include/qrcodegen - cp libqrcodegen.a $out/lib - cp qrcodegen.h $out/include/qrcodegen/ + install -Dt $out/lib/ libqrcodegen.a + install -Dt $out/include/qrcodegen/ qrcodegen.h runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://www.nayuki.io/page/qr-code-generator-library"; description = "High-quality QR Code generator library in many languages"; - license = licenses.mit; - maintainers = with maintainers; [ mcbeth AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) # TODO: build the other languages # TODO: multiple outputs diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 68a300ac25..a8257a36d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -173,9 +173,9 @@ stdenv.mkDerivation rec { "-make" "libs" "-make" "tools" "-make" "translations" "-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend" ]) ++ [ - "-${if demos then "" else "no"}make" "demos" - "-${if examples then "" else "no"}make" "examples" - "-${if docs then "" else "no"}make" "docs" + "-${lib.optionalString (!demos) "no"}make" "demos" + "-${lib.optionalString (!examples) "no"}make" "examples" + "-${lib.optionalString (!docs) "no"}make" "docs" ] ++ lib.optional developerBuild "-developer-build" ++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ] ++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh index 9152133443..519f2f887d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 1cf228d4e2..43c6dade7d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,12 @@ qtModule rec { pname = "qtmqtt"; - version = "6.5.1"; + version = "6.5.2"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-tXCLb4ZWgdPSfnlGKsKNW9kJ57cm8+d8y416O42NZvk="; + hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0="; }; qtInputs = [ qtbase ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index 77b5284c9c..a0ac367f16 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -1,310 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 { fetchurl, mirror }: { qt3d = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt3d-everywhere-src-6.5.1.tar.xz"; - sha256 = "16v875hv58f1cnb76c8pd63v44fncfdrv29b008bamxs23lf2m3y"; - name = "qt3d-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz"; + sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11"; + name = "qt3d-everywhere-src-6.5.2.tar.xz"; + }; + }; + qt5 = { + version = "6.5.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz"; + sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515"; + name = "qt5-everywhere-src-6.5.2.tar.xz"; }; }; qt5compat = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt5compat-everywhere-src-6.5.1.tar.xz"; - sha256 = "10zvah04mnyg5apkwq015kxs03y467naicxy8ljfzazgbwljp6df"; - name = "qt5compat-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz"; + sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"; + name = "qt5compat-everywhere-src-6.5.2.tar.xz"; }; }; qtactiveqt = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.tar.xz"; - sha256 = "0yii7ihvzncwqhrb1635my5arr6lymr2d3wnwpcn42b7l6krsk6d"; - name = "qtactiveqt-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz"; + sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x"; + name = "qtactiveqt-everywhere-src-6.5.2.tar.xz"; }; }; qtbase = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtbase-everywhere-src-6.5.1.tar.xz"; - sha256 = "1vdzxrcfhn6ym7p8jzr3xxx1r4r435fx461lwfgii8838cgzlmnv"; - name = "qtbase-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz"; + sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"; + name = "qtbase-everywhere-src-6.5.2.tar.xz"; }; }; qtcharts = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtcharts-everywhere-src-6.5.1.tar.xz"; - sha256 = "0xfgj970ip0fn2gxrsilg1gvq4w2849vs6gysn0qhnz7qw7m0nxi"; - name = "qtcharts-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz"; + sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp"; + name = "qtcharts-everywhere-src-6.5.2.tar.xz"; }; }; qtconnectivity = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtconnectivity-everywhere-src-6.5.1.tar.xz"; - sha256 = "0yl2i4qdmvdzspnr0jpf031gd2cndkx4hppy5sdjppy4g2dlrmrg"; - name = "qtconnectivity-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz"; + sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv"; + name = "qtconnectivity-everywhere-src-6.5.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdatavis3d-everywhere-src-6.5.1.tar.xz"; - sha256 = "0cx3bmbwg0y99495zp1gafs4bfn75dbf6r6dfgy1ii9i66y2lcsj"; - name = "qtdatavis3d-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz"; + sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8"; + name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz"; }; }; qtdeclarative = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdeclarative-everywhere-src-6.5.1.tar.xz"; - sha256 = "0yff5nbcspl3w3231wvgvac38q0lskxx1l2wm1lx2raac7wlh490"; - name = "qtdeclarative-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz"; + sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"; + name = "qtdeclarative-everywhere-src-6.5.2.tar.xz"; }; }; qtdoc = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdoc-everywhere-src-6.5.1.tar.xz"; - sha256 = "0c9ckm7rcp3vi7qipzqyqpar2f5l426s8vgdz71q1ccx432a0kj1"; - name = "qtdoc-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz"; + sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3"; + name = "qtdoc-everywhere-src-6.5.2.tar.xz"; }; }; qtgrpc = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtgrpc-everywhere-src-6.5.1.tar.xz"; - sha256 = "1r27m7c1ab1gk2hzi4d9mpvk1kc5zypx6d6q9wa7kv26d4d2vgls"; - name = "qtgrpc-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz"; + sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks"; + name = "qtgrpc-everywhere-src-6.5.2.tar.xz"; }; }; qthttpserver = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qthttpserver-everywhere-src-6.5.1.tar.xz"; - sha256 = "0z7wrvfln7mr7n1i1pijx36c6wi66dm91mdir5f8gqk15i84zpj7"; - name = "qthttpserver-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz"; + sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq"; + name = "qthttpserver-everywhere-src-6.5.2.tar.xz"; }; }; qtimageformats = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtimageformats-everywhere-src-6.5.1.tar.xz"; - sha256 = "1daxijk9mb2gb65pxjdqw4r5vjs3vi20d4lixq6mh0xdk717yzw9"; - name = "qtimageformats-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz"; + sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"; + name = "qtimageformats-everywhere-src-6.5.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlanguageserver-everywhere-src-6.5.1.tar.xz"; - sha256 = "1j9bhd4k30ana08nppqqll6v5nxr9dzxqxsh12i2cihjr9mcr9lr"; - name = "qtlanguageserver-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz"; + sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"; + name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz"; }; }; qtlocation = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlocation-everywhere-src-6.5.1.tar.xz"; - sha256 = "1x0j6r0gll469aq75viyyyw1gfl180rcyq0h83z35664jzx1i2mn"; - name = "qtlocation-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz"; + sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9"; + name = "qtlocation-everywhere-src-6.5.2.tar.xz"; }; }; qtlottie = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlottie-everywhere-src-6.5.1.tar.xz"; - sha256 = "10bbq952iv3f2v42nqirld0qy363g03zdq6hlh1lfcbmgc8gif0h"; - name = "qtlottie-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz"; + sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"; + name = "qtlottie-everywhere-src-6.5.2.tar.xz"; }; }; qtmultimedia = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtmultimedia-everywhere-src-6.5.1.tar.xz"; - sha256 = "1k71chjdh66yv13li38ig507wpsr7cn87nqkvcfxmkf8w5hca7qb"; - name = "qtmultimedia-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz"; + sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"; + name = "qtmultimedia-everywhere-src-6.5.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtnetworkauth-everywhere-src-6.5.1.tar.xz"; - sha256 = "18viv41qazcbix9l21g5vz1r6zp6mxnbl2c2j3ip1yln7rmbac57"; - name = "qtnetworkauth-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz"; + sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"; + name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz"; }; }; qtpositioning = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtpositioning-everywhere-src-6.5.1.tar.xz"; - sha256 = "08m41rx1yd28dr53pfrdfvgkmnszqyax88jhqczcb048w50gjg05"; - name = "qtpositioning-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz"; + sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"; + name = "qtpositioning-everywhere-src-6.5.2.tar.xz"; }; }; qtquick3d = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3d-everywhere-src-6.5.1.tar.xz"; - sha256 = "07ncn3gl3yvdq8ly3rn7693lzq0slghmw9ljq119s4bbsnk2ddji"; - name = "qtquick3d-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz"; + sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m"; + name = "qtquick3d-everywhere-src-6.5.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3dphysics-everywhere-src-6.5.1.tar.xz"; - sha256 = "1j0kfqdwx8x7bagw8qjkywsd2fzih2yp36vza2hil56m35s8ibcl"; - name = "qtquick3dphysics-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; + sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m"; + name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquickeffectmaker-everywhere-src-6.5.1.tar.xz"; - sha256 = "18lhvf9mlprmg0jba9biciscns12zvwr5jj81kkvv0mv8h3yrg2i"; - name = "qtquickeffectmaker-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; + sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym"; + name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquicktimeline-everywhere-src-6.5.1.tar.xz"; - sha256 = "0lfm997p5x5nn4zlz2p1djd3757b0m00347xkfy9n6y5fsidny8h"; - name = "qtquicktimeline-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz"; + sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9"; + name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtremoteobjects-everywhere-src-6.5.1.tar.xz"; - sha256 = "16v2qzn5lf5bxrdff4fr624x5n262qvhinrk0vfmcdvrb2plgkvq"; - name = "qtremoteobjects-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz"; + sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"; + name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz"; }; }; qtscxml = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtscxml-everywhere-src-6.5.1.tar.xz"; - sha256 = "0xr4005b640r1h7nbfmgjban9mihxgm4sfqizw30xhsjpg4a6ghw"; - name = "qtscxml-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz"; + sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58"; + name = "qtscxml-everywhere-src-6.5.2.tar.xz"; }; }; qtsensors = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsensors-everywhere-src-6.5.1.tar.xz"; - sha256 = "19dbci4487anpkm85n1yly1mm5zx1f5dgx08v5ar5462f61wlnn9"; - name = "qtsensors-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz"; + sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0"; + name = "qtsensors-everywhere-src-6.5.2.tar.xz"; }; }; qtserialbus = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialbus-everywhere-src-6.5.1.tar.xz"; - sha256 = "0zqmbqnaf8ln6kdf5nc9k4q618d7jd4dmc2gsmgcf2mz55w9dzyv"; - name = "qtserialbus-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz"; + sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph"; + name = "qtserialbus-everywhere-src-6.5.2.tar.xz"; }; }; qtserialport = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialport-everywhere-src-6.5.1.tar.xz"; - sha256 = "19ijnjy5bqv7g74q2ax4pvmggphpccckszxilj0vkqnl8q34smf3"; - name = "qtserialport-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz"; + sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06"; + name = "qtserialport-everywhere-src-6.5.2.tar.xz"; }; }; qtshadertools = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtshadertools-everywhere-src-6.5.1.tar.xz"; - sha256 = "0ljhysyiwxawws0481hyk1xbycc21jg6gq5fsn8yyi2rhdhng075"; - name = "qtshadertools-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz"; + sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"; + name = "qtshadertools-everywhere-src-6.5.2.tar.xz"; }; }; qtspeech = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtspeech-everywhere-src-6.5.1.tar.xz"; - sha256 = "1djp6ijjvl94zajbvgz80xnzd2fpkq8fnnpxnq9jg5jny6jhn4k7"; - name = "qtspeech-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz"; + sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8"; + name = "qtspeech-everywhere-src-6.5.2.tar.xz"; }; }; qtsvg = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsvg-everywhere-src-6.5.1.tar.xz"; - sha256 = "1vq8jvz13hp9nj9r77f0nx7nq3pciy4sk1j6d2dzbw243m4jk3fm"; - name = "qtsvg-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz"; + sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"; + name = "qtsvg-everywhere-src-6.5.2.tar.xz"; }; }; qttools = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttools-everywhere-src-6.5.1.tar.xz"; - sha256 = "0a93xg65z19bldwhc77x87khjwkx3hs01z1gjdznza5jhjgdyi2p"; - name = "qttools-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz"; + sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"; + name = "qttools-everywhere-src-6.5.2.tar.xz"; }; }; qttranslations = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttranslations-everywhere-src-6.5.1.tar.xz"; - sha256 = "16ylh1hf7r4g8s0h6wgkngwy1p75qnq6byz1q14wwzk3q8s2qzjj"; - name = "qttranslations-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz"; + sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"; + name = "qttranslations-everywhere-src-6.5.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz"; - sha256 = "1h9whvpdy37vazl095qqvsl8d2b298v2i25fsvr04x9ns3b47cl9"; - name = "qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; + sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05"; + name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; }; }; qtwayland = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwayland-everywhere-src-6.5.1.tar.xz"; - sha256 = "0kcp1adgszcrwv89f2m3rp2ldbrbnb7prkr8065w5j9ik2hiw7vw"; - name = "qtwayland-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz"; + sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"; + name = "qtwayland-everywhere-src-6.5.2.tar.xz"; }; }; qtwebchannel = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebchannel-everywhere-src-6.5.1.tar.xz"; - sha256 = "0jpc231gmgy540x9im8ld1fjmxqjaw1c40r6d2g5gxrpwxkl6drb"; - name = "qtwebchannel-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz"; + sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"; + name = "qtwebchannel-everywhere-src-6.5.2.tar.xz"; }; }; qtwebengine = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebengine-everywhere-src-6.5.1.tar.xz"; - sha256 = "0clcxkybgn5ny22rbdckxczqsf5gc3f55q7r02l5q7q6biqbs61g"; - name = "qtwebengine-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz"; + sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"; + name = "qtwebengine-everywhere-src-6.5.2.tar.xz"; }; }; qtwebsockets = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebsockets-everywhere-src-6.5.1.tar.xz"; - sha256 = "06fsc42x571af78rlx8ah7i9nqc9qnzqvd1mmrx12xd6a2r6d3vb"; - name = "qtwebsockets-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz"; + sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"; + name = "qtwebsockets-everywhere-src-6.5.2.tar.xz"; }; }; qtwebview = { - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebview-everywhere-src-6.5.1.tar.xz"; - sha256 = "0r1six7k9nz1n64c8ff1j24x2dfrr931aiwygpsf36bim27bdbvb"; - name = "qtwebview-everywhere-src-6.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz"; + sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr"; + name = "qtwebview-everywhere-src-6.5.2.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 6198a05934..b914495429 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 libX11 libXext ]; - sourceRoot = "source/Kvantum"; + sourceRoot = "${src.name}/Kvantum"; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index af4f194efc..0d9d1d42c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; - sourceRoot = "source/Kvantum"; + sourceRoot = "${src.name}/Kvantum"; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 9b866a26e6..93ecaa698f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + dontWrapQtApps = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix index 7dbd272e43..5af34139f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -37,6 +37,21 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = [ raylib-games ]; + patches = [ + # Patch version in CMakeList to 4.5.0 + # Remove this when updating to a new revision + (fetchpatch { + url = "https://github.com/raysan5/raylib/commit/0d4db7ad7f6fd442ed165ebf8ab8b3f4033b04e7.patch"; + hash = "sha256-RGokbQAwJAZm2FU2VNwraE3xko8E+RLLFjUfDRXeKhA="; + }) + ]; + + # fix libasound.so/libpulse.so not being found + preFixup = '' + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${finalAttrs.version}"} + ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${finalAttrs.version}"} + ''; + meta = with lib; { description = "A simple and easy-to-use library to enjoy videogames programming"; homepage = "https://www.raylib.com/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix index 325de9151b..d1136d4be8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-test"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/tests"; + sourceRoot = "${finalAttrs.src.name}/clients/tests"; nativeBuildInputs = [ cmake @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-benchmark"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/rider"; + sourceRoot = "${finalAttrs.src.name}/clients/rider"; nativeBuildInputs = [ cmake @@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-samples"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/samples"; + sourceRoot = "${finalAttrs.src.name}/clients/samples"; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 8a6b72f521..f35ff4c5ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -1,15 +1,21 @@ -{ stdenv, lib, fetchurl, bzip2, zlib }: +{ stdenv +, lib +, fetchurl +, bzip2 +, curl +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cfitsio"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "sha256-66U9Gz9uNFYyuwmnt1LsfO09Y+xRU6hIOA84gMXWGIk="; + url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz"; + hash = "sha256-/a3AHQnPn1QlOALF7IfrEN5RzkEwQRQVrojDCUBiG4s="; }; - buildInputs = [ bzip2 zlib ]; + buildInputs = [ bzip2 curl zlib ]; patches = [ ./darwin-rpath-universal.patch ]; @@ -22,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = with lib; { + meta = { homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; longDescription = @@ -35,8 +41,8 @@ stdenv.mkDerivation rec { FITS files. ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; - license = licenses.mit; - maintainers = with maintainers; [ xbreak hjones2199 ]; - platforms = with platforms; linux ++ darwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xbreak hjones2199 ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index bb16d8b11e..7090e15dc3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -12,17 +12,18 @@ , libjpeg , gsl , fftw +, gtest }: stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.8"; + version = "2.0.2"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-+KFuZgM/Bl6Oezq3WXjWCHefc1wvR3wOKXejmT0pw1U="; + hash = "sha256-GoEvWzGT3Ckv9Syif6Z2kAlnvg/Kt5I8SpGFG9kFTJo="; }; nativeBuildInputs = [ @@ -45,14 +46,24 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" + ] ++ lib.optional doCheck [ + "-DINDI_BUILD_UNITTESTS=ON" + "-DINDI_BUILD_INTEGTESTS=ON" ]; + checkInputs = [ gtest ]; + + doCheck = true; + + # Socket address collisions between tests + enableParallelChecking = false; + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 7144a17c18..2423a6e20e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -17,6 +17,7 @@ , libdc1394 , gpsd , ffmpeg +, limesuite , version , src , withFirmware ? false @@ -33,22 +34,22 @@ stdenv.mkDerivation rec { buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw + limesuite ] ++ lib.optionals withFirmware [ firmware ]; postPatch = '' - for f in indi-qsi/CMakeLists.txt \ - indi-dsi/CMakeLists.txt \ - indi-armadillo-platypus/CMakeLists.txt \ - indi-orion-ssg3/CMakeLists.txt - do + for f in $(find . -name "CMakeLists.txt"); do substituteInPlace $f \ --replace "/lib/udev/rules.d" "lib/udev/rules.d" \ --replace "/etc/udev/rules.d" "lib/udev/rules.d" \ --replace "/lib/firmware" "lib/firmware" done + substituteInPlace libpktriggercord/CMakeLists.txt \ + --replace "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)" + sed '1i#include ' -i indi-duino/libfirmata/src/firmata.cpp # gcc12 ''; @@ -57,11 +58,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d" - # Pentax, Atik, and SX cmakelists are currently broken - "-DWITH_PENTAX=off" - "-DWITH_ATIK=off" - "-DWITH_SX=off" ] ++ lib.optionals (!withFirmware) [ + "-DWITH_ATIK=off" "-DWITH_APOGEE=off" "-DWITH_DSI=off" "-DWITH_QHY=off" @@ -75,7 +73,7 @@ stdenv.mkDerivation rec { description = "Third party drivers for the INDI astronomical software suite"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 660433c2dd..7875051cbf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -19,6 +19,7 @@ , ffmpeg , version , src +, autoPatchelfHook }: stdenv.mkDerivation rec { @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { inherit version src; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake autoPatchelfHook ]; buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { description = "Third party firmware for the INDI astronomical software suite"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ hjones2199 ]; + maintainers = with maintainers; [ hjones2199 sheepforce ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index fae8b95cb2..6b110a152e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,30 +1,29 @@ { stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-version = "1.9.8"; + inherit (indilib) version; indi-3rdparty-src = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; - rev = "v${indi-version}"; - sha256 = "sha256-ZFbMyjMvAWcdsl+1TyX5/v5nY1DqvhZ2ckFBDe8gdQg="; + rev = "v${version}"; + hash = "sha256-xAGSFTOfO9P8JldzY59OnQULzf2Mlx3vWjoP+IDdEFE="; }; indi-firmware = callPackage ./indi-firmware.nix { - version = indi-version; + inherit version; src = indi-3rdparty-src; }; indi-3rdparty = callPackage ./indi-3rdparty.nix { - version = indi-version; + inherit version; src = indi-3rdparty-src; - withFirmware = stdenv.isx86_64; + withFirmware = stdenv.isx86_64 || stdenv.isAarch64; firmware = indi-firmware; }; in callPackage ./indi-with-drivers.nix { pname = "indi-full"; - version = indi-version; + inherit version; extraDrivers = [ indi-3rdparty - ] ++ lib.optionals stdenv.isx86_64 [ - indi-firmware - ]; + ] ++ lib.optional (stdenv.isx86_64 || stdenv.isAarch64) indi-firmware + ; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index 2ad8424975..a7c388339d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -11,7 +11,8 @@ , enableOpencl ? true , opencl-headers , ocl-icd -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudaPackages , addOpenGLRunpath }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index 57139f8bcd..1f5e4b250a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -13,13 +13,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "simple-dftd3"; - version = "0.7.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dftd3"; repo = pname; rev = "v${version}"; - hash = "sha256-5OvmMgjD8ujjKHkuw4NT8hEXKh5YPxuBl/Mu6g2/KIA="; + hash = "sha256-dfXiKKCGJ69aExSKpVC3Bp//COy256R9PDyxCNmDsfo="; }; nativeBuildInputs = [ cmake gfortran ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index cdfa924b22..e0a6ffd9d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -94,6 +94,7 @@ in # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix index d67f31375e..21e6cbf858 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -5,7 +5,7 @@ , stdenv , cmake , cudaPackages ? { } -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , nvidia-thrust , useThrustSourceBuild ? true , pythonSupport ? true diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index d10da6843c..04f263568c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -86,29 +86,6 @@ let # "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273 "${minArch'}0"; - cuda-common-redist = with cudaPackages; [ - libcublas # cublas_v2.h - libcusparse # cusparse.h - ]; - - # Build-time dependencies - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof # - ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api # - ] ++ cuda-common-redist; - }; - - # Run-time dependencies - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in assert (builtins.match "[^[:space:]]*" gpuTargetString) != null; @@ -128,16 +105,22 @@ stdenv.mkDerivation { ninja gfortran ] ++ lists.optionals cudaSupport [ - cuda-native-redist + cudaPackages.cuda_nvcc ]; buildInputs = [ libpthreadstubs lapack blas - ] ++ lists.optionals cudaSupport [ - cuda-redist - ] ++ lists.optionals rocmSupport [ + ] ++ lists.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + libcublas # cublas_v2.h + libcusparse # cusparse.h + ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ + cuda_nvprof # + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + cuda_profiler_api # + ]) ++ lists.optionals rocmSupport [ hip hipblas hipsparse diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 95eeaeb8ab..cbc24b1546 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, gfortran, blas, lapack -, enableCuda ? false, cudatoolkit +, config +, enableCuda ? config.cudaSupport, cudatoolkit }: let diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index 51b55592d4..67dfef186e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -6,7 +6,8 @@ , fixDarwinDylibNames , gmp , mpfr -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 3426b0149a..1ac08ce0cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -1,203 +1,104 @@ { stdenv , bash -, abseil-cpp +, buildPackages +, buildBazelPackage , fetchFromGitHub -, fetchFromGitLab -, fetchpatch -, fetchurl -, flatbuffers , lib -, zlib }: let - tflite-eigen = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = "3d9051ea84a5089b277c88dac456b3b1576bfa7f"; - sha256 = "1y3f2jvimb5i904f4n37h23cv2pkdlbz8656s0kga1y7c0p50wif"; - }; - - gemmlowp-src = fetchFromGitHub { - owner = "google"; - repo = "gemmlowp"; - rev = "fda83bdc38b118cc6b56753bd540caa49e570745"; - sha256 = "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"; - }; - - neon-2-sse-src = fetchFromGitHub { - owner = "intel"; - repo = "ARM_NEON_2_x86_SSE"; - rev = "1200fe90bb174a6224a525ee60148671a786a71f"; - sha256 = "0fhxch711ck809dpq1myxz63jiiwfcnxvj45ww0kg8s0pqpn5kv6"; - }; - - farmhash-src = fetchFromGitHub { - owner = "google"; - repo = "farmhash"; - rev = "816a4ae622e964763ca0862d9dbd19324a1eaf45"; - sha256 = "1mqxsljq476n1hb8ilkrpb39yz3ip2hnc7rhzszz4sri8ma7qzp6"; - }; - - fft2d-src = fetchurl { - url = "http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz"; - sha256 = "ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9"; - }; - - fp16-src = fetchFromGitHub { - owner = "Maratyszcza"; - repo = "FP16"; - rev = "4dfe081cf6bcd15db339cf2680b9281b8451eeb3"; - sha256 = "06a8dfl3a29r93nxpp6hpywsajz5d555n3sqd3i6krybb6swnvh7"; - }; - - ruy-src = fetchFromGitHub { - owner = "google"; - repo = "ruy"; - rev = "23633b37099b614a2f836ef012cafc8087fdb98c"; - sha256 = "14k9hz6ss8qy8nsajk6lrq25f6qxrldxky31ijw0dpqnfnnswrx4"; - }; - - cpuinfo-src = fetchFromGitHub { - owner = "pytorch"; - repo = "cpuinfo"; - rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; - sha256 = "0q6760xdxsg18acdv8vq3yrq7ksr7wsm8zbyan01zf2khnb6fw4x"; + buildPlatform = stdenv.buildPlatform; + hostPlatform = stdenv.hostPlatform; + pythonEnv = buildPackages.python3.withPackages (ps: [ ps.numpy ]); + bazelDepsSha256ByBuildAndHost = { + x86_64-linux = { + x86_64-linux = "sha256-61qmnAB80syYhURWYJOiOnoGOtNa1pPkxfznrFScPAo="; + aarch64-linux = "sha256-sOIYpp98wJRz3RGvPasyNEJ05W29913Lsm+oi/aq/Ag="; + }; + aarch64-linux = { + aarch64-linux = "sha256-MJU4y9Dt9xJWKgw7iKW+9Ur856rMIHeFD5u05s+Q7rQ="; + }; }; + bazelHostConfigName.aarch64-linux = "elinux_aarch64"; + bazelDepsSha256ByHost = + bazelDepsSha256ByBuildAndHost.${buildPlatform.system} or + (throw "unsupported build system ${buildPlatform.system}"); + bazelDepsSha256 = bazelDepsSha256ByHost.${hostPlatform.system} or + (throw "unsupported host system ${hostPlatform.system} with build system ${buildPlatform.system}"); in -stdenv.mkDerivation rec { - pname = "tensorflow-lite"; - version = "2.5.0"; +buildBazelPackage rec { + name = "tensorflow-lite"; + version = "2.13.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l"; + hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0="; }; - patches = [ - # TODO: remove on the next version bump - (fetchpatch { - name = "include-schema-conversion-utils-source.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/f3c4f4733692150fd6174f2cd16438cfaba2e5ab.patch"; - sha256 = "0zx4hbz679kn79f30159rl1mq74dg45cvaawii0cyv48z472yy4k"; - }) - # TODO: remove on the next version bump - (fetchpatch { - name = "cxxstandard-var.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/9b128ae4200e10b4752f903492d1e7d11957ed5c.patch"; - sha256 = "1q0izdwdji5fbyqll6k4dmkzfykyvvz5cvc6hysdj285nkn2wy6h"; - }) + bazel = buildPackages.bazel_5; + + nativeBuildInputs = [ pythonEnv buildPackages.perl ]; + + bazelTargets = [ + "//tensorflow/lite:libtensorflowlite.so" + "//tensorflow/lite/c:tensorflowlite_c" + "//tensorflow/lite/tools/benchmark:benchmark_model" + "//tensorflow/lite/tools/benchmark:benchmark_model_performance_options" ]; - buildInputs = [ zlib flatbuffers ]; + bazelFlags = [ + "--config=opt" + ] ++ lib.optionals (hostPlatform.system != buildPlatform.system) [ + "--config=${bazelHostConfigName.${hostPlatform.system}}" + ]; - dontConfigure = true; + bazelBuildFlags = [ "--cxxopt=--std=c++17" ]; + + buildAttrs = { + installPhase = '' + mkdir -p $out/{bin,lib} + + # copy the libs and binaries into the output dir + cp ./bazel-bin/tensorflow/lite/c/libtensorflowlite_c.so $out/lib + cp ./bazel-bin/tensorflow/lite/libtensorflowlite.so $out/lib + cp ./bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model $out/bin + cp ./bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model_performance_options $out/bin + + find . -type f -name '*.h' | while read f; do + path="$out/include/''${f/.\//}" + install -D "$f" "$path" + + # remove executable bit from headers + chmod -x "$path" + done + ''; + }; + + fetchAttrs.sha256 = bazelDepsSha256; + + PYTHON_BIN_PATH = pythonEnv.interpreter; + + dontAddBazelOpts = true; + removeRulesCC = false; postPatch = '' - substituteInPlace ./tensorflow/lite/tools/make/Makefile \ - --replace /bin/bash ${bash}/bin/bash \ - --replace /bin/sh ${bash}/bin/sh + rm .bazelversion ''; - makefile = "tensorflow/lite/tools/make/Makefile"; - - preBuild = - let - includes = - lib.concatMapStringsSep - " " - (subdir: "-I $PWD/tensorflow/lite/tools/make/downloads/${subdir}") - [ - "neon_2_sse" - "gemmlowp" - "absl" - "fp16/include" - "farmhash/src" - "ruy" - "cpuinfo" - "cpuinfo/src" - "cpuinfo/include" - "cpuinfo/deps/clog/include" - "eigen" - ]; - in - '' - # enter the vendoring lair of doom - - prefix="$PWD/tensorflow/lite/tools/make/downloads" - - mkdir -p "$prefix" - - tar xzf ${fft2d-src} -C "$prefix" - - ln -s ${ruy-src} "$prefix/ruy" - ln -s ${gemmlowp-src} "$prefix/gemmlowp" - ln -s ${neon-2-sse-src} "$prefix/neon_2_sse" - ln -s ${farmhash-src} "$prefix/farmhash" - ln -s ${cpuinfo-src} "$prefix/cpuinfo" - ln -s ${fp16-src} "$prefix/fp16" - ln -s ${tflite-eigen} "$prefix/eigen" - - # tensorflow lite is using the *source* of flatbuffers - ln -s ${flatbuffers.src} "$prefix/flatbuffers" - - # tensorflow lite expects to compile abseil into `libtensorflow-lite.a` - ln -s ${abseil-cpp.src} "$prefix/absl" - - # set CXXSTANDARD=c++17 here because abseil-cpp in nixpkgs is set as - # such and would be used in dependents like libedgetpu - buildFlagsArray+=( - INCLUDES="-I $PWD ${includes}" - CXXSTANDARD="-std=c++17" - TARGET_TOOLCHAIN_PREFIX="" - -j$NIX_BUILD_CORES - all) - ''; - - installPhase = '' - mkdir "$out" - - # copy the static lib and binaries into the output dir - cp -r ./tensorflow/lite/tools/make/gen/linux_${stdenv.hostPlatform.uname.processor}/{bin,lib} "$out" - - find ./tensorflow/lite -type f -name '*.h' | while read f; do - path="$out/include/''${f/.\//}" - install -D "$f" "$path" - - # remove executable bit from headers - chmod -x "$path" - done + preConfigure = '' + patchShebangs configure ''; + # configure script freaks out when parameters are passed + dontAddPrefix = true; + configurePlatforms = []; + meta = with lib; { description = "An open source deep learning framework for on-device inference."; homepage = "https://www.tensorflow.org/lite"; license = licenses.asl20; - maintainers = with maintainers; [ cpcloud ]; + maintainers = with maintainers; [ mschwaig cpcloud ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - knownVulnerabilities = [ - # at least some of - "CVE-2023-27579" - "CVE-2023-25801" - "CVE-2023-25676" - "CVE-2023-25675" - "CVE-2023-25674" - "CVE-2023-25673" - "CVE-2023-25671" - "CVE-2023-25670" - "CVE-2023-25669" - "CVE-2023-25668" - "CVE-2023-25667" - "CVE-2023-25665" - "CVE-2023-25666" - "CVE-2023-25664" - "CVE-2023-25663" - "CVE-2023-25662" - "CVE-2023-25660" - "CVE-2023-25659" - "CVE-2023-25658" - # and many many more - ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index a9a4eec6e5..6502888890 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-6Wa/rnm5lPATeqbQJ6QC+pn8D3l/petPvokEewXYEUA="; + sha256 = "sha256-JJFHRoG/w5PLSrn99i4EUjRtbNUYDF19/xlsYOwwFZA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix index bd372a5627..0ef61ca360 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi -, libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut +, libICE, libSM, libXt, libXmu, libGLU, libGL, boost179, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr, xz , curl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ plib freeglut xorgproto libX11 libXext libXi - libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut + libICE libSM libXt libXmu libGLU libGL boost179 zlib libjpeg freealut openscenegraph openal expat apr curl xz ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix index 5c72d65327..f25ac14df8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; - buildInputs = [ SDL gtk2 libGLU libGL ]; + buildInputs = [ SDL ] ++ lib.optionals (!stdenv.isDarwin) [ gtk2 libGLU libGL ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index 223bbec1d4..f2f9b6ec88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.15"; + version = "1.13.16"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mDcXr9JPYtuz2EtonoeuimH1VsEKbNr/Q0gs+a7azTU="; + sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix index bde66f292c..fe648a2ce7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fmt +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +# Although we include upstream patches that fix compilation with fmt_10, we +# still use fmt_9 because this dependency is propagated, and many of spdlog's +# reverse dependencies don't support fmt_10 yet. +, fmt_9 , staticBuild ? stdenv.hostPlatform.isStatic # tests @@ -29,7 +37,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ fmt ]; + propagatedBuildInputs = [ fmt_9 ]; cmakeFlags = [ "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix index fee0cb4216..4406aa0218 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stb"; - version = "unstable-2021-09-10"; + version = "unstable-2023-01-29"; src = fetchFromGitHub { owner = "nothings"; repo = "stb"; - rev = "af1a5bc352164740c1cc1354942b1c6b72eacb8a"; - sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr"; + rev = "5736b15f7ea0ffb08dd38af21067c314d6a3aae9"; + hash = "sha256-s2ASdlT3bBNrqvwfhhN6skjbmyEnUgvNOrvhgUSRj98="; }; nativeBuildInputs = [ copyPkgconfigItems ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix index 6a88fae373..47a512b56a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.5.1"; + version = "6.6.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-QlIwOAUXHk290ZoB5Swdz+Da/FmcPP7bClwv+wRainU="; + hash = "sha256-+QApuNqEbI+v9VMP0fpIRweRiNBAVU9VwdXR4EdD0p0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tclap/1.2.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix rename to third_party/nixpkgs/pkgs/development/libraries/tclap/1.2.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/tclap/1.4.nix b/third_party/nixpkgs/pkgs/development/libraries/tclap/1.4.nix new file mode 100644 index 0000000000..7a0b576596 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/tclap/1.4.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchgit +, cmake +, doxygen +, python3 +}: +stdenv.mkDerivation { + pname = "tclap"; + + # This version is slightly newer than 1.4.0-rc1: + # See https://github.com/mirror/tclap/compare/1.4.0-rc1..3feeb7b2499b37d9cb80890cadaf7c905a9a50c6 + version = "1.4-3feeb7b"; + + src = fetchgit { + url = "git://git.code.sf.net/p/tclap/code"; + rev = "3feeb7b2499b37d9cb80890cadaf7c905a9a50c6"; # 1.4 branch + hash = "sha256-byLianB6Vf+I9ABMmsmuoGU2o5RO9c5sMckWW0F+GDM="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + nativeBuildInputs = [ + cmake + doxygen + python3 + ]; + + # Installing docs is broken in this package+version so we stub out some files + preInstall = '' + touch docs/manual.html + ''; + + doCheck = true; + + meta = with lib; { + description = "Templatized C++ Command Line Parser Library (v1.4)"; + homepage = "https://tclap.sourceforge.net/"; + license = licenses.mit; + maintainers = teams.deshaw.members; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix index fd6b21a94f..acb3a24048 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.18.0"; + version = "0.18.1"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-fBk4nLeRCiDli45GkDyMGjY1MAj5/MGwP3SKzPm18+E="; + hash = "sha256-BMbxDl14jKeOE+4u8NIVLHsHDAr1VIPWuULinP8pZyY="; }; # Workaround to make the Python wrapper not drop this package: @@ -102,6 +102,9 @@ stdenv.mkDerivation rec { "SecurityFromBufferTest" "python_test" + # fails on hydra, passes locally + "concurrency_test" + # Tests that fail in the Darwin sandbox when trying to use network "UnitTests" "TInterruptTest" diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 1df7553e6c..ce54681799 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -4,6 +4,7 @@ , fetchpatch , gettext , meson +, mesonEmulatorHook , ninja , pkg-config , asciidoc @@ -32,13 +33,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.5.1"; + version = "3.5.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+XLVCse6/czxE7HrmdyuNUBGhameVb/vFvOsg7Tel00="; + sha256 = "FGbIsIl75dngVth+EK1YkntYgDPwGvLxplaokhw6KO4="; }; patches = [ @@ -71,6 +72,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withIntrospection [ gobject-introspection vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix index 56cebc08dc..e26e6e603f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit , enableAvx ? stdenv.hostPlatform.avxSupport , enableSse41 ? stdenv.hostPlatform.sse4_1Support diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index 1af9a7ce7c..4ded9c2860 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen, numactl , rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config -, enableCuda ? false +, config +, enableCuda ? config.cudaSupport , cudatoolkit , enableRocm ? false , rocm-core, rocm-runtime, rocm-device-libs, hip diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index b40f465546..cb1a8dccff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -18,14 +18,14 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; version = "0.17.17"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; + url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; sha256 = "sha256-IOYhseRYsyADz+qZc5tngkuGZShUqLzjPiYSTjR/32w="; }; @@ -50,10 +50,13 @@ stdenv.mkDerivation rec { buildInputs = [ glib systemd - libgudev libpcap ]; + checkInputs = lib.optionals finalAttrs.passthru.withGudev [ + libgudev + ]; + nativeCheckInputs = [ python3 which @@ -81,12 +84,25 @@ stdenv.mkDerivation rec { ln -s "$PWD/libumockdev-preload.so.0" "$out/lib/libumockdev-preload.so.0" ''; + passthru = { + # libgudev is needed for an optional test but it itself relies on umockdev for testing. + withGudev = false; + + tests = { + withGudev = finalAttrs.finalPackage.overrideAttrs (attrs: { + passthru = attrs.passthru // { + withGudev = true; + }; + }); + }; + }; + meta = with lib; { homepage = "https://github.com/martinpitt/umockdev"; - changelog = "https://github.com/martinpitt/umockdev/releases/tag/${version}"; + changelog = "https://github.com/martinpitt/umockdev/releases/tag/${finalAttrs.version}"; description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; platforms = with platforms; linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 429fae7feb..dc53bbb54d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.31"; + version = "1.32"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-oH+nIu2HZ27AINhncUvJovJMRk2nORLzlwbu71IZ4jg="; + hash = "sha256-dFl5nTQMgpa2le+FfAfd7yTFoJsJq2p097kmQNKxuhE="; }; postPatch = lib.optionalString doCheck '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 35811b8129..57168b2cc1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.40.3"; + version = "2.40.5"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-zAqoP0DbxkwcauQuxrha9L4qnb9STPy5X4mjZ/tQmN0="; + hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix index 8877365e1d..23dc8dc3b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, freepats }: +{ lib, stdenv, fetchFromGitHub, writeTextFile, cmake, alsa-lib, OpenAL, freepats }: +let + defaultCfgPath = "${placeholder "out"}/etc/wildmidi/wildmidi.cfg"; +in stdenv.mkDerivation rec { pname = "wildmidi"; version = "0.4.5"; @@ -13,21 +16,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ alsa-lib stdenv.cc.libc/*couldn't find libm*/ ]; + buildInputs = lib.optionals stdenv.buildPlatform.isLinux [ + alsa-lib stdenv.cc.libc/*couldn't find libm*/ + ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ + OpenAL + ]; preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace /etc/wildmidi $out/etc # https://github.com/Mindwerks/wildmidi/issues/236 substituteInPlace src/wildmidi.pc.in \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; - postInstall = '' - mkdir "$out"/etc - echo "dir ${freepats}" > "$out"/etc/wildmidi.cfg - echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg + cmakeFlags = [ + "-DWILDMIDI_CFG=${defaultCfgPath}" + ]; + + postInstall = let + defaultCfg = writeTextFile { + name = "wildmidi.cfg"; + text = '' + dir ${freepats} + source ${freepats}/freepats.cfg + ''; + }; + in '' + mkdir -p "$(dirname ${defaultCfgPath})" + ln -s ${defaultCfg} ${defaultCfgPath} ''; meta = with lib; { @@ -39,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix index dbb2fa03d4..726640293e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -50,7 +50,7 @@ let strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ] + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ] ++ extraNativeBuildInputs; buildInputs = [ @@ -110,23 +110,14 @@ let in rec { - wlroots_0_14 = generic { - version = "0.14.1"; - hash = "sha256-wauk7TCL/V7fxjOZY77KiPbfydIc9gmOiYFOuum4UOs="; - }; - wlroots_0_15 = generic { version = "0.15.1"; hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; - extraBuildInputs = [ vulkan-loader ]; - extraNativeBuildInputs = [ glslang ]; }; wlroots_0_16 = generic { version = "0.16.2"; hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; - extraBuildInputs = [ vulkan-loader ]; - extraNativeBuildInputs = [ glslang ]; extraPatch = '' substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix index 8b92e78d2b..c9adf68115 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix @@ -40,7 +40,7 @@ let description = "C++ library for developing web applications"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ juliendehos willibutz ]; + maintainers = with maintainers; [ juliendehos ]; }; }; in { diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix index cc7406b114..c88c7d42b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; + mainProgram = "xdg-dbus-proxy"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 766f944f15..c25bc2f512 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "44.1"; + version = "44.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NoLFRsgZIqW6adYthvacDCaxfJCWgj9YFJ0LVbvw7ts="; + sha256 = "UO0arCkDA+oLxchAqcEWWRhUarSnOiTFLcqicHK1/yE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix index c7509bc43a..0a254b1095 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xercesc/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ stdenv +, lib +, fetchurl +, curl +}: stdenv.mkDerivation rec { pname = "xerces-c"; @@ -9,8 +13,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-PY7Bx/lOOP7g5Mpa0eHZ2yPL86ELumJva0r6Le2v5as="; }; - # Disable SSE2 extensions on platforms for which they are not enabled by default - configureFlags = [ "--disable-sse2" ]; + buildInputs = [ + curl + ]; + + configureFlags = [ + # Disable SSE2 extensions on platforms for which they are not enabled by default + "--disable-sse2" + "--enable-netaccessor-curl" + ]; + enableParallelBuilding = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix new file mode 100644 index 0000000000..bde2dfefee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix @@ -0,0 +1,45 @@ +{ lib +, clangStdenv +, fetchFromGitHub +, cmake +, cppzmq +, libuuid +, nlohmann_json +, openssl +, xeus +, xtl +, zeromq +}: + +clangStdenv.mkDerivation rec { + pname = "xeus-zmq"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = "xeus-zmq"; + rev = "${version}"; + hash = "sha256-j23NPgqwjQ7x4QriCb+N7CtBWhph+pCmBC0AULEDL1U="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cppzmq + libuuid + openssl + xeus + xtl + zeromq + ]; + + propagatedBuildInputs = [ nlohmann_json ]; + + meta = { + description = "ZeroMQ-based middleware for xeus"; + homepage = "https://github.com/jupyter-xeus/xeus-zmq"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 0a404f616b..31d064c2af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -5,7 +5,7 @@ , cmake , gtest , doCheck ? true -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , ncclSupport ? false , rLibrary ? false , cudaPackages diff --git a/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix deleted file mode 100644 index 837cc0d48b..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, aalib -, alsa-lib -, autoconf -, ffmpeg_4 -, flac -, libGL -, libGLU -, libcaca -, libcdio -, libmng -, libmpcdec -, libpulseaudio -, libtheora -, libv4l -, libvorbis -, ncurses -, perl -, pkg-config -, speex -, vcdimager -, xorg -, zlib -}: - -stdenv.mkDerivation rec { - pname = "xine-lib"; - version = "1.2.11"; - - src = fetchurl { - url = "mirror://sourceforge/xine/xine-lib-${version}.tar.xz"; - sha256 = "sha256-71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU="; - }; - - patches = [ - # Fix build with libcaca 0.99.beta20 ; remove for xine-lib 1.2.12 - (fetchpatch { - name = "xine-lib-libcaca-0.99.beta20-fix.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch"; - sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr"; - }) - ]; - - nativeBuildInputs = [ - autoconf - pkg-config - perl - ]; - buildInputs = [ - aalib - alsa-lib - ffmpeg_4 # xine-lib 1.2.12 should support ffmpeg_5 - flac - libGL - libGLU - libcaca - libcdio - libmng - libmpcdec - libpulseaudio - libtheora - libv4l - libvorbis - ncurses - perl - speex - vcdimager - zlib - ] ++ (with xorg; [ - libX11 - libXext - libXinerama - libXv - libxcb - ]); - - enableParallelBuilding = true; - - NIX_LDFLAGS = "-lxcb-shm"; - - - meta = with lib; { - homepage = "https://xine.sourceforge.net/"; - description = "A high-performance, portable and reusable multimedia playback engine"; - license = with licenses; [ gpl2Plus lgpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix index c4c20f207a..e90df0888a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; }) + # Fixes invalid pointer conversions that cause compilation to fail with clang 15+ + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/38e4d5f561318fa825e6544c2ef55ac5899c81b0.diff"; + sha256 = "sha256-VJuFyiPhuAZlDxmNHBty+JbYwG85ea5u2sv7HZRHMwo="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix index 950a7e0dc5..61f57f0762 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix @@ -296,12 +296,12 @@ let nclasses = build-asdf-system { pname = "nclasses"; - version = "0.5.0"; + version = "0.6.0"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nclasses"; - rev = "0.5.0"; - sha256 = "sha256-UcavZ0fCA2hkVU/CqUZfyCqJ8gXKPpXTCP0WLUIF1Ss="; + rev = "0.6.0"; + sha256 = "sha256-JupP+TIxavUoyOPnp57FqpEjWfgKspdFoSRnV2rk5U4="; }; lispLibs = [ self.nasdf super.moptilities ]; }; @@ -330,10 +330,12 @@ let nhooks = build-asdf-system { pname = "nhooks"; - version = "20230214-git"; - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/nhooks/2023-02-14/nhooks-20230214-git.tgz"; - sha256 = "0rapn9v942yd2snlskvlr1g22hmyhlsrclahxjsgn4pbvqc5gwyw"; + version = "1.2.1"; + src = pkgs.fetchFromGitHub { + owner = "atlas-engineer"; + repo = "nhooks"; + rev = "1.2.1"; + hash = "sha256-D61QHxHTceIu5mCGKf3hy53niQMfs0idEYQK1ZYn1YM="; }; lispLibs = with self; [ bordeaux-threads closer-mop serapeum ]; }; @@ -368,7 +370,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.4.0"; + version = "3.5.0"; lispLibs = (with super; [ alexandria @@ -437,8 +439,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.4.0"; - sha256 = "sha256-o+GAMHKi+9q+EGY6SEZrxKCEO4IxdOiB4oPpJPGYO0w="; + rev = "3.5.0"; + sha256 = "sha256-/x3S4qAvvHxUxDcs6MAuZvAtqLTQdwlH7r4zFlKIjY4="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -451,15 +453,17 @@ let pkgs.gnome.adwaita-icon-theme ]; - # This is needed since asdf:make tries to write in the directory of the .asd file of the system it's compiling - postConfigure = '' - export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$(pwd)// - ''; + # This patch removes the :build-operation component from the nyxt/gi-gtk-application system. + # This is done because if asdf:operate is used and the operation matches the system's :build-operation + # then output translations are ignored, causing the result of the operation to be placed where + # the .asd is located, which in this case is the nix store. + # see: https://gitlab.common-lisp.net/asdf/asdf/-/blob/master/doc/asdf.texinfo#L2582 + patches = [ ./patches/nyxt-remove-build-operation.patch ]; buildScript = pkgs.writeText "build-nyxt.lisp" '' (load "${super.alexandria.asdfFasl}/asdf.${super.alexandria.faslExt}") - ;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:make instead - (asdf:make :nyxt/gi-gtk-application) + ;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:operare :program-op instead + (asdf:operate :program-op :nyxt/gi-gtk-application) ''; # TODO(kasper): use wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch b/third_party/nixpkgs/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch new file mode 100644 index 0000000000..e050ce10b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/patches/nyxt-remove-build-operation.patch @@ -0,0 +1,12 @@ +diff --git a/nyxt.asd b/nyxt.asd +index ea2630ce..fdf837e4 100644 +--- a/nyxt.asd ++++ b/nyxt.asd +@@ -480,7 +480,6 @@ The renderer is configured from NYXT_RENDERER or `*nyxt-renderer*'.")) + :defsystem-depends-on ("nasdf") + :class :nasdf-system + :depends-on (nyxt/gi-gtk) +- :build-operation "program-op" + :build-pathname "nyxt" + :entry-point "nyxt:entry-point") + diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 10601dbd7a..e8b4be7dfd 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -2416,6 +2416,37 @@ buildLuarocksPackage { }; }) {}; +magick = callPackage({ fetchgit, buildLuarocksPackage, lua }: +buildLuarocksPackage { + pname = "magick"; + version = "1.6.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/magick-1.6.0-1.rockspec"; + sha256 = "1pg150xsxnqvlhxpiy17s9hm4dkc84v46mlwi9rhriynqz8qks9w"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/leafo/magick.git", + "rev": "6971fa700c4d392130492a3925344b51c7cc54aa", + "date": "2022-03-10T20:02:11-08:00", + "path": "/nix/store/fpl99q09zg3qnk4kagxk1djabl1dm47l-magick", + "sha256": "01b9qsz27f929rz5z7vapqhazxak74sichdwkjwb219nlhrwfncm", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = (lua.luaversion != "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "git://github.com/leafo/magick.git"; + description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI"; + license.fullName = "MIT"; + }; +}) {}; + markdown = callPackage({ buildLuarocksPackage, luaAtLeast, fetchgit, luaOlder, lua }: buildLuarocksPackage { pname = "markdown"; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix index bdf363fb47..7c7ffcccf2 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix @@ -89,7 +89,13 @@ rec { , rocksSubdir }: let rocksTrees = lib.imap0 - (i: dep: { name = "dep-${toString i}"; root = "${dep}"; rocks_dir = "${dep}/${dep.rocksSubdir}"; }) + (i: dep: { + name = "dep-${toString i}"; + root = "${dep}"; + # packages built by buildLuaPackage or luarocks doesn't contain rocksSubdir + # hence a default here + rocks_dir = if dep ? rocksSubdir then "${dep}/${dep.rocksSubdir}" else "${dep.pname}-${dep.version}-rocks"; + }) requiredLuaRocks; # Explicitly point luarocks to the relevant locations for multiple-output diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/magick.patch b/third_party/nixpkgs/pkgs/development/lua-modules/magick.patch new file mode 100644 index 0000000000..41b5ed98c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lua-modules/magick.patch @@ -0,0 +1,53 @@ +diff --git a/magick/wand/lib.lua b/magick/wand/lib.lua +index 21940a0..0d103dc 100644 +--- a/magick/wand/lib.lua ++++ b/magick/wand/lib.lua +@@ -134,15 +134,6 @@ get_filters = function() + local prefixes = { + "/usr/include/ImageMagick", + "/usr/local/include/ImageMagick", +- unpack((function() +- local _accum_0 = { } +- local _len_0 = 1 +- for p in get_flags():gmatch("-I([^%s]+)") do +- _accum_0[_len_0] = p +- _len_0 = _len_0 + 1 +- end +- return _accum_0 +- end)()) + } + for _index_0 = 1, #prefixes do + local p = prefixes[_index_0] +@@ -204,12 +195,7 @@ try_to_load = function(...) + break + end + end +- if pcall(function() +- out = ffi.load(name) +- end) then +- return out +- end +- _continue_0 = true ++ return ffi.load(name) + until true + if not _continue_0 then + break +@@ -217,17 +203,7 @@ try_to_load = function(...) + end + return error("Failed to load ImageMagick (" .. tostring(...) .. ")") + end +-lib = try_to_load("MagickWand", function() +- local lname = get_flags():match("-l(MagickWand[^%s]*)") +- local suffix +- if ffi.os == "OSX" then +- suffix = ".dylib" +- elseif ffi.os == "Windows" then +- suffix = ".dll" +- else +- suffix = ".so" +- end +- return lname and "lib" .. lname .. suffix ++lib = try_to_load("@nix_wand@", function() + end) + return { + lib = lib, diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index 102fcd85bc..50dbcdecc6 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -15,6 +15,7 @@ , gnulib , gnum4 , gobject-introspection +, imagemagick , installShellFiles , lib , libevent @@ -477,6 +478,25 @@ with prev; ]; }); + magick = prev.magick.overrideAttrs (oa: { + buildInputs = oa.buildInputs ++ [ + imagemagick + ]; + + # Fix MagickWand not being found in the pkg-config search path + patches = [ + ./magick.patch + ]; + + postPatch = '' + substituteInPlace magick/wand/lib.lua \ + --replace @nix_wand@ ${imagemagick}/lib/libMagickWand-7.Q16HDRI.so + ''; + + # Requires ffi + meta.broken = !isLuaJIT; + }); + mpack = prev.mpack.overrideAttrs (drv: { buildInputs = (drv.buildInputs or []) ++ [ libmpack ]; env = { diff --git a/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix b/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix index d027efd859..eff9cb4f87 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.30.0"; + version = "1.30.4"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1z9mrkxwfkp07z1k3kdgsda4dpb3hl3wa8mn0vwy3avh0k3my0px"; + sha256 = "1dc02krdysaal1w3lrwr9xcz04r72jgm0kg3bpv70gd830yp9bkr"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix index fa2eeae00b..42b70c64ab 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix @@ -158,8 +158,7 @@ stdenv.mkDerivation ({ installPhase = '' ${if target == "android" then '' - ${if release then "" - else '' + ${lib.optionalString (!release) '' cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out ''} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix index 1688d1f6a1..2949f4c1c8 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/cbor/default.nix @@ -2,12 +2,12 @@ buildNimPackage rec { pname = "cbor"; - version = "20230310"; + version = "20230619"; src = fetchFromSourcehut { owner = "~ehmry"; repo = "nim_${pname}"; rev = version; - hash = "sha256-VmSYWgXDJLB2D2m3/ymrEytT2iW5JE56WmDz2MPHAqQ="; + hash = "sha256-F6T/5bUwrJyhRarTWO9cjbf7UfEOXPNWu6mfVKNZsQA="; }; meta = with lib; src.meta // { diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix index bdd7de6a46..2d7b229ca1 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/eris/default.nix @@ -1,27 +1,24 @@ -{ lib, buildNimPackage, fetchFromGitea, pkg-config -, base32, coap, cbor, freedesktop_org, syndicate, tkrzw }: +{ lib, buildNimPackage, fetchFromGitea, pkg-config, base32, coap, cbor +, freedesktop_org, illwill, syndicate, tkrzw }: -buildNimPackage rec { +buildNimPackage (final: prev: { pname = "eris"; - version = "20230201"; + version = "20230722"; outputs = [ "bin" "out" ]; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; - repo = "nim-${pname}"; - rev = version; - hash = "sha256-6vlD/woqTkbSRWhRtQD/ynk0DG+GrGwh6x+qUmo6YSQ="; + repo = "nim-eris"; + rev = final.version; + hash = "sha256-JVl2/PmFVYuD4s9hKoQwVDKUa3PBWK5SBDEmVHVSuig="; }; propagatedNativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ - base32 - coap - cbor - freedesktop_org - syndicate - tkrzw - ]; + propagatedBuildInputs = + [ base32 coap cbor freedesktop_org illwill tkrzw ]; postInstall = '' + mkdir -p "$bin/share/recoll/filters" + mv "$bin/bin/rclerislink" "$bin/share/recoll/filters/" + mkdir -p "$bin/share/applications" substitute "eris-open.desktop" "$bin/share/applications/eris-open.desktop"\ --replace "Exec=eriscmd " "Exec=$bin/bin/eriscmd " @@ -29,10 +26,11 @@ buildNimPackage rec { install -D "eris-link.xml" -t "$bin/share/mime/packages" install -D "eris48.png" "$bin/share/icons/hicolor/48x48/apps/eris.png" ''; - meta = src.meta // { + meta = final.src.meta // { + homepage = "https://codeberg.org/eris/nim-eris"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ ehmry ]; mainProgram = "eriscmd"; badPlatforms = lib.platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/hashlib/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/hashlib/default.nix new file mode 100644 index 0000000000..67fff072c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/hashlib/default.nix @@ -0,0 +1,17 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage rec { + pname = "hashlib"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "khchen"; + repo = pname; + rev = "84e0247555e4488594975900401baaf5bbbfb531"; + hash = "sha256-nWNThelCh0LPVU7ryZgS/23hRRvJDVL2xWbQibb+zN0="; + }; + meta = src.meta // { + description = "Hash Library for Nim"; + maintainers = with lib.maintainers; [ ehmry ]; + license = lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/illwill/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/illwill/default.nix index a87588de0e..aa51017662 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/illwill/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/illwill/default.nix @@ -2,13 +2,13 @@ buildNimPackage rec { pname = "illwill"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "johnnovak"; repo = "illwill"; rev = "v${version}"; - hash = "sha256-9YBkad5iUKRb375caAuoYkfp5G6KQDhX/yXQ7vLu/CA="; + hash = "sha256-4DHGVWzN/WTAyDRBBpXlcfKnYIcbFt42/iWInaBUwi4="; }; meta = with lib; diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/noise/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/noise/default.nix index 7931467dbb..d4b9bfdda5 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/noise/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/noise/default.nix @@ -1,8 +1,18 @@ -{ fetchFromGitHub }: +{ lib, buildNimPackage, fetchFromGitHub }: -fetchFromGitHub { - owner = "jangko"; - repo = "nim-noise"; - rev = "v0.1.14"; - sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449"; -} +buildNimPackage (finalAttrs: { + pname = "noise"; + version = "0.1.8"; + src = fetchFromGitHub { + owner = "jangko"; + repo = "nim-noise"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-QD7X1QTAKHYa2+QiYjrQq74CnEafwq/RsshlW2yZqmI="; + }; + meta = finalAttrs.src.meta // { + description = "Nim implementation of linenoise"; + homepage = "https://github.com/jangko/nim-noise"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ehmry ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix index 251975bcad..d48f7830e7 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/preserves/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, buildNimPackage, fetchFromGitea, npeg }: +{ lib, stdenv, buildNimPackage, fetchFromGitea, nim-unwrapped, npeg }: buildNimPackage rec { pname = "preserves"; - version = "20221102"; + version = "20230530"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; repo = "${pname}-nim"; rev = version; - hash = "sha256-oRsq1ugtrOvTn23596BXRy71TQZ4h/Vv6JGqBTZdoKY="; + hash = "sha256-IRIBGjv4po8VyL873v++ovqz8Vg6a9Qbh/M1fxpQXvY="; }; propagatedBuildInputs = [ npeg ]; + nimFlags = [ "--path:${nim-unwrapped}/nim" ]; doCheck = !stdenv.isDarwin; meta = src.meta // { description = "Nim implementation of the Preserves data language"; diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/regex/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/regex/default.nix index 091377eb1f..03e4315a2c 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/regex/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/regex/default.nix @@ -1,8 +1,20 @@ -{ fetchFromGitHub }: +{ lib, buildNimPackage, fetchFromGitHub, unicodedb }: -fetchFromGitHub { - owner = "nitely"; - repo = "nim-regex"; - rev = "eeefb4f"; - sha256 = "13gn0qhnxz07474kv94br5qlac9j8pz2555fk83538fiq83vgbm5"; -} +buildNimPackage (finalAttrs: { + pname = "regex"; + version = "0.20.2"; + src = fetchFromGitHub { + owner = "nitely"; + repo = "nim-regex"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VViDf0uD6bj9WOO827NRbLUt+PgBPEmz/A/DDRCrHpc="; + }; + propagatedBuildInputs = [ unicodedb ]; + doCheck = false; + meta = finalAttrs.src.meta // { + description = "Pure Nim regex engine"; + homepage = "https://github.com/nitely/nim-regex"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ehmry ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix index c695cd00ca..4d1520d62e 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix @@ -1,8 +1,19 @@ -{ fetchFromGitHub }: +{ lib, buildNimPackage, fetchFromGitHub, unicodedb }: -fetchFromGitHub { - owner = "nitely"; - repo = "nim-segmentation"; - rev = "v0.1.0"; - sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh"; -} +buildNimPackage (finalAttrs: { + pname = "segmentation"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "nitely"; + repo = "nim-segmentation"; + rev = "v${finalAttrs.version}"; + sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh"; + }; + propagatedBuildInputs = [ unicodedb ]; + meta = finalAttrs.src.meta // { + description = "Unicode text segmentation (tr29)"; + homepage = "https://github.com/nitely/nim-segmentation"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ehmry ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix index b172e5fbdb..e22455ad90 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix @@ -1,16 +1,16 @@ -{ lib, buildNimPackage, fetchFromGitea, nimSHA2, preserves }: +{ lib, buildNimPackage, fetchFromGitea, hashlib, preserves }: buildNimPackage rec { pname = "syndicate"; - version = "20221102"; + version = "20230530"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; repo = "${pname}-nim"; rev = version; - hash = "sha256-yTPbEsBcpEPXfmhykbWzWdnJ2ExEJxdii1L+mqx8VGQ="; + hash = "sha256-lUHoMSQwUlz9EDMvpFL9GlrwbwMvZDILSmuakONwe50="; }; - propagatedBuildInputs = [ nimSHA2 preserves ]; + propagatedBuildInputs = [ hashlib preserves ]; meta = src.meta // { description = "Nim implementation of the Syndicated Actor model"; license = lib.licenses.unlicense; diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/taps/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/taps/default.nix index 4bf8f24797..ce453dbaa3 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/taps/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/taps/default.nix @@ -2,12 +2,12 @@ buildNimPackage rec { pname = "taps"; - version = "20221228"; + version = "20230331"; src = fetchFromSourcehut { owner = "~ehmry"; repo = "nim_${pname}"; rev = version; - hash = "sha256-0EjMP5pIPJg4/3nzj6ECC68f709TS06OrJlTZ0tavEo="; + hash = "sha256-p2DBJWFwS82oHPq0uMCtZWFbn8GFndEJBjhkHeuPGos="; }; propagatedBuildInputs = [ getdns ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix index 8b60710e82..cbc897a1fc 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix @@ -1,8 +1,18 @@ -{ fetchFromGitHub }: +{ lib, buildNimPackage, fetchFromGitHub }: -fetchFromGitHub { - owner = "nitely"; - repo = "nim-unicodedb"; - rev = "v0.9.0"; - sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq"; -} +buildNimPackage (finalAttrs: { + pname = "unicodedb"; + version = "0.12.0"; + src = fetchFromGitHub { + owner = "nitely"; + repo = "nim-unicodedb"; + rev = finalAttrs.version; + hash = "sha256-vtksdRTWH/Fjp1z8KSFGjgn1SRUxtUZwlOa+vMuB53A="; + }; + meta = finalAttrs.src.meta // { + description = "Unicode Character Database (UCD, tr44) for Nim"; + homepage = "https://github.com/nitely/nim-unicodedb"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ehmry ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix index 772524eaf9..8efb1fee7e 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix @@ -1,8 +1,19 @@ -{ fetchFromGitHub }: +{ lib, buildNimPackage, fetchFromGitHub, segmentation }: -fetchFromGitHub { - owner = "nitely"; - repo = "nim-unicodeplus"; - rev = "v0.8.0"; - sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk"; -} +buildNimPackage (finalAttrs: { + pname = "unicodeplus"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "nitely"; + repo = "nim-unicodeplus"; + rev = "v${finalAttrs.version}"; + sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk"; + }; + propagatedBuildInputs = [ segmentation ]; + meta = finalAttrs.src.meta // { + description = "Common unicode operations"; + homepage = "https://github.com/nitely/nim-unicodeplus"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ehmry ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/ws/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/ws/default.nix new file mode 100644 index 0000000000..704d6d936b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/ws/default.nix @@ -0,0 +1,21 @@ +{ lib, buildNimPackage, fetchFromGitHub }: + +buildNimPackage (finalAttrs: { + pname = "ws"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "treeform"; + repo = "ws"; + rev = finalAttrs.version; + hash = "sha256-3wVi6CjMTjcc5MJEozJN6W3TuYDb53w2MDCsv6lMH0k="; + }; + preCheck = '' + rm tests/test_ws.nim tests/test_timeout.nim + ''; + meta = finalAttrs.src.meta // { + description = "Simple WebSocket library for Nim"; + homepage = "https://github.com/treeform/ws"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ehmry ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix index e999c18b3e..437865eb70 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -39,14 +39,21 @@ in mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 + "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 + bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 eslint_d = pkgs.eslint_d; # Added 2023-05-26 + flood = pkgs.flood; # Added 2023-07-25 + gtop = pkgs.gtop; # added 2023-07-31 manta = pkgs.node-manta; # Added 2023-05-06 readability-cli = pkgs.readability-cli; # Added 2023-06-12 + reveal-md = pkgs.reveal-md; # added 2023-07-31 thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 + zx = pkgs.zx; # added 2023-08-01 } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix index 0c94da29c6..494a69e8a3 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix @@ -1,5 +1,4 @@ -# Use this file to add `meta.mainProgram` to packages in `nodePackages`, that don't provide an -# executable that matches that packages name, so that they'll work with `nix run`. +# Use this file to add `meta.mainProgram` to packages in `nodePackages`. { # Packages that provide multiple executables where one is clearly the `mainProgram`. "@antfu/ni" = "ni"; @@ -11,12 +10,11 @@ vue-cli = "vue"; "@withgraphite/graphite-cli" = "gt"; - # Packages that provide a single executable whose name differs from the package's `name`. + # Packages that provide a single executable. "@angular/cli" = "ng"; "@antora/cli" = "antora"; "@astrojs/language-server" = "astro-ls"; "@babel/cli" = "babel"; - "@bitwarden/cli" = "bw"; "@commitlint/cli" = "commitlint"; "@forge/cli" = "forge"; "@gitbeaker/cli" = "gitbeaker"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 61448bc987..dd1fadae56 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -3,7 +3,6 @@ , "@antfu/ni" , "@astrojs/language-server" , "@babel/cli" -, "@bitwarden/cli" , "@commitlint/cli" , "@commitlint/config-conventional" , "@emacs-eask/cli" @@ -40,7 +39,6 @@ , "awesome-lint" , "balanceofsatoshis" , "bash-language-server" -, "bibtex-tidy" , "bower" , "bower2nix" , "browserify" @@ -123,6 +121,7 @@ , "diagnostic-languageserver" , "diff2html-cli" , "dockerfile-language-server-nodejs" +, "dotenv-cli" , "dotenv-vault" , "elasticdump" , "@electron-forge/cli" @@ -141,7 +140,6 @@ , "fixjson" , "fkill-cli" , "fleek-cli" -, "flood" , "forever" , "fx" , "ganache" @@ -164,7 +162,6 @@ , "makam" , "meshcommander" , "gqlint" -, "gtop" , "gulp" , "gulp-cli" , "he" @@ -274,7 +271,6 @@ , "redoc-cli" , "remod-cli" , "reveal.js" -, "reveal-md" , "rimraf" , "rollup" , {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"} @@ -397,5 +393,4 @@ , "yarn" , "yo" , "@zwave-js/server" -, "zx" ] diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index e4bd8c2c2c..b2893f98e6 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -13,6 +13,15 @@ let sha512 = "HqiDzaLDFCXkcCO/SwoyhRwqYtINFHF7t9BDRq4x90TOKNAJpiqUt9X5lQ08bwxYzc067HUywDjGySpebHcUpw=="; }; }; + "@0no-co/graphql.web-1.0.4" = { + name = "_at_0no-co_slash_graphql.web"; + packageName = "@0no-co/graphql.web"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.0.4.tgz"; + sha512 = "W3ezhHGfO0MS1PtGloaTpg0PbaT8aZSmmaerL7idtU5F7oCI+uu25k+MsMS31BVFlp4aMkHSrNRxiD72IlK8TA=="; + }; + }; "@75lb/deep-merge-1.1.1" = { name = "_at_75lb_slash_deep-merge"; packageName = "@75lb/deep-merge"; @@ -184,31 +193,31 @@ let sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; }; }; - "@angular-devkit/architect-0.1601.4" = { + "@angular-devkit/architect-0.1601.6" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1601.4"; + version = "0.1601.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1601.4.tgz"; - sha512 = "OOSbNlDy+Q3jY0oFHaq8kkna9HYI1zaS8IHeCIDP6T/ZIAVad4+HqXAL4SKQrKJikkoBQv1Z/eaDBL5XPFK9Bw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1601.6.tgz"; + sha512 = "dY+/FNUNrOj+m4iG5/v8N0PfbDmjkjjoy/YkquRHS1yo7fGGDFNqji2552mbtjN6/LwyWDhOO7fxdqppadjnvA=="; }; }; - "@angular-devkit/core-16.1.4" = { + "@angular-devkit/core-16.1.6" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "16.1.4"; + version = "16.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.4.tgz"; - sha512 = "WCAzNi9LxpFIi2WVPaJQd2kHPqCnCexWzUZN05ltJuBGCQL1O+LgRHGwnQ4WZoqmrF5tcWt2a3GFtJ3DgMc1hw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.6.tgz"; + sha512 = "3OjtrPWvsqVkMBwqPeE65ccCIw56FooNpVVAJ0XwhVQv5mA81pmbCzU7JsR6U449ZT7O4cQblzZMQvWvx74HCg=="; }; }; - "@angular-devkit/schematics-16.1.4" = { + "@angular-devkit/schematics-16.1.6" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "16.1.4"; + version = "16.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.4.tgz"; - sha512 = "yjRgwHAfFaeuimgbQtjwSUyXzEHpMSdTRb2zg+TOp6skoGvHOG8xXFJ7DjBkSMeAQdFF0fkxhPS9YmlxqNc+7A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.6.tgz"; + sha512 = "KA8P78gaS76HMHGBOM8JHJXWLOxCIShYVB2Un/Cu6z3jVODvXq+ILZUc1Y0RsAce/vsl2wf8qpoh5Lku9KJHUQ=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -400,13 +409,13 @@ let sha512 = "xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA=="; }; }; - "@astrojs/compiler-1.5.5" = { + "@astrojs/compiler-1.5.7" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "1.5.5"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.5.5.tgz"; - sha512 = "8LEj9nUr5+92ms8/ZUyajcLYqurhXHTNMERctsHZ1JyRrnjseheUHCM+MC34bMP0uOou2JXJFWVJudDTTe4S/A=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.5.7.tgz"; + sha512 = "dFU7GAMbpTUGPkRoCoMQrGFlTe3qIiQMSOxIXp/nB1Do4My9uogjEmBHdR5Cwr4i6rc5/1R3Od9v8kU/pkHXGQ=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -508,15 +517,6 @@ let sha512 = "oWWcEKyrx4sNFxfvOgkMai1jJtOuERmND8fAp8vRA6i38HBU80q8jjkoAitFGPHUz57EhI2ewYYNnf7vkGteOQ=="; }; }; - "@aws-sdk/chunked-blob-reader-3.310.0" = { - name = "_at_aws-sdk_slash_chunked-blob-reader"; - packageName = "@aws-sdk/chunked-blob-reader"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.310.0.tgz"; - sha512 = "CrJS3exo4mWaLnWxfCH+w88Ou0IcAZSIkk4QbmxiHl/5Dq705OLoxf4385MVyExpqpeVJYOYQ2WaD8i/pQZ2fg=="; - }; - }; "@aws-sdk/chunked-blob-reader-native-3.295.0" = { name = "_at_aws-sdk_slash_chunked-blob-reader-native"; packageName = "@aws-sdk/chunked-blob-reader-native"; @@ -526,22 +526,13 @@ let sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ=="; }; }; - "@aws-sdk/chunked-blob-reader-native-3.310.0" = { - name = "_at_aws-sdk_slash_chunked-blob-reader-native"; - packageName = "@aws-sdk/chunked-blob-reader-native"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.310.0.tgz"; - sha512 = "RuhyUY9hCd6KWA2DMF/U6rilYLLRYrDY6e0lq3Of1yzSRFxi4bk9ZMCF0mxf/9ppsB5eudUjrOypYgm6Axt3zw=="; - }; - }; - "@aws-sdk/client-cognito-identity-3.363.0" = { + "@aws-sdk/client-cognito-identity-3.382.0" = { name = "_at_aws-sdk_slash_client-cognito-identity"; packageName = "@aws-sdk/client-cognito-identity"; - version = "3.363.0"; + version = "3.382.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.363.0.tgz"; - sha512 = "tsJzgBSCpna85IVsuS7FBIK9wkSl7fs8TJ/QzapIgu8rKss0ySHVO6TeMVAdw2BvaQl7CxU9c3PosjhLWHu6KQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.382.0.tgz"; + sha512 = "EgKpWh5w2uWNzjtcD3S3JLSuuwLvvaeaVih60xNEoyaxpqwgjAe0vw/8GT9q2nqhS0J+B3bQVYdkCyA5oQDVEQ=="; }; }; "@aws-sdk/client-s3-3.296.0" = { @@ -553,13 +544,22 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.367.0" = { + "@aws-sdk/client-s3-3.379.1" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.367.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.367.0.tgz"; - sha512 = "E9onOs03zHDo/ytjEooCbSbYNUvvvOc5dK7oNEQ9s5cpGjiY2ojQieMg7x+Uz7FbAslIEsABXliYe2Xib+N7Ug=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.379.1.tgz"; + sha512 = "H4ECLySyEkLHRCBv7q5RS5AhesAsDlC7b3wK4YfbTjdqLVhQZIGqy4IJX98VStKZOea43txhndlDlGvKt8p7kA=="; + }; + }; + "@aws-sdk/client-s3-3.382.0" = { + name = "_at_aws-sdk_slash_client-s3"; + packageName = "@aws-sdk/client-s3"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.382.0.tgz"; + sha512 = "7s5DI1dw5HUF9+tHuZzkJaZBcaE3kuGsMw17/enEa8YdF0CtL5rW46FlzQ3/7NYIKc9rhDtb0UMakEej1cWFtg=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -571,13 +571,22 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.363.0" = { + "@aws-sdk/client-sso-3.379.1" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.363.0.tgz"; - sha512 = "PZ+HfKSgS4hlMnJzG+Ev8/mgHd/b/ETlJWPSWjC/f2NwVoBQkBnqHjdyEx7QjF6nksJozcVh5Q+kkYLKc/QwBQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.379.1.tgz"; + sha512 = "2N16TPnRcq+seNP8VY/Zq7kfnrUOrJMbVNpyDZWGe5Qglua3n8v/FzxmXFNI87MiSODq8IHtiXhggWhefCd+TA=="; + }; + }; + "@aws-sdk/client-sso-3.382.0" = { + name = "_at_aws-sdk_slash_client-sso"; + packageName = "@aws-sdk/client-sso"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.382.0.tgz"; + sha512 = "ge11t4hJllOF8pBNF0p1X52lLqUsLGAoey24fvk3fyvvczeLpegGYh2kdLG0iwFTDgRxaUqK+kboH5Wy9ux/pw=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -589,13 +598,22 @@ let sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw=="; }; }; - "@aws-sdk/client-sso-oidc-3.363.0" = { + "@aws-sdk/client-sso-oidc-3.379.1" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.363.0.tgz"; - sha512 = "V3Ebiq/zNtDS/O92HUWGBa7MY59RYSsqWd+E0XrXv6VYTA00RlMTbNcseivNgp2UghOgB9a20Nkz6EqAeIN+RQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.379.1.tgz"; + sha512 = "B6hZ2ysPyvafCMf6gls1jHI/IUviVZ4+TURpNfUBqThg/hZ1IMxc4BLkXca6VlgzYR+bWU8GKiClS9fFH6mu0g=="; + }; + }; + "@aws-sdk/client-sso-oidc-3.382.0" = { + name = "_at_aws-sdk_slash_client-sso-oidc"; + packageName = "@aws-sdk/client-sso-oidc"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.382.0.tgz"; + sha512 = "hTfvB1ftbrqaz7qiEkmRobzUQwG34oZlByobn8Frdr5ZQbJk969bX6evQAPyKlJEr26+kL9TnaX+rbLR/+gwHQ=="; }; }; "@aws-sdk/client-sts-3.296.0" = { @@ -607,13 +625,22 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.363.0" = { + "@aws-sdk/client-sts-3.379.1" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.363.0.tgz"; - sha512 = "0jj14WvBPJQ8xr72cL0mhlmQ90tF0O0wqXwSbtog6PsC8+KDE6Yf+WsxsumyI8E5O8u3eYijBL+KdqG07F/y/w=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.379.1.tgz"; + sha512 = "gEnKuk9bYjThvmxCgOgCn1qa+rRX8IgIRE2+xhbWhlpDanozhkDq9aMB5moX4tBNYQEmi1LtGD+JOvOoZRnToQ=="; + }; + }; + "@aws-sdk/client-sts-3.382.0" = { + name = "_at_aws-sdk_slash_client-sts"; + packageName = "@aws-sdk/client-sts"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.382.0.tgz"; + sha512 = "G5wgahrOqmrljjyLVGASIZUXIIdalbCo0z4PuFHdb2R2CVfwO8renfgrmk4brT9tIxIfen5bRA7ftXMe7yrgRA=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -625,13 +652,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/credential-provider-cognito-identity-3.363.0" = { + "@aws-sdk/credential-provider-cognito-identity-3.382.0" = { name = "_at_aws-sdk_slash_credential-provider-cognito-identity"; packageName = "@aws-sdk/credential-provider-cognito-identity"; - version = "3.363.0"; + version = "3.382.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.363.0.tgz"; - sha512 = "5x42JvqEsBUrm6/qdf0WWe4mlmJjPItxamQhRjuOzeQD/BxsA2W5VS/7n0Ws0e27DNhlnUErcIJd+bBy6j1fqA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.382.0.tgz"; + sha512 = "fEsmPSylpQdALSS1pKMa9QghMk9xFiQCanmUWbQ7ETkcjuYuc/DK6GIA0pRjq/BROJJNSxKrSxt3TZPzVpvb3w=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -643,13 +670,13 @@ let sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g=="; }; }; - "@aws-sdk/credential-provider-env-3.363.0" = { + "@aws-sdk/credential-provider-env-3.378.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.363.0.tgz"; - sha512 = "VAQ3zITT2Q0acht0HezouYnMFKZ2vIOa20X4zQA3WI0HfaP4D6ga6KaenbDcb/4VFiqfqiRHfdyXHP0ThcDRMA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.378.0.tgz"; + sha512 = "B2OVdO9kBClDwGgWTBLAQwFV8qYTYGyVujg++1FZFSFMt8ORFdZ5fNpErvJtiSjYiOOQMzyBeSNhKyYNXCiJjQ=="; }; }; "@aws-sdk/credential-provider-imds-3.296.0" = { @@ -670,13 +697,22 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.363.0" = { + "@aws-sdk/credential-provider-ini-3.379.1" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.363.0.tgz"; - sha512 = "ZYN+INoqyX5FVC3rqUxB6O8nOWkr0gHRRBm1suoOlmuFJ/WSlW/uUGthRBY5x1AQQnBF8cpdlxZzGHd41lFVNw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.379.1.tgz"; + sha512 = "YhEsJIskzCFwIIKiMN9GSHQkgWwj/b7rq0ofhsXsCRimFtdVkmMlB9veE6vtFAuXpX/WOGWdlWek1az0V22uuw=="; + }; + }; + "@aws-sdk/credential-provider-ini-3.382.0" = { + name = "_at_aws-sdk_slash_credential-provider-ini"; + packageName = "@aws-sdk/credential-provider-ini"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.382.0.tgz"; + sha512 = "31pi44WWri2WQmagqptUv7x3Nq8pQ6H06OCQx5goEm77SosSdwQwyBPrS9Pg0yI9aljFAxF+rZ75degsCorbQg=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -688,13 +724,22 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.363.0" = { + "@aws-sdk/credential-provider-node-3.379.1" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.363.0.tgz"; - sha512 = "C1qXFIN2yMxD6pGgug0vR1UhScOki6VqdzuBHzXZAGu7MOjvgHNdscEcb3CpWnITHaPL2ztkiw75T1sZ7oIgQg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.379.1.tgz"; + sha512 = "39Y4OHKn6a8lY8YJhSLLw08aZytWxfvSjM4ObIEnE6hjLl8gsL9vROKKITsh3q6iGQ1EDSWMWZL50aOh3LJUIg=="; + }; + }; + "@aws-sdk/credential-provider-node-3.382.0" = { + name = "_at_aws-sdk_slash_credential-provider-node"; + packageName = "@aws-sdk/credential-provider-node"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.382.0.tgz"; + sha512 = "q6AWCCb0E0cH/Y5Dtln0QssbCBXDbV4PoTV3EdRuGoJcHyNfHJ8X0mqcc7k44wG4Piazu+ufZThvn43W7W9a4g=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -706,13 +751,13 @@ let sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA=="; }; }; - "@aws-sdk/credential-provider-process-3.363.0" = { + "@aws-sdk/credential-provider-process-3.378.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.363.0.tgz"; - sha512 = "fOKAINU7Rtj2T8pP13GdCt+u0Ml3gYynp8ki+1jMZIQ+Ju/MdDOqZpKMFKicMn3Z1ttUOgqr+grUdus6z8ceBQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.378.0.tgz"; + sha512 = "KFTIy7u+wXj3eDua4rgS0tODzMnXtXhAm1RxzCW9FL5JLBBrd82ymCj1Dp72217Sw5Do6NjCnDTTNkCHZMA77w=="; }; }; "@aws-sdk/credential-provider-sso-3.296.0" = { @@ -724,13 +769,22 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.363.0" = { + "@aws-sdk/credential-provider-sso-3.379.1" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.363.0.tgz"; - sha512 = "5RUZ5oM0lwZSo3EehT0dXggOjgtxFogpT3cZvoLGtIwrPBvm8jOQPXQUlaqCj10ThF1sYltEyukz/ovtDwYGew=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.379.1.tgz"; + sha512 = "PhGtu1+JbUntYP/5CSfazQhWsjUBiksEuhg9fLhYl5OAgZVjVygbgoNVUz/gM7gZJSEMsasTazkn7yZVzO/k7w=="; + }; + }; + "@aws-sdk/credential-provider-sso-3.382.0" = { + name = "_at_aws-sdk_slash_credential-provider-sso"; + packageName = "@aws-sdk/credential-provider-sso"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.382.0.tgz"; + sha512 = "tKCQKqxnAHeRD7pQNmDmLWwC7pt5koo6yiQTVQ382U+8xx7BNsApE1zdC4LrtrVN1FYqVbw5kXjYFtSCtaUxGA=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -742,22 +796,22 @@ let sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.363.0" = { + "@aws-sdk/credential-provider-web-identity-3.378.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.363.0.tgz"; - sha512 = "Z6w7fjgy79pAax580wdixbStQw10xfyZ+hOYLcPudoYFKjoNx0NQBejg5SwBzCF/HQL23Ksm9kDfbXDX9fkPhA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.378.0.tgz"; + sha512 = "GWjydOszhc4xDF8xuPtBvboglXQr0gwCW1oHAvmLcOT38+Hd6qnKywnMSeoXYRPgoKfF9TkWQgW1jxplzCG0UA=="; }; }; - "@aws-sdk/credential-providers-3.363.0" = { + "@aws-sdk/credential-providers-3.382.0" = { name = "_at_aws-sdk_slash_credential-providers"; packageName = "@aws-sdk/credential-providers"; - version = "3.363.0"; + version = "3.382.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.363.0.tgz"; - sha512 = "hVa1DdYasnLud2EKjDAlDHiV/+H/Zq52chHU00c/R8XwPu1s0kZX3NMmlt0D2HhYqC1mUwtdmE58Jra2POviQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.382.0.tgz"; + sha512 = "+emgPCb8t5ODLpE1GeCkKaI6lx9M3RLQCYBGYkm/2o8FyvNeob9IBs6W8ufUTlnl4YRdKjDOlcfDtS00wCVHfA=="; }; }; "@aws-sdk/eventstream-codec-3.296.0" = { @@ -823,15 +877,6 @@ let sha512 = "kJJsO9kNDNQIYzIIAB/vHFRfVrc1KUYcPMtCLVprHQhPkSxxnOlHF5wBTJ98IRKi/eGYxD5QrCzrMKLI95BPKw=="; }; }; - "@aws-sdk/hash-blob-browser-3.367.0" = { - name = "_at_aws-sdk_slash_hash-blob-browser"; - packageName = "@aws-sdk/hash-blob-browser"; - version = "3.367.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.367.0.tgz"; - sha512 = "RhkpXceqQP5UF0eGvLVRSM/gJI8rUdgThAFLPlM5cYRPtIoeDddTTNk0BEf8GzetXTyzx3TEe1Z5tEjbb0pMuA=="; - }; - }; "@aws-sdk/hash-node-3.296.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; @@ -850,15 +895,6 @@ let sha512 = "EO3nNQiTq5/AQj55E9T10RC7QRnExCIYsvTiKzQPfJEdKiTy8Xga6oQEAGttRABBlP0wTjG4HVnHEEFZ6HbcoQ=="; }; }; - "@aws-sdk/hash-stream-node-3.357.0" = { - name = "_at_aws-sdk_slash_hash-stream-node"; - packageName = "@aws-sdk/hash-stream-node"; - version = "3.357.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.357.0.tgz"; - sha512 = "KZjN1VAw1KHNp+xKVOWBGS+MpaYQTjZFD5f+7QQqW4TfbAkFFwIAEYIHq5Q8Gw+jVh0h61OrV/LyW3J2PVzc+w=="; - }; - }; "@aws-sdk/invalid-dependency-3.296.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; @@ -877,22 +913,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/is-array-buffer-3.310.0" = { - name = "_at_aws-sdk_slash_is-array-buffer"; - packageName = "@aws-sdk/is-array-buffer"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.310.0.tgz"; - sha512 = "urnbcCR+h9NWUnmOtet/s4ghvzsidFmspfhYaHAmSRdy9yDjdjBJMFjjsn85A1ODUktztm+cVncXjQ38WCMjMQ=="; - }; - }; - "@aws-sdk/lib-storage-3.367.0" = { + "@aws-sdk/lib-storage-3.379.1" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.367.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.367.0.tgz"; - sha512 = "bwLVDQAiPQ5hGTGPOOmJsF9uxDY2lI/J648mdSp2GU373U0PvayOUp72j4nCibTXlOzSjSGcoK8sQksgeUHdyg=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.379.1.tgz"; + sha512 = "o/OFPQL/pZQ1ppjQnBu/3cXfIBz4h0qpwpA2B6osZGfuUzuZJYInEDKixswQligX1Sjxwxd+RL/2TEYNzx1vGw=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -904,15 +931,6 @@ let sha512 = "TvDafbHFcplnf0QqRlkjZ/Dz+dLWBmzBEclRk+h34r4XaIWxvmQ9EtQRo6+6sfAVRtAj2l+i1fm9EjwPMVkb9A=="; }; }; - "@aws-sdk/md5-js-3.357.0" = { - name = "_at_aws-sdk_slash_md5-js"; - packageName = "@aws-sdk/md5-js"; - version = "3.357.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.357.0.tgz"; - sha512 = "to42sFAL7KgV/X9X40LLfEaNMHMGQL6/7mPMVCL/W2BZf3zw5OTl3lAaNyjXA+gO5Uo4lFEiQKAQVKNbr8b8Nw=="; - }; - }; "@aws-sdk/middleware-bucket-endpoint-3.296.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; @@ -922,13 +940,13 @@ let sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.363.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.378.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.363.0.tgz"; - sha512 = "kR8+0X50zslpzRW29q4JbpPMadE1z39ZfGwPaBLKpoWvSGt4x+75FaoK71TH7urPPoFyD2Y+XKGA6YRYTUNHSQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.378.0.tgz"; + sha512 = "3o+AYU6JWUsPM49bWglCUOgNvySiHkbIma0J6F9a68e30vEDD0FUQtKzyHPZkF7iYDyesEl166gYjwVNAmASzw=="; }; }; "@aws-sdk/middleware-content-length-3.296.0" = { @@ -958,13 +976,13 @@ let sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.363.0" = { + "@aws-sdk/middleware-expect-continue-3.378.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.363.0.tgz"; - sha512 = "I88xneZp6jRwySmIl9uI7eZCcTsqRVnTDfUr1JiXt7zonqNNm80PVYMs6pwaw7t97ec1AQJcsONjuXZyCMnu5g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.378.0.tgz"; + sha512 = "8maaNQvza3/IGDbIyVQkUbGlo+Oc6SY1gVG50UMcTUX8nwZrD1/ko+ft+pd2EDb2n+0JritoDj4bjr6pdesNBg=="; }; }; "@aws-sdk/middleware-flexible-checksums-3.296.0" = { @@ -976,13 +994,13 @@ let sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.363.0" = { + "@aws-sdk/middleware-flexible-checksums-3.378.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.363.0.tgz"; - sha512 = "FBYmrMRX01uNximNN0WLgpf97GN4xNTLaKsDlkjYRWKJ+J97ICkvLG0FcSu7+SNCpCdJJBeQ5tRVOPVpUu6nmA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.378.0.tgz"; + sha512 = "pHkcVTu2T+x/1fpPHMpRDpXY5zxDsjijv3C6Nz/nm3gQrZvQ3fYDrQdV3Oj6Xeg40B3kkcp/bzgDo7MDzG088A=="; }; }; "@aws-sdk/middleware-host-header-3.296.0" = { @@ -994,13 +1012,13 @@ let sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ=="; }; }; - "@aws-sdk/middleware-host-header-3.363.0" = { + "@aws-sdk/middleware-host-header-3.379.1" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.363.0.tgz"; - sha512 = "FobpclDCf5Y1ueyJDmb9MqguAdPssNMlnqWQpujhYVABq69KHu73fSCWSauFPUrw7YOpV8kG1uagDF0POSxHzA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.379.1.tgz"; + sha512 = "LI4KpAFWNWVr2aH2vRVblr0Y8tvDz23lj8LOmbDmCrzd5M21nxuocI/8nEAQj55LiTIf9Zs+dHCdsyegnFXdrA=="; }; }; "@aws-sdk/middleware-location-constraint-3.296.0" = { @@ -1012,13 +1030,13 @@ let sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.363.0" = { + "@aws-sdk/middleware-location-constraint-3.379.1" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.363.0.tgz"; - sha512 = "piNzpNNI/fChSGOZxcq/2msN2qFUSEAbhqs91zbcpv8CEPekVLc4W9laXCG764BEMyfG97ZU8MtzwHeMhELhBA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.379.1.tgz"; + sha512 = "+bmy8DjX9jtqJk8WiDaHoP9M5ZcqjHSJf4mkv8IUZ/FNTUl9j6Dll//bG/JxuAw5e5shtCDjmZ027W5d9ITp0g=="; }; }; "@aws-sdk/middleware-logger-3.296.0" = { @@ -1030,13 +1048,13 @@ let sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw=="; }; }; - "@aws-sdk/middleware-logger-3.363.0" = { + "@aws-sdk/middleware-logger-3.378.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.363.0.tgz"; - sha512 = "SSGgthScYnFGTOw8EzbkvquqweFmvn7uJihkpFekbtBNGC/jGOGO+8ziHjTQ8t/iI/YKubEwv+LMi0f77HKSEg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.378.0.tgz"; + sha512 = "l1DyaDLm3KeBMNMuANI3scWh8Xvu248x+vw6Z7ExWOhGXFmQ1MW7YvASg/SdxWkhlF9HmkkTif1LdMB22x6QDA=="; }; }; "@aws-sdk/middleware-recursion-detection-3.296.0" = { @@ -1048,13 +1066,13 @@ let sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.363.0" = { + "@aws-sdk/middleware-recursion-detection-3.378.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.363.0.tgz"; - sha512 = "MWD/57QgI/N7fG8rtzDTUdSqNpYohQfgj9XCFAoVeI/bU4usrkOrew43L4smJG4XrDxlNT8lSJlDtd64tuiUZA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.378.0.tgz"; + sha512 = "mUMfHAz0oGNIWiTZHTVJb+I515Hqs2zx1j36Le4MMiiaMkPW1SRUF1FIwGuc1wh6E8jB5q+XfEMriDjRi4TZRA=="; }; }; "@aws-sdk/middleware-retry-3.296.0" = { @@ -1075,13 +1093,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.363.0" = { + "@aws-sdk/middleware-sdk-s3-3.379.1" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.363.0.tgz"; - sha512 = "npC8vLCero+vULizrK0QPjNanWbgH4A/2Llc1nO8N005uvUe7co6WglILF2W3guZrFk/0uGEdX67OnLxUD97pw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.379.1.tgz"; + sha512 = "NVHRpNLfkHCqr3CE1Bmlf8Fhys8lL78kDX7UONnTZXvSiSXmCS7EbNtGDghZ8IKi+V9S/ifB4sLsX3tfzY0i6Q=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -1093,13 +1111,13 @@ let sha512 = "0EnHtiRzcRcXaF6zEgcRGUtVgX0RqczwlGXjtryHcxiqU/+adqbRuckC7bdMF4Zva6GVPS25XppvGF4M+UzAEw=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.363.0" = { + "@aws-sdk/middleware-sdk-sts-3.379.1" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.363.0.tgz"; - sha512 = "1yy2Ac50FO8BrODaw5bPWvVrRhaVLqXTFH6iHB+dJLPUkwtY5zLM3Mp+9Ilm7kME+r7oIB1wuO6ZB1Lf4ZszIw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.379.1.tgz"; + sha512 = "SK3gSyT0XbLiY12+AjLFYL9YngxOXHnZF3Z33Cdd4a+AUYrVBV7JBEEGD1Nlwrcmko+3XgaKlmgUaR5s91MYvg=="; }; }; "@aws-sdk/middleware-serde-3.296.0" = { @@ -1120,13 +1138,13 @@ let sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q=="; }; }; - "@aws-sdk/middleware-signing-3.363.0" = { + "@aws-sdk/middleware-signing-3.379.1" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.363.0.tgz"; - sha512 = "/7qia715pt9JKYIPDGu22WmdZxD8cfF/5xB+1kmILg7ZtjO0pPuTaCNJ7xiIuFd7Dn7JXp5lop08anX/GOhNRQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.379.1.tgz"; + sha512 = "kBk2ZUvR84EM4fICjr8K+Ykpf8SI1UzzPp2/UVYZ0X+4H/ZCjfSqohGRwHykMqeplne9qHSL7/rGJs1H3l3gPg=="; }; }; "@aws-sdk/middleware-ssec-3.296.0" = { @@ -1138,13 +1156,13 @@ let sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA=="; }; }; - "@aws-sdk/middleware-ssec-3.363.0" = { + "@aws-sdk/middleware-ssec-3.378.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.363.0.tgz"; - sha512 = "pN+QN1rMShYpJnTJSCIYnNRhD0S8xSZsTn6ThgcO559Xiwz5LMHFOfOXUCEyxtbVW5kMHLUh3w101AMUKae99A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.378.0.tgz"; + sha512 = "WDT2LOd6OxlY1zkrRG9ZtW2vFms/dsqMg9VyE88RKG2oATxSXEhkr5zLbNVh3TyuUKnV9jydate56d/ECwHOHg=="; }; }; "@aws-sdk/middleware-stack-3.296.0" = { @@ -1165,13 +1183,22 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.363.0" = { + "@aws-sdk/middleware-user-agent-3.379.1" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.363.0.tgz"; - sha512 = "ri8YaQvXP6odteVTMfxPqFR26Q0h9ejtqhUDv47P34FaKXedEM4nC6ix6o+5FEYj6l8syGyktftZ5O70NoEhug=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.379.1.tgz"; + sha512 = "4zIGeAIuutcRieAvovs82uBNhJBHuxfxaAUqrKiw49xUBG7xeNVUl+DYPSpbALbEIy4ujfwWCBOOWVCt6dyUZg=="; + }; + }; + "@aws-sdk/middleware-user-agent-3.382.0" = { + name = "_at_aws-sdk_slash_middleware-user-agent"; + packageName = "@aws-sdk/middleware-user-agent"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.382.0.tgz"; + sha512 = "LFRW1jmXOrOAd3911ktn6oaYmuurNnulbdRMOUdwz99GGdLVFipQhOi9idKswb8IOhPa4jEVQt25Kcv7ctvu0A=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1228,13 +1255,13 @@ let sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw=="; }; }; - "@aws-sdk/s3-presigned-post-3.367.0" = { + "@aws-sdk/s3-presigned-post-3.379.1" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.367.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.367.0.tgz"; - sha512 = "Uy6+tZejgL6QJKXPwxwXUAR60s4+aNScEUXYuIAs9pwArvKLgz2YxBG0GuPPCFnLGPHwvwgxbTog5971wNIZGA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.379.1.tgz"; + sha512 = "EFToAaAIW0bhV7QFEVwddpRjNuulmwJfgJyn2aNt36exETBBRRkeJrIxjOY6QevIwMCCEoq+RIYEPkV+llijoQ=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1246,13 +1273,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.367.0" = { + "@aws-sdk/s3-request-presigner-3.379.1" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.367.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.367.0.tgz"; - sha512 = "VVfLQitGn31+HSjzJs1VJgmLlZeiqcmqitBZA6oe3XUrk6YMFTRg6rAWkV8S//s5fp5LtmDfT1wWBNAK0qctcw=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.379.1.tgz"; + sha512 = "99wY7+UzptKZIUo5VTfkkfowLt/K7eLE1MXGCsIfKZmHF756F86ZAy0CRZ1OPaAXOQI2uUbhwwBqLyQY6NbfPg=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1282,13 +1309,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.363.0" = { + "@aws-sdk/signature-v4-crt-3.378.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.363.0.tgz"; - sha512 = "u2IajQm63KHhmgy76JgLM8OPRlxtpCSmd6DVcHCsUacPadyaxUofy0m0QA9ofBJVs6ukM4XVnWuOgtLj7UGsbw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.378.0.tgz"; + sha512 = "+7ZnoHT4EuyfkJUAovAicRhHztACkApe/1i7e3PfxMhqexy+hAk/Z/b58iXFnVCRecNmRy/cESets/SdjbUepA=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1300,13 +1327,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.363.0" = { + "@aws-sdk/signature-v4-multi-region-3.378.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.363.0.tgz"; - sha512 = "iWamQSpaBKg88LKuiUq8xO/7iyxJ+ORkA3qDhAwUqyTJOg87ma47yFf4ycCKqINnflc3AIGLGzBHnkBc4cMF5g=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.378.0.tgz"; + sha512 = "gtuABS7EeYZQeNzTrabY3Ruv4wWmoz4u8OMSGl47gYPDWA70WYEZ0aoi4zSGuKhXiqtVvTsO9wGEMIInwV5phQ=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1327,13 +1354,22 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.363.0" = { + "@aws-sdk/token-providers-3.379.1" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.363.0"; + version = "3.379.1"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.363.0.tgz"; - sha512 = "6+0aJ1zugNgsMmhTtW2LBWxOVSaXCUk2q3xyTchSXkNzallYaRiZMRkieW+pKNntnu0g5H1T0zyfCO0tbXwxEA=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.379.1.tgz"; + sha512 = "NlYPkArJ7A/txCrjqqkje+4hsv7pSOqm+Qdx3BUIOc7PRYrBVs/XwThxUkGceSntVXoNlO8g9DFL0NY53/wb8Q=="; + }; + }; + "@aws-sdk/token-providers-3.382.0" = { + name = "_at_aws-sdk_slash_token-providers"; + packageName = "@aws-sdk/token-providers"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.382.0.tgz"; + sha512 = "axn4IyPpHdkXi8G06KCB3tPz79DipZFFH9N9YVDpLMnDYTdfX36HGdYzINaQc+z+XPbEpa1ZpoIzWScHRjFjdg=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1345,13 +1381,13 @@ let sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg=="; }; }; - "@aws-sdk/types-3.357.0" = { + "@aws-sdk/types-3.378.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.357.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.357.0.tgz"; - sha512 = "/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.378.0.tgz"; + sha512 = "qP0CvR/ItgktmN8YXpGQglzzR/6s0nrsQ4zIfx3HMwpsBTwuouYahcCtF1Vr82P4NFcoDA412EJahJ2pIqEd+w=="; }; }; "@aws-sdk/url-parser-3.296.0" = { @@ -1390,15 +1426,6 @@ let sha512 = "z1r40BsBiOTALnzASvLb4qutGwPpL+jH2UKTCV5WJLXZFMzRnpZaRfeZGE8lMJ/i0+jv9H9G1FmVzE8UgB4rhw=="; }; }; - "@aws-sdk/util-base64-3.310.0" = { - name = "_at_aws-sdk_slash_util-base64"; - packageName = "@aws-sdk/util-base64"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.310.0.tgz"; - sha512 = "v3+HBKQvqgdzcbL+pFswlx5HQsd9L6ZTlyPVL2LS9nNXnCcR3XgGz9jRskikRUuUvUXtkSG1J88GAOnJ/apTPg=="; - }; - }; "@aws-sdk/util-body-length-browser-3.295.0" = { name = "_at_aws-sdk_slash_util-body-length-browser"; packageName = "@aws-sdk/util-body-length-browser"; @@ -1426,15 +1453,6 @@ let sha512 = "5ezVEITQnrQKn+CU9qfZHgRp2nrrbX0Clmlm9aiNjAEQEPHY33tWl0t6n8h8yU+IpGiNRMWBVC4aSJaE5NA1mA=="; }; }; - "@aws-sdk/util-buffer-from-3.310.0" = { - name = "_at_aws-sdk_slash_util-buffer-from"; - packageName = "@aws-sdk/util-buffer-from"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.310.0.tgz"; - sha512 = "i6LVeXFtGih5Zs8enLrt+ExXY92QV25jtEnTKHsmlFqFAuL3VBeod6boeMXkN2p9lbSVVQ1sAOOYZOHYbYkntw=="; - }; - }; "@aws-sdk/util-config-provider-3.295.0" = { name = "_at_aws-sdk_slash_util-config-provider"; packageName = "@aws-sdk/util-config-provider"; @@ -1480,13 +1498,22 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.357.0" = { + "@aws-sdk/util-endpoints-3.378.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.357.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.357.0.tgz"; - sha512 = "XHKyS5JClT9su9hDif715jpZiWHQF9gKZXER8tW0gOizU3R9cyWc9EsJ2BRhFNhi7nt/JF/CLUEc5qDx3ETbUw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.378.0.tgz"; + sha512 = "NU5C2l2xAXxpyB5nT0fIhahLPlJoJdzHWw4uC53KH9b4PrjHtgvgCN8beIsD3QxyfgeoM4A5J9Auo6WurfRnLw=="; + }; + }; + "@aws-sdk/util-endpoints-3.382.0" = { + name = "_at_aws-sdk_slash_util-endpoints"; + packageName = "@aws-sdk/util-endpoints"; + version = "3.382.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.382.0.tgz"; + sha512 = "flajPyjmjNG67fXk7l4GoTB/7J11VBqtFZXuuAZKhKU07Ia3IQupsFqNf5lV8D44ZgjnKH0fTGnv3dUALjW7Wg=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1498,13 +1525,13 @@ let sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw=="; }; }; - "@aws-sdk/util-format-url-3.363.0" = { + "@aws-sdk/util-format-url-3.378.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.363.0.tgz"; - sha512 = "lz3z4M5QPVJxALVUOU6a538CO+VPDLl9dgeAQCRF7fVjYP7nRGjm7Hc1oiEP7nYL3sAw/lQfbL7NlTPNXRwRlQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.378.0.tgz"; + sha512 = "CtW2HnCq08ildVD7B5OPn1zOxBAMBjkDxqzOcLw3Rk9F6OKuMM9hawulU62tMtouJPC0QSS6eLoNOrYGch5ehQ=="; }; }; "@aws-sdk/util-hex-encoding-3.295.0" = { @@ -1579,13 +1606,13 @@ let sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog=="; }; }; - "@aws-sdk/util-user-agent-browser-3.363.0" = { + "@aws-sdk/util-user-agent-browser-3.378.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.363.0.tgz"; - sha512 = "fk9ymBUIYbxiGm99Cn+kAAXmvMCWTf/cHAcB79oCXV4ELXdPa9lN5xQhZRFNxLUeXG4OAMEuCAUUuZEj8Fnc1Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.378.0.tgz"; + sha512 = "FSCpagzftK1W+m7Ar6lpX7/Gr9y5P56nhFYz8U4EYQ4PkufS6czWX9YW+/FA5OYV0vlQ/SvPqMnzoHIPUNhZrQ=="; }; }; "@aws-sdk/util-user-agent-node-3.296.0" = { @@ -1597,13 +1624,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.363.0" = { + "@aws-sdk/util-user-agent-node-3.378.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.363.0"; + version = "3.378.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.363.0.tgz"; - sha512 = "Fli/dvgGA9hdnQUrYb1//wNSFlK2jAfdJcfNXA6SeBYzSeH5pVGYF4kXF0FCdnMA3Fef+Zn1zAP/hw9v8VJHWQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.378.0.tgz"; + sha512 = "IdwVJV0E96MkJeFte4dlWqvB+oiqCiZ5lOlheY3W9NynTuuX0GGYNC8Y9yIsV8Oava1+ujpJq0ww6qXdYxmO4A=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1615,15 +1642,6 @@ let sha512 = "ITN8v3F63ZkA4sdmCtSbS/mhav4F0MEAiXDAUXtMJLNqVtaVcyQST4i9vNmPpIVthAPAtP0QjyF2tq/Di8bxtQ=="; }; }; - "@aws-sdk/util-utf8-3.310.0" = { - name = "_at_aws-sdk_slash_util-utf8"; - packageName = "@aws-sdk/util-utf8"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.310.0.tgz"; - sha512 = "DnLfFT8uCO22uOJc0pt0DsSNau1GTisngBCDw8jQuWT5CqogMJu4b/uXmwEqfj8B3GX6Xsz8zOd6JpRlPftQoA=="; - }; - }; "@aws-sdk/util-utf8-browser-3.259.0" = { name = "_at_aws-sdk_slash_util-utf8-browser"; packageName = "@aws-sdk/util-utf8-browser"; @@ -1714,13 +1732,13 @@ let sha512 = "Z4dfbglV9kNZO177CNx4bo5ekFuYwwsvjLiKdZI4r84bYGv3irrbQz7JC3/rUfFH2l4T/W6OFleJaa2X0IaQqw=="; }; }; - "@azure/core-lro-2.5.3" = { + "@azure/core-lro-2.5.4" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.3.tgz"; - sha512 = "ubkOf2YCnVtq7KqEJQqAI8dDD5rH1M6OP5kW0KO/JQyTaxLA0N0pjFWvvaysCj9eHMNBcuuoZXhhl0ypjod2DA=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.4.tgz"; + sha512 = "3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q=="; }; }; "@azure/core-paging-1.5.0" = { @@ -1831,13 +1849,13 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/cli-7.22.6" = { + "@babel/cli-7.22.9" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.22.6"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.22.6.tgz"; - sha512 = "Be3/RfEDmkMRGT1+ru5nTkfcvWz5jDOYg1V9rXqTz2u9Qt96O1ryboGvxVBp7wOnYWDB8DNHIWb6DThrpudfOw=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.22.9.tgz"; + sha512 = "nb2O7AThqRo7/E53EGiuAkMaRbb7J5Qp3RvN+dmua1U+kydm0oznkhqbTEG15yk26G/C3yL6OdZjzgl+DMXVVA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1876,13 +1894,13 @@ let sha512 = "Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ=="; }; }; - "@babel/compat-data-7.22.6" = { + "@babel/compat-data-7.22.9" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.22.6"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.6.tgz"; - sha512 = "29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz"; + sha512 = "5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="; }; }; "@babel/core-7.0.0" = { @@ -1894,13 +1912,13 @@ let sha512 = "nrvxS5u6QUN5gLl1GEakIcmOeoUHT1/gQtdMRq18WFURJ5osn4ppJLVSseMQo4zVWKJfBTF4muIYijXUnKlRLQ=="; }; }; - "@babel/core-7.22.8" = { + "@babel/core-7.22.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.22.8"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.22.8.tgz"; - sha512 = "75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz"; + sha512 = "G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w=="; }; }; "@babel/generator-7.18.2" = { @@ -1912,13 +1930,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.22.7" = { + "@babel/generator-7.22.9" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.22.7"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.22.7.tgz"; - sha512 = "p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz"; + sha512 = "KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw=="; }; }; "@babel/helper-annotate-as-pure-7.22.5" = { @@ -1939,40 +1957,40 @@ let sha512 = "m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw=="; }; }; - "@babel/helper-compilation-targets-7.22.6" = { + "@babel/helper-compilation-targets-7.22.9" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.22.6"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz"; - sha512 = "534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz"; + sha512 = "7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw=="; }; }; - "@babel/helper-create-class-features-plugin-7.22.6" = { + "@babel/helper-create-class-features-plugin-7.22.9" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.22.6"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.6.tgz"; - sha512 = "iwdzgtSiBxF6ni6mzVnZCF3xt5qE6cEA0J7nFt8QOAWZ0zjCFceEgpn3vtb2V7WFR6QzP2jmIFOHMTRo7eNJjQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz"; + sha512 = "Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.22.6" = { + "@babel/helper-create-regexp-features-plugin-7.22.9" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.22.6"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.6.tgz"; - sha512 = "nBookhLKxAWo/TUCmhnaEJyLz2dekjQvv5SRpE9epWQBcpedWLKt8aZdsuT9XV5ovzR3fENLjRXVT0GsSlGGhA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz"; + sha512 = "+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw=="; }; }; - "@babel/helper-define-polyfill-provider-0.4.1" = { + "@babel/helper-define-polyfill-provider-0.4.2" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz"; - sha512 = "kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz"; + sha512 = "k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw=="; }; }; "@babel/helper-environment-visitor-7.22.5" = { @@ -2020,13 +2038,13 @@ let sha512 = "8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg=="; }; }; - "@babel/helper-module-transforms-7.22.5" = { + "@babel/helper-module-transforms-7.22.9" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.22.5"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz"; - sha512 = "+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz"; + sha512 = "t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ=="; }; }; "@babel/helper-optimise-call-expression-7.22.5" = { @@ -2047,22 +2065,22 @@ let sha512 = "uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="; }; }; - "@babel/helper-remap-async-to-generator-7.22.5" = { + "@babel/helper-remap-async-to-generator-7.22.9" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.22.5"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz"; - sha512 = "cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz"; + sha512 = "8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ=="; }; }; - "@babel/helper-replace-supers-7.22.5" = { + "@babel/helper-replace-supers-7.22.9" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.22.5"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz"; - sha512 = "aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz"; + sha512 = "LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg=="; }; }; "@babel/helper-simple-access-7.22.5" = { @@ -2119,13 +2137,13 @@ let sha512 = "R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="; }; }; - "@babel/helper-wrap-function-7.22.5" = { + "@babel/helper-wrap-function-7.22.9" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.22.5"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz"; - sha512 = "bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz"; + sha512 = "sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q=="; }; }; "@babel/helpers-7.22.6" = { @@ -2245,15 +2263,6 @@ let sha512 = "UCe1X/hplyv6A5g2WnQ90tnHRvYL29dabCWww92lO7VdfMVTVReBTRrhiMrKQejHD9oVkdnRdwYuzUZkBVQisg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-export-namespace-from"; - packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; - sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; - }; - }; "@babel/plugin-proposal-json-strings-7.18.6" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; @@ -2272,15 +2281,6 @@ let sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-numeric-separator"; - packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; - sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; - }; - }; "@babel/plugin-proposal-object-rest-spread-7.0.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; @@ -2974,13 +2974,13 @@ let sha512 = "yECRVxRu25Nsf6IY5v5XrXhcW9ZHomUQiq30VO8H7r3JYPcBJDTcxZmT+6v1O3QKKrDp1Wp40LinGbcd+jlp9A=="; }; }; - "@babel/plugin-transform-runtime-7.22.7" = { + "@babel/plugin-transform-runtime-7.22.9" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.22.7"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.7.tgz"; - sha512 = "o02xM7iY7mSPI+TvaYDH0aYl+lg3+KT7qrD705JlsB/GrZSNaYO/4i+aDFKPiJ7ubq3hgv8NNLCdyB5MFxT8mg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz"; + sha512 = "9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ=="; }; }; "@babel/plugin-transform-shorthand-properties-7.22.5" = { @@ -3028,13 +3028,13 @@ let sha512 = "bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA=="; }; }; - "@babel/plugin-transform-typescript-7.22.5" = { + "@babel/plugin-transform-typescript-7.22.9" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.22.5"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz"; - sha512 = "SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.9.tgz"; + sha512 = "BnVR1CpKiuD0iobHPaM1iLvcwPYN2uVFAqoLVSpEDKWuOikoCv5HbKLxclhKYUXlWkX86DoZGtqI4XhbOsyrMg=="; }; }; "@babel/plugin-transform-unicode-escapes-7.22.5" = { @@ -3091,13 +3091,13 @@ let sha512 = "Fnx1wWaWv2w2rl+VHxA9si//Da40941IQ29fKiRejVR7oN1FxSEL8+SyAX/2oKIye2gPvY/GBbJVEKQ/oi43zQ=="; }; }; - "@babel/preset-env-7.22.7" = { + "@babel/preset-env-7.22.9" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.22.7"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.7.tgz"; - sha512 = "1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.9.tgz"; + sha512 = "wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g=="; }; }; "@babel/preset-flow-7.22.5" = { @@ -3109,13 +3109,13 @@ let sha512 = "ta2qZ+LSiGCrP5pgcGt8xMnnkXQrq8Sa4Ulhy06BOlF5QbLw9q5hIx7bn5MrsvyTGAfh6kTOo07Q+Pfld/8Y5Q=="; }; }; - "@babel/preset-modules-0.1.5" = { + "@babel/preset-modules-0.1.6" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; - sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz"; + sha512 = "ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg=="; }; }; "@babel/preset-react-7.0.0" = { @@ -3298,13 +3298,13 @@ let sha512 = "yzZ6OK0W7frfoCqvl0s3KeVUUB22wYs74Qu3Y+VGgvW7yvq5m0M82RZQWghKdtLyQejc4469QlmhQsJmCF7ULg=="; }; }; - "@braintree/sanitize-url-6.0.2" = { + "@braintree/sanitize-url-6.0.3" = { name = "_at_braintree_slash_sanitize-url"; packageName = "@braintree/sanitize-url"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz"; - sha512 = "Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg=="; + url = "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.3.tgz"; + sha512 = "g2hMyGSFYOvt0eeY2c2wrG1B6dVWF1be4vGxG9mI1BEHJuQm4Hie2HrooxYHBDRDi8hANIzQ8cuvBgxSVlQOTQ=="; }; }; "@bugsnag/browser-7.20.2" = { @@ -3361,40 +3361,40 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/cli-core-0.17.1" = { + "@cdktf/cli-core-0.17.3" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.17.1.tgz"; - sha512 = "PlcRLTpbhJB4ELNFjDROi2xduEI/0GeXd/0NzCW5c+luycSK5DNH2XJ0TG/qDa3G+6AKOhX5A1ac10vugmyl6w=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.17.3.tgz"; + sha512 = "KgsibdYAB5MuC0wM2143kiKj/jUsAuCOTRzHfIakIUVd6xsLIOxMdWCTOPbPhmcUPr0SHatFnjKD/d7y1A5Bow=="; }; }; - "@cdktf/commons-0.17.1" = { + "@cdktf/commons-0.17.3" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.17.1.tgz"; - sha512 = "AXNMYlu3RXSZUHdMxR1EsOiMfemqVrBy27G70rJkfz4OjA4IqxITzyDF3imnmagLwMgL9yOgF35RyEDzIUPVrw=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.17.3.tgz"; + sha512 = "5TZpuxjfYvmf1iXoel5HWz06Sf+5VYmZF/HeBmf03uHIAgDYJZZoyFp4wwH4lzT6pjr1uYBbyX49HTkLlmDbxQ=="; }; }; - "@cdktf/hcl2cdk-0.17.1" = { + "@cdktf/hcl2cdk-0.17.3" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.17.1.tgz"; - sha512 = "89nf+/Or2jvQthTTDsza2R6uF1j6Y5TjaDz0bwY9La1QjH3wcyk9GJxniz2BYDf1UqdRugdcaVOkJjq54Fepxw=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.17.3.tgz"; + sha512 = "T49ptQ2L5c80hO8XSLESjHq5ILfXQsceK7oK6LFheOidvCFyQPH4EsKUGUazqiqB0/Loab4+tsp/ou2L2BMc6Q=="; }; }; - "@cdktf/hcl2json-0.17.1" = { + "@cdktf/hcl2json-0.17.3" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.17.1.tgz"; - sha512 = "nOAuJe22FKzBlNJhKRHHTH8Pst2kNEJ18IIL4T2Tfde9EMayyBcGmQ4rsEu4tj0+EuUkryKSkLmwdzPrJS+aaQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.17.3.tgz"; + sha512 = "lczep0P2adwv08bf3mF1ScKyAD/Y502QVxGrYm8+E+3cl11qtFVblFJXRcAS288Opnqz1X0ekN4YCmkPawETbg=="; }; }; "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" = { @@ -3406,13 +3406,13 @@ let sha512 = "5ysQrHJvqYLYg407KvaDNu+xx68ZGaqeF0SohXe5e4yNqJhPFPUQ536rkReQcPc2yZiF5PDmmvf5T9MOacHpSQ=="; }; }; - "@cdktf/provider-generator-0.17.1" = { + "@cdktf/provider-generator-0.17.3" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.17.1.tgz"; - sha512 = "STOlAZXGMVEcsRkx5bZhmhiLfiEB16ztwpTQBWVdXVyVHejgU/i/Xrbl4e/id6K5AG+mZTDHKnKucx+UCOHr+A=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.17.3.tgz"; + sha512 = "HXzLVmn2Y+1OuoRkhIhUy8A3EikgnZUcuNHgyt0Z7+uUQ6qf0082iF5v7qrRbs+sZ7UvKyLIgy+bch+ZkskVpg=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3442,49 +3442,49 @@ let sha512 = "MVbXLbTcAotOPUj0pAMhVtJ+3/kFkwJqc5qNOleOZTv6QkZZABDMS21dSrSlVswEHwrpWC03e4fWytjqKvuE2A=="; }; }; - "@cloudflare/workerd-darwin-64-1.20230628.0" = { + "@cloudflare/workerd-darwin-64-1.20230724.0" = { name = "_at_cloudflare_slash_workerd-darwin-64"; packageName = "@cloudflare/workerd-darwin-64"; - version = "1.20230628.0"; + version = "1.20230724.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20230628.0.tgz"; - sha512 = "ndtsGCR3WKcNvq2eE2teQXcE+r7PwMh3jnyxPuc4/Fed4q3DQC++da4zNn8f+D+dLd7myifGeygbHic86vh4OA=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20230724.0.tgz"; + sha512 = "DQmFZWHhs8waQFYRb/Z8QmbitAvBMXnbUMUentp+3lS4eCYI0/iurTaQDiz5+ldUn9FTxD+1XuYZlTHzVNxoHw=="; }; }; - "@cloudflare/workerd-darwin-arm64-1.20230628.0" = { + "@cloudflare/workerd-darwin-arm64-1.20230724.0" = { name = "_at_cloudflare_slash_workerd-darwin-arm64"; packageName = "@cloudflare/workerd-darwin-arm64"; - version = "1.20230628.0"; + version = "1.20230724.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20230628.0.tgz"; - sha512 = "cvGUkP517K43PzlMm0Q9WFBJCOC8UR+E5qNf+nO2fewAx8SCyeqrOboVliDBaQmI8z6F6f59L6Gh4QuxEJEjdA=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20230724.0.tgz"; + sha512 = "C7T0v/lMjEX7c4iROSZKgIF1eGw3+sj/gFpBD6xwxfbIcrKBjncMypeLQNpRTCdBQr1W3sNpg9jagwuVX5ByZQ=="; }; }; - "@cloudflare/workerd-linux-64-1.20230628.0" = { + "@cloudflare/workerd-linux-64-1.20230724.0" = { name = "_at_cloudflare_slash_workerd-linux-64"; packageName = "@cloudflare/workerd-linux-64"; - version = "1.20230628.0"; + version = "1.20230724.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20230628.0.tgz"; - sha512 = "NRYVNTuhvAxBzkj3V1TkYl1LiV9xxT6yk3OUXzcA6eUPH2EQYkDeOkWhAeuKrTi5JY8gLUvvxs5OOj5WTL9jYQ=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20230724.0.tgz"; + sha512 = "o0F/hj73UXOQwkPkYqZuIxpjG8gAs2eoAGqxX1HSIYRf7iUhfFcPrupwjqlNqf7Oo1h46M+sClSFjr/ZU/LCjg=="; }; }; - "@cloudflare/workerd-linux-arm64-1.20230628.0" = { + "@cloudflare/workerd-linux-arm64-1.20230724.0" = { name = "_at_cloudflare_slash_workerd-linux-arm64"; packageName = "@cloudflare/workerd-linux-arm64"; - version = "1.20230628.0"; + version = "1.20230724.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20230628.0.tgz"; - sha512 = "IVrP/Pf12k9S31TDjnHSUe/xrYLkuvQN+DtoUSWVgpe0Mj1w8uHUPGpRIc8XQF+6OWFUQr2SgGsEtjeYZm3Hlw=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20230724.0.tgz"; + sha512 = "UpzCoo7LOuPWxFPw84TZQTPIawIDQNSb3XnC6ffMjUH/FVwHmHdngIFZxW+xjLHKMIzGNAqSn3eRHekKgO3QqA=="; }; }; - "@cloudflare/workerd-windows-64-1.20230628.0" = { + "@cloudflare/workerd-windows-64-1.20230724.0" = { name = "_at_cloudflare_slash_workerd-windows-64"; packageName = "@cloudflare/workerd-windows-64"; - version = "1.20230628.0"; + version = "1.20230724.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20230628.0.tgz"; - sha512 = "y6scWqHFHhlf2a1AsT0UeMyWSloIO1baVxp9DW62gFO8BwWrTPgwiG9Rr09zllY5tSxkrU7VOPsEbK9NNcRMsA=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20230724.0.tgz"; + sha512 = "wVpPNu19fnvgsD8V6NiGPSuET0bzKmgn3wJ6RwAwQA+GQ0hdDIDVYd13aImhgO6jLfQvkduCDxeZluGZ7PPojQ=="; }; }; "@colors/colors-1.5.0" = { @@ -3496,22 +3496,22 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; - "@commitlint/config-validator-17.4.4" = { + "@commitlint/config-validator-17.6.7" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "17.4.4"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.4.4.tgz"; - sha512 = "bi0+TstqMiqoBAQDvdEP4AFh0GaKyLFlPPEObgI29utoKEYoPQTvF0EYqIwYYLEoJYhj5GfMIhPHJkTJhagfeg=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.6.7.tgz"; + sha512 = "vJSncmnzwMvpr3lIcm0I8YVVDJTzyjy7NZAeXbTXy+MPUdAr9pKyyg7Tx/ebOQ9kqzE6O9WT6jg2164br5UdsQ=="; }; }; - "@commitlint/ensure-17.4.4" = { + "@commitlint/ensure-17.6.7" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "17.4.4"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.4.4.tgz"; - sha512 = "AHsFCNh8hbhJiuZ2qHv/m59W/GRE9UeOXbkOqxYMNNg9pJ7qELnFcwj5oYpa6vzTSHtPGKf3C2yUFNy1GGHq6g=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.6.7.tgz"; + sha512 = "mfDJOd1/O/eIb/h4qwXzUxkmskXDL9vNPnZ4AKYKiZALz4vHzwMxBSYtyL2mUIDeU9DRSpEUins8SeKtFkYHSw=="; }; }; "@commitlint/execute-rule-17.4.0" = { @@ -3532,31 +3532,31 @@ let sha512 = "+IS7vpC4Gd/x+uyQPTAt3hXs5NxnkqAZ3aqrHd5Bx/R9skyCAWusNlNbw3InDbAK6j166D9asQM8fnmYIa+CXQ=="; }; }; - "@commitlint/is-ignored-17.6.6" = { + "@commitlint/is-ignored-17.6.7" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "17.6.6"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.6.6.tgz"; - sha512 = "4Fw875faAKO+2nILC04yW/2Vy/wlV3BOYCSQ4CEFzriPEprc1Td2LILmqmft6PDEK5Sr14dT9tEzeaZj0V56Gg=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.6.7.tgz"; + sha512 = "vqyNRqtbq72P2JadaoWiuoLtXIs9SaAWDqdtef6G2zsoXqKFc7vqj1f+thzVgosXG3X/5K9jNp+iYijmvOfc/g=="; }; }; - "@commitlint/lint-17.6.6" = { + "@commitlint/lint-17.6.7" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "17.6.6"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.6.6.tgz"; - sha512 = "5bN+dnHcRLkTvwCHYMS7Xpbr+9uNi0Kq5NR3v4+oPNx6pYXt8ACuw9luhM/yMgHYwW0ajIR20wkPAFkZLEMGmg=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.6.7.tgz"; + sha512 = "TW+AozfuOFMrHn+jdwtz0IWu8REKFp0eryOvoBp2r8IXNc4KihKB1spAiUB6SFyHD6hVVeolz12aHnJ3Mb+xVQ=="; }; }; - "@commitlint/load-17.5.0" = { + "@commitlint/load-17.6.7" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "17.5.0"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-17.5.0.tgz"; - sha512 = "l+4W8Sx4CD5rYFsrhHH8HP01/8jEP7kKf33Xlx2Uk2out/UKoKPYMOIRcDH5ppT8UXLMV+x6Wm5osdRKKgaD1Q=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-17.6.7.tgz"; + sha512 = "QZ2rJTbX55BQdYrCm/p6+hh/pFBgC9nTJxfsrK6xRPe2thiQzHN0AQDBqBwAirn6gIkHrjIbCbtAE6kiDYLjrw=="; }; }; "@commitlint/message-17.4.2" = { @@ -3568,13 +3568,13 @@ let sha512 = "3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q=="; }; }; - "@commitlint/parse-17.6.5" = { + "@commitlint/parse-17.6.7" = { name = "_at_commitlint_slash_parse"; packageName = "@commitlint/parse"; - version = "17.6.5"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-17.6.5.tgz"; - sha512 = "0zle3bcn1Hevw5Jqpz/FzEWNo2KIzUbc1XyGg6WrWEoa6GH3A1pbqNF6MvE6rjuy6OY23c8stWnb4ETRZyN+Yw=="; + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-17.6.7.tgz"; + sha512 = "ibO03BgEns+JJpohpBZYD49mCdSNMg6fTv7vA5yqzEFWkBQk5NWhEBw2yG+Z1UClStIRkMkAYyI2HzoQG9tCQQ=="; }; }; "@commitlint/read-17.5.1" = { @@ -3586,22 +3586,22 @@ let sha512 = "7IhfvEvB//p9aYW09YVclHbdf1u7g7QhxeYW9ZHSO8Huzp8Rz7m05aCO1mFG7G8M+7yfFnXB5xOmG18brqQIBg=="; }; }; - "@commitlint/resolve-extends-17.4.4" = { + "@commitlint/resolve-extends-17.6.7" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "17.4.4"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.4.4.tgz"; - sha512 = "znXr1S0Rr8adInptHw0JeLgumS11lWbk5xAWFVno+HUFVN45875kUtqjrI6AppmD3JI+4s0uZlqqlkepjJd99A=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.6.7.tgz"; + sha512 = "PfeoAwLHtbOaC9bGn/FADN156CqkFz6ZKiVDMjuC2N5N0740Ke56rKU7Wxdwya8R8xzLK9vZzHgNbuGhaOVKIg=="; }; }; - "@commitlint/rules-17.6.5" = { + "@commitlint/rules-17.6.7" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "17.6.5"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-17.6.5.tgz"; - sha512 = "uTB3zSmnPyW2qQQH+Dbq2rekjlWRtyrjDo4aLFe63uteandgkI+cc0NhhbBAzcXShzVk0qqp8SlkQMu0mgHg/A=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-17.6.7.tgz"; + sha512 = "x/SDwDTN3w3Gr5xkhrIORu96rlKCc8ZLYEMXRqi9+MB33st2mKcGvKa5uJuigHlbl3xm75bAAubATrodVrjguQ=="; }; }; "@commitlint/to-lines-17.4.0" = { @@ -3640,13 +3640,13 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-6.31.1" = { + "@cspell/cspell-bundled-dicts-6.31.2" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "6.31.1"; + version = "6.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.31.1.tgz"; - sha512 = "rsIev+dk1Vd8H1OKZhNhXycIVsMfeWJaeW3QUi1l4oIoGwQfJVbs1ZPZPHE5cglzyHOW1jQNStXf34UKaC6siA=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.31.2.tgz"; + sha512 = "rQ5y/U1Ah5AaduIh3NU2z371hRrOr1cmNdhhP8oiuz2E4VqmcoVHflXIct9DgY8uIJpwsSCdR6ypOQWZYXYnwA=="; }; }; "@cspell/cspell-pipe-6.31.1" = { @@ -3676,13 +3676,13 @@ let sha512 = "1KeTQFiHMssW1eRoF2NZIEg4gPVIfXLsL2+VSD/AV6YN7lBcuf6gRRgV5KWYarhxtEfjxhDdDTmu26l/iJEUtw=="; }; }; - "@cspell/dict-ada-4.0.1" = { + "@cspell/dict-ada-4.0.2" = { name = "_at_cspell_slash_dict-ada"; packageName = "@cspell/dict-ada"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.0.1.tgz"; - sha512 = "/E9o3nHrXOhYmQE43deKbxZcR3MIJAsa+66IzP9TXGHheKEx8b9dVMVVqydDDH8oom1H0U20NRPtu6KRVbT9xw=="; + url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.0.2.tgz"; + sha512 = "0kENOWQeHjUlfyId/aCM/mKXtkEgV0Zu2RhUXCBr4hHo9F9vph+Uu8Ww2b0i5a4ZixoIkudGA+eJvyxrG1jUpA=="; }; }; "@cspell/dict-aws-1.0.14" = { @@ -3730,13 +3730,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.0.16" = { + "@cspell/dict-companies-3.0.17" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.16.tgz"; - sha512 = "Ut/ntCTnnzjO5cDrPnzYYLLaoElNsXNmLXIxHELP9lR70OsiLVJE079A2fhgE58smvnjJDcERVGyQJTirDBICA=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.17.tgz"; + sha512 = "vo1jbozgZWSzz2evIL26kLd35tVb+5kW/UTvTzAwaWutSWRloRyKx38nj2CaLJ2IFxBdiATteCFGTzKCvJJl6A=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3748,13 +3748,13 @@ let sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; }; }; - "@cspell/dict-cpp-5.0.3" = { + "@cspell/dict-cpp-5.0.4" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.0.3.tgz"; - sha512 = "7sx/RFsf0hB3q8chx8OHYl9Kd+g0pqA1laphwaAQ+/jPwoAreYT3kNQWbJ3bIt/rMoORetFSQxckSbaJXwwqpw=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.0.4.tgz"; + sha512 = "Vmz/CCb2d91ES5juaO8+CFWeTa2AFsbpR8bkCPJq+P8cRP16+37tY0zNXEBSK/1ur4MakaRf76jeQBijpZxw0Q=="; }; }; "@cspell/dict-cryptocurrencies-1.0.10" = { @@ -3811,22 +3811,22 @@ let sha512 = "2Lo8W2ezHmGgY8cWFr4RUwnjbndna5mokpCK/DuxGILQnuajR0J31ANQOXj/8iZM2phFB93ZzMNk/0c04TDfSQ=="; }; }; - "@cspell/dict-dart-2.0.2" = { + "@cspell/dict-dart-2.0.3" = { name = "_at_cspell_slash_dict-dart"; packageName = "@cspell/dict-dart"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.2.tgz"; - sha512 = "jigcODm7Z4IFZ4vParwwP3IT0fIgRq/9VoxkXfrxBMsLBGGM2QltHBj7pl+joX+c4cOHxfyZktGJK1B1wFtR4Q=="; + url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.3.tgz"; + sha512 = "cLkwo1KT5CJY5N5RJVHks2genFkNCl/WLfj+0fFjqNR+tk3tBI1LY7ldr9piCtSFSm4x9pO1x6IV3kRUY1lLiw=="; }; }; - "@cspell/dict-data-science-1.0.6" = { + "@cspell/dict-data-science-1.0.8" = { name = "_at_cspell_slash_dict-data-science"; packageName = "@cspell/dict-data-science"; - version = "1.0.6"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-1.0.6.tgz"; - sha512 = "lLvuZSWAr2N6Ny5Q0WburmqZxCSdDFpOk01z8NuKhIHvwQWdBRZSDFGY1j4LrJEde8K3L0M1glq4Jtqm4mnW7Q=="; + url = "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-1.0.8.tgz"; + sha512 = "uGx0rd3BftfZ5mvXtPxvLNkQ33y0ylNw4GpBAAfF3hgGtifKdvLSmphOGuNgDYUPpJ0+e025bsvtN0/ZZCzWTg=="; }; }; "@cspell/dict-django-1.0.26" = { @@ -3847,13 +3847,13 @@ let sha512 = "bKJ4gPyrf+1c78Z0Oc4trEB9MuhcB+Yg+uTTWsvhY6O2ncFYbB/LbEZfqhfmmuK/XJJixXfI1laF2zicyf+l0w=="; }; }; - "@cspell/dict-docker-1.1.6" = { + "@cspell/dict-docker-1.1.7" = { name = "_at_cspell_slash_dict-docker"; packageName = "@cspell/dict-docker"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.6.tgz"; - sha512 = "zCCiRTZ6EOQpBnSOm0/3rnKW1kCcAUDUA7SxJG3SuH6iZvKi3I8FEg8+O83WQUeXg0SyPNerD9F40JLnnJjJig=="; + url = "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.7.tgz"; + sha512 = "XlXHAr822euV36GGsl2J1CkBIVg3fZ6879ZOg5dxTIssuhUOCiV2BuzKZmt6aIFmcdPmR14+9i9Xq+3zuxeX0A=="; }; }; "@cspell/dict-dotnet-1.0.32" = { @@ -3919,13 +3919,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.3.4" = { + "@cspell/dict-en_us-4.3.6" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.3.4"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.4.tgz"; - sha512 = "mR2yqWmFip1zTKja2SqyVMbzuqEThqkEJk9M32bMDziPJpEyOIPvLA0UPmj3cyRKJkRuVF0bhDCE33O+at38hw=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.6.tgz"; + sha512 = "odhgsjNZI9BtEOJdvqfAuv/3yz5aB1ngfBNaph7WSnYVt//9e3fhrElZ6/pIIkoyuGgeQPwz1fXt+tMgcnLSEQ=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -4225,13 +4225,13 @@ let sha512 = "IHfWLme3FXE7vnOmMncSBxOsMTdNWd1Vcyhag03WS8oANSgX8IZ+4lMI00mF0ptlgchf16/OU8WsV4pZfikEFw=="; }; }; - "@cspell/dict-public-licenses-2.0.2" = { + "@cspell/dict-public-licenses-2.0.3" = { name = "_at_cspell_slash_dict-public-licenses"; packageName = "@cspell/dict-public-licenses"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.2.tgz"; - sha512 = "baKkbs/WGEV2lCWZoL0KBPh3uiPcul5GSDwmXEBAsR5McEW52LF94/b7xWM0EmSAc/y8ODc5LnPYC7RDRLi6LQ=="; + url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.3.tgz"; + sha512 = "JSLEdpEYufQ1H+93UHi+axlqQm1fhgK6kpdLHp6uPHu//CsvETcqNVawjB+qOdI/g38JTMw5fBqSd0aGNxa6Dw=="; }; }; "@cspell/dict-python-1.0.38" = { @@ -4243,13 +4243,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.1.1" = { + "@cspell/dict-python-4.1.4" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.1.1"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.1.tgz"; - sha512 = "gllGfnunCC3HhNuiF/e8OHq+EZG3bErydmnE1TlvSSngChLo/0O46hD7U+chHyTakZ6z4ancH5O+0cQ78e8XDA=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.4.tgz"; + sha512 = "4JJ6MjIyuZN4h2VkSxZxiQ55lVh6NccW/0H6rdu0aDz+E3uyFVFtlBp5kTY5jIA11PZqSZZpyowzGnwrJX6w0g=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -4324,22 +4324,22 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.1.18" = { + "@cspell/dict-software-terms-3.2.0" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.1.18"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.18.tgz"; - sha512 = "puNwb9w7Au8CGdQsNcFD/YTnFR6IuNjciXWRjmnSV+M1lZ6pJiFi4AMvecFmdZzyM3UYpWRAYxlt/RJ+RsBWbA=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.2.0.tgz"; + sha512 = "RI6sv4Bc4i42YH/ofVelv8lXpJRhCyS9IhI2BtejUoMXKhKA9gC01ATXOylx+oaQmj3t5ark4R50xKFRvC7ENA=="; }; }; - "@cspell/dict-sql-2.1.0" = { + "@cspell/dict-sql-2.1.1" = { name = "_at_cspell_slash_dict-sql"; packageName = "@cspell/dict-sql"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.0.tgz"; - sha512 = "Bb+TNWUrTNNABO0bmfcYXiTlSt0RD6sB2MIY+rNlaMyIwug43jUjeYmkLz2tPkn3+2uvySeFEOMVYhMVfcuDKg=="; + url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.1.tgz"; + sha512 = "v1mswi9NF40+UDUMuI148YQPEQvWjac72P6ZsjlRdLjEiQEEMEsTQ+zlkIdnzC9QCNyJaqD5Liq9Mn78/8Zxtw=="; }; }; "@cspell/dict-svelte-1.0.2" = { @@ -4414,31 +4414,31 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@csstools/css-parser-algorithms-2.3.0" = { + "@csstools/css-parser-algorithms-2.3.1" = { name = "_at_csstools_slash_css-parser-algorithms"; packageName = "@csstools/css-parser-algorithms"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.0.tgz"; - sha512 = "dTKSIHHWc0zPvcS5cqGP+/TPFUJB0ekJ9dGKvMAFoNuBFhDPBt9OMGNZiIA5vTiNdGHHBeScYPXIGBMnVOahsA=="; + url = "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.1.tgz"; + sha512 = "xrvsmVUtefWMWQsGgFffqWSK03pZ1vfDki4IVIIUxxDKnGBzqNgv0A7SB1oXtVNEkcVO8xi1ZrTL29HhSu5kGA=="; }; }; - "@csstools/css-tokenizer-2.1.1" = { + "@csstools/css-tokenizer-2.2.0" = { name = "_at_csstools_slash_css-tokenizer"; packageName = "@csstools/css-tokenizer"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz"; - sha512 = "GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA=="; + url = "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.0.tgz"; + sha512 = "wErmsWCbsmig8sQKkM6pFhr/oPha1bHfvxsUY5CYSQxwyhA9Ulrs8EqCgClhg4Tgg2XapVstGqSVcz0xOYizZA=="; }; }; - "@csstools/media-query-list-parser-2.1.2" = { + "@csstools/media-query-list-parser-2.1.3" = { name = "_at_csstools_slash_media-query-list-parser"; packageName = "@csstools/media-query-list-parser"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.2.tgz"; - sha512 = "M8cFGGwl866o6++vIY7j1AKuq9v57cf+dGepScwCcbut9ypJNr4Cj+LLTWligYUZ0uyhEoJDKt5lvyBfh2L3ZQ=="; + url = "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.3.tgz"; + sha512 = "ATul1u+pic4aVpstgueqxEv4MsObEbszAxfTXpx9LHaeD3LAh+wFqdCteyegWmjk0k5rkSCAvIOaJe9U3DD09w=="; }; }; "@csstools/selector-specificity-3.0.0" = { @@ -4819,15 +4819,6 @@ let sha512 = "IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA=="; }; }; - "@emotion/hash-0.9.1" = { - name = "_at_emotion_slash_hash"; - packageName = "@emotion/hash"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz"; - sha512 = "gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="; - }; - }; "@emotion/is-prop-valid-1.2.1" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; @@ -4900,24 +4891,6 @@ let sha512 = "mueuEoh+s1eRbSJqq9KNBQwI4QhQV6sRXIfTyLXSHGMpyew61rOK4qY21uKbXl1iBoMb0AdL1deWFCQVlN2qHA=="; }; }; - "@esbuild/android-arm-0.17.6" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.6.tgz"; - sha512 = "bSC9YVUjADDy1gae8RrioINU6e1lCkg3VGVwm0QQ2E1CWcC4gnMce9+B6RpxuSsrsXsk1yojn7sp1fnG8erE2g=="; - }; - }; - "@esbuild/android-arm-0.18.11" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.11.tgz"; - sha512 = "q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q=="; - }; - }; "@esbuild/android-arm64-0.16.3" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4927,24 +4900,6 @@ let sha512 = "RolFVeinkeraDvN/OoRf1F/lP0KUfGNb5jxy/vkIMeRRChkrX/HTYN6TYZosRJs3a1+8wqpxAo5PI5hFmxyPRg=="; }; }; - "@esbuild/android-arm64-0.17.6" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.6.tgz"; - sha512 = "YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg=="; - }; - }; - "@esbuild/android-arm64-0.18.11" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.11.tgz"; - sha512 = "snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw=="; - }; - }; "@esbuild/android-x64-0.16.3" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4954,24 +4909,6 @@ let sha512 = "SFpTUcIT1bIJuCCBMCQWq1bL2gPTjWoLZdjmIhjdcQHaUfV41OQfho6Ici5uvvkMmZRXIUGpM3GxysP/EU7ifQ=="; }; }; - "@esbuild/android-x64-0.17.6" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.6.tgz"; - sha512 = "MVcYcgSO7pfu/x34uX9u2QIZHmXAB7dEiLQC5bBl5Ryqtpj9lT2sg3gNDEsrPEmimSJW2FXIaxqSQ501YLDsZQ=="; - }; - }; - "@esbuild/android-x64-0.18.11" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.11.tgz"; - sha512 = "iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw=="; - }; - }; "@esbuild/darwin-arm64-0.16.3" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4981,24 +4918,6 @@ let sha512 = "DO8WykMyB+N9mIDfI/Hug70Dk1KipavlGAecxS3jDUwAbTpDXj0Lcwzw9svkhxfpCagDmpaTMgxWK8/C/XcXvw=="; }; }; - "@esbuild/darwin-arm64-0.17.6" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.6.tgz"; - sha512 = "bsDRvlbKMQMt6Wl08nHtFz++yoZHsyTOxnjfB2Q95gato+Yi4WnRl13oC2/PJJA9yLCoRv9gqT/EYX0/zDsyMA=="; - }; - }; - "@esbuild/darwin-arm64-0.18.11" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.11.tgz"; - sha512 = "Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w=="; - }; - }; "@esbuild/darwin-x64-0.16.3" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -5008,24 +4927,6 @@ let sha512 = "uEqZQ2omc6BvWqdCiyZ5+XmxuHEi1SPzpVxXCSSV2+Sh7sbXbpeNhHIeFrIpRjAs0lI1FmA1iIOxFozKBhKgRQ=="; }; }; - "@esbuild/darwin-x64-0.17.6" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.6.tgz"; - sha512 = "xh2A5oPrYRfMFz74QXIQTQo8uA+hYzGWJFoeTE8EvoZGHb+idyV4ATaukaUvnnxJiauhs/fPx3vYhU4wiGfosg=="; - }; - }; - "@esbuild/darwin-x64-0.18.11" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.11.tgz"; - sha512 = "N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw=="; - }; - }; "@esbuild/freebsd-arm64-0.16.3" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -5035,24 +4936,6 @@ let sha512 = "nJansp3sSXakNkOD5i5mIz2Is/HjzIhFs49b1tjrPrpCmwgBmH9SSzhC/Z1UqlkivqMYkhfPwMw1dGFUuwmXhw=="; }; }; - "@esbuild/freebsd-arm64-0.17.6" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.6.tgz"; - sha512 = "EnUwjRc1inT4ccZh4pB3v1cIhohE2S4YXlt1OvI7sw/+pD+dIE4smwekZlEPIwY6PhU6oDWwITrQQm5S2/iZgg=="; - }; - }; - "@esbuild/freebsd-arm64-0.18.11" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.11.tgz"; - sha512 = "atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A=="; - }; - }; "@esbuild/freebsd-x64-0.16.3" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -5062,24 +4945,6 @@ let sha512 = "TfoDzLw+QHfc4a8aKtGSQ96Wa+6eimljjkq9HKR0rHlU83vw8aldMOUSJTUDxbcUdcgnJzPaX8/vGWm7vyV7ug=="; }; }; - "@esbuild/freebsd-x64-0.17.6" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.6.tgz"; - sha512 = "Uh3HLWGzH6FwpviUcLMKPCbZUAFzv67Wj5MTwK6jn89b576SR2IbEp+tqUHTr8DIl0iDmBAf51MVaP7pw6PY5Q=="; - }; - }; - "@esbuild/freebsd-x64-0.18.11" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.11.tgz"; - sha512 = "XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q=="; - }; - }; "@esbuild/linux-arm-0.16.3" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -5089,24 +4954,6 @@ let sha512 = "VwswmSYwVAAq6LysV59Fyqk3UIjbhuc6wb3vEcJ7HEJUtFuLK9uXWuFoH1lulEbE4+5GjtHi3MHX+w1gNHdOWQ=="; }; }; - "@esbuild/linux-arm-0.17.6" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.6.tgz"; - sha512 = "7YdGiurNt7lqO0Bf/U9/arrPWPqdPqcV6JCZda4LZgEn+PTQ5SMEI4MGR52Bfn3+d6bNEGcWFzlIxiQdS48YUw=="; - }; - }; - "@esbuild/linux-arm-0.18.11" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.11.tgz"; - sha512 = "Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg=="; - }; - }; "@esbuild/linux-arm64-0.16.3" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -5116,24 +4963,6 @@ let sha512 = "7I3RlsnxEFCHVZNBLb2w7unamgZ5sVwO0/ikE2GaYvYuUQs9Qte/w7TqWcXHtCwxvZx/2+F97ndiUQAWs47ZfQ=="; }; }; - "@esbuild/linux-arm64-0.17.6" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.6.tgz"; - sha512 = "bUR58IFOMJX523aDVozswnlp5yry7+0cRLCXDsxnUeQYJik1DukMY+apBsLOZJblpH+K7ox7YrKrHmJoWqVR9w=="; - }; - }; - "@esbuild/linux-arm64-0.18.11" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.11.tgz"; - sha512 = "c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog=="; - }; - }; "@esbuild/linux-ia32-0.16.3" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -5143,24 +4972,6 @@ let sha512 = "X8FDDxM9cqda2rJE+iblQhIMYY49LfvW4kaEjoFbTTQ4Go8G96Smj2w3BRTwA8IHGoi9dPOPGAX63dhuv19UqA=="; }; }; - "@esbuild/linux-ia32-0.17.6" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.6.tgz"; - sha512 = "ujp8uoQCM9FRcbDfkqECoARsLnLfCUhKARTP56TFPog8ie9JG83D5GVKjQ6yVrEVdMie1djH86fm98eY3quQkQ=="; - }; - }; - "@esbuild/linux-ia32-0.18.11" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.11.tgz"; - sha512 = "S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw=="; - }; - }; "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -5179,24 +4990,6 @@ let sha512 = "hIbeejCOyO0X9ujfIIOKjBjNAs9XD/YdJ9JXAy1lHA+8UXuOqbFe4ErMCqMr8dhlMGBuvcQYGF7+kO7waj2KHw=="; }; }; - "@esbuild/linux-loong64-0.17.6" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.6.tgz"; - sha512 = "y2NX1+X/Nt+izj9bLoiaYB9YXT/LoaQFYvCkVD77G/4F+/yuVXYCWz4SE9yr5CBMbOxOfBcy/xFL4LlOeNlzYQ=="; - }; - }; - "@esbuild/linux-loong64-0.18.11" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.11.tgz"; - sha512 = "MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw=="; - }; - }; "@esbuild/linux-mips64el-0.16.3" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -5206,24 +4999,6 @@ let sha512 = "znFRzICT/V8VZQMt6rjb21MtAVJv/3dmKRMlohlShrbVXdBuOdDrGb+C2cZGQAR8RFyRe7HS6klmHq103WpmVw=="; }; }; - "@esbuild/linux-mips64el-0.17.6" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.6.tgz"; - sha512 = "09AXKB1HDOzXD+j3FdXCiL/MWmZP0Ex9eR8DLMBVcHorrWJxWmY8Nms2Nm41iRM64WVx7bA/JVHMv081iP2kUA=="; - }; - }; - "@esbuild/linux-mips64el-0.18.11" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.11.tgz"; - sha512 = "qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg=="; - }; - }; "@esbuild/linux-ppc64-0.16.3" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -5233,24 +5008,6 @@ let sha512 = "EV7LuEybxhXrVTDpbqWF2yehYRNz5e5p+u3oQUS2+ZFpknyi1NXxr8URk4ykR8Efm7iu04//4sBg249yNOwy5Q=="; }; }; - "@esbuild/linux-ppc64-0.17.6" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.6.tgz"; - sha512 = "AmLhMzkM8JuqTIOhxnX4ubh0XWJIznEynRnZAVdA2mMKE6FAfwT2TWKTwdqMG+qEaeyDPtfNoZRpJbD4ZBv0Tg=="; - }; - }; - "@esbuild/linux-ppc64-0.18.11" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.11.tgz"; - sha512 = "T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ=="; - }; - }; "@esbuild/linux-riscv64-0.16.3" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -5260,24 +5017,6 @@ let sha512 = "uDxqFOcLzFIJ+r/pkTTSE9lsCEaV/Y6rMlQjUI9BkzASEChYL/aSQjZjchtEmdnVxDKETnUAmsaZ4pqK1eE5BQ=="; }; }; - "@esbuild/linux-riscv64-0.17.6" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.6.tgz"; - sha512 = "Y4Ri62PfavhLQhFbqucysHOmRamlTVK10zPWlqjNbj2XMea+BOs4w6ASKwQwAiqf9ZqcY9Ab7NOU4wIgpxwoSQ=="; - }; - }; - "@esbuild/linux-riscv64-0.18.11" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.11.tgz"; - sha512 = "evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w=="; - }; - }; "@esbuild/linux-s390x-0.16.3" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -5287,24 +5026,6 @@ let sha512 = "NbeREhzSxYwFhnCAQOQZmajsPYtX71Ufej3IQ8W2Gxskfz9DK58ENEju4SbpIj48VenktRASC52N5Fhyf/aliQ=="; }; }; - "@esbuild/linux-s390x-0.17.6" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.6.tgz"; - sha512 = "SPUiz4fDbnNEm3JSdUW8pBJ/vkop3M1YwZAVwvdwlFLoJwKEZ9L98l3tzeyMzq27CyepDQ3Qgoba44StgbiN5Q=="; - }; - }; - "@esbuild/linux-s390x-0.18.11" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.11.tgz"; - sha512 = "/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg=="; - }; - }; "@esbuild/linux-x64-0.16.3" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -5314,24 +5035,6 @@ let sha512 = "SDiG0nCixYO9JgpehoKgScwic7vXXndfasjnD5DLbp1xltANzqZ425l7LSdHynt19UWOcDjG9wJJzSElsPvk0w=="; }; }; - "@esbuild/linux-x64-0.17.6" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.6.tgz"; - sha512 = "a3yHLmOodHrzuNgdpB7peFGPx1iJ2x6m+uDvhP2CKdr2CwOaqEFMeSqYAHU7hG+RjCq8r2NFujcd/YsEsFgTGw=="; - }; - }; - "@esbuild/linux-x64-0.18.11" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.11.tgz"; - sha512 = "xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA=="; - }; - }; "@esbuild/netbsd-x64-0.16.3" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -5341,24 +5044,6 @@ let sha512 = "AzbsJqiHEq1I/tUvOfAzCY15h4/7Ivp3ff/o1GpP16n48JMNAtbW0qui2WCgoIZArEHD0SUQ95gvR0oSO7ZbdA=="; }; }; - "@esbuild/netbsd-x64-0.17.6" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.6.tgz"; - sha512 = "EanJqcU/4uZIBreTrnbnre2DXgXSa+Gjap7ifRfllpmyAU7YMvaXmljdArptTHmjrkkKm9BK6GH5D5Yo+p6y5A=="; - }; - }; - "@esbuild/netbsd-x64-0.18.11" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.11.tgz"; - sha512 = "aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q=="; - }; - }; "@esbuild/openbsd-x64-0.16.3" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -5368,24 +5053,6 @@ let sha512 = "gSABi8qHl8k3Cbi/4toAzHiykuBuWLZs43JomTcXkjMZVkp0gj3gg9mO+9HJW/8GB5H89RX/V0QP4JGL7YEEVg=="; }; }; - "@esbuild/openbsd-x64-0.17.6" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.6.tgz"; - sha512 = "xaxeSunhQRsTNGFanoOkkLtnmMn5QbA0qBhNet/XLVsc+OVkpIWPHcr3zTW2gxVU5YOHFbIHR9ODuaUdNza2Vw=="; - }; - }; - "@esbuild/openbsd-x64-0.18.11" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.11.tgz"; - sha512 = "tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ=="; - }; - }; "@esbuild/sunos-x64-0.16.3" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -5395,24 +5062,6 @@ let sha512 = "SF9Kch5Ete4reovvRO6yNjMxrvlfT0F0Flm+NPoUw5Z4Q3r1d23LFTgaLwm3Cp0iGbrU/MoUI+ZqwCv5XJijCw=="; }; }; - "@esbuild/sunos-x64-0.17.6" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.6.tgz"; - sha512 = "gnMnMPg5pfMkZvhHee21KbKdc6W3GR8/JuE0Da1kjwpK6oiFU3nqfHuVPgUX2rsOx9N2SadSQTIYV1CIjYG+xw=="; - }; - }; - "@esbuild/sunos-x64-0.18.11" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.11.tgz"; - sha512 = "kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng=="; - }; - }; "@esbuild/win32-arm64-0.16.3" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -5422,24 +5071,6 @@ let sha512 = "u5aBonZIyGopAZyOnoPAA6fGsDeHByZ9CnEzyML9NqntK6D/xl5jteZUKm/p6nD09+v3pTM6TuUIqSPcChk5gg=="; }; }; - "@esbuild/win32-arm64-0.17.6" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.6.tgz"; - sha512 = "G95n7vP1UnGJPsVdKXllAJPtqjMvFYbN20e8RK8LVLhlTiSOH1sd7+Gt7rm70xiG+I5tM58nYgwWrLs6I1jHqg=="; - }; - }; - "@esbuild/win32-arm64-0.18.11" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.11.tgz"; - sha512 = "Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg=="; - }; - }; "@esbuild/win32-ia32-0.16.3" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -5449,24 +5080,6 @@ let sha512 = "GlgVq1WpvOEhNioh74TKelwla9KDuAaLZrdxuuUgsP2vayxeLgVc+rbpIv0IYF4+tlIzq2vRhofV+KGLD+37EQ=="; }; }; - "@esbuild/win32-ia32-0.17.6" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.6.tgz"; - sha512 = "96yEFzLhq5bv9jJo5JhTs1gI+1cKQ83cUpyxHuGqXVwQtY5Eq54ZEsKs8veKtiKwlrNimtckHEkj4mRh4pPjsg=="; - }; - }; - "@esbuild/win32-ia32-0.18.11" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.11.tgz"; - sha512 = "o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg=="; - }; - }; "@esbuild/win32-x64-0.16.3" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -5476,24 +5089,6 @@ let sha512 = "5/JuTd8OWW8UzEtyf19fbrtMJENza+C9JoPIkvItgTBQ1FO2ZLvjbPO6Xs54vk0s5JB5QsfieUEshRQfu7ZHow=="; }; }; - "@esbuild/win32-x64-0.17.6" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.6.tgz"; - sha512 = "n6d8MOyUrNp6G4VSpRcgjs5xj4A91svJSaiwLIDWVWEsZtpN5FA9NlBbZHDmAJc2e8e6SF4tkBD3HAvPF+7igA=="; - }; - }; - "@esbuild/win32-x64-0.18.11" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.11.tgz"; - sha512 = "rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA=="; - }; - }; "@eslint-community/eslint-utils-4.4.0" = { name = "_at_eslint-community_slash_eslint-utils"; packageName = "@eslint-community/eslint-utils"; @@ -5503,13 +5098,13 @@ let sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="; }; }; - "@eslint-community/regexpp-4.5.1" = { + "@eslint-community/regexpp-4.6.2" = { name = "_at_eslint-community_slash_regexpp"; packageName = "@eslint-community/regexpp"; - version = "4.5.1"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz"; - sha512 = "Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ=="; + url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz"; + sha512 = "pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -5521,13 +5116,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-2.1.0" = { + "@eslint/eslintrc-2.1.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz"; - sha512 = "Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz"; + sha512 = "9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA=="; }; }; "@eslint/js-8.36.0" = { @@ -5539,13 +5134,13 @@ let sha512 = "lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg=="; }; }; - "@eslint/js-8.44.0" = { + "@eslint/js-8.46.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "8.44.0"; + version = "8.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz"; - sha512 = "Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz"; + sha512 = "a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA=="; }; }; "@esm2cjs/cacheable-lookup-7.0.0" = { @@ -5593,13 +5188,13 @@ let sha512 = "BuqNhUgDz7pZffEwVXRXhRNb6l46CCu17knfUW7juP6H5ugqFFrLOcNiVjt66h4HjsHA0V5NKR7udA7kziqhoQ=="; }; }; - "@esm2cjs/is-5.4.1" = { + "@esm2cjs/is-5.6.0" = { name = "_at_esm2cjs_slash_is"; packageName = "@esm2cjs/is"; - version = "5.4.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/is/-/is-5.4.1.tgz"; - sha512 = "HdfuTvyK/KHuPqmzWybKG3rElLqf/2ebb3Nvf7HryBtFmMfMLEJzDh9mVbzq/ELBfu4dUyNoU2ZojwCpsH18CQ=="; + url = "https://registry.npmjs.org/@esm2cjs/is/-/is-5.6.0.tgz"; + sha512 = "r0j/f9mRDfhegzmZw9zw2k76Igv8jBdpd/Dy/+W2B+uZ0iVPggA3h4rkAcvNKyVeD/7YAfaMORuncBprZ/hLRA=="; }; }; "@esm2cjs/lowercase-keys-3.0.0" = { @@ -5674,13 +5269,13 @@ let sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; }; }; - "@exodus/schemasafe-1.0.1" = { + "@exodus/schemasafe-1.1.1" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.1.tgz"; - sha512 = "PQdbF8dGd4LnbwBlcc4ML8RKYdplm+e9sUeWBTr4zgF13/Shiuov9XznvM4T8cb1CfyKK21yTUkuAIIh/DAH/g=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.1.1.tgz"; + sha512 = "Pd7+aGvWIaTDL5ecV4ZBEtBrjXnk8/ly5xyHbikxVhgcq7qhihzHWHbcYmFupQBT2A5ggNZGvT7Bpj0M6AKHjA=="; }; }; "@expo/apple-utils-1.0.0" = { @@ -5737,15 +5332,6 @@ let sha512 = "OcACI1md1Yo5TQmUxxueJ/RaTlR2Mgl6KswTFOYCL1XJERF/jjAx95zhWXH+JQGdlM0yB0vqM6vB6GbUFRvLxA=="; }; }; - "@expo/config-7.0.3" = { - name = "_at_expo_slash_config"; - packageName = "@expo/config"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-7.0.3.tgz"; - sha512 = "joVtB5o+NF40Tmsdp65UzryRtbnCuMbXkVO4wJnNJO4aaK0EYLdHCYSewORVqNcDfGN0LphQr8VTG2npbd9CJA=="; - }; - }; "@expo/config-8.0.5" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; @@ -5773,15 +5359,6 @@ let sha512 = "RVvU40RtZt12HavuDAe+LDIq9lHj7sheOfMEHdmpJ/uTA8pgvkbc56XF6JHQD+yRr6+uhhb+JnAasGq49dsQbw=="; }; }; - "@expo/config-plugins-5.0.4" = { - name = "_at_expo_slash_config-plugins"; - packageName = "@expo/config-plugins"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-5.0.4.tgz"; - sha512 = "vzUcVpqOMs3h+hyRdhGwk+eGIOhXa5xYdd92yO17RMNHav3v/+ekMbs7XA2c3lepMO8Yd4/5hqmRw9ZTL6jGzg=="; - }; - }; "@expo/config-plugins-6.0.2" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; @@ -5791,13 +5368,13 @@ let sha512 = "Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ=="; }; }; - "@expo/config-plugins-7.2.5" = { + "@expo/config-plugins-7.2.4" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "7.2.5"; + version = "7.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.2.5.tgz"; - sha512 = "w+5ccu1IxBHgyQk9CPFKLZOk8yZQEyTjbJwOzESK1eR7QwosbcsLkN1c1WWUZYiCXwORu3UTwJYll4+X2xxJhQ=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.2.4.tgz"; + sha512 = "TItGwmKH1GDjA5GlMkXo1A8pqeqppSK40aSVRVQaGZraUj+nuvtpWxNgEWZxWFumiatP2ocWwyWVjfmH+rJY6g=="; }; }; "@expo/config-types-45.0.0" = { @@ -5809,15 +5386,6 @@ let sha512 = "/QGhhLWyaGautgEyU50UJr5YqKJix5t77ePTwreOVAhmZH+ff3nrrtYTTnccx+qF08ZNQmfAyYMCD3rQfzpiJA=="; }; }; - "@expo/config-types-47.0.0" = { - name = "_at_expo_slash_config-types"; - packageName = "@expo/config-types"; - version = "47.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-types/-/config-types-47.0.0.tgz"; - sha512 = "r0pWfuhkv7KIcXMUiNACJmJKKwlTBGMw9VZHNdppS8/0Nve8HZMTkNRFQzTHW1uH3pBj8jEXpyw/2vSWDHex9g=="; - }; - }; "@expo/config-types-48.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; @@ -5872,13 +5440,13 @@ let sha512 = "Q0i3GposBj/b2OPL0CV00HczawtslorNpoJSBQfB4aNR6i7DBIZZ1jWJtrFP8+zHZqlUi4d21aoblNUrKpgBew=="; }; }; - "@expo/eas-json-3.13.0" = { + "@expo/eas-json-3.17.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "3.13.0"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.13.0.tgz"; - sha512 = "N8NuFFYj4U4sxV/WlytH2iZJdiUuHiW37UBMYiRGEvgJcus4DNMME51DS3r8yrloj2zAGzmpyT2+ydCh0QjKHA=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.17.0.tgz"; + sha512 = "5Wae3BeXtU4hQrblcjRbxcitTgxKONPDUfAp1CtMUZw4WPRglA66XRfCo8XJRwWPa3tj+F06g1ZKcU+AN0ZZZQ=="; }; }; "@expo/image-utils-0.3.21" = { @@ -6052,15 +5620,6 @@ let sha512 = "ZRMn0a9Wo/coKXLMvizUytqtG5pniUHaBMSS28yFTcGVvyDJh2nFVkBf9po52mSkbm9rGp/Pev6GAf57m6S2BA=="; }; }; - "@expo/prebuild-config-5.0.7" = { - name = "_at_expo_slash_prebuild-config"; - packageName = "@expo/prebuild-config"; - version = "5.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-5.0.7.tgz"; - sha512 = "D+TBpJUHe4+oTGFPb4o0rrw/h1xxc6wF+abJnbDHUkhnaeiHkE2O3ByS7FdiZ2FT36t0OKqeSKG/xFwWT3m1Ew=="; - }; - }; "@expo/prebuild-config-6.0.1" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; @@ -6070,6 +5629,15 @@ let sha512 = "WK3FDht1tdXZGCvtG5s7HSwzhsc7Tyu2DdqV9jVUsLtGD42oqUepk13mEWlU9LOTBgLsoEueKjoSK4EXOXFctw=="; }; }; + "@expo/prebuild-config-6.2.5" = { + name = "_at_expo_slash_prebuild-config"; + packageName = "@expo/prebuild-config"; + version = "6.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-6.2.5.tgz"; + sha512 = "XHgQ4OWZ03rzczD+D2ulQRjyHCVnA36cfX4q+r2x1Say4hI7lIg75ZQEsWdEMU9rZV8TbDUtZlPL4pxNWpYu7Q=="; + }; + }; "@expo/results-1.0.0" = { name = "_at_expo_slash_results"; packageName = "@expo/results"; @@ -6124,13 +5692,13 @@ let sha512 = "sqPAjOEFTrjaTybrh9SnPFLInDXcoMC06psEFmH68jLTmoipSQCq8GCEfIoHhxRDALWB+DsiwXJSbXlE/iVIIQ=="; }; }; - "@expo/steps-1.0.23" = { + "@expo/steps-1.0.28" = { name = "_at_expo_slash_steps"; packageName = "@expo/steps"; - version = "1.0.23"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.23.tgz"; - sha512 = "H6rW49Dje0O/EDamhpbiYwpVltWM+057Exd7RFz8pzmPnkIAYHMXOErIftl3P79LM+ydWe5WWLX92cYU5uCFgA=="; + url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.28.tgz"; + sha512 = "HyYzc9b6oftTGLoH73RD2ZK/h0dbC0aSezazcf1yvvhfHJpVQrpI0wZ3DHXEJocVSNGykH+RUHmoORVknkFJFA=="; }; }; "@expo/timeago.js-1.0.0" = { @@ -6205,121 +5773,121 @@ let sha512 = "5D2qVpZrgpjtqU4eNOcWGp1gnUCgjfM+vKGE2y03kKN6z5EBhtx0qdRFbg8QuNNj8wXNoX93KJoYb+NqoxswmQ=="; }; }; - "@forge/api-2.18.1" = { + "@forge/api-2.18.3" = { name = "_at_forge_slash_api"; packageName = "@forge/api"; - version = "2.18.1"; + version = "2.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/api/-/api-2.18.1.tgz"; - sha512 = "Qf5SKSZSWzSZWoRs01LvsAXTMwwxqpuXPVQ75MAtXMToyPqn/GSlc8O4S2qRnIc0hikh+GzAbpRQWGdOjKqbJg=="; + url = "https://registry.npmjs.org/@forge/api/-/api-2.18.3.tgz"; + sha512 = "SGv665h93tM3TwssIcDmmXYjsXXMTzDbzYCEr1bTVEKuFeop88yp+usl5AF1DdeU3XZq5lBjK1mIN2kmuQBcVA=="; }; }; - "@forge/auth-0.0.2" = { + "@forge/auth-0.0.3" = { name = "_at_forge_slash_auth"; packageName = "@forge/auth"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/auth/-/auth-0.0.2.tgz"; - sha512 = "lnOE7uMJpCGbZkIqsLby+ARYUfbhPdG+o69fV3wAfWg0kQtJkYIMCCpP1boptNXFSg1hAiLnG9+3LysPHSgYlA=="; + url = "https://registry.npmjs.org/@forge/auth/-/auth-0.0.3.tgz"; + sha512 = "C0x3ciLGFDPKoLpNRi/8JHw3xupgGAVenYKBKeeb2gxvD2IbixquqISCImKFFEOypaYOl13wHPV86QbC80ia1A=="; }; }; - "@forge/babel-plugin-transform-ui-1.1.3" = { + "@forge/babel-plugin-transform-ui-1.1.5" = { name = "_at_forge_slash_babel-plugin-transform-ui"; packageName = "@forge/babel-plugin-transform-ui"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/babel-plugin-transform-ui/-/babel-plugin-transform-ui-1.1.3.tgz"; - sha512 = "NgzZtB3ar46aaUHF8yO67XwetsgzOMswAXnCkfz7dpHroUHTe5XWCZkybWutW6mJP+WUICSreR1VFiG2ift/tA=="; + url = "https://registry.npmjs.org/@forge/babel-plugin-transform-ui/-/babel-plugin-transform-ui-1.1.5.tgz"; + sha512 = "C/7wuVzyjcp4/5Fbfke7DJO2B9ljUAYuCA0C71CwnchRfzZ2weunhV8zdioOOMEamxtyu91BHhqOwRq0pyLUAw=="; }; }; - "@forge/bundler-4.10.2" = { + "@forge/bundler-4.10.4" = { name = "_at_forge_slash_bundler"; packageName = "@forge/bundler"; - version = "4.10.2"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.2.tgz"; - sha512 = "yvYUPrNP8BirbqM7BermRIPftTS+Ij0PwNcxYz96ISpB/CaL6WP5O5vEpqPWDRCnl83N4zVlZcJuyVvrNAMeTw=="; + url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.10.4.tgz"; + sha512 = "/ChKPrhZu4PcBKpnqbc4YYrh0gxtHwlPLdmhHa2uvs6Wqgg8R70qgb/J7Ani66NwFMWpCeBe/gJpQbhknkxDGw=="; }; }; - "@forge/cli-shared-3.15.1" = { + "@forge/cli-shared-3.17.0" = { name = "_at_forge_slash_cli-shared"; packageName = "@forge/cli-shared"; - version = "3.15.1"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.15.1.tgz"; - sha512 = "NZGLu63dIV3o5iv6w9cQrQt/jq3yq6Q8zLNZWzBKVk/4IkTDzyguZRcpguI7AiOnaDcweutwFuWvfQv6RD7juA=="; + url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.17.0.tgz"; + sha512 = "qbhMIpci9JA0i6iaz0s0cnQ708+M1Nw5CnvpO647eBWbZiuuuCjjqNuqq8Y7+qvpRbPW9hbyvFIQAHy0cAgngQ=="; }; }; - "@forge/csp-2.1.3" = { + "@forge/csp-2.1.5" = { name = "_at_forge_slash_csp"; packageName = "@forge/csp"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/csp/-/csp-2.1.3.tgz"; - sha512 = "ccaodlJx0qfV/eCERa8a6oZwGPd8c0nXYWdTrl3JPoJn7MrpP0mzVc/BgmXIhyybaA81lXNfxVAYUeV4QekYzg=="; + url = "https://registry.npmjs.org/@forge/csp/-/csp-2.1.5.tgz"; + sha512 = "l1W0CRxCmWIocw1l27pTtUT6+/U92yQAJ4xWv3B57bPGGD3rSMNn3eXQqnog4Waa786CcrL1iHWv/DEEjvexpQ=="; }; }; - "@forge/egress-1.2.1" = { + "@forge/egress-1.2.2" = { name = "_at_forge_slash_egress"; packageName = "@forge/egress"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/egress/-/egress-1.2.1.tgz"; - sha512 = "4XUr2LfLN4TGbEcg5GiqFeHwOT+1l7aaW7nwCn0uz2uFahQ+G9Kq0ebFWqsvzd5mCvO9oaSAucJaDeEpriKhmA=="; + url = "https://registry.npmjs.org/@forge/egress/-/egress-1.2.2.tgz"; + sha512 = "i+1xZd3CzlPagyEguH4NSUd9xFu9fw5vqhZZM/1J0leEDFCKYD1EPGm+G6UCh1qQqU2nssU9xZw79RE+x8chQg=="; }; }; - "@forge/lint-3.6.1" = { + "@forge/lint-3.6.3" = { name = "_at_forge_slash_lint"; packageName = "@forge/lint"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.6.1.tgz"; - sha512 = "fzc6Rtx2vottfJZEWdlPEp77StRY6o4G4oIopKbo9AABUYZujRqxrrND9QU6AoeM91iIGkRea7Tyc/PASoHC8Q=="; + url = "https://registry.npmjs.org/@forge/lint/-/lint-3.6.3.tgz"; + sha512 = "p/U+VYpW2+/9VPSqi3PR5H41K1UC3UTpVkFrAFw4M9aXvLyunkG1sXcrc0Q30BRfKYyZERNm1pY8EjqKT1ESYA=="; }; }; - "@forge/manifest-4.16.0" = { + "@forge/manifest-4.18.0" = { name = "_at_forge_slash_manifest"; packageName = "@forge/manifest"; - version = "4.16.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.16.0.tgz"; - sha512 = "1i/vQ4OPQpxCDQATzw7BsQ+26F/1O8sbnpgfb4gIMm2E4oHsx3ADU537ka53mWaHY5o0/ioMyT72RfPAielTZA=="; + url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.18.0.tgz"; + sha512 = "AfZpGb9BUDDOchpNUSxpVapl1hDYuRYv26knD6aiBmuzutj/nPl//ES4nmd6nw5vZhZ/DTIl5V0BgPeHKNI0pg=="; }; }; - "@forge/runtime-4.4.3" = { + "@forge/runtime-4.4.5" = { name = "_at_forge_slash_runtime"; packageName = "@forge/runtime"; - version = "4.4.3"; + version = "4.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/runtime/-/runtime-4.4.3.tgz"; - sha512 = "lxc68nY+UGAJ+GewDRo/QFiaZjxdypRmGMPreS4cyD67Btq+XvRIOe1awtanegy6ryzNux0T0XknIS74mVLBHQ=="; + url = "https://registry.npmjs.org/@forge/runtime/-/runtime-4.4.5.tgz"; + sha512 = "8z1IIxG81gG7cpORa3yAdR9J5Z1BF1Itr8yYWsc/BqnpyjigmoGON/ZITb9srBio3sxGnD0UMqHq/jIL3KnQEw=="; }; }; - "@forge/storage-1.5.4" = { + "@forge/storage-1.5.5" = { name = "_at_forge_slash_storage"; packageName = "@forge/storage"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/storage/-/storage-1.5.4.tgz"; - sha512 = "Ag8M0lAiqE0NMYp3eliUgoi8YYhr6ElOV47MgA53UCXV4jKCH7aWjr+1UneqagVwnh6rE2oPp7yeBNXUFewd3g=="; + url = "https://registry.npmjs.org/@forge/storage/-/storage-1.5.5.tgz"; + sha512 = "4APa+O8vqmoRNHb8qSxH3TabI4H8flVQbTEktdDDe+OMrMXQfc8cQXbtyUvNMnR78m9b0ZEz1bh1toIupzRxkw=="; }; }; - "@forge/tunnel-3.6.2" = { + "@forge/tunnel-3.6.4" = { name = "_at_forge_slash_tunnel"; packageName = "@forge/tunnel"; - version = "3.6.2"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.6.2.tgz"; - sha512 = "/WUBPZeXyGRdefWMeDTGwZ8V15tP+g1gufpAGptD8Ko0B735izISZsskTNErTCs3P8H6ihCJo/FnBncWvlf/8A=="; + url = "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.6.4.tgz"; + sha512 = "jvae7S6YPZNJu1Xtk6nJaEpNRgcQMyG19AqT++Mm0UX7s1XXK7lxcrcFOU2i/dCBEQoorFexcnrs3UX7luvDVQ=="; }; }; - "@forge/util-1.2.3" = { + "@forge/util-1.3.1" = { name = "_at_forge_slash_util"; packageName = "@forge/util"; - version = "1.2.3"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/util/-/util-1.2.3.tgz"; - sha512 = "VijL/4LX4WHYMkfynU+5mfS2LvqUy3FU8zWEMwXQ31rPglKrpK/5+pTKUjjCEsCTjMA2jDqXUyLYads+pRl8dw=="; + url = "https://registry.npmjs.org/@forge/util/-/util-1.3.1.tgz"; + sha512 = "AgyTKr0wWOZlCTZtShwOIoW8JApA78H7n+PhXbXC0NQwJE2fKust2uOOsty0fNDqw2ooabxbY1zZLq7pSQt9Uw=="; }; }; "@gar/promisify-1.1.3" = { @@ -6331,31 +5899,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-39.5.1" = { + "@gitbeaker/core-39.10.2" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "39.5.1"; + version = "39.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.5.1.tgz"; - sha512 = "14Tw/cGEijWI2NsjlqOLZt0BhePJc2ljHFNiwSv/lDuPAnbtpqGlAWma4hDdhtm2+s/4eKL6Y/taS6I3EdinwQ=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.10.2.tgz"; + sha512 = "aYU4S+DOnuT7zmHD8h/ap4rJgfdMBHytQuinVMxQwD9k+iCrDNZ9TPT1C2e77ZXLkBwfx6gBlbn0/n1QPphiUQ=="; }; }; - "@gitbeaker/requester-utils-39.5.1" = { + "@gitbeaker/requester-utils-39.10.2" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "39.5.1"; + version = "39.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.5.1.tgz"; - sha512 = "36Hy9WgRMjVSGWg+ZE1a9pO7zxNFcR3WPVyqaGECPmfrmFtwaClHxauGCRS3W0LwFPL9paKuPTYuQnc9PxqI6Q=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.10.2.tgz"; + sha512 = "40XILUwFuuGoB+y/wvjxNzl4ybGxRXJ1Q/CZboS+3sZj1HviwML0m+eBKHtAGESH5wl4dNTtDt/ge6y1gHtIqQ=="; }; }; - "@gitbeaker/rest-39.5.1" = { + "@gitbeaker/rest-39.10.2" = { name = "_at_gitbeaker_slash_rest"; packageName = "@gitbeaker/rest"; - version = "39.5.1"; + version = "39.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.5.1.tgz"; - sha512 = "BV5O45urALYCSC7i78KsRu4NabWIbkH+NfHMMQr0HJm8BP3FWiJZFqXEJuYBbDxE0Rw8yq4QPObF9cfOGAaX1w=="; + url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.10.2.tgz"; + sha512 = "54sMSqTuLn0zH9AXwrvJkiiuPe5XDYLnMTVH/VsRFUNM6OJSix2aapX3wTMjb9AsP/yQFFF7Bh1+k6Ce346PLw=="; }; }; "@glideapps/ts-necessities-2.1.3" = { @@ -6403,13 +5971,13 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-3.7.1" = { + "@google-cloud/pubsub-3.7.3" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "3.7.1"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.7.1.tgz"; - sha512 = "J6jzgIubq1sAMafnSF2wGnOn1qkNd0l0Y5ChG33rU27/iDXmxKabaiY/dvFndX3v57TE/QcB9uQt5A6Pek+WrA=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.7.3.tgz"; + sha512 = "ZRDC4g7tpIJ8fkAp4MiU+tDfousM/q6pXK6ytFn0cbYEdNQuWOf4wqopNYMOUJ+AIjaTbgmNw77dStOKTc9Acg=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -6547,13 +6115,13 @@ let sha512 = "P2nlkAsPZKLIXImFhj0YTtny5NQVGSsKnhi7PzXiaHSXc6KkzqbWZHKvikD4PObanqg+7IO58rKFpGXP7eeO+w=="; }; }; - "@graphql-tools/executor-graphql-ws-1.0.2" = { + "@graphql-tools/executor-graphql-ws-1.1.0" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.0.2.tgz"; - sha512 = "T9lKnweig4+LqS8EmBmyfAVYYUEkzLzoiB/L7CJeoI4dy+U+5fxZcfq8Aq2imVQpeeOldBg54JK89UgBRKv9Qg=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.0.tgz"; + sha512 = "yM67SzwE8rYRpm4z4AuGtABlOp9mXXVy6sxXnTJRoYIdZrmDbKVfIY+CpZUJCqS0FX3xf2+GoHlsj7Qswaxgcg=="; }; }; "@graphql-tools/executor-http-0.1.10" = { @@ -6565,13 +6133,13 @@ let sha512 = "hnAfbKv0/lb9s31LhWzawQ5hghBfHS+gYWtqxME6Rl0Aufq9GltiiLBcl7OVVOnkLF0KhwgbYP1mB5VKmgTGpg=="; }; }; - "@graphql-tools/executor-http-1.0.1" = { + "@graphql-tools/executor-http-1.0.2" = { name = "_at_graphql-tools_slash_executor-http"; packageName = "@graphql-tools/executor-http"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.1.tgz"; - sha512 = "36D2oxVuv7NboFdPPS9MDOICvsg08P1K9xkqcQTB4UQogkUn58ZFfWM+4cZ9rwfNCIPTIzH4quoj7Xo09xbzmw=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.2.tgz"; + sha512 = "JKTB4E3kdQM2/1NEcyrVPyQ8057ZVthCV5dFJiKktqY9IdmF00M8gupFcW3jlbM/Udn78ickeUBsUzA3EouqpA=="; }; }; "@graphql-tools/executor-legacy-ws-0.0.11" = { @@ -6808,13 +6376,13 @@ let sha512 = "rPc9oDzMnycvz+X+wrN3PLrhMBQkG4+sd8EzaFN6dypcssiefgWKToXtRKI8HHK68n2xEq1PyrOpkjHFJB+GwA=="; }; }; - "@graphql-tools/utils-10.0.3" = { + "@graphql-tools/utils-10.0.4" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.3.tgz"; - sha512 = "6uO41urAEIs4sXQT2+CYGsUTkHkVo/2MpM/QjoHj6D6xoEF2woXHBpdAVi0HKIInDwZqWgEYOwIFez0pERxa1Q=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.4.tgz"; + sha512 = "MF+nZgGROSnFgyOYWhrl2PuJMlIBvaCH48vtnlnDQKSeDc2fUfOzUVloBAQvnYmK9JBmHHks4Pxv25Ybg3r45Q=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -6952,6 +6520,24 @@ let sha512 = "DGuSbtMFbaRsyffMf+VEkVu8HkSXEUfO3UyGJNtqxW9ABdtTIA+2UXAJpwbJS+xfQxuwqLUeELmL6FuZkOqPxw=="; }; }; + "@grpc/grpc-js-1.8.18" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.8.18"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.18.tgz"; + sha512 = "2uWPtxhsXmVgd8WzDhfamSjHpZDXfMjMDciY6VRTq4Sn7rFzazyf0LLDa0oav+61UHIoEZb4KKaAV6S7NuJFbQ=="; + }; + }; + "@grpc/grpc-js-1.8.21" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.8.21"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.21.tgz"; + sha512 = "KeyQeZpxeEBSqFVTi3q2K7PiPXmgBfECc4updA1ejCLjYmoAlvvM3ZMp5ztTDUCUQmoY3CpDxvchjO1+rFkoHg=="; + }; + }; "@grpc/grpc-js-1.8.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -6997,6 +6583,15 @@ let sha512 = "1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ=="; }; }; + "@grpc/proto-loader-0.7.8" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.8.tgz"; + sha512 = "GU12e2c8dmdXb7XUlOgYWZ2o2i+z9/VeACkxTA/zzAe2IjclC5PnVL0lpgjhrqfpDYHzM8B1TF6pqWegMYAzlA=="; + }; + }; "@handsontable/formulajs-2.0.2" = { name = "_at_handsontable_slash_formulajs"; packageName = "@handsontable/formulajs"; @@ -7042,13 +6637,13 @@ let sha512 = "q8XRDFn2peboPHGV+wbLCpp52anKiZsoNHZGA+t3I2iJ0/Qn+/8YNO0ILiJnPlVYos6fHceYiL75fhNIISTBRg=="; }; }; - "@hpcc-js/wasm-2.5.0" = { + "@hpcc-js/wasm-2.13.1" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "2.5.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.5.0.tgz"; - sha512 = "G26BamgaHW46f6P8bmkygapgNcy+tTDMwIvCzmMzdp39sxUS1u4gaT/vR2SSDc4x3SfL5RE4B2B8ef/wd429Hg=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz"; + sha512 = "dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -7168,103 +6763,112 @@ let sha512 = "LBWf21EYmOJnM4azYPM4LsNbiH9GBK8rc1dwmDhuUELI43dEOGWSs2ateLn8/E9vyrVELGwQ1Y3Bu61YHa8kaA=="; }; }; - "@inquirer/checkbox-1.3.3" = { + "@inquirer/checkbox-1.3.6" = { name = "_at_inquirer_slash_checkbox"; packageName = "@inquirer/checkbox"; - version = "1.3.3"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.3.3.tgz"; - sha512 = "iiAQtwEuMJsQy70Ix4poNauWPLDb8bDo9vQGMGmBEVpAKV2wDOwNvgxSsst3sfPB29iMO2+4NkGCf7hxlMJayw=="; + url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.3.6.tgz"; + sha512 = "xeY5U/vwU62Hkt7bjAmw446V4iKNR5rzHQGErOREVicxtmipjkGku+qm8MV7y/dWZelxAH0MIkNBbBLqg6/MsQ=="; }; }; - "@inquirer/confirm-2.0.4" = { + "@inquirer/confirm-2.0.7" = { name = "_at_inquirer_slash_confirm"; packageName = "@inquirer/confirm"; - version = "2.0.4"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.4.tgz"; - sha512 = "wL8TS2vdrYWUypIw4XiwnNhk8k6T0PRE6nsyva8PtKP3MZxd7bKgmmhdl8OqApAFZgW6SWobPCOQNkiAIIOjjQ=="; + url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.7.tgz"; + sha512 = "pEpvyeMaYNZYnHYxZL+9M8XtFsJly1Sk0gRPAr2wzRWMtqAvyWCclQo96Zu56S072L3Aez+ntcQ/Mvi+PGX42w=="; }; }; - "@inquirer/core-2.3.0" = { + "@inquirer/core-2.3.1" = { name = "_at_inquirer_slash_core"; packageName = "@inquirer/core"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/core/-/core-2.3.0.tgz"; - sha512 = "JoJtfplpSa0HOzsCaZA5gcUyibTlMb9h/+d9BiP55OHEB5l2jaQZ/hSnIgjVtyox1BhDYmppzUoa5n1BXc3+aQ=="; + url = "https://registry.npmjs.org/@inquirer/core/-/core-2.3.1.tgz"; + sha512 = "faYAYnIfdEuns3jGKykaog5oUqFiEVbCx9nXGZfUhyEEpKcHt5bpJfZTb3eOBQKo8I/v4sJkZeBHmFlSZQuBCw=="; }; }; - "@inquirer/editor-1.2.2" = { + "@inquirer/core-3.1.0" = { + name = "_at_inquirer_slash_core"; + packageName = "@inquirer/core"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/core/-/core-3.1.0.tgz"; + sha512 = "l+vA7cbkVnEnrV1zCStw9//4mrmJNTziE67C9vQA3ccyTeGx+o0APnFmXo1AMSf7r9N7+gom9KdSjk7v4bg2Wg=="; + }; + }; + "@inquirer/editor-1.2.5" = { name = "_at_inquirer_slash_editor"; packageName = "@inquirer/editor"; - version = "1.2.2"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.2.tgz"; - sha512 = "jIUC7Wy4LXZU/7/DQ2W/sWsyTr8k00QRBWc2fsUlWg+rgoLWV/Gy60irbuyp/VCu/jQ/AHRnEz4sS2IJnSxDjA=="; + url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.5.tgz"; + sha512 = "OyNWKv87U4BpmPSaKNFjiaayH1GYOrccbXiA5s0Zk+b/j8ESo67rMBv9GiBvm9fl1VbXydZpxGz7WKCIbn6cag=="; }; }; - "@inquirer/expand-1.1.3" = { + "@inquirer/expand-1.1.6" = { name = "_at_inquirer_slash_expand"; packageName = "@inquirer/expand"; - version = "1.1.3"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.3.tgz"; - sha512 = "rd2IH4Na6/EoSdEBwj3PoXQ9XjisrktAaSh8XWLiZs/RbsJh00KQmgVxfSJmVxQNw97vYLPc79UBYRkhvgrnng=="; + url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.6.tgz"; + sha512 = "9sbFz0dorHOmJ9ndkg4vHq0pNSBAKJ1jlOHE9kwdONRhG4fl1bl1OIBAOaeNZ8XqS/1tEaoDcG2zpFmFDjG1Jw=="; }; }; - "@inquirer/input-1.2.3" = { + "@inquirer/input-1.2.6" = { name = "_at_inquirer_slash_input"; packageName = "@inquirer/input"; - version = "1.2.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.3.tgz"; - sha512 = "JDe8Lnl++K+yvqHvMObjxO26/YXpOuJY2Eso5XiTA1TAfGHkQGuRFcemfUK5zuUwuLvYr2fOUiSFBJw+6+w59Q=="; + url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.6.tgz"; + sha512 = "zmAAYCEJ7sblT36N3CL7Ugd0Js7hVZwb0BDmCWncTn4I0o+h4t8Kj8pBXh0Kdms2zxitOIBcbZDfFmUkZ5Zs1A=="; }; }; - "@inquirer/password-1.1.3" = { + "@inquirer/password-1.1.6" = { name = "_at_inquirer_slash_password"; packageName = "@inquirer/password"; - version = "1.1.3"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.3.tgz"; - sha512 = "bGF0FFCMLyS4144SX3kqnaM9qpRQ5KFv/B3C3Ya/l/aTNu9+tTSP2y4z0AB8po8BfA9LTfDebcrlM0VFVTBxng=="; + url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.6.tgz"; + sha512 = "HV+7aECu+qT5SQi1PH+5i90ckrUSPqVQ/QWCC3bUYQFh1E/yuQIU479Jw59xldUy+1DxVeqEtBPHpUxNlqUBKw=="; }; }; - "@inquirer/prompts-2.3.0" = { + "@inquirer/prompts-2.3.1" = { name = "_at_inquirer_slash_prompts"; packageName = "@inquirer/prompts"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/prompts/-/prompts-2.3.0.tgz"; - sha512 = "x79tSDIZAibOl9WaBoOuyaQqNnisOO8Pk0qWyulP/nPaD/WkoRvkzk7hR4WTRmWAyE8CNbjdYgGltvd0qmvCGQ=="; + url = "https://registry.npmjs.org/@inquirer/prompts/-/prompts-2.3.1.tgz"; + sha512 = "YQeBFzIE+6fcec5N/U2mSz+IcKEG4wtGDwF7MBLIDgITWzB3o723JpKJ1rxWqdCvTXkYE+gDXK/seSN6omo3DQ=="; }; }; - "@inquirer/rawlist-1.2.3" = { + "@inquirer/rawlist-1.2.6" = { name = "_at_inquirer_slash_rawlist"; packageName = "@inquirer/rawlist"; - version = "1.2.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.3.tgz"; - sha512 = "Rmb+5Ju7JHN1xTa1H7BwO5vsy3FqQz7kefEAGoZOawfeeB1zenJolb7LKVvv3nrpH16itDLl79sBTixokoe9lg=="; + url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.6.tgz"; + sha512 = "EFwYq0ymYeF2ofDw7DkDGooBOvfrcsJgHMMSYKjvu9rp5PRKCBviUuRlmSPs6x97ttOvHKNa3L3FJGXykyskLw=="; }; }; - "@inquirer/select-1.2.3" = { + "@inquirer/select-1.2.6" = { name = "_at_inquirer_slash_select"; packageName = "@inquirer/select"; - version = "1.2.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/select/-/select-1.2.3.tgz"; - sha512 = "kipYkf5iVok9i22YSLJiwf4m0Ek6S67tJm20jJr/kjuSmbnbpO0mJGFuhgbrGS4uDqkeEOB3tQ81mqb7cVIVbA=="; + url = "https://registry.npmjs.org/@inquirer/select/-/select-1.2.6.tgz"; + sha512 = "FE2UQ9sfabDMzu8ynz83nnFoTmUjeoh52AmEwCmiMo61ulN785B5N4t0w8R8ezm6hQtngIGXkP0/FCuGTbsR6g=="; }; }; - "@inquirer/type-1.1.0" = { + "@inquirer/type-1.1.1" = { name = "_at_inquirer_slash_type"; packageName = "@inquirer/type"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/type/-/type-1.1.0.tgz"; - sha512 = "XMaorygt2o/mXinZg/OOz6d3JKuV3o4jRc/3KDiVPeKLLkjiO4iJErbLKtKn+Od2ZC2lbiFQkrIuloVpEubisA=="; + url = "https://registry.npmjs.org/@inquirer/type/-/type-1.1.1.tgz"; + sha512 = "ACc2N1AnIYtg+bfnitna0OJ1rptWqa8apdDDRQnRWb0R5MEPGAgvqWaDbZahATXOnglqKDRIeHFEQfqxhM6p/g=="; }; }; "@ionic/cli-framework-3.0.6" = { @@ -8240,22 +7844,22 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.84.0" = { + "@jsii/check-node-1.85.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.84.0.tgz"; - sha512 = "gLa+N1WKksCjTXaK8VMjTbEXf58QlrDOovoTOEzhGNgTFyAUX8woIRAUmk+X70ssDzBvgh3E98mIsDKoWOp6zA=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.85.0.tgz"; + sha512 = "dOrye7NuafkHADt3jk0TxMu/2sOHXxOYTwAuKj9L1/Te1xFfw2fzni80J12rTBQeVQxLVFNgDynsl2J7cuFFtQ=="; }; }; - "@jsii/spec-1.84.0" = { + "@jsii/spec-1.85.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.84.0.tgz"; - sha512 = "P2PCE4jlmuTh5Oj7Be2jdn5qyzIWHX4rcyYspddc0DLZAuLB/LRQYytrxgfdy4+NroGhrPeKPBoF9MwJ5CzfXA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.85.0.tgz"; + sha512 = "RIBLbuKf7JOC54v1JnRuykwlL+qmOgivQM8LHJxiAsUKiuY5ypSzG0JyeoJ1+lMQ9zZ50Ho0HY1ZO+XH18ZgNg=="; }; }; "@json2csv/formatters-6.1.3" = { @@ -8294,33 +7898,6 @@ let sha512 = "UAdaZwahrUeYhMYYilJwDsRfE7wDRsmGMsszYH67j8FLD5gZitqG38RXpUgHEH0s6YjsY8iKYWeEQ19WILncFA=="; }; }; - "@jspm/core-2.0.1" = { - name = "_at_jspm_slash_core"; - packageName = "@jspm/core"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jspm/core/-/core-2.0.1.tgz"; - sha512 = "Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw=="; - }; - }; - "@koa/multer-3.0.2" = { - name = "_at_koa_slash_multer"; - packageName = "@koa/multer"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@koa/multer/-/multer-3.0.2.tgz"; - sha512 = "Q6WfPpE06mJWyZD1fzxM6zWywaoo+zocAn2YA9QYz4RsecoASr1h/kSzG0c5seDpFVKCMZM9raEfuM7XfqbRLw=="; - }; - }; - "@koa/router-10.1.1" = { - name = "_at_koa_slash_router"; - packageName = "@koa/router"; - version = "10.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@koa/router/-/router-10.1.1.tgz"; - sha512 = "ORNjq5z4EmQPriKbR0ER3k4Gh7YGNhWDL7JBW+8wXDrHLbWYKYSJaOJ9aN06npF5tbTxe2JBOsurpJDAvjiXKw=="; - }; - }; "@kurkle/color-0.3.2" = { name = "_at_kurkle_slash_color"; packageName = "@kurkle/color"; @@ -8357,13 +7934,13 @@ let sha512 = "4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA=="; }; }; - "@ledgerhq/devices-8.0.4" = { + "@ledgerhq/devices-8.0.5" = { name = "_at_ledgerhq_slash_devices"; packageName = "@ledgerhq/devices"; - version = "8.0.4"; + version = "8.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.4.tgz"; - sha512 = "dxOiWZmtEv1tgw70+rW8gviCRZUeGDUnxY6HUPiRqTAc0Ts2AXxiJChgAsPvIywWTGW+S67Nxq1oTZdpRbdt+A=="; + url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.5.tgz"; + sha512 = "Cy4LOfcYhYGWLd2nRA/CY/AneJT+Q3RyNwzoRx28gqAN21vF3+IZtL0jqs1n78rZ2bTEHyBS1GMOX13s5Y+O4g=="; }; }; "@ledgerhq/errors-5.50.0" = { @@ -8375,13 +7952,13 @@ let sha512 = "gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow=="; }; }; - "@ledgerhq/errors-6.12.7" = { + "@ledgerhq/errors-6.13.0" = { name = "_at_ledgerhq_slash_errors"; packageName = "@ledgerhq/errors"; - version = "6.12.7"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.7.tgz"; - sha512 = "1BpjzFErPK7qPFx0oItcX0mNLJMplVAm2Dpl5urZlubewnTyyw5sahIBjU+8LLCWJ2eGEh/0wyvh0jMtR0n2Mg=="; + url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.13.0.tgz"; + sha512 = "cMFNX2AN6Gdj4RVIizI/7vWb+JYRu5na0rQSjybf7xGW5MSVdFVRcOg90VvqnDRsNfgFBbJzhpf7o4D7S3yFgg=="; }; }; "@ledgerhq/hw-transport-5.51.1" = { @@ -8393,31 +7970,31 @@ let sha512 = "6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw=="; }; }; - "@ledgerhq/hw-transport-6.28.5" = { + "@ledgerhq/hw-transport-6.28.6" = { name = "_at_ledgerhq_slash_hw-transport"; packageName = "@ledgerhq/hw-transport"; - version = "6.28.5"; + version = "6.28.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.5.tgz"; - sha512 = "xmw5RhYbqExBBqTvOnOjN/RYNIGMBxFJ+zcYNfkfw/E+uEY3L7xq8Z7sC/n7URTT6xtEctElqduBJnBQE4OQtw=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.6.tgz"; + sha512 = "0VVB4jIG6ZTRtHusI5kO2jPcc1yFQ+iIcNKiTaaBHytsdGjTfhipje+W4vxo+nCdOKdrkOqB80GwykmKuNNXyA=="; }; }; - "@ledgerhq/hw-transport-node-hid-6.27.17" = { + "@ledgerhq/hw-transport-node-hid-6.27.19" = { name = "_at_ledgerhq_slash_hw-transport-node-hid"; packageName = "@ledgerhq/hw-transport-node-hid"; - version = "6.27.17"; + version = "6.27.19"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.17.tgz"; - sha512 = "yoK3NDuk6uqIrxEgClKUGi9rcYcybwpZMo1n91FGAK8s8veDS/AfQRjeQG8sFjOEaHMijFluMvaCikvQP1NbsQ=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.19.tgz"; + sha512 = "f8GZ5qpgFM4W8ndymlKPbmFVPIklle2mUDC9MGClFbo/BHb73Cz47AZSDsD++hQ3oX7xyHVUaRzubEBLD3TYVw=="; }; }; - "@ledgerhq/hw-transport-node-hid-noevents-6.27.16" = { + "@ledgerhq/hw-transport-node-hid-noevents-6.27.17" = { name = "_at_ledgerhq_slash_hw-transport-node-hid-noevents"; packageName = "@ledgerhq/hw-transport-node-hid-noevents"; - version = "6.27.16"; + version = "6.27.17"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.16.tgz"; - sha512 = "7MK245Cfj4B4WijO+a0iux+glmyHr44ezSuec4h1PfQrtiOGf+Sk26oi8WHJX+pabc9c566Qxkgdo4FvHWCCaA=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.17.tgz"; + sha512 = "QCuySuUgD8wAvTBO9jSwxZvjbfaRfoGNgr7JcDuu25D8pTTIn7S1mCtvVX8TwgMT9hIHsjfkbw6L23FPClvldg=="; }; }; "@ledgerhq/hw-transport-u2f-5.36.0-deprecated" = { @@ -8474,22 +8051,22 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/child-process-7.1.1" = { + "@lerna/child-process-7.1.4" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "7.1.1"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.1.1.tgz"; - sha512 = "mR8PaTkckYPLmEBG2VsVsJq2UuzEvjXevOB1rKLKUZ/dPCGcottVhbiEzTxickc+s7Y/1dTTLn/1BKj3B1a5BA=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.1.4.tgz"; + sha512 = "cSiMDx9oI9vvVT+V/WHcbqrksNoc9PIPFiks1lPS7zrVWkEbgA6REQyYmRd2H71kihzqhX5TJ20f2dWv6oEPdA=="; }; }; - "@lerna/create-7.1.1" = { + "@lerna/create-7.1.4" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "7.1.1"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-7.1.1.tgz"; - sha512 = "1PY2OgwGxp7b91JzLKEhONVl69mCt1IyYEc6pzKy3Sv+UOdeK2QFq1SX/85hNOR3iitiyZ75bNWUTcBly1ZlZg=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-7.1.4.tgz"; + sha512 = "D5YWXsXIxWb1aGqcbtttczg86zMzkNhcs00/BleFNxdNYlTRdjLIReELOGBGrq3Hij05UN+7Dv9EKnPFJVbqAw=="; }; }; "@lezer/common-0.15.12" = { @@ -8528,6 +8105,15 @@ let sha512 = "fkAZCkkpB90Nepvfd2NqwAF6wa3O+/ofhBDeQd7+79JwEtBqhCVGfa/xVb2j1mUscxmTIqwo1WIJtKM7YgGYsw=="; }; }; + "@ljharb/through-2.3.9" = { + name = "_at_ljharb_slash_through"; + packageName = "@ljharb/through"; + version = "2.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@ljharb/through/-/through-2.3.9.tgz"; + sha512 = "yN599ZBuMPPK4tdoToLlvgJB4CLK8fGl7ntfy0Wn7U6ttNvHYurd81bfUiK/6sMkiIwm65R6ck4L6+Y3DfVbNQ=="; + }; + }; "@lmdb/lmdb-darwin-arm64-2.5.3" = { name = "_at_lmdb_slash_lmdb-darwin-arm64"; packageName = "@lmdb/lmdb-darwin-arm64"; @@ -8654,13 +8240,13 @@ let sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; }; }; - "@mapbox/node-pre-gyp-1.0.10" = { + "@mapbox/node-pre-gyp-1.0.11" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz"; - sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; + url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz"; + sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="; }; }; "@mark.probst/typescript-json-schema-0.55.0" = { @@ -8843,13 +8429,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/rush-lib-5.100.1" = { + "@microsoft/rush-lib-5.100.2" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.100.1"; + version = "5.100.2"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.100.1.tgz"; - sha512 = "UFn1vKLy7Iv4LmqcCSnizf0V0/Cn/pGcpne3J1m1oeFuc0QqfYOgzSqD6zNrFut6S1Tf4BCFLxlJph0XjbAYmA=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.100.2.tgz"; + sha512 = "wuyvYok7qEdADNeN98C+tO5lU23CH04kSYbJ/lz4CQfqVIviFLQQExDEPnvRxNP0I1XmuMdsaIVG28m1tLCMMA=="; }; }; "@mischnic/json-sourcemap-0.1.0" = { @@ -9149,15 +8735,6 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@nicolo-ribaudo/semver-v6-6.3.3" = { - name = "_at_nicolo-ribaudo_slash_semver-v6"; - packageName = "@nicolo-ribaudo/semver-v6"; - version = "6.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz"; - sha512 = "3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg=="; - }; - }; "@noble/hashes-1.3.1" = { name = "_at_noble_slash_hashes"; packageName = "@noble/hashes"; @@ -9464,22 +9041,13 @@ let sha512 = "y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg=="; }; }; - "@npmcli/package-json-2.0.0" = { + "@npmcli/package-json-4.0.1" = { name = "_at_npmcli_slash_package-json"; packageName = "@npmcli/package-json"; - version = "2.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/package-json/-/package-json-2.0.0.tgz"; - sha512 = "42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA=="; - }; - }; - "@npmcli/package-json-4.0.0" = { - name = "_at_npmcli_slash_package-json"; - packageName = "@npmcli/package-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/package-json/-/package-json-4.0.0.tgz"; - sha512 = "ZeXtZBQ/xjSUmrZj9R1Y2gsQRfkdhP5H31SCieJbAd8bHbn4YRglOoajcEZTJTM9m9BuEE7KiDcMPEoD/OgJkw=="; + url = "https://registry.npmjs.org/@npmcli/package-json/-/package-json-4.0.1.tgz"; + sha512 = "lRCEGdHZomFsURroh522YvA/2cVb9oPIJrjHanCJZkiasz1BzcnLr3tBJhlV7S86MBJBuAQ33is2D60YitZL2Q=="; }; }; "@npmcli/promise-spawn-1.3.2" = { @@ -9527,130 +9095,130 @@ let sha512 = "NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA=="; }; }; - "@nrwl/devkit-16.5.0" = { + "@nrwl/devkit-16.6.0" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.5.0.tgz"; - sha512 = "O/CH43gM2sumfO1BX7f20B4rniE9P48XwMEQoi1HssdzL+IstHWw5Q9BO2uoSCNpu5x04V/VzX/8yFmoFmOJ7g=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.6.0.tgz"; + sha512 = "xZEN6wfA1uJwv+FVRQFOHsCcpvGvIYGx2zutbzungDodWkfzlJ3tzIGqYjIpPCBVT83erM6Gscnka2W46AuKfA=="; }; }; - "@nrwl/tao-16.5.0" = { + "@nrwl/tao-16.6.0" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-16.5.0.tgz"; - sha512 = "lY/XV2n7iulHY77Uakt3Epa9m/NG7oTSN196baLjFykxUvLJI47PMX5qytugHkS8JLdcAB5p0qGsrQSHoi6jvg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-16.6.0.tgz"; + sha512 = "NQkDhmzlR1wMuYzzpl4XrKTYgyIzELdJ+dVrNKf4+p4z5WwKGucgRBj60xMQ3kdV25IX95/fmMDB8qVp/pNQ0Q=="; }; }; - "@nx/devkit-16.5.0" = { + "@nx/devkit-16.6.0" = { name = "_at_nx_slash_devkit"; packageName = "@nx/devkit"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/devkit/-/devkit-16.5.0.tgz"; - sha512 = "IfGGKwgOBZshgRtL0V0IOuTaW8mnuSFft708fQfRyw8ArpNeyJbdbIvd9lCsHAFaKE5VTIKug4C48tyQikM7eA=="; + url = "https://registry.npmjs.org/@nx/devkit/-/devkit-16.6.0.tgz"; + sha512 = "rhJ0y+MSPHDuoZPxsOYdj/n5ks+gK74TIMgTb8eZgPT/uR86a4oxf62wUQXgECedR5HzLE2HunbnoLhhJXmpJw=="; }; }; - "@nx/nx-darwin-arm64-16.5.0" = { + "@nx/nx-darwin-arm64-16.6.0" = { name = "_at_nx_slash_nx-darwin-arm64"; packageName = "@nx/nx-darwin-arm64"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.0.tgz"; - sha512 = "0+5FH3ot5o0lpL0OKD4fO2n0a6LqLxr0LwU2VYxaAR1GLzOeVE5W3jBWY9ztOE+ktm8mGaZsdIIOQ77Iz/xwsQ=="; + url = "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.6.0.tgz"; + sha512 = "8nJuqcWG/Ob39rebgPLpv2h/V46b9Rqqm/AGH+bYV9fNJpxgMXclyincbMIWvfYN2tW+Vb9DusiTxV6RPrLapA=="; }; }; - "@nx/nx-darwin-x64-16.5.0" = { + "@nx/nx-darwin-x64-16.6.0" = { name = "_at_nx_slash_nx-darwin-x64"; packageName = "@nx/nx-darwin-x64"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.0.tgz"; - sha512 = "yziX2oXUSyOPOcRLmFMRsNs0eBVla5IGjAKqpY4OXAPBuyrOfgsW5ztj0PQM34gvqipXtTlN04Xt/U0jzQLudA=="; + url = "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.6.0.tgz"; + sha512 = "T4DV0/2PkPZjzjmsmQEyjPDNBEKc4Rhf7mbIZlsHXj27BPoeNjEcbjtXKuOZHZDIpGFYECGT/sAF6C2NVYgmxw=="; }; }; - "@nx/nx-freebsd-x64-16.5.0" = { + "@nx/nx-freebsd-x64-16.6.0" = { name = "_at_nx_slash_nx-freebsd-x64"; packageName = "@nx/nx-freebsd-x64"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.0.tgz"; - sha512 = "hwIRRMyWrT2R4ozp6yXRNR1fwcclBlkkIQ51/1IzINPQxynMguuOvNZaJFD4OuZIDmI526++GmogPZc0aMzwkg=="; + url = "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.6.0.tgz"; + sha512 = "Ck/yejYgp65dH9pbExKN/X0m22+xS3rWF1DBr2LkP6j1zJaweRc3dT83BWgt5mCjmcmZVk3J8N01AxULAzUAqA=="; }; }; - "@nx/nx-linux-arm-gnueabihf-16.5.0" = { + "@nx/nx-linux-arm-gnueabihf-16.6.0" = { name = "_at_nx_slash_nx-linux-arm-gnueabihf"; packageName = "@nx/nx-linux-arm-gnueabihf"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.0.tgz"; - sha512 = "BEWLpBhJ2AcZNDsiExLDcM9kmQ4+E+0YUcOsrAeX1s5D4HXXVtHMdTmOucKs4NNFqMuJ2Cf3ZzqmAIkRug0beA=="; + url = "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.6.0.tgz"; + sha512 = "eyk/R1mBQ3X0PCSS+Cck3onvr3wmZVmM/+x0x9Ai02Vm6q9Eq6oZ1YtZGQsklNIyw1vk2WV9rJCStfu9mLecEw=="; }; }; - "@nx/nx-linux-arm64-gnu-16.5.0" = { + "@nx/nx-linux-arm64-gnu-16.6.0" = { name = "_at_nx_slash_nx-linux-arm64-gnu"; packageName = "@nx/nx-linux-arm64-gnu"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.0.tgz"; - sha512 = "EWmTbDLbBIjM/OJ594hoFKsEka/b8jM6NehL37mlIXL6fixUEA8LlO0MfUQ+kIPg79nWIujzulkIEhYFDWM1WA=="; + url = "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.6.0.tgz"; + sha512 = "S0qFFdQFDmBIEZqBAJl4K47V3YuMvDvthbYE0enXrXApWgDApmhtxINXSOjSus7DNq9kMrgtSDGkBmoBot61iw=="; }; }; - "@nx/nx-linux-arm64-musl-16.5.0" = { + "@nx/nx-linux-arm64-musl-16.6.0" = { name = "_at_nx_slash_nx-linux-arm64-musl"; packageName = "@nx/nx-linux-arm64-musl"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.0.tgz"; - sha512 = "np/7+HEtEEvtu4zo3GBBPtTG8IP++vvH3o8VXpAB9eD4Jctz3rYzbfMc7GtLZkz8LCmCsjzqnrNtmcmoaRbomQ=="; + url = "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.6.0.tgz"; + sha512 = "TXWY5VYtg2wX/LWxyrUkDVpqCyJHF7fWoVMUSlFe+XQnk9wp/yIbq2s0k3h8I4biYb6AgtcVqbR4ID86lSNuMA=="; }; }; - "@nx/nx-linux-x64-gnu-16.5.0" = { + "@nx/nx-linux-x64-gnu-16.6.0" = { name = "_at_nx_slash_nx-linux-x64-gnu"; packageName = "@nx/nx-linux-x64-gnu"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.0.tgz"; - sha512 = "iLOwgAaa1BHPLFhkBVi7GLAf6LfdYuv/R2rxlqq4d6fhv4Eq91Wo08LsqbFds+LpMN0CA+W/QMc3w9IIS/MPrA=="; + url = "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.6.0.tgz"; + sha512 = "qQIpSVN8Ij4oOJ5v+U+YztWJ3YQkeCIevr4RdCE9rDilfq9RmBD94L4VDm7NRzYBuQL8uQxqWzGqb7ZW4mfHpw=="; }; }; - "@nx/nx-linux-x64-musl-16.5.0" = { + "@nx/nx-linux-x64-musl-16.6.0" = { name = "_at_nx_slash_nx-linux-x64-musl"; packageName = "@nx/nx-linux-x64-musl"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.0.tgz"; - sha512 = "UE3tpgli7a08AsRaw/o1BUXnFOxICGzcYj1aglHBh6urVeUHK0aNt11djZcQ6ETgPgcjoGdwr7RqpANGnJQH9g=="; + url = "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.6.0.tgz"; + sha512 = "EYOHe11lfVfEfZqSAIa1c39mx2Obr4mqd36dBZx+0UKhjrcmWiOdsIVYMQSb3n0TqB33BprjI4p9ZcFSDuoNbA=="; }; }; - "@nx/nx-win32-arm64-msvc-16.5.0" = { + "@nx/nx-win32-arm64-msvc-16.6.0" = { name = "_at_nx_slash_nx-win32-arm64-msvc"; packageName = "@nx/nx-win32-arm64-msvc"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.0.tgz"; - sha512 = "u9cNKP8zrNIdeyaK5LHX+Zh+rkadE8tSE+vNulphCLhGuXJRpjaVY1juq9UQEo41NJQE6DuWWk2fnj4gALWugQ=="; + url = "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.6.0.tgz"; + sha512 = "f1BmuirOrsAGh5+h/utkAWNuqgohvBoekQgMxYcyJxSkFN+pxNG1U68P59Cidn0h9mkyonxGVCBvWwJa3svVFA=="; }; }; - "@nx/nx-win32-x64-msvc-16.5.0" = { + "@nx/nx-win32-x64-msvc-16.6.0" = { name = "_at_nx_slash_nx-win32-x64-msvc"; packageName = "@nx/nx-win32-x64-msvc"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.0.tgz"; - sha512 = "E9109SAYNZXqCeWikZXyxNd7SZnCbdKGvqtQktS7dedHGwOmgIWfJ6bsvA7s2zHr09THQKJ4+7U1tDkWVNR9cg=="; + url = "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.6.0.tgz"; + sha512 = "UmTTjFLpv4poVZE3RdUHianU8/O9zZYBiAnTRq5spwSDwxJHnLTZBUxFFf3ztCxeHOUIfSyW9utpGfCMCptzvQ=="; }; }; - "@oclif/color-1.0.7" = { + "@oclif/color-1.0.10" = { name = "_at_oclif_slash_color"; packageName = "@oclif/color"; - version = "1.0.7"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/color/-/color-1.0.7.tgz"; - sha512 = "XUWsQRVP+HReS5+hkjIB21/qMLswv1t65S3pRhjDbDKbBeZVQXCHtVQiUMOjnCvni0d5NBZWIxu+fNUo9dK5Kg=="; + url = "https://registry.npmjs.org/@oclif/color/-/color-1.0.10.tgz"; + sha512 = "INWEDAL3SzzR3pIhkrqk22HV6JravLUeRZXAIpoQqIeLReauaibCVcNTzOlt0z0S8YrqRhksc54ZxZC4Oa8xBw=="; }; }; "@oclif/command-1.8.0" = { @@ -9662,13 +9230,13 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/command-1.8.30" = { + "@oclif/command-1.8.35" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.30"; + version = "1.8.35"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.30.tgz"; - sha512 = "1l8t77foQJErqveIJwWIXLr/EtWSqQkEcSmHgVBZAVjUaJWvnLZKgohmugJcIp9aR+wYCowRrCL3rLxEMzpq4A=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.35.tgz"; + sha512 = "oILFTe3n6WjEbhXaSJd6FPsU4H97WxkC3Q0+Y63pfTXIZ424Fb9Hlg1CazscWcJqCrhuuUag6mItdgYo0kpinw=="; }; }; "@oclif/config-1.17.0" = { @@ -9680,13 +9248,22 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/config-1.18.11" = { + "@oclif/config-1.18.15" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.18.11"; + version = "1.18.15"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.11.tgz"; - sha512 = "qr9i5ekCX/z3EfKNaQEeTy0C6uPFxpLBdShh3EKK7ZknFfBbYYaw7K29W53eqddqXYHPaOKa1lkjn7zv9HAhYg=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.15.tgz"; + sha512 = "eBTiFXGfXSzghc4Yjp3EutYU+6MrHX1kzk4j5i4CsR5AEor43ynXFrzpO6v7IwbR1KyUo+9SYE2D69Y+sHIMpg=="; + }; + }; + "@oclif/config-1.18.16" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.16.tgz"; + sha512 = "VskIxVcN22qJzxRUq+raalq6Q3HUde7sokB7/xk5TqRZGEKRVbFeqdQBxDWwQeudiJEgcNiMvIFbMQ43dY37FA=="; }; }; "@oclif/config-1.18.2" = { @@ -9716,6 +9293,15 @@ let sha512 = "6jYuZgXvHfOIc9GIaS4T3CIKGTjPmfAxuMcbCbMRKJJl4aq/4xeRlEz0E8/hz8HxvxZBGvN2GwAUHlrGWQVrVw=="; }; }; + "@oclif/core-2.11.5" = { + name = "_at_oclif_slash_core"; + packageName = "@oclif/core"; + version = "2.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/core/-/core-2.11.5.tgz"; + sha512 = "ALv0YyaMwfy+LRGigKoqST/It8uYBwp1+3F4OpwmPpQl7BiRCGbOBnJSrWNNCAEMZiYpWNgF/3WQVB5VUQlYbQ=="; + }; + }; "@oclif/core-2.8.11" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; @@ -9725,15 +9311,6 @@ let sha512 = "9wYW6KRSWfB/D+tqeyl/jxmEz/xPXkFJGVWfKaptqHz6FPWNJREjAM945MuJL2Y8NRhMe+ScRlZ3WpdToX5aVQ=="; }; }; - "@oclif/core-2.8.5" = { - name = "_at_oclif_slash_core"; - packageName = "@oclif/core"; - version = "2.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-2.8.5.tgz"; - sha512 = "316DLfrHQDYmWDriI4Woxk9y1wVUrPN1sZdbQLHdOdlTA9v/twe7TdHpWOriEypfl6C85NWEJKc1870yuLtjrQ=="; - }; - }; "@oclif/errors-1.3.4" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -9761,13 +9338,13 @@ let sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.9" = { + "@oclif/help-1.0.14" = { name = "_at_oclif_slash_help"; packageName = "@oclif/help"; - version = "1.0.9"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.9.tgz"; - sha512 = "16fbQNPfzqB9NcNlB8O9S1yv+D71SXojTx+kv3d6/h4i0vPidpdrE70n/Vj0eNNtS9azkWpqG4KrCKsd742ITg=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.14.tgz"; + sha512 = "Hu2/Dyo91cgLNaqN3wkvkBGuZ7eqb0TQNVKrzGButZyaBpJzmwW4L6D4tAF390WDYZG7EubmLePlNYb+rNB4jw=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -9779,13 +9356,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.13" = { + "@oclif/parser-3.8.16" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.13"; + version = "3.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.13.tgz"; - sha512 = "M4RAB4VB5DuPF3ZoVJlXyemyxhflYBKrvP0cBI/ZJVelrfR7Z1fB/iUSrw7SyFvywI13mHmtEQ8Xz0bSUs7g8A=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.16.tgz"; + sha512 = "jeleXSh5izmBQ6vwyCJmbFPahPpd/ajxASi25FaYAWcvwVMzP/vKAKQXKWZun6T9K/gd6ywSsTpfAXiZAjBd6g=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -9806,13 +9383,13 @@ let sha512 = "oQl7ZqXhXJUOH26mDPcqcMGmcdIoK/uQPSpUBrfLa1iaQ30slTs0T7KOzg+vwKuPqIIF1nTCPuH67lE8GvUPTw=="; }; }; - "@oclif/plugin-commands-2.2.15" = { + "@oclif/plugin-commands-2.2.17" = { name = "_at_oclif_slash_plugin-commands"; packageName = "@oclif/plugin-commands"; - version = "2.2.15"; + version = "2.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-commands/-/plugin-commands-2.2.15.tgz"; - sha512 = "QaTIZhG5SW7sr42p4crJyE7jindr1hdHdazWTjiiPjsFEP3zUxVsNmwEMWPsBBVsjzw/gtztgpAexkZWJD8rXA=="; + url = "https://registry.npmjs.org/@oclif/plugin-commands/-/plugin-commands-2.2.17.tgz"; + sha512 = "shjVZCopCIbTN8I/i/DR7NwqFRMFau++n3+x2ON7JSNRo+zr/lXQUejxv50D64etQ4dP5wyIyvs+t9iN7j//gg=="; }; }; "@oclif/plugin-help-1.2.11" = { @@ -9851,22 +9428,22 @@ let sha512 = "B2cGOyRskorr8NiGrmIBYxEK0c4laJo+W16VeEblLVDW8w6BvnSwC6K4Vd6rkKmPHRsgqoYrA5BCfPTwvUdSCg=="; }; }; - "@oclif/plugin-help-5.2.9" = { + "@oclif/plugin-help-5.2.15" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "5.2.9"; + version = "5.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.9.tgz"; - sha512 = "0J3oowPURZJ4Dn1p1WpQ46E4+CoV20KTn1cvsNiDl6Hmbw+qoljKQnArJJzNFeZQxWo4R7/S42PrzKJTVYh68Q=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.15.tgz"; + sha512 = "q3gC4kIRlTilA8sG/9Eq2BEW2wo2KWV0ZbQ+8i3uQCvrgY4qoCIp5JTfsbbKR5XWaqPDdZPWhWuS1Rveu5V4FA=="; }; }; - "@oclif/plugin-not-found-2.3.26" = { + "@oclif/plugin-not-found-2.3.34" = { name = "_at_oclif_slash_plugin-not-found"; packageName = "@oclif/plugin-not-found"; - version = "2.3.26"; + version = "2.3.34"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-2.3.26.tgz"; - sha512 = "a8WfN8km1A9Q0lXWo1LZgFEjVFYIbOOp/QG++zyHt2Hnsp2b5Zr0p8EQLBK7v6na6C0Mrr+GlMI8zE40hYWMbw=="; + url = "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-2.3.34.tgz"; + sha512 = "uXUpw6o2e0aqnNn+XkGL7LbL+Th2rBD1JGtFbb6anmvUvz2skiGz0o23BYmrQW8tvU92ajPOykfClKD75ptZcw=="; }; }; "@oclif/plugin-plugins-2.4.7" = { @@ -9878,22 +9455,22 @@ let sha512 = "6fzUDLWrSK7n6+EBrEekEEYrYTCneRoOF9TzojkjuFn1+ailvUlr98G90bblxKOyy8fqMe7QjvqwTgIDQ9ZIzg=="; }; }; - "@oclif/plugin-update-3.1.22" = { + "@oclif/plugin-update-3.1.28" = { name = "_at_oclif_slash_plugin-update"; packageName = "@oclif/plugin-update"; - version = "3.1.22"; + version = "3.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-update/-/plugin-update-3.1.22.tgz"; - sha512 = "cbBATw3kHaJ+HdPaBWW+2feXV1sv3yUCHzasi6vCjV/kV3+hOqIvwPtACCWXjKc/nRh/eEiAoAewmJHbR+SBXQ=="; + url = "https://registry.npmjs.org/@oclif/plugin-update/-/plugin-update-3.1.28.tgz"; + sha512 = "anP0kt73La0hzz9iqiBcxkXFwf7Mr+vQ+PdVnyKVTsI86yFWROFDmrBf5HSgF1rjvvGashvVGLq6hpKzSFUFJw=="; }; }; - "@oclif/plugin-warn-if-update-available-2.0.41" = { + "@oclif/plugin-warn-if-update-available-2.0.46" = { name = "_at_oclif_slash_plugin-warn-if-update-available"; packageName = "@oclif/plugin-warn-if-update-available"; - version = "2.0.41"; + version = "2.0.46"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.41.tgz"; - sha512 = "4QW6IGRxMdsk9RHZi+2POkB6m6aI3ItXOZJykvuDh7Fl64azoh/h9oBJpYIZ6vAgZ6A1dwS/nckSsuoYiG6a7g=="; + url = "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.46.tgz"; + sha512 = "TyOvPHzl1e8lLeRF8A9nhte+H9LR0arWqu+MYhNxzislx7SbG4M5yRhoH5F1MmwGxgJBbWHZVsmLjZm4S9cEog=="; }; }; "@oclif/screen-1.0.4" = { @@ -9905,13 +9482,13 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@oclif/screen-3.0.4" = { + "@oclif/screen-3.0.6" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.4.tgz"; - sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA=="; + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.6.tgz"; + sha512 = "nEv7dFPxCrWrvK6dQ8zya0/Kb54EXVcwIKV9capjSa89ZDoOo+qH0YSo4/eQVECXgW3eUvgKLDIcIt62YBk0HA=="; }; }; "@octokit/auth-token-2.5.0" = { @@ -10166,6 +9743,15 @@ let sha512 = "D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA=="; }; }; + "@one-ini/wasm-0.1.1" = { + name = "_at_one-ini_slash_wasm"; + packageName = "@one-ini/wasm"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz"; + sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw=="; + }; + }; "@opencensus/core-0.0.8" = { name = "_at_opencensus_slash_core"; packageName = "@opencensus/core"; @@ -10220,40 +9806,40 @@ let sha512 = "O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA=="; }; }; - "@opentelemetry/core-1.15.0" = { + "@opentelemetry/core-1.15.1" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.0.tgz"; - sha512 = "GGTS6BytfaN8OgbCUOnxg/a9WVsVUj0484zXHZuBzvIXx7V4Tmkb0IHnnhS7Q0cBLNLgjNuvrCpQaP8fIvO4bg=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz"; + sha512 = "V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg=="; }; }; - "@opentelemetry/resources-1.15.0" = { + "@opentelemetry/resources-1.15.1" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.0.tgz"; - sha512 = "Sb8A6ZXHXDlgHv32UNRE3y8McWE3vkb5dsSttYArYa5ZpwjiF5ge0vnnKUUnG7bY0AgF9VBIOORZE8gsrnD2WA=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.1.tgz"; + sha512 = "15JcpyKZHhFYQ1uiC08vR02sRY/2seSnqSJ0tIUhcdYDzOhd0FrqPYpLj3WkLhVdQP6vgJ+pelAmSaOrCxCpKA=="; }; }; - "@opentelemetry/sdk-trace-base-1.15.0" = { + "@opentelemetry/sdk-trace-base-1.15.1" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.0.tgz"; - sha512 = "udt1c9VHipbZwvCPIQR1VLg25Z4AMR/g0X8KmcInbFruGWQ/lptVPkz3yvWAsGSta5yHNQ3uoPwcyCygGnQ6Lg=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.1.tgz"; + sha512 = "5hccBe2yXzzXyExJNkTsIzDe1AM7HK0al+y/D2yEpslJqS1HUzsUSuCMY7Z4+Sfz5Gf0kTa6KYEt1QUQppnoBA=="; }; }; - "@opentelemetry/semantic-conventions-1.15.0" = { + "@opentelemetry/semantic-conventions-1.15.1" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.0.tgz"; - sha512 = "f3wwFrFyCpGrFBrFs7lCUJSCSCGyeKG52c+EKeobs3Dd29M75yO6GYkt6PkYPfDawxSlV5p+4yJPPk8tPObzTQ=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.1.tgz"; + sha512 = "n8Kur1/CZlYG32YCEj30CoUqA8R7UyDVZzoEU6SDP+13+kXDT2kFVu6MpcnEUTyGP3i058ID6Qjp5h6IJxdPPQ=="; }; }; "@opentelemetry/semantic-conventions-1.3.1" = { @@ -10265,67 +9851,67 @@ let sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA=="; }; }; - "@orval/angular-6.16.0" = { + "@orval/angular-6.17.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.16.0.tgz"; - sha512 = "pdKQkmHG0YRZF1Vkh1kvuIVGseec4mArXW0BV8LzrtP7F2Wg51cDcYys/gh3w/rq6uE2FGa4ildl+wvPq6pLJg=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.17.0.tgz"; + sha512 = "MW1tySUMXGqLNrImjdQ7ezy2tpOowkTwWgh71n0N8mm/wAr3h3AUqTkXs8ZIdI/rlG9aCV5tRbm/NQSC1KaPjA=="; }; }; - "@orval/axios-6.16.0" = { + "@orval/axios-6.17.0" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.16.0.tgz"; - sha512 = "RL/inKaJg5ivFcI0JrJPqlcR1MqFl2pv/j1GM79D4fKdTHFbXSD7/AVav6IQHnkQlrfuJxIca4flUphEXDc0kw=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.17.0.tgz"; + sha512 = "S40tnHRAhXBnDqAIfLCjgJuhUrFrPCCi9ARVIjhiM8R1EkVwI/ApWNuwZj48eqbzICTojaC+jVWY54TDkZ02hg=="; }; }; - "@orval/core-6.16.0" = { + "@orval/core-6.17.0" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.16.0.tgz"; - sha512 = "9OgVvRZSaZecV2srixw+eCANSvXiKOiLPBSi9LjSyzU7HMPh1eVvYEE/ZzV7l/n0XIErE/DFcuvQTNAidsrIaw=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.17.0.tgz"; + sha512 = "WrGaG4Ri+AW7oiDNErlVLNs/SdMI/TQGz5VObOP3Q7gek2IsVqE4mr/X7zrMZxbZhrUuIl207mltFdqc4zCgNA=="; }; }; - "@orval/msw-6.16.0" = { + "@orval/msw-6.17.0" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.16.0.tgz"; - sha512 = "/SVDOHBDoYEUUbIbA4fKAmm+0gwbf/TjJTBU2he3Cu6LNAaxKjbiLKR9jSMsPU1haJczoIfq1LxctwRi1iW+mg=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.17.0.tgz"; + sha512 = "/awk0JBOg5oO7bw9ZlVguvJAngFKi9roTV35XpCUtcGG4Sw9KtujLZ2T3lMvEy5wxWoMFD2UAoH7Ob1uAJpZJQ=="; }; }; - "@orval/query-6.16.0" = { + "@orval/query-6.17.0" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.16.0.tgz"; - sha512 = "X0d51at/6X5w3wWuyLTSjQ95oZHL4CqhWDgeDlgzYLRGORjX6YRvMODT/SM70rEDNvd+WwwZ+PHYgPL6tJhvNA=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.17.0.tgz"; + sha512 = "YXvHjz2PcRd7faw9PYsqyRx+0ES5G0IS1JjYFWGoOYy6saSaRLVAYte8ABJJ8Sju8fxzba/BzQBgTZfe3BP8Zw=="; }; }; - "@orval/swr-6.16.0" = { + "@orval/swr-6.17.0" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.16.0.tgz"; - sha512 = "pbicl6Ado/fyorY1GZzQSzUIm0NwARo5mmPCqiSR5TrS0mBx+UXj65xV+T8vKI5Cs2atoch9Nz9BCb0hr0XpTw=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.17.0.tgz"; + sha512 = "entOSyODgDCXwOwE+aBAlg+LdmwhFNCg/0y/v5tuIfVTP5vhwTcqJFYGIZvMT9xittxTss7bAbiDQ9zOReU/Qg=="; }; }; - "@orval/zod-6.16.0" = { + "@orval/zod-6.17.0" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.16.0.tgz"; - sha512 = "ptwVvuFYRdGHiLLdxk/afcYE92jAwtRELe1XWwakKUbKU5s4rXr/81zJumqLwVrdR2fUfnUiJCpqp5sgVLaECw=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-6.17.0.tgz"; + sha512 = "ff0HSMC9LUVNreulsdx5hKy6lkoayZBcFn9bbk9BmFpbMCynjPOLXOpXwjHhWgny0HP66gjZtp5uOEtvVkWoMg=="; }; }; "@parcel/bundler-default-2.9.3" = { @@ -10976,15 +10562,6 @@ let sha512 = "VtaY4spKTdN5LjJ04im/d/joXuvLbQdgy5Z4DXF4MFZhQ+MTrejbNMkfZBp1Bs3O5+bFqnJgyGdPuZQflvIa5A=="; }; }; - "@phc/format-1.0.0" = { - name = "_at_phc_slash_format"; - packageName = "@phc/format"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz"; - sha512 = "m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ=="; - }; - }; "@pkgjs/parseargs-0.11.0" = { name = "_at_pkgjs_slash_parseargs"; packageName = "@pkgjs/parseargs"; @@ -10994,22 +10571,22 @@ let sha512 = "+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="; }; }; - "@playwright/test-1.35.1" = { + "@playwright/test-1.36.2" = { name = "_at_playwright_slash_test"; packageName = "@playwright/test"; - version = "1.35.1"; + version = "1.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/@playwright/test/-/test-1.35.1.tgz"; - sha512 = "b5YoFe6J9exsMYg0pQAobNDR85T1nLumUYgUTtKm4d21iX2L7WqKq9dW8NGJ+2vX0etZd+Y7UeuqsxDXm9+5ZA=="; + url = "https://registry.npmjs.org/@playwright/test/-/test-1.36.2.tgz"; + sha512 = "2rVZeyPRjxfPH6J0oGJqE8YxiM1IBRyM8hyrXYK7eSiAqmbNhxwcLa7dZ7fy9Kj26V7FYia5fh9XJRq4Dqme+g=="; }; }; - "@pm2/agent-2.0.1" = { + "@pm2/agent-2.0.3" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.1.tgz"; - sha512 = "QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw=="; + url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.3.tgz"; + sha512 = "xkqqCoTf5VsciMqN0vb9jthW7olVAi4KRFNddCc7ZkeJZ3i8QwZANr4NSH2H5DvseRFHq7MiPspRY/EWAFWWTg=="; }; }; "@pm2/io-5.0.0" = { @@ -11066,13 +10643,13 @@ let sha512 = "3ttOeHBpmWRbgJrpDQ8Nwd3W8s8iuiP5YZM0JRyKWaMtX8lu9d7/AKyxPmhYsMJuN+q/1dwHa7QFeDZJ53b0oA=="; }; }; - "@pnpm/dependency-path-2.1.2" = { + "@pnpm/dependency-path-2.1.3" = { name = "_at_pnpm_slash_dependency-path"; packageName = "@pnpm/dependency-path"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-2.1.2.tgz"; - sha512 = "BXEMdGHZG2y8z7hZAVn+r0z+IdszFZbVPpAp3xyDH3gDN30A4HCVhhCUUf0mthqQZsT131jK4HW82EUwEiW01A=="; + url = "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-2.1.3.tgz"; + sha512 = "OKuLDqRZfAJAb4fnPZyPyrR827ISL1WV5YBs0q4BitPAz8ORUPSXSCFVailLhoyZWLE0Ag6hROy42Jkw/WnCUw=="; }; }; "@pnpm/error-1.4.0" = { @@ -11165,13 +10742,13 @@ let sha512 = "3MYHYm8epnciApn6w5Fzx6sepawmsNU7l6lvIq+ER22/DPSrr83YMhU/EQWnf4lORn2YyiXFj0FJSyJzEtIGmw=="; }; }; - "@pnpm/types-9.1.0" = { + "@pnpm/types-9.2.0" = { name = "_at_pnpm_slash_types"; packageName = "@pnpm/types"; - version = "9.1.0"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/types/-/types-9.1.0.tgz"; - sha512 = "MMPDMLOY17bfNhLhR9Qmq6/2keoocnR5DWXZfZDC4dKXugrMsE1jB6RnuU8swJIo4zyCsMT/iVSAtl/XK+9Z+A=="; + url = "https://registry.npmjs.org/@pnpm/types/-/types-9.2.0.tgz"; + sha512 = "LtkHgtJ5Bjny4poUWyMhOKHc822/zm8NhPx+7VbopfDYnTrKgJwTyTbZjZEyN5KpDw3R1Fr8VYdmv5gn4eyWbw=="; }; }; "@pnpm/write-project-manifest-1.1.7" = { @@ -11210,22 +10787,22 @@ let sha512 = "J/p2PcgT39Za4wpukbN6iUkEUvL5aE7Bs9kXBeEkrjEgc0Uu7J7B2ypwx9J0qM3m3lk2273RT5/4oGv8pfFLcg=="; }; }; - "@prisma/engines-4.16.2" = { + "@prisma/engines-5.1.0" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "4.16.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.16.2.tgz"; - sha512 = "vx1nxVvN4QeT/cepQce68deh/Turxy5Mr+4L4zClFuK1GlxN3+ivxfuv+ej/gvidWn1cE1uAhW7ALLNlYbRUAw=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.1.0.tgz"; + sha512 = "HqaFsnPmZOdMWkPq6tT2eTVTQyaAXEDdKszcZ4yc7DGMBIYRP6j/zAJTtZUG9SsMV8FaucdL5vRyxY/p5Ni28g=="; }; }; - "@prisma/prisma-fmt-wasm-4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81" = { - name = "_at_prisma_slash_prisma-fmt-wasm"; - packageName = "@prisma/prisma-fmt-wasm"; - version = "4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81"; + "@prisma/prisma-schema-wasm-5.1.0-28.a9b7003df90aa623086e4d6f4e43c72468e6339b" = { + name = "_at_prisma_slash_prisma-schema-wasm"; + packageName = "@prisma/prisma-schema-wasm"; + version = "5.1.0-28.a9b7003df90aa623086e4d6f4e43c72468e6339b"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81.tgz"; - sha512 = "g090+dEH7wrdCw359+8J9+TGH84qK28V/dxwINjhhNCtju9lej99z9w/AVsJP9UhhcCPS4psYz4iu8d53uxVpA=="; + url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.1.0-28.a9b7003df90aa623086e4d6f4e43c72468e6339b.tgz"; + sha512 = "rm2mg85O/p99NhOgQfXwP78CCo+bkWNI1vNveQqmmlnra/74vYbvEj/Er+u3ML2u8Kl5tPRzuewt3RYkT36eFw=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -11471,130 +11048,13 @@ let sha512 = "9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.130" = { + "@redocly/openapi-core-1.0.0" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.130"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.130.tgz"; - sha512 = "P24AcEw06s002JZsG6f79/oqEJm3vRj4RySPHjHiJA4JXugbI7Msx4shmIX2PaGsxCLo2aKK/QlDK/0TYDqkrA=="; - }; - }; - "@remix-run/dev-1.18.0" = { - name = "_at_remix-run_slash_dev"; - packageName = "@remix-run/dev"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-run-dev/-/remix-run-dev-1.18.0.tgz"; - sha512 = "5vGcc3OTBLZImKY0BMXDXDqdh0mjh4ZqptI9eRwXZ9O5AfGp4Ce7Q8tNldazBVOJMM4fGgLeXRIOTfuRDe5tDA=="; - }; - }; - "@remix-run/express-1.18.1" = { - name = "_at_remix-run_slash_express"; - packageName = "@remix-run/express"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/express/-/express-1.18.1.tgz"; - sha512 = "jI751cvY2pi4ZD7/+5qAC1Xyt049EM3baNhm5VATsVaTNVOJbNxazOvKflv+bLbpw1lV9sF3MAAMnig5YqStMg=="; - }; - }; - "@remix-run/node-1.18.1" = { - name = "_at_remix-run_slash_node"; - packageName = "@remix-run/node"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/node/-/node-1.18.1.tgz"; - sha512 = "Civ8hQGdQKxmYtDvzV+8sYOPiLfH2FtT35iSwEqDN49uraInljoWngSwzrRmKkilhI4eABSN9fv0trUDyOTBrQ=="; - }; - }; - "@remix-run/router-1.7.0" = { - name = "_at_remix-run_slash_router"; - packageName = "@remix-run/router"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.7.0.tgz"; - sha512 = "Eu1V3kz3mV0wUpVTiFHuaT8UD1gj/0VnoFHQYX35xlslQUpe8CuYoKFn9d4WZFHm3yDywz6ALZuGdnUPKrNeAw=="; - }; - }; - "@remix-run/router-1.7.1" = { - name = "_at_remix-run_slash_router"; - packageName = "@remix-run/router"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz"; - sha512 = "bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ=="; - }; - }; - "@remix-run/serve-1.18.1" = { - name = "_at_remix-run_slash_serve"; - packageName = "@remix-run/serve"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/serve/-/serve-1.18.1.tgz"; - sha512 = "u3SFXjUYmm3RV02QMGfCrjw7qMxg7y3wpnDf9RWfZtZG6oQEHpGkJeUXdSJjVGCmGQlWtGoVaFZ0fOQllu9G4g=="; - }; - }; - "@remix-run/server-runtime-1.18.0" = { - name = "_at_remix-run_slash_server-runtime"; - packageName = "@remix-run/server-runtime"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.18.0.tgz"; - sha512 = "iiSKgGIWMkvf4ftnjGBmIJpgqxRwv8XQilAINapaYsx1zEM6egZGYE6WvaxLuRQSceZZNgLAYzL48TmK+DAU5g=="; - }; - }; - "@remix-run/server-runtime-1.18.1" = { - name = "_at_remix-run_slash_server-runtime"; - packageName = "@remix-run/server-runtime"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.18.1.tgz"; - sha512 = "E0sQlgUQG2ytFmUH7zRH7n2MufnP6WWWq1KpRoiuwJZxfTFIzaiCCIiNqbP/uXGWDGcwEevpawNUzzszL1tT0w=="; - }; - }; - "@remix-run/web-blob-3.0.4" = { - name = "_at_remix-run_slash_web-blob"; - packageName = "@remix-run/web-blob"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/web-blob/-/web-blob-3.0.4.tgz"; - sha512 = "AfegzZvSSDc+LwnXV+SwROTrDtoLiPxeFW+jxgvtDAnkuCX1rrzmVJ6CzqZ1Ai0bVfmJadkG5GxtAfYclpPmgw=="; - }; - }; - "@remix-run/web-fetch-4.3.4" = { - name = "_at_remix-run_slash_web-fetch"; - packageName = "@remix-run/web-fetch"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.3.4.tgz"; - sha512 = "AUM1XBa4hcgeNt2CD86OlB5aDLlqdMl0uJ+89R8dPGx07I5BwMXnbopCaPAkvSBIoHeT/IoLWIuZrLi7RvXS+Q=="; - }; - }; - "@remix-run/web-file-3.0.2" = { - name = "_at_remix-run_slash_web-file"; - packageName = "@remix-run/web-file"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/web-file/-/web-file-3.0.2.tgz"; - sha512 = "eFC93Onh/rZ5kUNpCQersmBtxedGpaXK2/gsUl49BYSGK/DvuPu3l06vmquEDdcPaEuXcsdGP0L7zrmUqrqo4A=="; - }; - }; - "@remix-run/web-form-data-3.0.4" = { - name = "_at_remix-run_slash_web-form-data"; - packageName = "@remix-run/web-form-data"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/web-form-data/-/web-form-data-3.0.4.tgz"; - sha512 = "UMF1jg9Vu9CLOf8iHBdY74Mm3PUvMW8G/XZRJE56SxKaOFWGSWlfxfG+/a3boAgHFLTkP7K4H1PxlRugy1iQtw=="; - }; - }; - "@remix-run/web-stream-1.0.3" = { - name = "_at_remix-run_slash_web-stream"; - packageName = "@remix-run/web-stream"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/web-stream/-/web-stream-1.0.3.tgz"; - sha512 = "wlezlJaA5NF6SsNMiwQnnAW6tnPzQ5I8qk0Y0pSohm0eHKa2FQ1QhEKLVVcDDu02TmkfHgnux0igNfeYhDOXiA=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0.tgz"; + sha512 = "wECCRB0obZuepmqmIUdwU0BB+YO3ibu0sX4IMLGgqWGa7etV14Yq0zjggdcArs3ynki2tBiop7p/+Q37FtsCpw=="; }; }; "@repeaterjs/repeater-3.0.4" = { @@ -11750,103 +11210,103 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rushstack/heft-config-file-0.12.4" = { + "@rushstack/heft-config-file-0.13.2" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.12.4"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.12.4.tgz"; - sha512 = "tqH5RZH0FyULMUcAlKyU0VgdIRgX8ggCfWbfFwzmMXvPT88X0+GMspNT1QXKSXWYa7WbQ0VuNqfKGwFN5PcEwA=="; + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.13.2.tgz"; + sha512 = "eJCuVnKR+uSG7qyeyICA57IOBD3OoOlNTpsJgNjcZZiTj+ZlKPaGmJ8/mzXwNiEpTIlRsVvoQURYFz9QY9sfnQ=="; }; }; - "@rushstack/node-core-library-3.59.3" = { + "@rushstack/node-core-library-3.59.6" = { name = "_at_rushstack_slash_node-core-library"; packageName = "@rushstack/node-core-library"; - version = "3.59.3"; + version = "3.59.6"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.59.3.tgz"; - sha512 = "OGk0nQc+SvDkn+IQN16co691A/96gPoRIoWdIlpUds+sYPAGWdTcNVjKMwFOAsCSASqOeF2lh1GdPtWoWJCkPQ=="; + url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.59.6.tgz"; + sha512 = "bMYJwNFfWXRNUuHnsE9wMlW/mOB4jIwSUkRKtu02CwZhQdmzMsUbxE0s1xOLwTpNIwlzfW/YT7OnOHgDffLgYg=="; }; }; - "@rushstack/package-deps-hash-4.0.30" = { + "@rushstack/package-deps-hash-4.0.41" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "4.0.30"; + version = "4.0.41"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.30.tgz"; - sha512 = "MoINJZMdaLsvolB3StW006+C0CnD0ngncG+7ojnTh16zo8jU28izg/unC4fbqEAWxVws9gieJkUWG3R8nh/BXQ=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.41.tgz"; + sha512 = "bx1g0I54BidJuIqyQHY2Vr4Azn2ThLgrc6hHjEIBzIVmXeznZxJfYViAPNFAu7BV/TaLIU1BSYeRn/yObu9KZA=="; }; }; - "@rushstack/package-extractor-0.2.17" = { + "@rushstack/package-extractor-0.3.11" = { name = "_at_rushstack_slash_package-extractor"; packageName = "@rushstack/package-extractor"; - version = "0.2.17"; + version = "0.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.2.17.tgz"; - sha512 = "SpL4ACND0d8vqYV8UROSJuABbQCkWYQ2q0JXJYZH3C9orypIRPMnmJvpcDPAVZAh+PL/+HYqDxJ8BzHdluh+jA=="; + url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.3.11.tgz"; + sha512 = "j5hRGB/ilCozT7qH5q3swM/xdf/TPFtolWkqciYCU8G8WFXxILbN2nwo4goWyWQaD9hFlCiw9S7z8LTEkSmapQ=="; }; }; - "@rushstack/rig-package-0.3.20" = { + "@rushstack/rig-package-0.4.0" = { name = "_at_rushstack_slash_rig-package"; packageName = "@rushstack/rig-package"; - version = "0.3.20"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.20.tgz"; - sha512 = "XemFRFbH9FOk1Es1kTjrYydenf3hXtrV3xxMCEWPuOSn2Lcll/dsLzEULbhCL0Nf5nGMe52ewEiVtX3odd5Ukg=="; + url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.4.0.tgz"; + sha512 = "FnM1TQLJYwSiurP6aYSnansprK5l8WUK8VG38CmAaZs29ZeL1msjK0AP1VS4ejD33G0kE/2cpsPsS9jDenBMxw=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.100.1" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.100.2" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.100.1"; + version = "5.100.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.100.1.tgz"; - sha512 = "/Ss+MOHd6Oyi+9No6pMyQ1e8o3DX678VO4m/066hZJyHVDNI3ffoJ2ZNxF7yNkxYPAAbnY3lj6JYOQnIjZTAGQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.100.2.tgz"; + sha512 = "A49NzlRDcp0Hd5WZWN8jvnvI+0MoFOdRXL3iutVI12YAYBH6c7uSul+71MMY83x0yQqk4TcfGYVpFWx1j/n8/Q=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.100.1" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.100.2" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.100.1"; + version = "5.100.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.100.1.tgz"; - sha512 = "9zkRzH/YX2IWRHV/ZHJ6uYYwRVKBlw9JD0mn/bOMvND/MiUmhZpUADXA5Q9Vmx9cxXvtoc2wc//RQa44Zlq0cw=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.100.2.tgz"; + sha512 = "FIAvmIfYLWhnygDCyUWSZOuyTWVRLFHYeG9xPmUpwJSPqxUL3HG5cRGVYlyRgK9oSJSEq+g0mpbe7nE8WwJgtg=="; }; }; - "@rushstack/rush-sdk-5.100.1" = { + "@rushstack/rush-sdk-5.100.2" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.100.1"; + version = "5.100.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.100.1.tgz"; - sha512 = "71/451koP0bF1Y7/nI8i+5ECUMCHyLtwg+8mxccAQwvQGZF5iFV0KNRtLk/UtjZT8oOBVEiRJZtg4YQP25Y6Og=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.100.2.tgz"; + sha512 = "+4DKbXj6R8vilRYswH8Lb+WIuIoD29/ZjMmazKBKXJTm3x7sgGJy45ozAZbfeXvdOTzqsg11NzIbwaDm8rRhLQ=="; }; }; - "@rushstack/stream-collator-4.0.248" = { + "@rushstack/stream-collator-4.0.259" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.0.248"; + version = "4.0.259"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.248.tgz"; - sha512 = "Ce/N1iftgFU57uHT6TojCPt4I+igZG2p7Zs9Hk41HFjQo2OuX2OSsAAjNBHfMmUiH5NwACwS2eFxlQvRk/0I4g=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.259.tgz"; + sha512 = "UfMRCp1avkUUs9pdtWQ8ZE8Nmuxeuw1a9bjLQ7cQJ3meuv8iDxKuxsyJRfrwIfCkVkNVw5OJ9eM6E/edUPP7qw=="; }; }; - "@rushstack/terminal-0.5.23" = { + "@rushstack/terminal-0.5.34" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.5.23"; + version = "0.5.34"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.5.23.tgz"; - sha512 = "2HRzUKw5X77ls93i7DtiWXTIekvU4cMRtjf7bcap2bh8ryhAL1kTiNioMqY+6gNG8CI8co9GFrLns+UrGPxirQ=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.5.34.tgz"; + sha512 = "Q7YDkPTsvJZpHapapo5sK2VCxW7byoqhK89tXMUiva6dNwelomgEe0S+njKw4vcmGde4hQD7LAqQPJPYFeU4mw=="; }; }; - "@rushstack/ts-command-line-4.15.0" = { + "@rushstack/ts-command-line-4.15.1" = { name = "_at_rushstack_slash_ts-command-line"; packageName = "@rushstack/ts-command-line"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.15.0.tgz"; - sha512 = "Xl1Xc8d89ioJ6AbOQsSIPyYvrQPqmGG+YrqUZKYEDenZtKq57xuFbBJya9TXgAWSB+uVRmDYYd9ogu6WTwRjCQ=="; + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.15.1.tgz"; + sha512 = "EL4jxZe5fhb1uVL/P/wQO+Z8Rc8FMiWJ1G7VgnPDvdIt5GVjRfK7vwzder1CZQiX3x0PY6uxENYLNGTFd1InRQ=="; }; }; "@sailshq/lodash-3.10.4" = { @@ -11876,13 +11336,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-16.1.4" = { + "@schematics/angular-16.1.6" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "16.1.4"; + version = "16.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.1.4.tgz"; - sha512 = "XfoeL+aBVIR/DzgVKGVhHW/TGQnqWvngyJVuCwXEVWzNfjxHYFkchXa78OItpAvTEr6/Y0Me9FQVAGVA4mMUyg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.1.6.tgz"; + sha512 = "BxghkeLfnMgV0D4DZDcbfPpox/Orw1ismSVGoQMIV/Daj2pqfSK+n97NAu0r0EsQyR5agPxOX9khVft+otODhg=="; }; }; "@scure/base-1.1.1" = { @@ -11903,13 +11363,13 @@ let sha512 = "/6JGNTkedAaGCxxWPHLHLzPAv+bJdPK1X4BvdQFfjpUUu8ccwWf5reGRxGf/vPRfly24dspufAwMWkgALW3gbw=="; }; }; - "@segment/ajv-human-errors-2.7.0" = { + "@segment/ajv-human-errors-2.11.0" = { name = "_at_segment_slash_ajv-human-errors"; packageName = "@segment/ajv-human-errors"; - version = "2.7.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.7.0.tgz"; - sha512 = "qgnhZR4JkorVsLuoYp/emoRNAyPTJuP7gGrnlzK2LN9hyN04Rx/efjq5cKq7uM6hPz7HPH0qmWQmB+KUjzsr6w=="; + url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.11.0.tgz"; + sha512 = "Aeb0L30mSdour4feuxcMlviNk+9UhmdzKHU652JWRSHg3aqxGz2SJ7DElZgO9AYPz25gahQhlRhtmrYA67vMJw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -11930,13 +11390,13 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.57.0" = { + "@sentry-internal/tracing-7.61.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.57.0"; + version = "7.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.57.0.tgz"; - sha512 = "tpViyDd8AhQGYYhI94xi2aaDopXOPfL2Apwrtb3qirWkomIQ2K86W1mPmkce+B0cFOnW2Dxv/ZTFKz6ghjK75A=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.61.0.tgz"; + sha512 = "zTr+MXEG4SxNxif42LIgm2RQn+JRXL2NuGhRaKSD2i4lXKFqHVGlVdoWqY5UfqnnJPokiTWIj9ejR8I5HV8Ogw=="; }; }; "@sentry/core-6.19.7" = { @@ -11948,13 +11408,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.57.0" = { + "@sentry/core-7.61.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.57.0"; + version = "7.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.57.0.tgz"; - sha512 = "l014NudPH0vQlzybtXajPxYFfs9w762NoarjObC3gu76D1jzBBFzhdRelkGpDbSLNTIsKhEDDRpgAjBWJ9icfw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.61.0.tgz"; + sha512 = "zl0ZKRjIoYJQWYTd3K/U6zZfS4GDY9yGd2EH4vuYO4kfYtEp/nJ8A+tfAeDo0c9FGxZ0Q+5t5F4/SfwbgyyQzg=="; }; }; "@sentry/hub-6.19.7" = { @@ -11966,13 +11426,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.57.0" = { + "@sentry/integrations-7.61.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.57.0"; + version = "7.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.57.0.tgz"; - sha512 = "C3WZo5AGI2L0dj+mIjeZpdAwDEG2nDYvZbTzq5J9hVoHFdP3t7fOWBHSPkSFVtTdMaJrv+82aKnUefVCeAjxGg=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.61.0.tgz"; + sha512 = "NEQ+CatBfUM1TmA4FOOyHfsMvSIwSg4pA55Lxiq9quDykzkEtrXFzUfFpZbTunz4cegG8hucPOqbzKFrDPfGjQ=="; }; }; "@sentry/minimal-6.19.7" = { @@ -11993,13 +11453,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.57.0" = { + "@sentry/node-7.61.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.57.0"; + version = "7.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.57.0.tgz"; - sha512 = "63mjyUVM6sfJFVQ5TGVRVGUsoEfESl5ABzIW1W0s9gUiQPaG8SOdaQJglb2VNrkMYxnRHgD8Q9LUh/qcmUyPGw=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.61.0.tgz"; + sha512 = "oTCqD/h92uvbRCrtCdiAqN6Mfe3vF7ywVHZ8Nq3hHmJp6XadUT+fCBwNQ7rjMyqJAOYAnx/vp6iN9n8C5qcYZQ=="; }; }; "@sentry/types-6.19.7" = { @@ -12011,13 +11471,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.57.0" = { + "@sentry/types-7.61.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.57.0"; + version = "7.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.57.0.tgz"; - sha512 = "D7ifoUfxuVCUyktIr5Gc+jXUbtcUMmfHdTtTbf1XCZHua5mJceK9wtl3YCg3eq/HK2Ppd52BKnTzEcS5ZKQM+w=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.61.0.tgz"; + sha512 = "/GLlIBNR35NKPE/SfWi9W10dK9hE8qTShzsuPVn5wAJxpT3Lb4+dkwmKCTLUYxdkmvRDEudkfOxgalsfQGTAWA=="; }; }; "@sentry/utils-6.19.7" = { @@ -12029,13 +11489,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.57.0" = { + "@sentry/utils-7.61.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.57.0"; + version = "7.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.57.0.tgz"; - sha512 = "YXrkMCiNklqkXctn4mKYkrzNCf/dfVcRUQrkXjeBC+PHXbcpPyaJgInNvztR7Skl8lE3JPGPN4v5XhLxK1bUUg=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.61.0.tgz"; + sha512 = "jfj14d0XBFiCU0G6dZZ12SizATiF5Mt4stBGzkM5iS9nXFj8rh1oTT7/p+aZoYzP2JTF+sDzkNjWxyKZkcTo0Q=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -12191,31 +11651,31 @@ let sha512 = "DAa5Z0JAZc6UfrTZLYwqoZxgAponZpFwaqd7WzzMA+loMCkYWyJNwxrAmV6cr2UUJpkko4toPZuJ3vM9Ie+NDA=="; }; }; - "@serverless/utils-6.11.2" = { + "@serverless/utils-6.13.1" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "6.11.2"; + version = "6.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.11.2.tgz"; - sha512 = "Uww5DM78K+bHmukNgVX3Yieu7CVnOKvpUhxxRe+5WiYBV7mNrLiZr9bNAtUSNOYFS4tU5Ig5YlMCCForCCYxEw=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.13.1.tgz"; + sha512 = "yokWzlsIaAd3TWzNgIDz6l8HZmtYZs9caaLuheZ0IiZ/bDWSCLBWn84HKkdWZOmFnYxejyPNJEOwE59mtSR3Ow=="; }; }; - "@shopify/cli-kit-3.47.3" = { + "@shopify/cli-kit-3.48.0" = { name = "_at_shopify_slash_cli-kit"; packageName = "@shopify/cli-kit"; - version = "3.47.3"; + version = "3.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.47.3.tgz"; - sha512 = "SJcKhT/8s2LhvsQvfQfT1L4ZZe7hYNiuVg2wX+S8zXo8sf8Ai08+49G3le7CIxZN855Y+TrLWA7oxzGv1xoMag=="; + url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.48.0.tgz"; + sha512 = "UQ1gmtQluS42UpVPJCyxNRi+v8pXICXJLGAm/v95NCQAjy6XWsf7AhyrfABlnXOc7ajKxmF2G1DFaswHoIGQVQ=="; }; }; - "@shopify/plugin-did-you-mean-3.47.3" = { + "@shopify/plugin-did-you-mean-3.48.0" = { name = "_at_shopify_slash_plugin-did-you-mean"; packageName = "@shopify/plugin-did-you-mean"; - version = "3.47.3"; + version = "3.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.47.3.tgz"; - sha512 = "JY+UqxsQr+BJzi31499VJxxzvDvMhQm5+oKuR6y+DrCX5dlUma9AEDCi922096jfrM0kpvNhkfTVmwKwC/i/MQ=="; + url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.48.0.tgz"; + sha512 = "SL/75M8cpoOQop857PfZQ5gJ3sF/cg4oMFaJQlLjVKM4P0ZFVS/0myj3WLzxVF3QQHzdf/h+yS+KnoC7dykBNw=="; }; }; "@sideway/address-4.1.4" = { @@ -12245,22 +11705,31 @@ let sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="; }; }; - "@sigstore/protobuf-specs-0.1.0" = { - name = "_at_sigstore_slash_protobuf-specs"; - packageName = "@sigstore/protobuf-specs"; - version = "0.1.0"; + "@sigstore/bundle-1.0.0" = { + name = "_at_sigstore_slash_bundle"; + packageName = "@sigstore/bundle"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz"; - sha512 = "a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ=="; + url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz"; + sha512 = "yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ=="; }; }; - "@sigstore/tuf-1.0.2" = { + "@sigstore/protobuf-specs-0.2.0" = { + name = "_at_sigstore_slash_protobuf-specs"; + packageName = "@sigstore/protobuf-specs"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz"; + sha512 = "8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg=="; + }; + }; + "@sigstore/tuf-1.0.3" = { name = "_at_sigstore_slash_tuf"; packageName = "@sigstore/tuf"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.2.tgz"; - sha512 = "vjwcYePJzM01Ha6oWWZ9gNcdIgnzyFxfqfWzph483DPJTH8Tb7f7bQRRll3CYVkyH56j0AgcPAcl6Vg95DPF+Q=="; + url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz"; + sha512 = "2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg=="; }; }; "@sinclair/typebox-0.25.24" = { @@ -12344,13 +11813,13 @@ let sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; - "@sindresorhus/is-5.4.1" = { + "@sindresorhus/is-5.6.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "5.4.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-5.4.1.tgz"; - sha512 = "axlrvsHlHlFmKKMEg4VyvMzFr93JWJj4eIfXY1STVuO2fsImCa7ncaiG5gC8HKOX590AW5RtRsC41/B+OfrSqw=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz"; + sha512 = "TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g=="; }; }; "@sinonjs/commons-1.8.6" = { @@ -12380,391 +11849,436 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; - "@smithy/abort-controller-1.0.2" = { + "@smithy/abort-controller-2.0.1" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-1.0.2.tgz"; - sha512 = "tb2h0b+JvMee+eAxTmhnyqyNk51UXIK949HnE14lFeezKsVJTB30maan+CO2IMwnig2wVYQH84B5qk6ylmKCuA=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.1.tgz"; + sha512 = "0s7XjIbsTwZyUW9OwXQ8J6x1UiA1TNCh60Vaw56nHahL7kUZsLhmTlWiaxfLkFtO2Utkj8YewcpHTYpxaTzO+w=="; }; }; - "@smithy/config-resolver-1.0.2" = { + "@smithy/chunked-blob-reader-2.0.0" = { + name = "_at_smithy_slash_chunked-blob-reader"; + packageName = "@smithy/chunked-blob-reader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.0.0.tgz"; + sha512 = "k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg=="; + }; + }; + "@smithy/chunked-blob-reader-native-2.0.0" = { + name = "_at_smithy_slash_chunked-blob-reader-native"; + packageName = "@smithy/chunked-blob-reader-native"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz"; + sha512 = "HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ=="; + }; + }; + "@smithy/config-resolver-2.0.1" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-1.0.2.tgz"; - sha512 = "8Bk7CgnVKg1dn5TgnjwPz2ebhxeR7CjGs5yhVYH3S8x0q8yPZZVWwpRIglwXaf5AZBzJlNO1lh+lUhMf2e73zQ=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.1.tgz"; + sha512 = "l83Pm7hV+8CBQOCmBRopWDtF+CURUJol7NsuPYvimiDhkC2F8Ba9T1imSFE+pD1UIJ9jlsDPAnZfPJT5cjnuEw=="; }; }; - "@smithy/credential-provider-imds-1.0.2" = { + "@smithy/credential-provider-imds-2.0.1" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-1.0.2.tgz"; - sha512 = "fLjCya+JOu2gPJpCiwSUyoLvT8JdNJmOaTOkKYBZoGf7CzqR6lluSyI+eboZnl/V0xqcfcqBG4tgqCISmWS3/w=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.1.tgz"; + sha512 = "8VxriuRINNEfVZjEFKBY75y9ZWAx73DZ5K/u+3LmB6r8WR2h3NaFxFKMlwlq0uzNdGhD1ouKBn9XWEGYHKiPLw=="; }; }; - "@smithy/eventstream-codec-1.0.2" = { + "@smithy/eventstream-codec-2.0.1" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-1.0.2.tgz"; - sha512 = "eW/XPiLauR1VAgHKxhVvgvHzLROUgTtqat2lgljztbH8uIYWugv7Nz+SgCavB+hWRazv2iYgqrSy74GvxXq/rg=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.1.tgz"; + sha512 = "/IiNB7gQM2y2ZC/GAWOWDa8+iXfhr1g9Xe5979cQEOdCWDISvrAiv18cn3OtIQUhbYOR3gm7QtCpkq1to2takQ=="; }; }; - "@smithy/eventstream-serde-browser-1.0.2" = { + "@smithy/eventstream-serde-browser-2.0.1" = { name = "_at_smithy_slash_eventstream-serde-browser"; packageName = "@smithy/eventstream-serde-browser"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-1.0.2.tgz"; - sha512 = "8bDImzBewLQrIF6hqxMz3eoYwEus2E5JrEwKnhpkSFkkoj8fDSKiLeP/26xfcaoVJgZXB8M1c6jSEZiY3cUMsw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.1.tgz"; + sha512 = "9E1/6ZGF7nB/Td3G1kcatU7VjjP8eZ/p/Q+0KsZc1AUPyv4lR15pmWnWj3iGBEGYI9qZBJ/7a/wPEPayabmA3Q=="; }; }; - "@smithy/eventstream-serde-config-resolver-1.0.2" = { + "@smithy/eventstream-serde-config-resolver-2.0.1" = { name = "_at_smithy_slash_eventstream-serde-config-resolver"; packageName = "@smithy/eventstream-serde-config-resolver"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-1.0.2.tgz"; - sha512 = "SeiJ5pfrXzkGP4WCt9V3Pimfr3OM85Nyh9u/V4J6E0O2dLOYuqvSuKdVnktV0Tcmuu1ZYbt78Th0vfetnSEcdQ=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.1.tgz"; + sha512 = "J8a+8HH8oDPIgq8Px/nPLfu9vpIjQ7XUPtP3orbs8KUh0GznNthSTy1xZP5RXjRqGQEkxPvsHf1po2+QOsgNFw=="; }; }; - "@smithy/eventstream-serde-node-1.0.2" = { + "@smithy/eventstream-serde-node-2.0.1" = { name = "_at_smithy_slash_eventstream-serde-node"; packageName = "@smithy/eventstream-serde-node"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-1.0.2.tgz"; - sha512 = "jqSfi7bpOBHqgd5OgUtCX0wAVhPqxlVdqcj2c4gHaRRXcbpCmK0DRDg7P+Df0h4JJVvTqI6dy2c0YhHk5ehPCw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.1.tgz"; + sha512 = "wklowUz0zXJuqC7FMpriz66J8OAko3z6INTg+iMJWYB1bWv4pc5V7q36PxlZ0RKRbj0u+EThlozWgzE7Stz2Sw=="; }; }; - "@smithy/eventstream-serde-universal-1.0.2" = { + "@smithy/eventstream-serde-universal-2.0.1" = { name = "_at_smithy_slash_eventstream-serde-universal"; packageName = "@smithy/eventstream-serde-universal"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-1.0.2.tgz"; - sha512 = "cQ9bT0j0x49cp8TQ1yZSnn4+9qU0WQSTkoucl3jKRoTZMzNYHg62LQao6HTQ3Jgd77nAXo00c7hqUEjHXwNA+A=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.1.tgz"; + sha512 = "WPPylIgVZ6wOYVgpF0Rs1LlocYyj248MRtKEEehnDvC+0tV7wmGt7H/SchCh10W4y4YUxuzPlW+mUvVMGmLSVg=="; }; }; - "@smithy/fetch-http-handler-1.0.2" = { + "@smithy/fetch-http-handler-2.0.1" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-1.0.2.tgz"; - sha512 = "kynyofLf62LvR8yYphPPdyHb8fWG3LepFinM/vWUTG2Q1pVpmPCM530ppagp3+q2p+7Ox0UvSqldbKqV/d1BpA=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.1.tgz"; + sha512 = "/SoU/ClazgcdOxgE4zA7RX8euiELwpsrKCSvulVQvu9zpmqJRyEJn8ZTWYFV17/eHOBdHTs9kqodhNhsNT+cUw=="; }; }; - "@smithy/hash-node-1.0.2" = { + "@smithy/hash-blob-browser-2.0.1" = { + name = "_at_smithy_slash_hash-blob-browser"; + packageName = "@smithy/hash-blob-browser"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.1.tgz"; + sha512 = "i/o2+sHb4jDRz5nf2ilTTbC0nVmm4LO//FbODCAB7pbzMdywxbZ6z+q56FmEa8R+aFbtApxQ1SJ3umEiNz6IPg=="; + }; + }; + "@smithy/hash-node-2.0.1" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-1.0.2.tgz"; - sha512 = "K6PKhcUNrJXtcesyzhIvNlU7drfIU7u+EMQuGmPw6RQDAg/ufUcfKHz4EcUhFAodUmN+rrejhRG9U6wxjeBOQA=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.1.tgz"; + sha512 = "oTKYimQdF4psX54ZonpcIE+MXjMUWFxLCNosjPkJPFQ9whRX0K/PFX/+JZGRQh3zO9RlEOEUIbhy9NO+Wha6hw=="; }; }; - "@smithy/invalid-dependency-1.0.2" = { + "@smithy/hash-stream-node-2.0.1" = { + name = "_at_smithy_slash_hash-stream-node"; + packageName = "@smithy/hash-stream-node"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.1.tgz"; + sha512 = "AequnQdPRuXf4AuvvFlSjnkWI460xxhAd6y362gFtOE4jjJLLXblbMAXVFrkV8/pDMGNjpVegVSpRmHXZsbKhg=="; + }; + }; + "@smithy/invalid-dependency-2.0.1" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-1.0.2.tgz"; - sha512 = "B1Y3Tsa6dfC+Vvb+BJMhTHOfFieeYzY9jWQSTR1vMwKkxsymD0OIAnEw8rD/RiDj/4E4RPGFdx9Mdgnyd6Bv5Q=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.1.tgz"; + sha512 = "2q/Eb0AE662zwyMV+z+TL7deBwcHCgaZZGc0RItamBE8kak3MzCi/EZCNoFWoBfxgQ4jfR12wm8KKsSXhJzJtQ=="; }; }; - "@smithy/is-array-buffer-1.0.2" = { + "@smithy/is-array-buffer-2.0.0" = { name = "_at_smithy_slash_is-array-buffer"; packageName = "@smithy/is-array-buffer"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-1.0.2.tgz"; - sha512 = "pkyBnsBRpe+c/6ASavqIMRBdRtZNJEVJOEzhpxZ9JoAXiZYbkfaSMRA/O1dUxGdJ653GHONunnZ4xMo/LJ7utQ=="; + url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz"; + sha512 = "z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="; }; }; - "@smithy/middleware-content-length-1.0.2" = { + "@smithy/md5-js-2.0.1" = { + name = "_at_smithy_slash_md5-js"; + packageName = "@smithy/md5-js"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.1.tgz"; + sha512 = "8WWOtwWMmIDgTkRv1o3opy3ABsRXs4/XunETK53ckxQRAiOML1PlnqLBK9Uwk9bvOD6cpmsC6dioIfmKGpJ25w=="; + }; + }; + "@smithy/middleware-content-length-2.0.1" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-1.0.2.tgz"; - sha512 = "pa1/SgGIrSmnEr2c9Apw7CdU4l/HW0fK3+LKFCPDYJrzM0JdYpqjQzgxi31P00eAkL0EFBccpus/p1n2GF9urw=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.1.tgz"; + sha512 = "IZhRSk5GkVBcrKaqPXddBS2uKhaqwBgaSgbBb1OJyGsKe7SxRFbclWS0LqOR9fKUkDl+3lL8E2ffpo6EQg0igw=="; }; }; - "@smithy/middleware-endpoint-1.0.3" = { + "@smithy/middleware-endpoint-2.0.1" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "1.0.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-1.0.3.tgz"; - sha512 = "GsWvTXMFjSgl617PCE2km//kIjjtvMRrR2GAuRDIS9sHiLwmkS46VWaVYy+XE7ubEsEtzZ5yK2e8TKDR6Qr5Lw=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.1.tgz"; + sha512 = "uz/KI1MBd9WHrrkVFZO4L4Wyv24raf0oR4EsOYEeG5jPJO5U+C7MZGLcMxX8gWERDn1sycBDqmGv8fjUMLxT6w=="; }; }; - "@smithy/middleware-retry-1.0.4" = { + "@smithy/middleware-retry-2.0.1" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "1.0.4"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-1.0.4.tgz"; - sha512 = "G7uRXGFL8c3F7APnoIMTtNAHH8vT4F2qVnAWGAZaervjupaUQuRRHYBLYubK0dWzOZz86BtAXKieJ5p+Ni2Xpg=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.1.tgz"; + sha512 = "NKHF4i0gjSyjO6C0ZyjEpNqzGgIu7s8HOK6oT/1Jqws2Q1GynR1xV8XTUs1gKXeaNRzbzKQRewHHmfPwZjOtHA=="; }; }; - "@smithy/middleware-serde-1.0.2" = { + "@smithy/middleware-serde-2.0.1" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-1.0.2.tgz"; - sha512 = "T4PcdMZF4xme6koUNfjmSZ1MLi7eoFeYCtodQNQpBNsS77TuJt1A6kt5kP/qxrTvfZHyFlj0AubACoaUqgzPeg=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.1.tgz"; + sha512 = "uKxPaC6ItH9ZXdpdqNtf8sda7GcU4SPMp0tomq/5lUg9oiMa/Q7+kD35MUrpKaX3IVXVrwEtkjCU9dogZ/RAUA=="; }; }; - "@smithy/middleware-stack-1.0.2" = { + "@smithy/middleware-stack-2.0.0" = { name = "_at_smithy_slash_middleware-stack"; packageName = "@smithy/middleware-stack"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-1.0.2.tgz"; - sha512 = "H7/uAQEcmO+eDqweEFMJ5YrIpsBwmrXSP6HIIbtxKJSQpAcMGY7KrR2FZgZBi1FMnSUOh+rQrbOyj5HQmSeUBA=="; + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.0.tgz"; + sha512 = "31XC1xNF65nlbc16yuh3wwTudmqs6qy4EseQUGF8A/p2m/5wdd/cnXJqpniy/XvXVwkHPz/GwV36HqzHtIKATQ=="; }; }; - "@smithy/node-config-provider-1.0.2" = { + "@smithy/node-config-provider-2.0.1" = { name = "_at_smithy_slash_node-config-provider"; packageName = "@smithy/node-config-provider"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-1.0.2.tgz"; - sha512 = "HU7afWpTToU0wL6KseGDR2zojeyjECQfr8LpjAIeHCYIW7r360ABFf4EaplaJRMVoC3hD9FeltgI3/NtShOqCg=="; + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.1.tgz"; + sha512 = "Zoel4CPkKRTQ2XxmozZUfqBYqjPKL53/SvTDhJHj+VBSiJy6MXRav1iDCyFPS92t40Uh+Yi+Km5Ch3hQ+c/zSA=="; }; }; - "@smithy/node-http-handler-1.0.3" = { + "@smithy/node-http-handler-2.0.1" = { name = "_at_smithy_slash_node-http-handler"; packageName = "@smithy/node-http-handler"; - version = "1.0.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-1.0.3.tgz"; - sha512 = "PcPUSzTbIb60VCJCiH0PU0E6bwIekttsIEf5Aoo/M0oTfiqsxHTn0Rcij6QoH6qJy6piGKXzLSegspXg5+Kq6g=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.1.tgz"; + sha512 = "Zv3fxk3p9tsmPT2CKMsbuwbbxnq2gzLDIulxv+yI6aE+02WPYorObbbe9gh7SW3weadMODL1vTfOoJ9yFypDzg=="; }; }; - "@smithy/property-provider-1.0.2" = { + "@smithy/property-provider-2.0.1" = { name = "_at_smithy_slash_property-provider"; packageName = "@smithy/property-provider"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-1.0.2.tgz"; - sha512 = "pXDPyzKX8opzt38B205kDgaxda6LHcTfPvTYQZnwP6BAPp1o9puiCPjeUtkKck7Z6IbpXCPUmUQnzkUzWTA42Q=="; + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.1.tgz"; + sha512 = "pmJRyY9SF6sutWIktIhe+bUdSQDxv/qZ4mYr3/u+u45riTPN7nmRxPo+e4sjWVoM0caKFjRSlj3tf5teRFy0Vg=="; }; }; - "@smithy/protocol-http-1.1.1" = { + "@smithy/protocol-http-2.0.1" = { name = "_at_smithy_slash_protocol-http"; packageName = "@smithy/protocol-http"; - version = "1.1.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.1.1.tgz"; - sha512 = "mFLFa2sSvlUxm55U7B4YCIsJJIMkA6lHxwwqOaBkral1qxFz97rGffP/mmd4JDuin1EnygiO5eNJGgudiUgmDQ=="; + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.1.tgz"; + sha512 = "mrkMAp0wtaDEIkgRObWYxI1Kun1tm6Iu6rK+X4utb6Ah7Uc3Kk4VIWwK/rBHdYGReiLIrxFCB1rq4a2gyZnSgg=="; }; }; - "@smithy/querystring-builder-1.0.2" = { + "@smithy/querystring-builder-2.0.1" = { name = "_at_smithy_slash_querystring-builder"; packageName = "@smithy/querystring-builder"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-1.0.2.tgz"; - sha512 = "6P/xANWrtJhMzTPUR87AbXwSBuz1SDHIfL44TFd/GT3hj6rA+IEv7rftEpPjayUiWRocaNnrCPLvmP31mobOyA=="; + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.1.tgz"; + sha512 = "bp+93WFzx1FojVEIeFPtG0A1pKsFdCUcZvVdZdRlmNooOUrz9Mm9bneRd8hDwAQ37pxiZkCOxopSXXRQN10mYw=="; }; }; - "@smithy/querystring-parser-1.0.2" = { + "@smithy/querystring-parser-2.0.1" = { name = "_at_smithy_slash_querystring-parser"; packageName = "@smithy/querystring-parser"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-1.0.2.tgz"; - sha512 = "IWxwxjn+KHWRRRB+K2Ngl+plTwo2WSgc2w+DvLy0DQZJh9UGOpw40d6q97/63GBlXIt4TEt5NbcFrO30CKlrsA=="; + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.1.tgz"; + sha512 = "h+e7k1z+IvI2sSbUBG9Aq46JsgLl4UqIUl6aigAlRBj+P6ocNXpM6Yn1vMBw5ijtXeZbYpd1YvCxwDgdw3jhmg=="; }; }; - "@smithy/service-error-classification-1.0.3" = { + "@smithy/service-error-classification-2.0.0" = { name = "_at_smithy_slash_service-error-classification"; packageName = "@smithy/service-error-classification"; - version = "1.0.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-1.0.3.tgz"; - sha512 = "2eglIYqrtcUnuI71yweu7rSfCgt6kVvRVf0C72VUqrd0LrV1M0BM0eYN+nitp2CHPSdmMI96pi+dU9U/UqAMSA=="; + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.0.tgz"; + sha512 = "2z5Nafy1O0cTf69wKyNjGW/sNVMiqDnb4jgwfMG8ye8KnFJ5qmJpDccwIbJNhXIfbsxTg9SEec2oe1cexhMJvw=="; }; }; - "@smithy/shared-ini-file-loader-1.0.2" = { + "@smithy/shared-ini-file-loader-2.0.1" = { name = "_at_smithy_slash_shared-ini-file-loader"; packageName = "@smithy/shared-ini-file-loader"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-1.0.2.tgz"; - sha512 = "bdQj95VN+lCXki+P3EsDyrkpeLn8xDYiOISBGnUG/AGPYJXN8dmp4EhRRR7XOoLoSs8anZHR4UcGEOzFv2jwGw=="; + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.1.tgz"; + sha512 = "a463YiZrPGvM+F336rIF8pLfQsHAdCRAn/BiI/EWzg5xLoxbC7GSxIgliDDXrOu0z8gT3nhVsif85eU6jyct3A=="; }; }; - "@smithy/signature-v4-1.0.2" = { + "@smithy/signature-v4-2.0.1" = { name = "_at_smithy_slash_signature-v4"; packageName = "@smithy/signature-v4"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-1.0.2.tgz"; - sha512 = "rpKUhmCuPmpV5dloUkOb9w1oBnJatvKQEjIHGmkjRGZnC3437MTdzWej9TxkagcZ8NRRJavYnEUixzxM1amFig=="; + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.1.tgz"; + sha512 = "jztv5Mirca42ilxmMDjzLdXcoAmRhZskGafGL49sRo5u7swEZcToEFrq6vtX5YMbSyTVrE9Teog5EFexY5Ff2Q=="; }; }; - "@smithy/smithy-client-1.0.4" = { + "@smithy/smithy-client-2.0.1" = { name = "_at_smithy_slash_smithy-client"; packageName = "@smithy/smithy-client"; - version = "1.0.4"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-1.0.4.tgz"; - sha512 = "gpo0Xl5Nyp9sgymEfpt7oa9P2q/GlM3VmQIdm+FeH0QEdYOQx3OtvwVmBYAMv2FIPWxkMZlsPYRTnEiBTK5TYg=="; + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.1.tgz"; + sha512 = "LHC5m6tYpEu1iNbONfvMbwtErboyTZJfEIPoD78Ei5MVr36vZQCaCla5mvo36+q/a2NAk2//fA5Rx3I1Kf7+lQ=="; }; }; - "@smithy/types-1.1.1" = { + "@smithy/types-2.0.2" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "1.1.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-1.1.1.tgz"; - sha512 = "tMpkreknl2gRrniHeBtdgQwaOlo39df8RxSrwsHVNIGXULy5XP6KqgScUw2m12D15wnJCKWxVhCX+wbrBW/y7g=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-2.0.2.tgz"; + sha512 = "wcymEjIXQ9+NEfE5Yt5TInAqe1o4n+Nh+rh00AwoazppmUt8tdo6URhc5gkDcOYrcvlDVAZE7uG69nDpEGUKxw=="; }; }; - "@smithy/url-parser-1.0.2" = { + "@smithy/url-parser-2.0.1" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-1.0.2.tgz"; - sha512 = "0JRsDMQe53F6EHRWksdcavKDRjyqp8vrjakg8EcCUOa7PaFRRB1SO/xGZdzSlW1RSTWQDEksFMTCEcVEKmAoqA=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.1.tgz"; + sha512 = "NpHVOAwddo+OyyIoujDL9zGL96piHWrTNXqltWmBvlUoWgt1HPyBuKs6oHjioyFnNZXUqveTOkEEq0U5w6Uv8A=="; }; }; - "@smithy/util-base64-1.0.2" = { + "@smithy/util-base64-2.0.0" = { name = "_at_smithy_slash_util-base64"; packageName = "@smithy/util-base64"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-1.0.2.tgz"; - sha512 = "BCm15WILJ3SL93nusoxvJGMVfAMWHZhdeDZPtpAaskozuexd0eF6szdz4kbXaKp38bFCSenA6bkUHqaE3KK0dA=="; + url = "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.0.tgz"; + sha512 = "Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA=="; }; }; - "@smithy/util-body-length-browser-1.0.2" = { + "@smithy/util-body-length-browser-2.0.0" = { name = "_at_smithy_slash_util-body-length-browser"; packageName = "@smithy/util-body-length-browser"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-1.0.2.tgz"; - sha512 = "Xh8L06H2anF5BHjSYTg8hx+Itcbf4SQZnVMl4PIkCOsKtneMJoGjPRLy17lEzfoh/GOaa0QxgCP6lRMQWzNl4w=="; + url = "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz"; + sha512 = "JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg=="; }; }; - "@smithy/util-body-length-node-1.0.2" = { + "@smithy/util-body-length-node-2.0.0" = { name = "_at_smithy_slash_util-body-length-node"; packageName = "@smithy/util-body-length-node"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-1.0.2.tgz"; - sha512 = "nXHbZsUtvZeyfL4Ceds9nmy2Uh2AhWXohG4vWHyjSdmT8cXZlJdmJgnH6SJKDjyUecbu+BpKeVvSrA4cWPSOPA=="; + 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=="; }; }; - "@smithy/util-buffer-from-1.0.2" = { + "@smithy/util-buffer-from-2.0.0" = { name = "_at_smithy_slash_util-buffer-from"; packageName = "@smithy/util-buffer-from"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-1.0.2.tgz"; - sha512 = "lHAYIyrBO9RANrPvccnPjU03MJnWZ66wWuC5GjWWQVfsmPwU6m00aakZkzHdUT6tGCkGacXSgArP5wgTgA+oCw=="; + url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz"; + sha512 = "/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw=="; }; }; - "@smithy/util-config-provider-1.0.2" = { + "@smithy/util-config-provider-2.0.0" = { name = "_at_smithy_slash_util-config-provider"; packageName = "@smithy/util-config-provider"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-1.0.2.tgz"; - sha512 = "HOdmDm+3HUbuYPBABLLHtn8ittuRyy+BSjKOA169H+EMc+IozipvXDydf+gKBRAxUa4dtKQkLraypwppzi+PRw=="; + url = "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz"; + sha512 = "xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="; }; }; - "@smithy/util-defaults-mode-browser-1.0.2" = { + "@smithy/util-defaults-mode-browser-2.0.1" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-1.0.2.tgz"; - sha512 = "J1u2PO235zxY7dg0+ZqaG96tFg4ehJZ7isGK1pCBEA072qxNPwIpDzUVGnLJkHZvjWEGA8rxIauDtXfB0qxeAg=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.1.tgz"; + sha512 = "w72Qwsb+IaEYEFtYICn0Do42eFju78hTaBzzJfT107lFOPdbjWjKnFutV+6GL/nZd5HWXY7ccAKka++C3NrjHw=="; }; }; - "@smithy/util-defaults-mode-node-1.0.2" = { + "@smithy/util-defaults-mode-node-2.0.1" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-1.0.2.tgz"; - sha512 = "9/BN63rlIsFStvI+AvljMh873Xw6bbI6b19b+PVYXyycQ2DDQImWcjnzRlHW7eP65CCUNGQ6otDLNdBQCgMXqg=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.1.tgz"; + sha512 = "dNF45caelEBambo0SgkzQ0v76m4YM+aFKZNTtSafy7P5dVF8TbjZuR2UX1A5gJABD9XK6lzN+v/9Yfzj/EDgGg=="; }; }; - "@smithy/util-hex-encoding-1.0.2" = { + "@smithy/util-hex-encoding-2.0.0" = { name = "_at_smithy_slash_util-hex-encoding"; packageName = "@smithy/util-hex-encoding"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-1.0.2.tgz"; - sha512 = "Bxydb5rMJorMV6AuDDMOxro3BMDdIwtbQKHpwvQFASkmr52BnpDsWlxgpJi8Iq7nk1Bt4E40oE1Isy/7ubHGzg=="; + url = "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz"; + sha512 = "c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA=="; }; }; - "@smithy/util-middleware-1.0.2" = { + "@smithy/util-middleware-2.0.0" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-1.0.2.tgz"; - sha512 = "vtXK7GOR2BoseCX8NCGe9SaiZrm9M2lm/RVexFGyPuafTtry9Vyv7hq/vw8ifd/G/pSJ+msByfJVb1642oQHKw=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.0.tgz"; + sha512 = "eCWX4ECuDHn1wuyyDdGdUWnT4OGyIzV0LN1xRttBFMPI9Ff/4heSHVxneyiMtOB//zpXWCha1/SWHJOZstG7kA=="; }; }; - "@smithy/util-retry-1.0.4" = { + "@smithy/util-retry-2.0.0" = { name = "_at_smithy_slash_util-retry"; packageName = "@smithy/util-retry"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-1.0.4.tgz"; - sha512 = "RnZPVFvRoqdj2EbroDo3OsnnQU8eQ4AlnZTOGusbYKybH3269CFdrZfZJloe60AQjX7di3J6t/79PjwCLO5Khw=="; + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.0.tgz"; + sha512 = "/dvJ8afrElasuiiIttRJeoS2sy8YXpksQwiM/TcepqdRVp7u4ejd9C4IQURHNjlfPUT7Y6lCDSa2zQJbdHhVTg=="; }; }; - "@smithy/util-stream-1.0.2" = { + "@smithy/util-stream-2.0.1" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-1.0.2.tgz"; - sha512 = "qyN2M9QFMTz4UCHi6GnBfLOGYKxQZD01Ga6nzaXFFC51HP/QmArU72e4kY50Z/EtW8binPxspP2TAsGbwy9l3A=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.1.tgz"; + sha512 = "2a0IOtwIKC46EEo7E7cxDN8u2jwOiYYJqcFKA6rd5rdXqKakHT2Gc+AqHWngr0IEHUfW92zX12wRQKwyoqZf2Q=="; }; }; - "@smithy/util-uri-escape-1.0.2" = { + "@smithy/util-uri-escape-2.0.0" = { name = "_at_smithy_slash_util-uri-escape"; packageName = "@smithy/util-uri-escape"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-1.0.2.tgz"; - sha512 = "k8C0BFNS9HpBMHSgUDnWb1JlCQcFG+PPlVBq9keP4Nfwv6a9Q0yAfASWqUCtzjuMj1hXeLhn/5ADP6JxnID1Pg=="; + url = "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz"; + sha512 = "ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw=="; }; }; - "@smithy/util-utf8-1.0.2" = { + "@smithy/util-utf8-2.0.0" = { name = "_at_smithy_slash_util-utf8"; packageName = "@smithy/util-utf8"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-1.0.2.tgz"; - sha512 = "V4cyjKfJlARui0dMBfWJMQAmJzoW77i4N3EjkH/bwnE2Ngbl4tqD2Y0C/xzpzY/J1BdxeCKxAebVFk8aFCaSCw=="; + url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.0.tgz"; + sha512 = "rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ=="; }; }; - "@smithy/util-waiter-1.0.2" = { + "@smithy/util-waiter-2.0.1" = { name = "_at_smithy_slash_util-waiter"; packageName = "@smithy/util-waiter"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-1.0.2.tgz"; - sha512 = "+jq4/Vd9ejPzR45qwYSePyjQbqYP9QqtyZYsFVyfzRnbGGC0AjswOh7txcxroafuEBExK4qE+L/QZA8wWXsJYw=="; + url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.1.tgz"; + sha512 = "bSyGFicPRYuGFFWAr72UvYI7tE7KmEeFJJ5iaLuTTdo8RGaNBZ2kE25coGtzrejYh9AhwSfckBvbxgEDxIxhlA=="; }; }; "@socket.io/component-emitter-3.1.0" = { @@ -12884,15 +12398,6 @@ let sha512 = "0p9uXkuB22qGdNfy3VeEhxkU5uwvp/KrBTAbrLBURv6ilxIVwanKwjMc41lQfIVgPGcOkmLbTolfFrSsueu7zA=="; }; }; - "@stoplight/json-3.20.3" = { - name = "_at_stoplight_slash_json"; - packageName = "@stoplight/json"; - version = "3.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/json/-/json-3.20.3.tgz"; - sha512 = "2m+Km6CkEPWj+H+CXxFyQB9+mVK8ifz9izK0UZpz4G1ZBx2Pd2hI+qw24FJ+X3DTYtMPYIeINTOEaTFWOmbRxQ=="; - }; - }; "@stoplight/json-3.21.0" = { name = "_at_stoplight_slash_json"; packageName = "@stoplight/json"; @@ -12911,13 +12416,13 @@ let sha512 = "nty0tHUq2f1IKuFYsLM4CXLZGHdMn+X/IwEUIpeSOXt0QjMUbL0Em57iJUDzz+2MkWG83smIigNZ3fauGjqgdQ=="; }; }; - "@stoplight/json-ref-resolver-3.1.5" = { + "@stoplight/json-ref-resolver-3.1.6" = { name = "_at_stoplight_slash_json-ref-resolver"; packageName = "@stoplight/json-ref-resolver"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/json-ref-resolver/-/json-ref-resolver-3.1.5.tgz"; - sha512 = "uaKLITor7UF+JBtI84zs3aOWM0L79zp7w9TrBTwPtx5SLbaQQ4HadDKgX5yhFOLMApLdhwhiftF4c0GFanOxGg=="; + url = "https://registry.npmjs.org/@stoplight/json-ref-resolver/-/json-ref-resolver-3.1.6.tgz"; + sha512 = "YNcWv3R3n3U6iQYBsFOiWSuRGE5su1tJSiX6pAPRVk7dP0L7lqCteXGzuVRQ0gMZqUl8v1P0+fAKxF6PLo9B5A=="; }; }; "@stoplight/ordered-object-literal-1.0.4" = { @@ -12938,22 +12443,22 @@ let sha512 = "lyIc6JUlUA8Ve5ELywPC8I2Sdnh1zc1zmbYgVarhXIp9YeAB0ReeqmGEOWNtlHkbP2DAA1AL65Wfn2ncjK/jtQ=="; }; }; - "@stoplight/spectral-cli-6.8.0" = { + "@stoplight/spectral-cli-6.10.0" = { name = "_at_stoplight_slash_spectral-cli"; packageName = "@stoplight/spectral-cli"; - version = "6.8.0"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-cli/-/spectral-cli-6.8.0.tgz"; - sha512 = "gwNAZSdUdxxzH8X2yf1YoDQmo9DYnqPhqFCaKx5alQa/SQG6DOG1taNeODq3wapLn6GDh0d5D8b1DVe7N6bWEw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-cli/-/spectral-cli-6.10.0.tgz"; + sha512 = "mJOlLtKvhiVUSXslcjHFrb+MPIMe6yrqsuABFyXqb2SMk/zOsLDIEKgB/UQ1w6hTcr54o6CVTAYf+0lnhCsWQw=="; }; }; - "@stoplight/spectral-core-1.18.1" = { + "@stoplight/spectral-core-1.18.3" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; - version = "1.18.1"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.18.1.tgz"; - sha512 = "tgUoQZ68hdhFG6CJToBZQtY2fCkh66T4BUtBhdzQ0ZqLU6MhgdL4PlE0yT2tObwsSExNuzaRZH6ssjvbjnHtQQ=="; + url = "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.18.3.tgz"; + sha512 = "YY8x7X2SWJIhGTLPol+eFiQpWPz0D0mJdkK2i4A0QJG68KkNhypP6+JBC7/Kz3XWjqr0L/RqAd+N5cQLPOKZGQ=="; }; }; "@stoplight/spectral-formats-1.5.0" = { @@ -12965,13 +12470,13 @@ let sha512 = "VskkdU3qBSvI1dfJ79ysjvTssfNlbA6wrf/XkXK6iTyjfIVqOAWVtjypTb2U95tN/X8IjIBBhNWtZ4tNVZilrA=="; }; }; - "@stoplight/spectral-formatters-1.1.0" = { + "@stoplight/spectral-formatters-1.2.0" = { name = "_at_stoplight_slash_spectral-formatters"; packageName = "@stoplight/spectral-formatters"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.1.0.tgz"; - sha512 = "KUOKOF0Wz9iFS4pKHO8mSx0OZc9J5ziFJfbxFOL8xDGlxYTfBIQsaOjwi6GItcar7wK8S2ksAIUS2ijzAygZ5A=="; + url = "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.2.0.tgz"; + sha512 = "1IrQksU1fpuvK7oT8t0jk419vkvzHbwqKYtnyoF9yZa+MV1AcSsieD5I6wBFL0WlgFr6iCg23s1V99VXlrFelw=="; }; }; "@stoplight/spectral-functions-1.7.2" = { @@ -12983,22 +12488,22 @@ let sha512 = "f+61/FtIkQeIo+a269CeaeqjpyRsgDyIk6DGr7iS4hyuk1PPk7Uf6MNRDs9FEIBh7CpdEJ+HSHbMLwgpymWTIw=="; }; }; - "@stoplight/spectral-parsers-1.0.2" = { + "@stoplight/spectral-parsers-1.0.3" = { name = "_at_stoplight_slash_spectral-parsers"; packageName = "@stoplight/spectral-parsers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-parsers/-/spectral-parsers-1.0.2.tgz"; - sha512 = "ZQXknJ+BM5Re4Opj4cgVlHgG2qyOk/wznKJq3Vf1qsBEg2CNzN0pJmSB0deRqW0kArqm44qpb8c+cz3F2rgMtw=="; - }; - }; - "@stoplight/spectral-ref-resolver-1.0.3" = { - name = "_at_stoplight_slash_spectral-ref-resolver"; - packageName = "@stoplight/spectral-ref-resolver"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ref-resolver/-/spectral-ref-resolver-1.0.3.tgz"; - sha512 = "pj+bH4SH8hcWlnV787WD7P0/En7LA3EfZMvG1JUGMW/7bFd9AaZZXNkh5j0ve8qnPlwP8F4SH/2Cnr1tXOXCVw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-parsers/-/spectral-parsers-1.0.3.tgz"; + sha512 = "J0KW5Rh5cHWnJQ3yN+cr/ijNFVirPSR0pkQbdrNX30VboEl083UEDrQ3yov9kjLVIWEk9t9kKE7Eo3QT/k4JLA=="; + }; + }; + "@stoplight/spectral-ref-resolver-1.0.4" = { + name = "_at_stoplight_slash_spectral-ref-resolver"; + packageName = "@stoplight/spectral-ref-resolver"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@stoplight/spectral-ref-resolver/-/spectral-ref-resolver-1.0.4.tgz"; + sha512 = "5baQIYL0NJTSVy8v6RxOR4U51xOUYM8wJri1YvlAT6bPN8m0EIxMwfVYi0xUZEMVeHcWx869nIkoqyWmOutF2A=="; }; }; "@stoplight/spectral-ruleset-bundler-1.5.2" = { @@ -13010,13 +12515,13 @@ let sha512 = "4QUVUFAU+S7IQ9XeCu+0TQMYxKFpKnkOAfa9unRQ1iPL2cviaipEN6witpbAptdHJD3UUjx4OnwlX8WwmXSq9w=="; }; }; - "@stoplight/spectral-ruleset-migrator-1.9.4" = { + "@stoplight/spectral-ruleset-migrator-1.9.5" = { name = "_at_stoplight_slash_spectral-ruleset-migrator"; packageName = "@stoplight/spectral-ruleset-migrator"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.4.tgz"; - sha512 = "bQjmYTf1COdhXdFg4dRzfZ7Ukc9ylr9f9J8c1PO3NGZtryUavw/109BrYfdQGgO0Hfkc/yVsRbkI4mKYNlvnXg=="; + url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.5.tgz"; + sha512 = "76n/HETr3UinVl/xLNldrH9p0JNoD8Gz4K75J6E4OHp4xD0P+BA2e8+W30HjIvqm1LJdLU2BNma0ioy+q3B9RA=="; }; }; "@stoplight/spectral-rulesets-1.16.0" = { @@ -13046,13 +12551,13 @@ let sha512 = "dwqYcDrGmEyUv5TWrDam5TGOxU72ufyQ7hnOIIDdmW5ezOwZaBFoR5XQ9AsH49w7wgvOqB2Bmo799pJPWnpCbg=="; }; }; - "@stoplight/types-13.15.0" = { + "@stoplight/types-13.17.0" = { name = "_at_stoplight_slash_types"; packageName = "@stoplight/types"; - version = "13.15.0"; + version = "13.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/types/-/types-13.15.0.tgz"; - sha512 = "pBLjVRrWGVd+KzTbL3qrmufSKIEp0UfziDBdt/nrTHPKrlrtVwaHdrrQMcpM23yJDU1Wcg4cHvhIuGtKCT5OmA=="; + url = "https://registry.npmjs.org/@stoplight/types/-/types-13.17.0.tgz"; + sha512 = "9wzSi8MZQXjO+GSYehwMWFSUHO5qtDr282RxrDDsxO9ZHn0a4nWE+kTWDWSdtbiZrIEantTSkycmQJxKxnnRTQ=="; }; }; "@stoplight/types-13.6.0" = { @@ -13154,103 +12659,103 @@ let sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; }; }; - "@swc/core-1.3.68" = { + "@swc/core-1.3.73" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.68.tgz"; - sha512 = "njGQuJO+Wy06dEayt70cf0c/KI3HGjm4iW9LLViVLBuYNzJ4SSdNfzejludzufu6im+dsDJ0i3QjgWhAIcVHMQ=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.73.tgz"; + sha512 = "ihjj/mAQKnXakFdFPlIJOjAvfLLc2f7t9u3k5Vsv8o30utD4/4mw1SAEL9vsPYM14XrMJa6PUNegw6hNxX1D2g=="; }; }; - "@swc/core-darwin-arm64-1.3.68" = { + "@swc/core-darwin-arm64-1.3.73" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.68.tgz"; - sha512 = "Z5pNxeuP2NxpOHTzDQkJs0wAPLnTlglZnR3WjObijwvdwT/kw1Y5EPDKM/BVSIeG40SPMkDLBbI0aj0qyXzrBA=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.73.tgz"; + sha512 = "RwCDCDg3gmgt+p/Kc48o3PdLBSCoFQKLb8QgC7F32Ql9wjVMS3fzy2i6NZ+MnbEnYGQtTcqLbxEDtpV3eMsEHw=="; }; }; - "@swc/core-darwin-x64-1.3.68" = { + "@swc/core-darwin-x64-1.3.73" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.68.tgz"; - sha512 = "ZHl42g6yXhfX4PzAQ0BNvBXpt/OcbAHfubWRN6eXELK3fiNnxL7QBW1if7iizlq6iA+Mj1pwHyyUit1pz0+fgA=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.73.tgz"; + sha512 = "cHmAWvCVRc7LTdv4LO4mZZXfW3E9NT/KNnLNG/PgWP9QK1bSQ7hUDVKsx70ygR4ONwfhqUuglakzu+xDfNoW+A=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.68" = { + "@swc/core-linux-arm-gnueabihf-1.3.73" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.68.tgz"; - sha512 = "Mk8f6KCOQ2CNAR4PtWajIjS6XKSSR7ZYDOCf1GXRxhS3qEyQH7V8elWvqWYqHcT4foO60NUmxA/NOM/dQrdO1A=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.73.tgz"; + sha512 = "EmJALh7KUJhcdr7uUQg7wTpdcX5k1Xjspgy3QMg8j2dwb4DsnFgrnArsFNXHBB1Dj7LlQSoyxQ5mBcJtUtCb8A=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.68" = { + "@swc/core-linux-arm64-gnu-1.3.73" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.68.tgz"; - sha512 = "RhBllggh9t9sIxaRgRcGrVaS7fDk6KsIqR6b9+dwU5OyDr4ZyHWw1ZaH/1/HAebuXYhNBjoNUiRtca6lKRIPgQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.73.tgz"; + sha512 = "RK6jTm8ppvglh42YOq/k2AqpHS9uYP5h5FNMmA9OI8lupCCS8HMtexbwqw+Xd0MGmSrsJiURw3Z6az8cEObrag=="; }; }; - "@swc/core-linux-arm64-musl-1.3.68" = { + "@swc/core-linux-arm64-musl-1.3.73" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.68.tgz"; - sha512 = "8K3zjU+tFgn6yGDEeD343gkKaHU9dhz77NiVkI1VzwRaT/Ag5pwl5eMQ1yStm8koNFzn3zq6rGjHfI5g2yI5Wg=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.73.tgz"; + sha512 = "hhS6yfgZLKPVAklGjKlbyf9InAhDGj3u+jbZkjStrOgtYNBCk5tbkROZP9ib5enN9m9Oosl5gM5v6oTw27TbUw=="; }; }; - "@swc/core-linux-x64-gnu-1.3.68" = { + "@swc/core-linux-x64-gnu-1.3.73" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.68.tgz"; - sha512 = "4xAnvsBOyeTL0AB8GWlRKDM/hsysJ5jr5qvdKKI3rZfJgnnxl/xSX6TJKPsJ8gygfUJ3BmfCbmUmEyeDZ3YPvA=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.73.tgz"; + sha512 = "ZGcY63EtFW5OLz1tsKhqhymzvoto329c0oRS9ptzMO66eUrjsHxTt5uPixrI24F6y+bn+qFqsgIw3nwMV8jTPw=="; }; }; - "@swc/core-linux-x64-musl-1.3.68" = { + "@swc/core-linux-x64-musl-1.3.73" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.68.tgz"; - sha512 = "RCpaBo1fcpy1EFdjF+I7N4lfzOaHXVV0iMw/ABM+0PD6tp3V/9pxsguaZyeAHyEiUlDA6PZ4TfXv5zfnXEgW4Q=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.73.tgz"; + sha512 = "DMz2W0PnzMXAhbMPGArQUBVayyzzzuivvJyJkyFaMPiIwaI+QG+UvLgjSM7NmG/9Eq9hX2zZ1zdaalVKXyyCHQ=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.68" = { + "@swc/core-win32-arm64-msvc-1.3.73" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.68.tgz"; - sha512 = "v2WZvXrSslYEpY1nqpItyamL4DyaJinmOkXvM8Bc1LLKU5rGuvmBdjUYg/5Y+o0AUynuiWubpgHNOkBWiCvfqw=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.73.tgz"; + sha512 = "yHB1jG3c4/5An//nA9+War6oiNrM/NUz6ivDPbrBfbJHtU/iPfgdAvxfm5/xpOFx4U18JJHnOt853sDyXJwi/A=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.68" = { + "@swc/core-win32-ia32-msvc-1.3.73" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.68.tgz"; - sha512 = "HH5NJrIdzkJs+1xxprie0qSCMBeL9yeEhcC1yZTzYv8bwmabOUSdtKIqS55iYP/2hLWn9CTbvKPmLOIhCopW3Q=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.73.tgz"; + sha512 = "cA61i4VPTrABAZ8LDvNVqwcO1VLEDO+71iWettvhyk7p6/H/lXG4VQVyHcncmfrAUzDQalXVbgZm6MA3hpqhFQ=="; }; }; - "@swc/core-win32-x64-msvc-1.3.68" = { + "@swc/core-win32-x64-msvc-1.3.73" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.68"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.68.tgz"; - sha512 = "9HZVtLQUgK8r/yXQdwe0VBexbIcrY6+fBROhs7AAPWdewpaUeLkwQEJk6TbYr9CQuHw26FFGg6SjwAiqXF+kgQ=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.73.tgz"; + sha512 = "QwTO9IlIpEr2GsJvW8qNVvQXTzT1ASqf8C8aZDLtVwHKdreTMjlrNMRYw1883DVLRuHMs5RLP4IA2A47Oexp1Q=="; }; }; "@swc/helpers-0.5.1" = { @@ -13262,13 +12767,13 @@ let sha512 = "sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg=="; }; }; - "@swc/wasm-1.3.66" = { + "@swc/wasm-1.3.73" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.66"; + version = "1.3.73"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.66.tgz"; - sha512 = "YxTkQLpfYr2j2vAHG+guWOGzpBYoqciJcHJKq1ecqHki8mxeTV6Origkyh4DzlG/K1hoy1/FtL6kal71Ktg+lg=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.73.tgz"; + sha512 = "jpYN+J0WQkzET0Y9tk8fTgVr4JFzFoy9bmd4WdbfgCYEgiva3ANcRUMtyLZDXFZz5RpracHeRx1Q/7DzZAhuSA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -13514,6 +13019,15 @@ let sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; }; + "@tootallnate/quickjs-emscripten-0.23.0" = { + name = "_at_tootallnate_slash_quickjs-emscripten"; + packageName = "@tootallnate/quickjs-emscripten"; + version = "0.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz"; + sha512 = "C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="; + }; + }; "@trufflesuite/uws-js-unofficial-20.10.0-unofficial.2" = { name = "_at_trufflesuite_slash_uws-js-unofficial"; packageName = "@trufflesuite/uws-js-unofficial"; @@ -13793,6 +13307,15 @@ let sha512 = "4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig=="; }; }; + "@types/content-type-1.1.3" = { + name = "_at_types_slash_content-type"; + packageName = "@types/content-type"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/content-type/-/content-type-1.1.3.tgz"; + sha512 = "pv8VcFrZ3fN93L4rTNIbbUzdkzjEyVMp5mPVjsFfOYTDOZMZiZ8P1dhu+kEv3faYyKzZgLlSvnyQNFg+p/v5ug=="; + }; + }; "@types/cookie-0.4.1" = { name = "_at_types_slash_cookie"; packageName = "@types/cookie"; @@ -13883,13 +13406,13 @@ let sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; - "@types/eslint-8.44.0" = { + "@types/eslint-8.44.1" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.44.0"; + version = "8.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.0.tgz"; - sha512 = "gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz"; + sha512 = "XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg=="; }; }; "@types/eslint-scope-3.7.4" = { @@ -13910,15 +13433,6 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.51" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.51"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"; - sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; - }; - }; "@types/estree-1.0.1" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; @@ -13928,15 +13442,6 @@ let sha512 = "LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="; }; }; - "@types/estree-jsx-0.0.1" = { - name = "_at_types_slash_estree-jsx"; - packageName = "@types/estree-jsx"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-0.0.1.tgz"; - sha512 = "gcLAYiMfQklDCPjQegGn0TBAn9it05ISEsEhlKQUddIk7o2XDokOcTN7HBO8tznM0D9dGezvHEfRZBfZf6me0A=="; - }; - }; "@types/estree-jsx-1.0.0" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; @@ -14000,15 +13505,6 @@ let sha512 = "wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg=="; }; }; - "@types/fs-extra-11.0.1" = { - name = "_at_types_slash_fs-extra"; - packageName = "@types/fs-extra"; - version = "11.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.1.tgz"; - sha512 = "MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA=="; - }; - }; "@types/geojson-7946.0.4" = { name = "_at_types_slash_geojson"; packageName = "@types/geojson"; @@ -14045,13 +13541,13 @@ let sha512 = "IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w=="; }; }; - "@types/hast-2.3.4" = { + "@types/hast-2.3.5" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz"; - sha512 = "wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g=="; + url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.5.tgz"; + sha512 = "SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg=="; }; }; "@types/html-minifier-terser-6.1.0" = { @@ -14207,15 +13703,6 @@ let sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; }; }; - "@types/jsonfile-6.1.1" = { - name = "_at_types_slash_jsonfile"; - packageName = "@types/jsonfile"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.1.tgz"; - sha512 = "GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png=="; - }; - }; "@types/keyv-3.1.4" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; @@ -14234,13 +13721,13 @@ let sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="; }; }; - "@types/lodash-4.14.195" = { + "@types/lodash-4.14.196" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.195"; + version = "4.14.196"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz"; - sha512 = "Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.196.tgz"; + sha512 = "22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ=="; }; }; "@types/long-4.0.2" = { @@ -14270,13 +13757,13 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/mdast-3.0.11" = { + "@types/mdast-3.0.12" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.11"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.11.tgz"; - sha512 = "Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz"; + sha512 = "DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg=="; }; }; "@types/mdurl-1.0.2" = { @@ -14342,6 +13829,15 @@ let sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; }; + "@types/mute-stream-0.0.1" = { + name = "_at_types_slash_mute-stream"; + packageName = "@types/mute-stream"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.1.tgz"; + sha512 = "0yQLzYhCqGz7CQPE3iDmYjhb7KMBFOP+tBkyw+/Y2YyDI5wpS7itXXxneN1zSsUwWx3Ji6YiVYrhAnpQGS/vkw=="; + }; + }; "@types/nanoid-3.0.0" = { name = "_at_types_slash_nanoid"; packageName = "@types/nanoid"; @@ -14351,13 +13847,13 @@ let sha512 = "UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ=="; }; }; - "@types/nlcst-1.0.0" = { + "@types/nlcst-1.0.1" = { name = "_at_types_slash_nlcst"; packageName = "@types/nlcst"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.0.tgz"; - sha512 = "3TGCfOcy8R8mMQ4CNSNOe3PG66HttvjcLzCoOpvXvDtfWOTi+uT/rxeOKm/qEwbM4SNe1O/PjdiBK2YcTjU4OQ=="; + url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.1.tgz"; + sha512 = "aVIyXt6pZiiMOtVByE4Y0gf+BLm1Cxc4ZLSK8VRHn1CgkO+kXbQwN/EBhQmhPdBMjFJCMBKtmNW2zWQuFywz8Q=="; }; }; "@types/node-10.17.60" = { @@ -14396,13 +13892,13 @@ let sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; }; }; - "@types/node-14.18.53" = { + "@types/node-14.18.54" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.53"; + version = "14.18.54"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz"; - sha512 = "soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz"; + sha512 = "uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw=="; }; }; "@types/node-15.14.9" = { @@ -14432,13 +13928,13 @@ let sha512 = "XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g=="; }; }; - "@types/node-16.18.38" = { + "@types/node-16.18.39" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.38"; + version = "16.18.39"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.38.tgz"; - sha512 = "6sfo1qTulpVbkxECP+AVrHV9OoJqhzCsfTNp5NIG+enM4HyM3HvZCO798WShIXBN0+QtDIcutJCjsVYnQP5rIQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.39.tgz"; + sha512 = "8q9ZexmdYYyc5/cfujaXb4YOucpQxAV4RMG0himLyDUOEr8Mr79VrqsFI+cQ2M2h89YIuy95lbxuYjxT4Hk4kQ=="; }; }; "@types/node-16.9.1" = { @@ -14468,15 +13964,6 @@ let sha512 = "z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w=="; }; }; - "@types/node-18.16.19" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.16.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.16.19.tgz"; - sha512 = "IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA=="; - }; - }; "@types/node-18.16.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -14486,6 +13973,15 @@ let sha512 = "OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q=="; }; }; + "@types/node-18.17.1" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.17.1.tgz"; + sha512 = "xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw=="; + }; + }; "@types/node-20.3.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -14504,13 +14000,22 @@ let sha512 = "vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw=="; }; }; - "@types/node-20.4.1" = { + "@types/node-20.4.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.4.1"; + version = "20.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.4.1.tgz"; - sha512 = "JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.4.2.tgz"; + sha512 = "Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw=="; + }; + }; + "@types/node-20.4.5" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "20.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz"; + sha512 = "rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg=="; }; }; "@types/node-6.14.13" = { @@ -14594,15 +14099,6 @@ let sha512 = "JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="; }; }; - "@types/ps-tree-1.1.2" = { - name = "_at_types_slash_ps-tree"; - packageName = "@types/ps-tree"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ps-tree/-/ps-tree-1.1.2.tgz"; - sha512 = "ZREFYlpUmPQJ0esjxoG1fMvB2HNaD3z+mjqdSosZvd3RalncI9NEur73P8ZJz4YQdL64CmV1w0RuqoRUlhQRBw=="; - }; - }; "@types/pug-2.0.6" = { name = "_at_types_slash_pug"; packageName = "@types/pug"; @@ -14648,13 +14144,13 @@ let sha512 = "eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw=="; }; }; - "@types/react-18.2.14" = { + "@types/react-18.2.18" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.2.14"; + version = "18.2.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.14.tgz"; - sha512 = "A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz"; + sha512 = "da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ=="; }; }; "@types/readdir-glob-1.1.1" = { @@ -14873,13 +14369,13 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/unist-2.0.6" = { + "@types/unist-2.0.7" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz"; - sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz"; + sha512 = "cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g=="; }; }; "@types/unist-3.0.0" = { @@ -14972,13 +14468,13 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; - "@types/which-3.0.0" = { - name = "_at_types_slash_which"; - packageName = "@types/which"; + "@types/wrap-ansi-3.0.0" = { + name = "_at_types_slash_wrap-ansi"; + packageName = "@types/wrap-ansi"; version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/which/-/which-3.0.0.tgz"; - sha512 = "ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ=="; + url = "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz"; + sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; }; }; "@types/ws-7.4.7" = { @@ -15053,76 +14549,76 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-5.61.0" = { + "@typescript-eslint/eslint-plugin-5.62.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.61.0.tgz"; - sha512 = "A5l/eUAug103qtkwccSCxn8ZRwT+7RXWkFECdA4Cvl1dOlDUgTpAOfSEElZn2uSUxhdDpnCdetrf0jvU4qrL+g=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz"; + sha512 = "TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag=="; }; }; - "@typescript-eslint/parser-5.61.0" = { + "@typescript-eslint/parser-5.62.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.61.0.tgz"; - sha512 = "yGr4Sgyh8uO6fSi9hw3jAFXNBHbCtKKFMdX2IkT3ZqpKmtAq3lHS4ixB/COFuAIJpwl9/AqF7j72ZDWYKmIfvg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz"; + sha512 = "VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA=="; }; }; - "@typescript-eslint/scope-manager-5.61.0" = { + "@typescript-eslint/scope-manager-5.62.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.61.0.tgz"; - sha512 = "W8VoMjoSg7f7nqAROEmTt6LoBpn81AegP7uKhhW5KzYlehs8VV0ZW0fIDVbcZRcaP3aPSW+JZFua+ysQN+m/Nw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz"; + sha512 = "VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w=="; }; }; - "@typescript-eslint/type-utils-5.61.0" = { + "@typescript-eslint/type-utils-5.62.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.61.0.tgz"; - sha512 = "kk8u//r+oVK2Aj3ph/26XdH0pbAkC2RiSjUYhKD+PExemG4XSjpGFeyZ/QM8lBOa7O8aGOU+/yEbMJgQv/DnCg=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz"; + sha512 = "xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew=="; }; }; - "@typescript-eslint/types-5.61.0" = { + "@typescript-eslint/types-5.62.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.61.0.tgz"; - sha512 = "ldyueo58KjngXpzloHUog/h9REmHl59G1b3a5Sng1GfBo14BkS3ZbMEb3693gnP1k//97lh7bKsp6/V/0v1veQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz"; + sha512 = "87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ=="; }; }; - "@typescript-eslint/typescript-estree-5.61.0" = { + "@typescript-eslint/typescript-estree-5.62.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.61.0.tgz"; - sha512 = "Fud90PxONnnLZ36oR5ClJBLTLfU4pIWBmnvGwTbEa2cXIqj70AEDEmOmpkFComjBZ/037ueKrOdHuYmSFVD7Rw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz"; + sha512 = "CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA=="; }; }; - "@typescript-eslint/utils-5.61.0" = { + "@typescript-eslint/utils-5.62.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.61.0.tgz"; - sha512 = "mV6O+6VgQmVE6+xzlA91xifndPW9ElFW8vbSF0xCT/czPXVhwDewKila1jOyRwa9AE19zKnrr7Cg5S3pJVrTWQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz"; + sha512 = "n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ=="; }; }; - "@typescript-eslint/visitor-keys-5.61.0" = { + "@typescript-eslint/visitor-keys-5.62.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.61.0"; + version = "5.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.61.0.tgz"; - sha512 = "50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz"; + sha512 = "07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw=="; }; }; "@urql/core-2.3.6" = { @@ -15134,13 +14630,13 @@ let sha512 = "PUxhtBh7/8167HJK6WqBv6Z0piuiaZHQGYbhwpNL9aIQmLROPEdaUYkY4wh45wPQXcTpnd11l0q3Pw+TI11pdw=="; }; }; - "@urql/core-3.1.1" = { + "@urql/core-4.0.11" = { name = "_at_urql_slash_core"; packageName = "@urql/core"; - version = "3.1.1"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@urql/core/-/core-3.1.1.tgz"; - sha512 = "Mnxtq4I4QeFJsgs7Iytw+HyhiGxISR6qtyk66c9tipozLZ6QVxrCiUPF2HY4BxNIabaxcp+rivadvm8NAnXj4Q=="; + url = "https://registry.npmjs.org/@urql/core/-/core-4.0.11.tgz"; + sha512 = "FFdY97vF5xnUrElcGw9erOLvtu+KGMLfwrLNDfv4IPgdp2IBsiGe+Kb7Aypfd3kH//BETewVSLm3+y2sSzjX6A=="; }; }; "@urql/exchange-retry-0.3.0" = { @@ -15152,58 +14648,22 @@ let sha512 = "hHqer2mcdVC0eYnVNbWyi28AlGOPb2vjH3lP3/Bc8Lc8BjhMsDwFMm7WhoP5C1+cfbr/QJ6Er3H/L08wznXxfg=="; }; }; - "@urql/exchange-retry-1.0.0" = { + "@urql/exchange-retry-1.2.0" = { name = "_at_urql_slash_exchange-retry"; packageName = "@urql/exchange-retry"; - version = "1.0.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@urql/exchange-retry/-/exchange-retry-1.0.0.tgz"; - sha512 = "UGyyGAMXzop9C/fIoe7Ij63DkPSy1uMw2jipB5dnB8R3kl80za7LYzVnA1HvBEt2ZPWfMuwez/VGLOQ7XX4bTA=="; + url = "https://registry.npmjs.org/@urql/exchange-retry/-/exchange-retry-1.2.0.tgz"; + sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vanilla-extract/babel-plugin-debug-ids-1.0.3" = { - name = "_at_vanilla-extract_slash_babel-plugin-debug-ids"; - packageName = "@vanilla-extract/babel-plugin-debug-ids"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/babel-plugin-debug-ids/-/babel-plugin-debug-ids-1.0.3.tgz"; - sha512 = "vm4jYu1xhSa6ofQ9AhIpR3DkAp4c+eoR1Rpm8/TQI4DmWbmGbOjYRcqV0aWsfaIlNhN4kFuxFMKBNN9oG6iRzA=="; - }; - }; - "@vanilla-extract/css-1.12.0" = { - name = "_at_vanilla-extract_slash_css"; - packageName = "@vanilla-extract/css"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/css/-/css-1.12.0.tgz"; - sha512 = "TEttZfnqTRtwgVYiBWQSGGUiVaYWReHp59DsavITEvh4TpJNifZFGhBznHx4wQFEsyio6xA513jps4tmqR6zmw=="; - }; - }; - "@vanilla-extract/integration-6.2.1" = { - name = "_at_vanilla-extract_slash_integration"; - packageName = "@vanilla-extract/integration"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.2.1.tgz"; - sha512 = "+xYJz07G7TFAMZGrOqArOsURG+xcYvqctujEkANjw2McCBvGEK505RxQqOuNiA9Mi9hgGdNp2JedSa94f3eoLg=="; - }; - }; - "@vanilla-extract/private-1.0.3" = { - name = "_at_vanilla-extract_slash_private"; - packageName = "@vanilla-extract/private"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.3.tgz"; - sha512 = "17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ=="; - }; - }; - "@vercel/build-utils-6.8.0" = { + "@vercel/build-utils-6.8.2" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "6.8.0"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.8.0.tgz"; - sha512 = "rGKTC1wCJeHvyEM4Td35M528XYPECcrb5xNF1k784BTVW4GicH6AQxr2YunfK+zkMBeR9WmG7fFAzEg38FLarw=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.8.2.tgz"; + sha512 = "pyDBREAzaLBM3zoURCCKjnKIqtqPprKcwDdd9eBTGI32qOSpbwswtyqtgj2zH/Ro0LI61jCr6sK87JHILCr1sg=="; }; }; "@vercel/error-utils-1.0.10" = { @@ -15224,13 +14684,13 @@ let sha512 = "v329WHdtIce+y7oAmaWRvEx59Xfo0FxlQqK4BJG0u6VWYoKWPaflohDAiehIZf/YHCRVb59ZxnzmMOcm/LR8YQ=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-1.3.11" = { + "@vercel/gatsby-plugin-vercel-builder-1.3.15" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "1.3.11"; + version = "1.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.3.11.tgz"; - sha512 = "e+HY3OHC89NRTwcIlxZ3BdOnZ11xgAkA185Z+tkCLUNLowAigwdPxnelGcqSQaGTguwf+3nWxi8GUDYwtHi6/Q=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.3.15.tgz"; + sha512 = "wtP7g9Xk01FGEVSHrrWQ0yuszoStHwJjlI1G+oPg1UXJb2s/xJP+WVL5Y9yjw6WCW88XV9Y6etCH7GvThSkQsg=="; }; }; "@vercel/go-2.5.1" = { @@ -15251,13 +14711,13 @@ let sha512 = "1rzFB664G6Yzp7j4ezW9hvVjqnaU2BhyUdhchbsxtRuxkMpGgPBZKhjzRQHFvlmkz37XLC658T5Nb1P91b4sBw=="; }; }; - "@vercel/next-3.8.8" = { + "@vercel/next-3.9.3" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.8.8"; + version = "3.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.8.8.tgz"; - sha512 = "h/TcVnrjnRrxkgTod80Wpy9Lo2k+DCpsNtRX+G0tJ8q8/WxMucQQ0dLv0t3J5vwmypowPzYzK5kKSfrewQVMxg=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.9.3.tgz"; + sha512 = "jHuw1HYzaLt5qzJm+U1ydzKMSM9ptW5vHZ3AkFqkav7qaCDrvV0SKOiNQ8xoJhBLNFuXQY6Z4l8Ag86kUYevGA=="; }; }; "@vercel/nft-0.22.5" = { @@ -15269,13 +14729,13 @@ let sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; }; }; - "@vercel/node-2.15.3" = { + "@vercel/node-2.15.7" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.15.3"; + version = "2.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.15.3.tgz"; - sha512 = "kqti7lE6TT3sESXMsCm4lqtNXjyKr9P7+yhjDDL/TIzqfhqPLuiYmkiKYVNctnsdLrzDi9Cp2qaQA2a9/jpv1g=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.15.7.tgz"; + sha512 = "zCmpQ15KsuvNd6KxJuNgrY+464ZdAo4Bc50Yixa61+rjxuFjy2ST8s+ybODY9as6NoPV0JVE2mmKPB1opkKKvg=="; }; }; "@vercel/python-3.1.60" = { @@ -15296,13 +14756,13 @@ let sha512 = "j0XaXe4ZpGVHG7XQSmZ3kza6s+ZtOBfRhnSxA70yCkrvPNN3tZgF3fevSKXizfL9fzVDd7Tdj++SCGWMdGfsyA=="; }; }; - "@vercel/remix-builder-1.8.15" = { + "@vercel/remix-builder-1.9.0" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "1.8.15"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-1.8.15.tgz"; - sha512 = "NV6YU2hwj1faLpldKEQmYWJ6+aGYUJLx2sCkWoEQy+WP9i4wHw0c3u+y+PfMlr3VBn1VIlDh1awf0NRXMcIEQg=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-1.9.0.tgz"; + sha512 = "XBaP9M4ytlamBKggKPZcT9IHRLy2w9zxK4GFYYHEVv2sfmh2gonRAbNwphr0OdAsr+yPDnPRt8L6jFPOqfABhQ=="; }; }; "@vercel/routing-utils-2.2.1" = { @@ -15323,13 +14783,13 @@ let sha512 = "J8I0B7wAn8piGoPhBroBfJWgMEJTMEL/2o8MCoCyWdaE7MRtpXhI10pj8IvcUvAECoGJ+SM1Pm+SvBqtbtZ5FQ=="; }; }; - "@vercel/static-build-1.3.38" = { + "@vercel/static-build-1.3.43" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.3.38"; + version = "1.3.43"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.38.tgz"; - sha512 = "fm2msCefaFTOttvMoNp+/AOpwQLP79NbTZxDuEwE3CU4YUCNOrTaYTGj7ye99Qv+GcL66f4JyCrbBa7CKwmL8A=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.43.tgz"; + sha512 = "FttkcVec7tYXz5G+WrummmWywv8XVJyib+XEQUDRs6kVGc5Z5h2Bg4OmgFfflEhummF/saLRrdwbTQgbEZORpA=="; }; }; "@vercel/static-config-2.0.17" = { @@ -15413,13 +14873,22 @@ let sha512 = "NwqBBruD1DvVmFVyPinOuuMGqpSroVTnl1R1vOnhbKquButOj+0b2k43Gn1fz/Uqe9hijLCxMEtMIIcW38ny8w=="; }; }; - "@volar/kit-1.7.4" = { + "@volar/kit-1.10.0" = { name = "_at_volar_slash_kit"; packageName = "@volar/kit"; - version = "1.7.4"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/kit/-/kit-1.7.4.tgz"; - sha512 = "LWN08tMYVm181rIztyqp+Qx6efv37w5/kLmAX4R+dr+nn0F/G8Em03TKP81YLOQTzK44EdUaG84Bq95suHcSWw=="; + url = "https://registry.npmjs.org/@volar/kit/-/kit-1.10.0.tgz"; + sha512 = "3ijH2Gqe8kWnij58rwaBID22J/b+VT457ZEf5TwyPDqHTrfNCZIVitpdD5WlLD4Wy/D0Vymwj2ct9TNc1hkOmQ=="; + }; + }; + "@volar/language-core-1.10.0" = { + name = "_at_volar_slash_language-core"; + packageName = "@volar/language-core"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.10.0.tgz"; + sha512 = "ddyWwSYqcbEZNFHm+Z3NZd6M7Ihjcwl/9B5cZd8kECdimVXUFdFi60XHWD27nrWtUQIsUYIG7Ca1WBwV2u2LSQ=="; }; }; "@volar/language-core-1.4.1" = { @@ -15431,13 +14900,13 @@ let sha512 = "EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ=="; }; }; - "@volar/language-core-1.7.4" = { - name = "_at_volar_slash_language-core"; - packageName = "@volar/language-core"; - version = "1.7.4"; + "@volar/language-server-1.10.0" = { + name = "_at_volar_slash_language-server"; + packageName = "@volar/language-server"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.7.4.tgz"; - sha512 = "KjwXpE39TqSG/PEUeElNy9a4JI+FE/wQu/S9M2UFdCVT3ybn4ulcsEd8jEaPs/YH31mZU8y+DFfgeVrxmNLUXw=="; + url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.10.0.tgz"; + sha512 = "EFOjdKvV6iCfGmBPuf/L7zK93E8eE/kCBWM5xyG92pJm6tq5R/CLx968CPc7rlWykitKMXJumACNzIeXnnlyEw=="; }; }; "@volar/language-server-1.4.1" = { @@ -15449,13 +14918,13 @@ let sha512 = "UxhiN205o8ZfTnMNhRPCtW+ncrBtqZMd+f08Xf99Je4WB+SYyv3VNnIZEQDXfaTXR6mLUgQ1mDwPsUOLKKGY8A=="; }; }; - "@volar/language-server-1.7.4" = { - name = "_at_volar_slash_language-server"; - packageName = "@volar/language-server"; - version = "1.7.4"; + "@volar/language-service-1.10.0" = { + name = "_at_volar_slash_language-service"; + packageName = "@volar/language-service"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.7.4.tgz"; - sha512 = "I5hJhl3WjskJpqJZTOMiESMAeovlLNenjaRcOD67cWojJjtVR2dwc/3WHcLomzUs09KtQ+MYVNNoneIPVtvgOA=="; + url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.10.0.tgz"; + sha512 = "qWeve/sUwBX94Ozb0A4vDLwjkDJDLz/k0VtRhNzN43PRGaCphl+dYMKftn1e7nYTcfcDKd5HjjfN+tT7txZ6kw=="; }; }; "@volar/language-service-1.4.1" = { @@ -15467,13 +14936,13 @@ let sha512 = "F30uT+xk20ZYpxRwNW9xBEoErSqd9zNW7iuFwSIX9bYO/12RLjB2I+vgM/GdPZnzZ37imXa76ykwqTRXrafigQ=="; }; }; - "@volar/language-service-1.7.4" = { - name = "_at_volar_slash_language-service"; - packageName = "@volar/language-service"; - version = "1.7.4"; + "@volar/source-map-1.10.0" = { + name = "_at_volar_slash_source-map"; + packageName = "@volar/source-map"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.7.4.tgz"; - sha512 = "VQTDa7mFIGydB32VsNlFA9SrGO2RlYml7Fw37zCL7tHplvy5681Nzkg+W7dMX98cpatkJPoKsam0of8WInVNyg=="; + url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.10.0.tgz"; + sha512 = "/ibWdcOzDGiq/GM1JU2eX8fH1bvAhl66hfe8yEgLEzg9txgr6qb5sQ/DEz5PcDL75tF5H5sCRRwn8Eu8ezi9mw=="; }; }; "@volar/source-map-1.4.1" = { @@ -15485,22 +14954,13 @@ let sha512 = "bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA=="; }; }; - "@volar/source-map-1.7.4" = { - name = "_at_volar_slash_source-map"; - packageName = "@volar/source-map"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.7.4.tgz"; - sha512 = "K4LpOgfps1olieqwEVGVZTlDnjhcQZQ4KSLRVWe7AkUKrqAP0H0s+5YSE3HyC4uquoYzWinYon9SD+ARhWpkqg=="; - }; - }; - "@volar/typescript-1.7.4" = { + "@volar/typescript-1.10.0" = { name = "_at_volar_slash_typescript"; packageName = "@volar/typescript"; - version = "1.7.4"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/typescript/-/typescript-1.7.4.tgz"; - sha512 = "xHiQoKAwXdLt1NXYZZ3uD32PKJ8KpZ5raBU6uCgCbhUh+7uWsk+cyFqDAboAPPm3oBCyCEGnnbrsJvimPEWyrA=="; + url = "https://registry.npmjs.org/@volar/typescript/-/typescript-1.10.0.tgz"; + sha512 = "OtqGtFbUKYC0pLNIk3mHQp5xWnvL1CJIUc9VE39VdZ/oqpoBh5jKfb9uJ45Y4/oP/WYTrif/Uxl1k8VTPz66Gg=="; }; }; "@volar/vue-language-core-1.6.5" = { @@ -15566,13 +15026,13 @@ let sha512 = "/yrv59IEnmh655z1oeDnGcvMYwnEzNzHLgeYcQCkhYX0xBvYWrAuefoiLcPBUkMpJsb46bqQ6Yv4pwTTQ4d3Qg=="; }; }; - "@vscode/test-electron-2.3.3" = { + "@vscode/test-electron-2.3.4" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.3.tgz"; - sha512 = "hgXCkDP0ibboF1K6seqQYyHAzCURgTwHS/6QU7slhwznDLwsRwg9bhfw1CZdyUEw8vvCmlrKWnd7BlQnI0BC4w=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.4.tgz"; + sha512 = "eWzIqXMhvlcoXfEFNWrVu/yYT5w6De+WZXR/bafUQhAp8+8GkQo95Oe14phwiRUPv8L+geAKl/QM2+PoT3YW3g=="; }; }; "@vue/cli-shared-utils-5.0.8" = { @@ -15683,15 +15143,6 @@ let sha512 = "7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="; }; }; - "@web3-storage/multipart-parser-1.0.0" = { - name = "_at_web3-storage_slash_multipart-parser"; - packageName = "@web3-storage/multipart-parser"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz"; - sha512 = "BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw=="; - }; - }; "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -15827,15 +15278,6 @@ let sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; }; }; - "@webassemblyjs/helper-buffer-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; - sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; - }; - }; "@webassemblyjs/helper-buffer-1.11.6" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; @@ -16052,15 +15494,6 @@ let sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; }; }; - "@webassemblyjs/helper-wasm-section-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; - sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; - }; - }; "@webassemblyjs/helper-wasm-section-1.11.6" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; @@ -16241,15 +15674,6 @@ let sha512 = "qNByLv/qST8x4CshQ8vUuX/+OebI9gK+FHkGPMnLnwALKFJOG0jIxG8TXaf2L+fVHNyd96qhsZ/GL54G3KTjpg=="; }; }; - "@webassemblyjs/wasm-edit-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; - sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; - }; - }; "@webassemblyjs/wasm-edit-1.11.6" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; @@ -16277,15 +15701,6 @@ let sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; - "@webassemblyjs/wasm-gen-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; - sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; - }; - }; "@webassemblyjs/wasm-gen-1.11.6" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; @@ -16322,15 +15737,6 @@ let sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; - "@webassemblyjs/wasm-opt-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; - sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; - }; - }; "@webassemblyjs/wasm-opt-1.11.6" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; @@ -16574,13 +15980,13 @@ let sha512 = "CdcjGC2vdKhc13KKxgsc6/616BQ7ooDIgPeTuAiE8qfCnS0mGzcfCOoZXypQSz73nxI+GWc7ZReIAVhxoE1KCg=="; }; }; - "@whatwg-node/fetch-0.9.7" = { + "@whatwg-node/fetch-0.9.9" = { name = "_at_whatwg-node_slash_fetch"; packageName = "@whatwg-node/fetch"; - version = "0.9.7"; + version = "0.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.7.tgz"; - sha512 = "heClS5ctTmoEvVbFd+6ztX0SyQduI3/Q+77vtNApDU/+Mwajy6ugxaoDGgSzJUoQ37McSV09kcGCt1Jcc6z9lQ=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.9.tgz"; + sha512 = "OTVoDm039CNyAWSRc2WBimMl/N9J4Fk2le21Xzcf+3OiWPNNSIbMnpWKBUyraPh2d9SAEgoBdQxTfVNihXgiUw=="; }; }; "@whatwg-node/node-fetch-0.3.6" = { @@ -16592,67 +15998,31 @@ let sha512 = "w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA=="; }; }; - "@whatwg-node/node-fetch-0.4.6" = { + "@whatwg-node/node-fetch-0.4.11" = { name = "_at_whatwg-node_slash_node-fetch"; packageName = "@whatwg-node/node-fetch"; - version = "0.4.6"; + version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.6.tgz"; - sha512 = "9oLD57yW0WWfu4ZtEmybBrx1JfkO4TzDpD2zXlp2Ue3UJplifQRap+MbE0PxRlVWtR4KWsIRamhn7J44DkwoyA=="; + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.11.tgz"; + sha512 = "JRMx/yrBW/PXUH+0EIurUIQtAsEMrHtZBBKv6b+YCK1yG7pMNqtkl5Z39Rynq8ysVc/I6yTtNwkCy9bz5To1vw=="; }; }; - "@withgraphite/graphite-cli-routes-0.24.0" = { - name = "_at_withgraphite_slash_graphite-cli-routes"; - packageName = "@withgraphite/graphite-cli-routes"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli-routes/-/graphite-cli-routes-0.24.0.tgz"; - sha512 = "eTqLvQmKjJB/r+FViiQaZks9V9p5EliyUq4xRsFxJBlGrPyIux+lIV6YQsTegGQb0NXYEdMyRB6RV7Fpx0ZQCw=="; - }; - }; - "@withgraphite/gti-cli-shared-types-0.3.0" = { - name = "_at_withgraphite_slash_gti-cli-shared-types"; - packageName = "@withgraphite/gti-cli-shared-types"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/gti-cli-shared-types/-/gti-cli-shared-types-0.3.0.tgz"; - sha512 = "TDSbvRoqZIOd+9dshtHpSQtToZlki4J+pUWnWsVzTR/4Sgi1op6rw5oVpyROWIx2rCrXU/mIljeWkuYX9k8Rpg=="; - }; - }; - "@withgraphite/retype-0.3.15" = { - name = "_at_withgraphite_slash_retype"; - packageName = "@withgraphite/retype"; - version = "0.3.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/retype/-/retype-0.3.15.tgz"; - sha512 = "J5eVSg+2BtksS+2rZi9ttJlushYpapCMxqyDGDUti/gfFpOgXaPxNMpDJ0TgJFEnFNea1Xrc3djhv7JxzhY+pQ=="; - }; - }; - "@withgraphite/retyped-routes-0.3.7" = { - name = "_at_withgraphite_slash_retyped-routes"; - packageName = "@withgraphite/retyped-routes"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/retyped-routes/-/retyped-routes-0.3.7.tgz"; - sha512 = "veadl+nEIw6zgbtchoAcl3C8469SZm5xyRvlrZTVFJK1kzniAEdTaUNsnRHsvC2HME3a5WdYoIZk/k24wegKvA=="; - }; - }; - "@xmldom/xmldom-0.7.11" = { + "@xmldom/xmldom-0.7.13" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.7.11"; + version = "0.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.11.tgz"; - sha512 = "UDi3g6Jss/W5FnSzO9jCtQwEpfymt0M+sPPlmLhDH6h2TJ8j4ESE/LpmNPBij15J5NKkk4/cg/qoVMdWI3vnlQ=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz"; + sha512 = "lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g=="; }; }; - "@xmldom/xmldom-0.8.8" = { + "@xmldom/xmldom-0.8.10" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.8.8"; + version = "0.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.8.tgz"; - sha512 = "0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz"; + sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; }; }; "@xmpp/base64-0.13.1" = { @@ -16997,85 +16367,76 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-11.4.0" = { + "@zwave-js/cc-11.8.1" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-11.4.0.tgz"; - sha512 = "CxKgjje18ofZIanH0q0Qm2BWpb7hIWLZoNh8Lzfads7rmfcAXGwuo9IbLQD1g5MiXDvpfPuLHUyxg2CW8Wttqg=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-11.8.1.tgz"; + sha512 = "7HFkBM/2MUW37CEla/fgXbqXFa6JKDlo1ThYhoLLqlhPowRZc6MhEGWa3rilJU4sgwSF4tFw5JAxgl5DkZ0O2A=="; }; }; - "@zwave-js/config-11.4.0" = { + "@zwave-js/config-11.8.1" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-11.4.0.tgz"; - sha512 = "vu0kOj25dmDAIv8U2js2EqnqlqBj/EKfrmQquWZEUiLG6Sao3w5YK53ZGFBSLxJc5J8LPTO6lxposCKo9eKxKg=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-11.8.1.tgz"; + sha512 = "/LQrX0xaXHV8E7qtT7KITUTnEzzhPBHKDAvjwAdiFWhW7jQbTYBennNMaS/btnrDQBZZtXdQOEuTpv8xwDn7wQ=="; }; }; - "@zwave-js/core-11.4.0" = { + "@zwave-js/core-11.8.1" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-11.4.0.tgz"; - sha512 = "z9Zo4H4684T4fNCcXMTSNYF/Wt+sxgonkhxva6q/RjDuOFz22709Ea3A9ycxZryw1UXaq5YAFHs9hj8770kfZw=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-11.8.1.tgz"; + sha512 = "zL7p+wNSZrkucQ+XpliixxW/Q++aKv/a/yu3SbKpvoWlBlx1Gu2uiJtHE66sULc/QiTk/h/fQGSV5XrlFIxadQ=="; }; }; - "@zwave-js/host-11.4.0" = { + "@zwave-js/host-11.8.1" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-11.4.0.tgz"; - sha512 = "g+JDLX5/m5kgPdJ+iZ6WPdrJkUAEDFQ1IkbA9atzlhhpSgvZ+s69l9NpwVPnQFhE93INbKkuBpR/fhJEfbx3AQ=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-11.8.1.tgz"; + sha512 = "GBzCZ8FJ+tIOLtTL8CBUo+6SqrxeDVnA6tVP/KELXHliSHy4VEcqzUgGD89jmsR4qaY7TX8aVrnlOXe2IQ0gXA=="; }; }; - "@zwave-js/nvmedit-11.4.0" = { + "@zwave-js/nvmedit-11.8.1" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-11.4.0.tgz"; - sha512 = "uHmu0SKq0RUSxHhWe9xE8lGwIOvqBtdiHzU2g7+inXmFE0IbGkEpxejqbmTN1RGwkzUJUpBW7H9ZaJQ4PqWo4w=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-11.8.1.tgz"; + sha512 = "uX1Z45N1xLKD2B7A3oyztl/dpSx5uo+E8+TpQXmFFOZS3aZzF5Ms6ybO+9F26kZLmb9OSIW8FswlPI6JEU6nxg=="; }; }; - "@zwave-js/serial-11.4.0" = { + "@zwave-js/serial-11.8.1" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-11.4.0.tgz"; - sha512 = "5w6NhbmZGolvxV/wWOiXgiUw3nv3D465IqMNgz3RBKZs3dJFQY6ZMvkd3SZolpTZhQtrNmzWb4HwZu+UxgHogw=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-11.8.1.tgz"; + sha512 = "30h8TkZt9PDf1p7+bh/s8mJSMJAAg3vcH7dfmun6IngTjTM0UAURgD+FyaWiU44PBD++bVtgLi0pA9q/4h53tg=="; }; }; - "@zwave-js/shared-11.3.0" = { + "@zwave-js/shared-11.8.0" = { name = "_at_zwave-js_slash_shared"; packageName = "@zwave-js/shared"; - version = "11.3.0"; + version = "11.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-11.3.0.tgz"; - sha512 = "LCM748qrw4Is6DAkS/76+hdwqbCJ56Fk4Ccmri7d9LB+vb88umuf3e8GchyL2ykv+UnwvQqWW9KUna9BNHqzfA=="; + url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-11.8.0.tgz"; + sha512 = "xEh31zJ+qIjcmFv249yxPCCUlZExwk+qKRcLxXqOsDyt7GUyU5jzEqoGlDe0ijCWmZxlbJdmXzOU/a9IhAffzw=="; }; }; - "@zwave-js/testing-11.4.0" = { + "@zwave-js/testing-11.8.1" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-11.4.0.tgz"; - sha512 = "jGyu/qC/L7Sg4sUi8FJnF2hn2ESXuEQezhbvouM1No6ziVIDcJQFWjKweVwmZzRix2sPnn0xUMfl7wYwp/2eLA=="; - }; - }; - "@zxing/text-encoding-0.9.0" = { - name = "_at_zxing_slash_text-encoding"; - packageName = "@zxing/text-encoding"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz"; - sha512 = "U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-11.8.1.tgz"; + sha512 = "P4lJdsxpiihczzE47h38KlUv5G8iZmStMHtUpoNhMCALHrENGVbK1FCxCEne0rgX5PvLGqkgH/pUm5ltHWl5/Q=="; }; }; "CSSselect-0.4.1" = { @@ -17663,15 +17024,6 @@ let sha512 = "0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="; }; }; - "ahocorasick-1.0.2" = { - name = "ahocorasick"; - packageName = "ahocorasick"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ahocorasick/-/ahocorasick-1.0.2.tgz"; - sha512 = "hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA=="; - }; - }; "airplay-js-0.2.16" = { name = "airplay-js"; packageName = "airplay-js"; @@ -17879,13 +17231,13 @@ let sha512 = "2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q=="; }; }; - "all-package-names-2.0.683" = { + "all-package-names-2.0.706" = { name = "all-package-names"; packageName = "all-package-names"; - version = "2.0.683"; + version = "2.0.706"; src = fetchurl { - url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.683.tgz"; - sha512 = "2PP8UoMc1JXIsThHTNKxLP/I2ZPUUA6AtW+esCdOEcMCbQxBQMldWiW3FXUdf2mtLJzmTC4ir8pRQljZEEb64Q=="; + url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.706.tgz"; + sha512 = "91VRfOiiyjEWpYBXKJOGS+0V0a4Hms0M1g7av7DO3xG0klj2HMIgzj/Lph3k6xwrF6OqM5x+D/gKWHqlyk7aGA=="; }; }; "alphanum-sort-1.0.2" = { @@ -18248,15 +17600,6 @@ let sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; }; }; - "ansi-term-0.0.2" = { - name = "ansi-term"; - packageName = "ansi-term"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-term/-/ansi-term-0.0.2.tgz"; - sha512 = "jLnGE+n8uAjksTJxiWZf/kcUmXq+cRWSl550B9NmQ8YiqaTM+lILcSe5dHdp8QkJPhaOghDjnMKwyYSMjosgAA=="; - }; - }; "ansi-to-html-0.6.15" = { name = "ansi-to-html"; packageName = "ansi-to-html"; @@ -18671,13 +18014,13 @@ let sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; }; }; - "are-we-there-yet-4.0.0" = { + "are-we-there-yet-4.0.1" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.0.tgz"; - sha512 = "nSXlV+u3vtVjRgihdTzbfWYzxPWGo424zPgQbHD0ZqIla3jqYAewDcvee0Ua2hjS5IfTAmjGlx1Jf0PKwjZDEw=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.1.tgz"; + sha512 = "2zuA+jpOYBRgoBCfa+fB87Rk0oGJjDX6pxGzqH6f33NzUhG25Xur6R0u0Z9VVAq8Z5JvQpQI6j6rtonuivC8QA=="; }; }; "arg-2.0.0" = { @@ -18716,15 +18059,6 @@ let sha512 = "PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="; }; }; - "argon2-0.30.3" = { - name = "argon2"; - packageName = "argon2"; - version = "0.30.3"; - src = fetchurl { - url = "https://registry.npmjs.org/argon2/-/argon2-0.30.3.tgz"; - sha512 = "DoH/kv8c9127ueJSBxAVJXinW9+EuPA3EMUxoV2sAY1qDE5H9BjTyVF/aD2XyHqbqUWabgBkIfcP3ZZuGhbJdg=="; - }; - }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -19157,6 +18491,15 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; + "array.prototype.findlastindex-1.2.2" = { + name = "array.prototype.findlastindex"; + packageName = "array.prototype.findlastindex"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz"; + sha512 = "tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw=="; + }; + }; "array.prototype.flat-1.3.1" = { name = "array.prototype.flat"; packageName = "array.prototype.flat"; @@ -19193,6 +18536,15 @@ let sha512 = "pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ=="; }; }; + "arraybuffer.prototype.slice-1.0.1" = { + name = "arraybuffer.prototype.slice"; + packageName = "arraybuffer.prototype.slice"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz"; + sha512 = "09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw=="; + }; + }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -19445,15 +18797,6 @@ let sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; }; }; - "ast-types-0.15.2" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz"; - sha512 = "c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg=="; - }; - }; "ast-types-0.8.15" = { name = "ast-types"; packageName = "ast-types"; @@ -19895,13 +19238,13 @@ let sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; }; }; - "atomically-2.0.1" = { + "atomically-2.0.2" = { name = "atomically"; packageName = "atomically"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/atomically/-/atomically-2.0.1.tgz"; - sha512 = "sxBhVZUFBFhqSAsYMM3X2oaUi2NVDJ8U026FsIusM8gYXls9AYs/eXzgGrufs1Qjpkxi9zunds+75QUFz+m7UQ=="; + url = "https://registry.npmjs.org/atomically/-/atomically-2.0.2.tgz"; + sha512 = "Xfmb4q5QV7uqTlVdMSTtO5eF4DCHfNOdaPyKlbFShkzeNP+3lj3yjjcbdjSmEY4+pDBKJ9g26aP+ImTe88UHoQ=="; }; }; "attach-ware-1.1.1" = { @@ -19985,13 +19328,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.15.20" = { + "aws-crt-1.17.0" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.15.20"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.20.tgz"; - sha512 = "BH70ccRssb281Xky/KsKvi7N1P1RHQUzWw+LFPDZ+JJd1AlmWRADsvHWrshV95FkeDQMASBxXdh8Ag+BhoPErg=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.17.0.tgz"; + sha512 = "DP7xySX/3oxhXw1mH7HAnudylk31CFXEWeKplmWpIzei0eE9tvw1fnJuBcRZjKTi7/tt+MFbhdHi3glWk+TSfg=="; }; }; "aws-sdk-1.18.0" = { @@ -20021,13 +19364,13 @@ let sha512 = "bSOfBCVPQ/0NWYpPl34MgqMbJf0eO6PsyVlmjbStlba+98hnE6X7z67tawBRot7S+qH3L49KW2u6dfJjvhDfdQ=="; }; }; - "aws-sdk-2.1413.0" = { + "aws-sdk-2.1427.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1413.0"; + version = "2.1427.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1413.0.tgz"; - sha512 = "vKpjC7iRwOhgv7P0xw90mVGO//2rqVPJKyYIs7uxLzSV0JzriVD+yqktOu/Hz6/phOmAd1cMIeFgpEC9ynrppg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1427.0.tgz"; + sha512 = "PIbBIKwvkvvic7hNQevpzi5Xqbi0YzzbLaFv8NZMorwu73b8ydyF+/B/G2iJ0w82jlAzDPQpWqf/7MuP59X9Gg=="; }; }; "aws-sign2-0.6.0" = { @@ -20255,31 +19598,31 @@ let sha512 = "MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA=="; }; }; - "babel-plugin-polyfill-corejs2-0.4.4" = { + "babel-plugin-polyfill-corejs2-0.4.5" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz"; - sha512 = "9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz"; + sha512 = "19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg=="; }; }; - "babel-plugin-polyfill-corejs3-0.8.2" = { + "babel-plugin-polyfill-corejs3-0.8.3" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz"; - sha512 = "Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz"; + sha512 = "z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA=="; }; }; - "babel-plugin-polyfill-regenerator-0.5.1" = { + "babel-plugin-polyfill-regenerator-0.5.2" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz"; - sha512 = "L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz"; + sha512 = "tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA=="; }; }; "babel-plugin-react-native-web-0.18.12" = { @@ -20651,13 +19994,13 @@ let sha512 = "ZNB4525U7BxT6v9C8LEtywyCgB4Pjnm7/bh+ru/Z9Ecxvg3fDjaJ6z305z9a61orQdbB1zqYHh5JbUqx4s4K0g=="; }; }; - "bash-language-server-4.10.1" = { + "bash-language-server-4.10.3" = { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.10.1"; + version = "4.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.10.1.tgz"; - sha512 = "yNHApNZUnetRC8w6GioGdS/HrNr3pecMTTXb20YZNLxqA70HfUwT37Gts+kCZ6XLEEffkwL5j6Pt3nzACBZVaw=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.10.3.tgz"; + sha512 = "5Ej3637jhQd5HJO3ZNGnVmeeGPprCcdkjL+QpkWeJXmns31aKedAHSEQfKjKAFqcUQ4JwMyXRXnHzut4jKbofg=="; }; }; "basic-auth-1.1.0" = { @@ -20894,13 +20237,13 @@ let sha512 = "pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g=="; }; }; - "better-sqlite3-8.4.0" = { + "better-sqlite3-8.5.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.4.0.tgz"; - sha512 = "NmsNW1CQvqMszu/CFAJ3pLct6NEFlNfuGM6vw72KHkjOD1UDnL96XNN1BMQc1hiHo8vE2GbOWQYIpZ+YM5wrZw=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.5.0.tgz"; + sha512 = "vbPcv/Hx5WYdyNg/NbcfyaBZyv9s/NVbxb7yCeC5Bq1pVocNxeL2tZmSu3Rlm4IEOTjYdGyzWQgyx0OSdORBzw=="; }; }; "bevent-0.1.5" = { @@ -21002,13 +20345,13 @@ let sha512 = "zKdnMPWEdh4F5INR07/eBrodC7QrF5JKvqskjz/ZZRXg5YSAZIbn8zGhbhUrElzHBZ2fvEQdOU59RHcTG3GiwA=="; }; }; - "bin-links-4.0.1" = { + "bin-links-4.0.2" = { name = "bin-links"; packageName = "bin-links"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bin-links/-/bin-links-4.0.1.tgz"; - sha512 = "bmFEM39CyX336ZGGRsGPlc6jZHriIoHacOQcTt72MktIjpPhZoP4te2jOyUXF3BLILmJ8aNLncoPVeIIFlrDeA=="; + url = "https://registry.npmjs.org/bin-links/-/bin-links-4.0.2.tgz"; + sha512 = "jxJ0PbXR8eQyPlExCvCs3JFnikvs1Yp4gUJt6nmgathdOwvur+q22KWC3h20gvWl4T/14DXKj2IlkJwwZkZPOw=="; }; }; "bin-version-3.1.0" = { @@ -21425,15 +20768,6 @@ let sha512 = "LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ=="; }; }; - "blessed-contrib-4.11.0" = { - name = "blessed-contrib"; - packageName = "blessed-contrib"; - version = "4.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.11.0.tgz"; - sha512 = "P00Xji3xPp53+FdU9f74WpvnOAn/SS0CKLy4vLAf5Ps7FGDOTY711ruJPZb3/7dpFuP+4i7f4a/ZTZdLlKG9WA=="; - }; - }; "blgr-0.2.0" = { name = "blgr"; packageName = "blgr"; @@ -21857,13 +21191,13 @@ let sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; }; - "bootstrap-5.3.0" = { + "bootstrap-5.3.1" = { name = "bootstrap"; packageName = "bootstrap"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0.tgz"; - sha512 = "UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw=="; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz"; + sha512 = "jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g=="; }; }; "bootstrap-vue-helper-json-1.1.1" = { @@ -22109,15 +21443,6 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; - "bresenham-0.0.3" = { - name = "bresenham"; - packageName = "bresenham"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bresenham/-/bresenham-0.0.3.tgz"; - sha512 = "wbMxoJJM1p3+6G7xEFXYNCJ30h2qkwmVxebkbwIl4OcnWtno5R3UT9VuYLfStlVNAQCmRjkGwjPFdfaPd4iNXw=="; - }; - }; "brfs-1.6.1" = { name = "brfs"; packageName = "brfs"; @@ -22154,15 +21479,6 @@ let sha512 = "cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="; }; }; - "browser-hrtime-1.1.8" = { - name = "browser-hrtime"; - packageName = "browser-hrtime"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-hrtime/-/browser-hrtime-1.1.8.tgz"; - sha512 = "kzXheikaJsBtzUBlyVtPIY5r0soQePzjwVwT4IlDpU2RvfB5Py52gpU98M77rgqMCheoSSZvrcrdj3t6cZ3suA=="; - }; - }; "browser-launcher2-0.4.6" = { name = "browser-launcher2"; packageName = "browser-launcher2"; @@ -22352,13 +21668,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.21.9" = { + "browserslist-4.21.10" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.9"; + version = "4.21.10"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz"; - sha512 = "M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz"; + sha512 = "bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ=="; }; }; "brq-0.1.8" = { @@ -23189,13 +22505,13 @@ let sha512 = "+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w=="; }; }; - "cacheable-request-10.2.12" = { + "cacheable-request-10.2.13" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "10.2.12"; + version = "10.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.12.tgz"; - sha512 = "qtWGB5kn2OLjx47pYUkWicyOpK1vy9XZhq8yRTXOy+KAmjjESSRLx6SiExnnaGGUP1NM6/vmygMu0fGylNh9tw=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.13.tgz"; + sha512 = "3SD4rrMu1msNGEtNSt8Od6enwdo//U9s4ykmXfA2TD58kcLkCobtCDiby7kNyj7a/Q7lz/mAesAFI54rTdnvBA=="; }; }; "cacheable-request-2.1.4" = { @@ -23234,13 +22550,13 @@ let sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; }; }; - "cachedir-2.3.0" = { + "cachedir-2.4.0" = { name = "cachedir"; packageName = "cachedir"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz"; - sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; + url = "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz"; + sha512 = "9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ=="; }; }; "caching-transform-4.0.0" = { @@ -23549,13 +22865,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001513" = { + "caniuse-lite-1.0.30001518" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001513"; + version = "1.0.30001518"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001513.tgz"; - sha512 = "pnjGJo7SOOjAGytZZ203Em95MRM8Cr6jhCXNF/FAXTpCTRTECnqQWLpiTRqrFtdYcth8hf4WECUpkezuYsMVww=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz"; + sha512 = "rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA=="; }; }; "canvas-2.11.2" = { @@ -23738,31 +23054,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.7.97" = { + "cdk8s-2.29.0" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.7.97"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.7.97.tgz"; - sha512 = "6twIOF35MsvQfqseLbB7aADUILNHTEdyZhP9QAdG/3WqgcDHxu2UYYIaoDNzzLhkzsPkd7wuQBeKHKVYy0qrCw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.29.0.tgz"; + sha512 = "w6kc457K1xr6dWNRPHIUjDleGNSar+85RZWI+b46DxNw4WdhFuSAEDRAFwcSWyxIv1d++C3ukO/BsFSOXQYU+A=="; }; }; - "cdk8s-plus-25-2.8.76" = { + "cdk8s-plus-25-2.16.0" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.8.76"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.8.76.tgz"; - sha512 = "PNZ1d0Ll6vkJy6PSrwqiNmu8zSewzAw+Wlck9xZMb7Qw3P1z+r1l9mpfEsiQuwMlaaGvCnTaaYFY4aIsCsfRzg=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.16.0.tgz"; + sha512 = "QSxTfuu9sTm8mYuxicQX9kxaNZIYPwt0vkwNojZETLkqIQO7bGmc0Cn3nAwnRDNfRUMs3JwbIcu/SHahN/18/w=="; }; }; - "cdktf-0.17.1" = { + "cdktf-0.17.3" = { name = "cdktf"; packageName = "cdktf"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.17.1.tgz"; - sha512 = "Bk9Al0z+RA3/hW372tf61QCbg2zGOVXjXlXC1taD37AfXpBgqD1fKOhJ980B93VcyMil2mIkubFC9hdrn2nziQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.17.3.tgz"; + sha512 = "bqAzuuYLc8sy0ZoKw/RnohS6SH6fwAhCsU31vxuEiwu0BVcCaExfjQVZx/iJgmF1TJqk/cu2fMCLUgT3PDAuhQ=="; }; }; "center-align-0.1.3" = { @@ -23900,15 +23216,6 @@ let sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; }; }; - "chalk-5.2.0" = { - name = "chalk"; - packageName = "chalk"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz"; - sha512 = "ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA=="; - }; - }; "chalk-5.3.0" = { name = "chalk"; packageName = "chalk"; @@ -24098,13 +23405,13 @@ let sha512 = "B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A=="; }; }; - "chart.js-4.3.0" = { + "chart.js-4.3.2" = { name = "chart.js"; packageName = "chart.js"; - version = "4.3.0"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz"; - sha512 = "ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g=="; + url = "https://registry.npmjs.org/chart.js/-/chart.js-4.3.2.tgz"; + sha512 = "pvQNyFOY1QmbmIr8oDORL16/FFivfxj8V26VFpFilMo4cNvkV5WXLJetDio365pd9gKUHGdirUTbqJfw8tr+Dg=="; }; }; "chartjs-color-2.4.1" = { @@ -25340,15 +24647,6 @@ let sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; }; - "co-body-6.1.0" = { - name = "co-body"; - packageName = "co-body"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co-body/-/co-body-6.1.0.tgz"; - sha512 = "m7pOT6CdLN7FuXUcpuz/8lfQ/L77x8SchHCF4G0RBTJO20Wzmhn5Sp4/5WsKy8OSpifBSUrmg83qEqaDHdyFuQ=="; - }; - }; "coa-1.0.4" = { name = "coa"; packageName = "coa"; @@ -25439,13 +24737,13 @@ let sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; - "codemaker-1.84.0" = { + "codemaker-1.85.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.84.0.tgz"; - sha512 = "sOUH3y2q2DEO+gDiBCCoGgkDs8aMY0LTMH0FmHbKpqReZwWDAmWJ0Voc4Thp4Mn380bPku9/ncqyY1a3MZnfEQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.85.0.tgz"; + sha512 = "58SuiaUdM2tTrfjW0HZ8Udiv9nCWUyKLe6tg11QtinTrzPgO0txqBYwo3AX/H6fg/e9NwtlZAqi58cfxSxG9/g=="; }; }; "codepage-1.4.0" = { @@ -26636,13 +25934,13 @@ let sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; - "content-security-policy-parser-0.3.0" = { + "content-security-policy-parser-0.4.1" = { name = "content-security-policy-parser"; packageName = "content-security-policy-parser"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/content-security-policy-parser/-/content-security-policy-parser-0.3.0.tgz"; - sha512 = "ub90B4t9EfDPv3DCH7vEwGe4tVMkSm4Ow1HsmvmEQwinDfpTEDmkuJVa5WpzHDTt2bUirNRZuzL6S0msASlJhg=="; + url = "https://registry.npmjs.org/content-security-policy-parser/-/content-security-policy-parser-0.4.1.tgz"; + sha512 = "NNJS8XPnx3OKr/CUOSwDSJw+lWTrZMYnclLKj0Y9CYOfJNJTWLFGPg3u2hYgbXMXKVRkZR2fbyReNQ1mUff/Qg=="; }; }; "content-type-1.0.4" = { @@ -26880,13 +26178,13 @@ let sha512 = "qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA=="; }; }; - "conventional-changelog-writer-6.0.0" = { + "conventional-changelog-writer-6.0.1" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.0.tgz"; - sha512 = "8PyWTnn7zBIt9l4hj4UusFs1TyG+9Ulu1zlOAc72L7Sdv9Hsc8E86ot7htY3HXCVhXHB/NO0pVGvZpwsyJvFfw=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz"; + sha512 = "359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ=="; }; }; "conventional-commits-filter-3.0.0" = { @@ -27159,15 +26457,6 @@ let sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw=="; }; }; - "copy-to-2.0.1" = { - name = "copy-to"; - packageName = "copy-to"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-to/-/copy-to-2.0.1.tgz"; - sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; - }; - }; "copy-webpack-plugin-10.2.4" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -27249,22 +26538,22 @@ let sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; }; }; - "core-js-3.31.1" = { + "core-js-3.32.0" = { name = "core-js"; packageName = "core-js"; - version = "3.31.1"; + version = "3.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.31.1.tgz"; - sha512 = "2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz"; + sha512 = "rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww=="; }; }; - "core-js-compat-3.31.1" = { + "core-js-compat-3.32.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.31.1"; + version = "3.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.1.tgz"; - sha512 = "wIDWd2s5/5aJSdpOJHfSibxNODxoGoWOBHt8JSPB41NOE94M7kuTPZCYLOlTtuoXTsBPKobpJ6T+y0SSy5L9SA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.0.tgz"; + sha512 = "7a9a3D1k4UCVKnLhrgALyFcP7YCsLOQIxPd0dKjf/6GuPcgyiGP70ewWdCGrSK7evyhymi0qO4EqCmSJofDeYw=="; }; }; "core-util-is-1.0.2" = { @@ -27393,13 +26682,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-4.3.0" = { + "cosmiconfig-typescript-loader-4.4.0" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz"; - sha512 = "NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.4.0.tgz"; + sha512 = "BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw=="; }; }; "count-trailing-zeros-1.0.1" = { @@ -27663,6 +26952,15 @@ let sha512 = "cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg=="; }; }; + "cross-fetch-4.0.0" = { + name = "cross-fetch"; + packageName = "cross-fetch"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz"; + sha512 = "e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g=="; + }; + }; "cross-spawn-4.0.2" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -27816,13 +27114,13 @@ let sha512 = "7+K7aQGarqbpucky26wled7QSCJeg6VkLUWS+hLjyf0Cqc9Zew5xsLa4QjReExWUJx+a97jbiflITZNuWxgMrg=="; }; }; - "cspell-gitignore-6.31.1" = { + "cspell-gitignore-6.31.2" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "6.31.1"; + version = "6.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.31.1.tgz"; - sha512 = "PAcmjN6X89Z8qgjem6HYb+VmvVtKuc+fWs4sk21+jv2MiLk23Bkp+8slSaIDVR//58fxJkMx17PHyo2cDO/69A=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.31.2.tgz"; + sha512 = "B1i8aiXCIbb/08u0K3xnDyXtg0qD+lb5B2itOOXi7KXlPkKvIuN4hWyXxhVDweWyYWEzyXD5wBpPrqICVrStHQ=="; }; }; "cspell-glob-0.1.25" = { @@ -27834,13 +27132,13 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-6.31.1" = { + "cspell-glob-6.31.2" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "6.31.1"; + version = "6.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.31.1.tgz"; - sha512 = "ygEmr5hgE4QtO5+L3/ihfMKBhPipbapfS22ilksFSChKMc15Regds0z+z/1ZBoe+OFAPneQfIuBxMwQ/fB00GQ=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.31.2.tgz"; + sha512 = "ceTjHM4HaBgvG5S3oiB+PTPYq58EQYG6MmYpycDHzpR5I2H1NurK9lxWHfANmLbi0DsHn58tIZNDMUnnQj19Jw=="; }; }; "cspell-grammar-6.31.1" = { @@ -27861,13 +27159,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-6.31.1" = { + "cspell-io-6.31.2" = { name = "cspell-io"; packageName = "cspell-io"; - version = "6.31.1"; + version = "6.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.31.1.tgz"; - sha512 = "deZcpvTYY/NmLfOdOtzcm+nDvJZozKmj4TY3pPpX0HquPX0A/w42bFRT/zZNmRslFl8vvrCZZUog7SOc6ha3uA=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.31.2.tgz"; + sha512 = "Lp7LsF/f35LaOneROb/9mWiprShz2ONxjYFAt3bYP7gIxq41lWi8QhO+SN6spoqPp/wQXjSqJ7MuTZsemxPRnA=="; }; }; "cspell-lib-4.3.12" = { @@ -27879,13 +27177,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-6.31.1" = { + "cspell-lib-6.31.2" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "6.31.1"; + version = "6.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.31.1.tgz"; - sha512 = "KgSiulbLExY+z2jGwkO77+aAkyugsPAw7y07j3hTQLpd+0esPCZqrmbo2ItnkvkDNd/c34PqQCr7/044/rz8gw=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.31.2.tgz"; + sha512 = "LqaB2ZfVfQHKL5aZzYoKU6/UxxAtWeXAYwpC9l+satXmajYyXtAh4kWmuW+y7kKRH2jA79rJQS3QE6ToeSqgQQ=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -27978,22 +27276,22 @@ let sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; - "css-declaration-sorter-6.4.0" = { + "css-declaration-sorter-6.4.1" = { name = "css-declaration-sorter"; packageName = "css-declaration-sorter"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"; - sha512 = "jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew=="; + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz"; + sha512 = "rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g=="; }; }; - "css-functions-list-3.1.0" = { + "css-functions-list-3.2.0" = { name = "css-functions-list"; packageName = "css-functions-list"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz"; - sha512 = "/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w=="; + url = "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz"; + sha512 = "d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg=="; }; }; "css-loader-2.1.1" = { @@ -28914,13 +28212,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-5.0.2" = { + "d3-graphviz-5.1.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.0.2.tgz"; - sha512 = "EVRow9rnFgm/L1trbbnu2PGOND11IcSEdWXbrDbz9hH0/Kj3YM2AqMkkTN/EAWgawD5/zryyCy+3Vm05oSJ1Kg=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.1.0.tgz"; + sha512 = "PSUmKfbqhixVlTOsT9ziV/wxHAzf31rfq1POUrdfOseJQ3+GQmLTKMWNgyGc5QXtNZq3emsgQycs7W0Hr4wVvw=="; }; }; "d3-hierarchy-1.1.9" = { @@ -29976,13 +29274,13 @@ let sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; - "deep-equal-2.2.1" = { + "deep-equal-2.2.2" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz"; - sha512 = "lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz"; + sha512 = "xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA=="; }; }; "deep-extend-0.2.11" = { @@ -30039,15 +29337,6 @@ let sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; - "deep-object-diff-1.1.9" = { - name = "deep-object-diff"; - packageName = "deep-object-diff"; - version = "1.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.9.tgz"; - sha512 = "Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA=="; - }; - }; "deepcopy-2.1.0" = { name = "deepcopy"; packageName = "deepcopy"; @@ -30300,13 +29589,13 @@ let sha512 = "Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw=="; }; }; - "degenerator-4.0.4" = { + "degenerator-5.0.1" = { name = "degenerator"; packageName = "degenerator"; - version = "4.0.4"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/degenerator/-/degenerator-4.0.4.tgz"; - sha512 = "MTZdZsuNxSBL92rsjx3VFWe57OpRlikyLbcx2B5Dmdv6oScqpMrvpY7zHLMymrUxo3U5+suPUMsNgW/+SZB1lg=="; + url = "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz"; + sha512 = "TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ=="; }; }; "del-2.2.2" = { @@ -30336,15 +29625,6 @@ let sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; - "del-6.0.0" = { - name = "del"; - packageName = "del"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-6.0.0.tgz"; - sha512 = "1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ=="; - }; - }; "del-6.1.1" = { name = "del"; packageName = "del"; @@ -30606,13 +29886,13 @@ let sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="; }; }; - "detect-libc-2.0.1" = { + "detect-libc-2.0.2" = { name = "detect-libc"; packageName = "detect-libc"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; - sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz"; + sha512 = "UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw=="; }; }; "detect-newline-2.1.0" = { @@ -31353,13 +30633,13 @@ let sha512 = "Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="; }; }; - "dompurify-2.4.5" = { + "dompurify-2.4.7" = { name = "dompurify"; packageName = "dompurify"; - version = "2.4.5"; + version = "2.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.5.tgz"; - sha512 = "jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz"; + sha512 = "kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="; }; }; "domutils-1.4.3" = { @@ -31641,24 +30921,6 @@ let sha512 = "pYxfDYpued//QpnLIm4Avk7rsNtAtQkUES2cwAYSvD/wd2pKD71gN2Ebj3e7klzXwjocvE8c5vx/1fxwpqmSxA=="; }; }; - "drawille-blessed-contrib-1.0.0" = { - name = "drawille-blessed-contrib"; - packageName = "drawille-blessed-contrib"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/drawille-blessed-contrib/-/drawille-blessed-contrib-1.0.0.tgz"; - sha512 = "WnHMgf5en/hVOsFhxLI8ZX0qTJmerOsVjIMQmn4cR1eI8nLGu+L7w5ENbul+lZ6w827A3JakCuernES5xbHLzQ=="; - }; - }; - "drawille-canvas-blessed-contrib-0.1.3" = { - name = "drawille-canvas-blessed-contrib"; - packageName = "drawille-canvas-blessed-contrib"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/drawille-canvas-blessed-contrib/-/drawille-canvas-blessed-contrib-0.1.3.tgz"; - sha512 = "bdDvVJOxlrEoPLifGDPaxIzFh3cD7QH05ePoQ4fwnqfi08ZSxzEhOUpI5Z0/SQMlWgcCQOEtuw0zrwezacXglw=="; - }; - }; "dreamopt-0.8.0" = { name = "dreamopt"; packageName = "dreamopt"; @@ -31893,6 +31155,15 @@ let sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; + "editorconfig-1.0.4" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz"; + sha512 = "L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q=="; + }; + }; "ee-first-1.1.0" = { name = "ee-first"; packageName = "ee-first"; @@ -31956,13 +31227,13 @@ let sha512 = "r1NDtlajsq7gf2EXgjRfblCVPquvD2yeg+6XGErOKblvxOpDi0iulZLVhgYDP4AEF1P5/HgbX/vwjlkEv7PEIQ=="; }; }; - "electron-to-chromium-1.4.454" = { + "electron-to-chromium-1.4.480" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.454"; + version = "1.4.480"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.454.tgz"; - sha512 = "pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.480.tgz"; + sha512 = "IXTgg+bITkQv/FLP9FjX6f9KFCs5hQWeh5uNSKxB9mqYj/JXhHDbu+ekS43LVvbkL3eW6/oZy4+r9Om6lan1Uw=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -32057,13 +31328,13 @@ let sha512 = "AGvFfs+d0JKCJQ4o01ASQLGPmSCxgfU9RFXvzPvZdjKK8oscynksuJhWrSTSw7j7Ep/sZct5b5ZhYCi8S/t0HQ=="; }; }; - "emmet-2.4.5" = { + "emmet-2.4.6" = { name = "emmet"; packageName = "emmet"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/emmet/-/emmet-2.4.5.tgz"; - sha512 = "xOiVNINJFh0dMik+KzXSEYbAnFLTnadEzanxj7+F15uIf6avQwu3uPa1wI/8AFtOWKZ8lHg7TjC83wXcPhgOPw=="; + url = "https://registry.npmjs.org/emmet/-/emmet-2.4.6.tgz"; + sha512 = "dJfbdY/hfeTyf/Ef7Y7ubLYzkBvPQ912wPaeVYpAxvFxkEBf/+hJu4H6vhAvFN6HlxqedlfVn2x1S44FfQ97pg=="; }; }; "emoji-named-characters-1.0.2" = { @@ -32417,6 +31688,15 @@ let sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; }; + "enquirer-2.4.1" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz"; + sha512 = "rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ=="; + }; + }; "ensure-posix-path-1.1.1" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; @@ -32697,13 +31977,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.21.2" = { + "es-abstract-1.22.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.21.2"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"; - sha512 = "y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz"; + sha512 = "ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw=="; }; }; "es-aggregate-error-1.0.9" = { @@ -32733,15 +32013,6 @@ let sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; }; }; - "es-module-lexer-0.9.3" = { - name = "es-module-lexer"; - packageName = "es-module-lexer"; - version = "0.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; - sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; - }; - }; "es-module-lexer-1.3.0" = { name = "es-module-lexer"; packageName = "es-module-lexer"; @@ -32931,24 +32202,6 @@ let sha512 = "71f7EjPWTiSguen8X/kxEpkAS7BFHwtQKisCDDV3Y4GLGWBaoSCyD5uXkaUew6JDzA9FEN1W23mdnSwW9kqCeg=="; }; }; - "esbuild-0.17.6" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.17.6"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.6.tgz"; - sha512 = "TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q=="; - }; - }; - "esbuild-0.18.11" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.18.11"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.18.11.tgz"; - sha512 = "i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA=="; - }; - }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -33237,15 +32490,6 @@ let sha512 = "yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ=="; }; }; - "esbuild-plugins-node-modules-polyfill-1.2.0" = { - name = "esbuild-plugins-node-modules-polyfill"; - packageName = "esbuild-plugins-node-modules-polyfill"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.2.0.tgz"; - sha512 = "jWyCoWQKRbxUUfWLO900IyBDHihavTMbQLCDRq8xqj6NhQ75eW7YRvdraSDzFqQ6/eLnhNZlvantQtYbZjqU0A=="; - }; - }; "esbuild-sunos-64-0.14.47" = { name = "esbuild-sunos-64"; packageName = "esbuild-sunos-64"; @@ -33507,22 +32751,22 @@ let sha512 = "Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw=="; }; }; - "eslint-8.44.0" = { + "eslint-8.46.0" = { name = "eslint"; packageName = "eslint"; - version = "8.44.0"; + version = "8.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz"; - sha512 = "0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz"; + sha512 = "cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg=="; }; }; - "eslint-config-prettier-8.8.0" = { + "eslint-config-prettier-8.9.0" = { name = "eslint-config-prettier"; packageName = "eslint-config-prettier"; - version = "8.8.0"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz"; - sha512 = "wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA=="; + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz"; + sha512 = "+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA=="; }; }; "eslint-config-standard-17.1.0" = { @@ -33579,13 +32823,13 @@ let sha512 = "GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ=="; }; }; - "eslint-plugin-import-2.27.5" = { + "eslint-plugin-import-2.28.0" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; - version = "2.27.5"; + version = "2.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"; - sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow=="; + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz"; + sha512 = "B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q=="; }; }; "eslint-plugin-jsx-a11y-6.7.1" = { @@ -33624,13 +32868,13 @@ let sha512 = "tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig=="; }; }; - "eslint-plugin-react-7.32.2" = { + "eslint-plugin-react-7.33.1" = { name = "eslint-plugin-react"; packageName = "eslint-plugin-react"; - version = "7.32.2"; + version = "7.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz"; - sha512 = "t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg=="; + url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz"; + sha512 = "L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA=="; }; }; "eslint-plugin-react-hooks-4.6.0" = { @@ -33660,13 +32904,13 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; - "eslint-plugin-vue-9.15.1" = { + "eslint-plugin-vue-9.16.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.15.1"; + version = "9.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.15.1.tgz"; - sha512 = "CJE/oZOslvmAR9hf8SClTdQ9JLweghT6JCBQNrT2Iel1uVw0W0OLJxzvPd6CxmABKCvLrtyDnqGV37O7KQv6+A=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.16.1.tgz"; + sha512 = "2FtnTqazA6aYONfDuOZTk0QzwhAwi7Z4+uJ7+GHeGxcKapjqWlDsRWDenvyG/utyOfAS5bVRmAG3cEWiYEz2bA=="; }; }; "eslint-rule-docs-1.1.235" = { @@ -33705,13 +32949,13 @@ let sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; - "eslint-scope-7.2.0" = { + "eslint-scope-7.2.2" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "7.2.0"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz"; - sha512 = "DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz"; + sha512 = "dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg=="; }; }; "eslint-utils-1.4.3" = { @@ -33768,13 +33012,13 @@ let sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; - "eslint-visitor-keys-3.4.1" = { + "eslint-visitor-keys-3.4.2" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"; - sha512 = "pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz"; + sha512 = "8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw=="; }; }; "esmangle-evaluator-1.0.1" = { @@ -33840,13 +33084,13 @@ let sha512 = "JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw=="; }; }; - "espree-9.6.0" = { + "espree-9.6.1" = { name = "espree"; packageName = "espree"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz"; - sha512 = "1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A=="; + url = "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz"; + sha512 = "oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ=="; }; }; "esprima-1.2.2" = { @@ -33966,33 +33210,6 @@ let sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; - "estree-util-attach-comments-2.1.1" = { - name = "estree-util-attach-comments"; - packageName = "estree-util-attach-comments"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-util-attach-comments/-/estree-util-attach-comments-2.1.1.tgz"; - sha512 = "+5Ba/xGGS6mnwFbXIuQiDPTbuTxuMCooq3arVv7gPZtYpjp+VXH/NkHAP35OOefPhNG/UGqU3vt/LTABwcHX0w=="; - }; - }; - "estree-util-build-jsx-2.2.2" = { - name = "estree-util-build-jsx"; - packageName = "estree-util-build-jsx"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-util-build-jsx/-/estree-util-build-jsx-2.2.2.tgz"; - sha512 = "m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg=="; - }; - }; - "estree-util-is-identifier-name-1.1.0" = { - name = "estree-util-is-identifier-name"; - packageName = "estree-util-is-identifier-name"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz"; - sha512 = "OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ=="; - }; - }; "estree-util-is-identifier-name-2.1.0" = { name = "estree-util-is-identifier-name"; packageName = "estree-util-is-identifier-name"; @@ -34002,15 +33219,6 @@ let sha512 = "bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ=="; }; }; - "estree-util-value-to-estree-1.3.0" = { - name = "estree-util-value-to-estree"; - packageName = "estree-util-value-to-estree"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-util-value-to-estree/-/estree-util-value-to-estree-1.3.0.tgz"; - sha512 = "Y+ughcF9jSUJvncXwqRageavjrNPAI+1M/L3BI3PyLp1nmgYTGUXU6t5z1Y7OWuThoDdhPME07bQU+d5LxdJqw=="; - }; - }; "estree-util-visit-1.2.1" = { name = "estree-util-visit"; packageName = "estree-util-visit"; @@ -34110,15 +33318,6 @@ let sha512 = "/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw=="; }; }; - "eval-0.1.6" = { - name = "eval"; - packageName = "eval"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz"; - sha512 = "o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ=="; - }; - }; "eve-0.5.4" = { name = "eve"; packageName = "eve"; @@ -34173,15 +33372,6 @@ let sha512 = "JkkW5xv0b2t822XOqoR3VorE9rw3reG0+k3+mACJc+TtyD0wrW9t2LsPcOV2F3kWIUDSP98GXhxm6JU+d7BEvg=="; }; }; - "event-stream-0.9.8" = { - name = "event-stream"; - packageName = "event-stream"; - version = "0.9.8"; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-0.9.8.tgz"; - sha512 = "o5h0Mp1bkoR6B0i7pTCAzRy+VzdsRWH997KQD4Psb0EOPoKEIiaRx/EsOdUl7p1Ktjw7aIWvweI/OY1R9XrlUg=="; - }; - }; "event-stream-3.1.7" = { name = "event-stream"; packageName = "event-stream"; @@ -34488,13 +33678,13 @@ let sha512 = "m4wU9j4Z9nXXoqT8RSfl28JSwmMNLFF69OON8H/lL3NeU0tNpGz313bcOfYoBBHokB0dC2tMl3VUcKgHELhL2Q=="; }; }; - "execa-7.1.1" = { + "execa-7.2.0" = { name = "execa"; packageName = "execa"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-7.1.1.tgz"; - sha512 = "wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q=="; + url = "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz"; + sha512 = "UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA=="; }; }; "execall-1.0.0" = { @@ -35343,15 +34533,6 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.11" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; - sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; - }; - }; "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; @@ -35379,6 +34560,15 @@ let sha512 = "ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA=="; }; }; + "fast-glob-3.3.1" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz"; + sha512 = "kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg=="; + }; + }; "fast-json-parse-1.0.3" = { name = "fast-json-parse"; packageName = "fast-json-parse"; @@ -35478,13 +34668,13 @@ let sha512 = "xEHkLUEmStETI+15zhglJLO9TjXxNkkp2ldEfYVZdcqxFhM172EfGl1irI6mVlTxXspYKH1/kjevnt/XSsPeFA=="; }; }; - "fast-redact-3.2.0" = { + "fast-redact-3.3.0" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.2.0.tgz"; - sha512 = "zaTadChr+NekyzallAMXATXLOR8MNx3zqpZ0MUF2aGf4EathnG0f32VLODNlY8IuGY3HoRO2L6/6fSzNsLaHIw=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.3.0.tgz"; + sha512 = "6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ=="; }; }; "fast-safe-stringify-2.1.1" = { @@ -36072,13 +35262,13 @@ let sha512 = "hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg=="; }; }; - "filesize-10.0.7" = { + "filesize-10.0.8" = { name = "filesize"; packageName = "filesize"; - version = "10.0.7"; + version = "10.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-10.0.7.tgz"; - sha512 = "iMRG7Qo9nayLoU3PNCiLizYtsy4W1ClrapeCwEgtiQelOAOuRJiw4QaLI+sSr8xr901dgHv+EYP2bCusGZgoiA=="; + url = "https://registry.npmjs.org/filesize/-/filesize-10.0.8.tgz"; + sha512 = "/ylBrxZ1GAjgh2CEemKKLwTtmXfWqTtN1jRl6iqLwnMEucUX5cmaCCUPGstQOHVCcK9uYL6o1cPNakLQU2sasQ=="; }; }; "filesize-3.6.1" = { @@ -36423,15 +35613,6 @@ let sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw=="; }; }; - "fix-esm-1.0.1" = { - name = "fix-esm"; - packageName = "fix-esm"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fix-esm/-/fix-esm-1.0.1.tgz"; - sha512 = "EZtb7wPXZS54GaGxaWxMlhd1DUDCnAg5srlYdu/1ZVeW+7wwR3Tp59nu52dXByFs3MBRq+SByx1wDOJpRvLEXw=="; - }; - }; "fkill-7.2.1" = { name = "fkill"; packageName = "fkill"; @@ -36441,13 +35622,13 @@ let sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; - "fkill-8.1.0" = { + "fkill-8.1.1" = { name = "fkill"; packageName = "fkill"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-8.1.0.tgz"; - sha512 = "XrPKdURVYoXerpYx+zhhaXrO9vHVflnGD4JhwjOwg03vKwyOH6eZ+EY69aKDD+q1EbCzviVmD+9OG9rwQy+z/A=="; + url = "https://registry.npmjs.org/fkill/-/fkill-8.1.1.tgz"; + sha512 = "138B7rFQMEKoJQOVl3NCPyRAaex0ruLvQgqkEWa/CyUY9MFFxZ8TtztiMJSs6/wD60M6kK0OKUOwHRsr3U2RBg=="; }; }; "flagged-respawn-1.0.1" = { @@ -36549,13 +35730,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.211.1" = { + "flow-parser-0.213.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.211.1"; + version = "0.213.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.211.1.tgz"; - sha512 = "TjUjPTe22yM1DYKDqsmnUblJ0Vs5WJWP3FeaXU8L1gGKGrAQBdxRvs0CRj6NXYF8gugej4JyRWGBbaiVunC9uw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.213.1.tgz"; + sha512 = "l+vyZO6hrWG60DredryA8mq62fK9vxL6/RR13HA/aVLBNh9No/wEJsKI+CJqPRkF4CIRUfcJQBeaMXSKcncxUQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -36999,13 +36180,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.16.0" = { + "fp-ts-2.16.1" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.0.tgz"; - sha512 = "bLq+KgbiXdTEoT1zcARrWEpa5z6A/8b7PcDW7Gef3NSisQ+VS7ll2Xbf1E+xsgik0rWub/8u0qP/iTTjj+PhxQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.1.tgz"; + sha512 = "by7U5W8dkIzcvDofUcO42yl9JbnHTEDBrzu3pt5fKT+Z4Oy85I21K80EYJYdjQGC2qum4Vo55Ag57iiIK4FYuA=="; }; }; "fraction.js-4.2.0" = { @@ -37485,13 +36666,13 @@ let sha512 = "cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="; }; }; - "futoin-hkdf-1.5.2" = { + "futoin-hkdf-1.5.3" = { name = "futoin-hkdf"; packageName = "futoin-hkdf"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/futoin-hkdf/-/futoin-hkdf-1.5.2.tgz"; - sha512 = "Bnytx8kQJQoEAPGgTZw3kVPy8e/n9CDftPzc0okgaujmbdF1x7w8wg+u2xS0CML233HgruNk6VQW28CzuUFMKw=="; + url = "https://registry.npmjs.org/futoin-hkdf/-/futoin-hkdf-1.5.3.tgz"; + sha512 = "SewY5KdMpaoCeh7jachEWFsh1nNlaDjNHZXWqL5IGwtpEYHTgkr2+AMCgNwKWkcc0wpSYrZfR7he4WdmHFtDxQ=="; }; }; "fuzzy-0.1.3" = { @@ -37521,15 +36702,6 @@ let sha512 = "/FAzX0w4Zd4PaVMM06wSJfDfdkYmIqZs4c6iCUc2icEL8nz6VJqyqlCy6InPZInjf6HadfhkFxYd2a0RDZ3Htg=="; }; }; - "fx-28.0.0" = { - name = "fx"; - packageName = "fx"; - version = "28.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fx/-/fx-28.0.0.tgz"; - sha512 = "vKQDA9g868cZiW8ulgs2uN1yx1i7/nsS33jTMOxekk0Z03BJLffVcdW6AVD32fWb3E6RtmWWuBXBZOk8cLXFNQ=="; - }; - }; "fx-runner-1.3.0" = { name = "fx-runner"; packageName = "fx-runner"; @@ -37719,15 +36891,6 @@ let sha512 = "TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ=="; }; }; - "generic-names-4.0.0" = { - name = "generic-names"; - packageName = "generic-names"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generic-names/-/generic-names-4.0.0.tgz"; - sha512 = "ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A=="; - }; - }; "generic-pool-3.8.2" = { name = "generic-pool"; packageName = "generic-pool"; @@ -38160,15 +37323,6 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; - "git-hooks-list-1.0.3" = { - name = "git-hooks-list"; - packageName = "git-hooks-list"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/git-hooks-list/-/git-hooks-list-1.0.3.tgz"; - sha512 = "Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ=="; - }; - }; "git-node-fs-1.0.0" = { name = "git-node-fs"; packageName = "git-node-fs"; @@ -38241,13 +37395,13 @@ let sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; }; }; - "git-semver-tags-5.0.0" = { + "git-semver-tags-5.0.1" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.0.tgz"; - sha512 = "fZ+tmZ1O5aXW/T5nLzZLbxWAHdQTLLXalOECMNAmhoEQSfqZjtaeMjpsXH4C5qVhrICTkVQeQFujB1lKzIHljA=="; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz"; + sha512 = "hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA=="; }; }; "git-sha1-0.1.2" = { @@ -38358,15 +37512,6 @@ let sha512 = "qVDEXufVtYUzYqI5hoDUONh9GCEPi0n+e35KNDafdsNt9fPxB0nvFW/kFiw7W42wkg8TUyhBqb+t24yyaoc87A=="; }; }; - "gl-matrix-2.8.1" = { - name = "gl-matrix"; - packageName = "gl-matrix"; - version = "2.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-2.8.1.tgz"; - sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; - }; - }; "glob-10.2.7" = { name = "glob"; packageName = "glob"; @@ -38376,13 +37521,13 @@ let sha512 = "jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA=="; }; }; - "glob-10.3.2" = { + "glob-10.3.3" = { name = "glob"; packageName = "glob"; - version = "10.3.2"; + version = "10.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.2.tgz"; - sha512 = "vsuLzB3c/uyDLLEdBZtT8vGnN0z57rwOxHV2oYZib/7HWmBspUaja/McYIobBjC4qaUTuNpUyFO2IdqM4DZIJA=="; + url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; + sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; }; }; "glob-3.2.11" = { @@ -38809,15 +37954,6 @@ let sha512 = "40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="; }; }; - "globby-10.0.0" = { - name = "globby"; - packageName = "globby"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-10.0.0.tgz"; - sha512 = "3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw=="; - }; - }; "globby-10.0.2" = { name = "globby"; packageName = "globby"; @@ -38998,13 +38134,13 @@ let sha512 = "UK5uXgffr6l/RJvI5ByLs2uieLGaPGGv3uDPu3vBEBzluQM2CEvTwTH1Hby2q2w1BA6+B122yhf/hjEsQiPlqg=="; }; }; - "goldengate-13.0.0" = { + "goldengate-13.0.2" = { name = "goldengate"; packageName = "goldengate"; - version = "13.0.0"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-13.0.0.tgz"; - sha512 = "We2URd1y5dMQeFVoWrGwDGj3wFSaSNiRbabirE9O/o05u8qYO8mJ4ynMz3RWflOAVpFS3JvmxVxuXGZfpt/g7w=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-13.0.2.tgz"; + sha512 = "E6l+y6luuISI4LUari8dF6XtFZd0xREZ7jnRywTvT4dr19lE0E0F7/u8/1VnZIe20aGw3qyIFFGxPr8YeyJo+Q=="; }; }; "gonzales-pe-4.3.0" = { @@ -39034,13 +38170,13 @@ let sha512 = "f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg=="; }; }; - "google-gax-3.6.0" = { + "google-gax-3.6.1" = { name = "google-gax"; packageName = "google-gax"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-3.6.0.tgz"; - sha512 = "2fyb61vWxUonHiArRNJQmE4tx5oY1ni8VPo08fzII409vDSCWG7apDX4qNOQ2GXXT82gLBn3d3P1Dydh7pWjyw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-3.6.1.tgz"; + sha512 = "g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w=="; }; }; "google-p12-pem-3.1.4" = { @@ -39259,13 +38395,13 @@ let sha512 = "kAxja6QDjw5oTJOFtrqhaQlLfCco3AwO4Mb4YRdP8A+v59roJA8mgEd0S5dOgFPyn74bPp8VWaKCI+of8wnPow=="; }; }; - "grammy-1.17.1" = { + "grammy-1.17.2" = { name = "grammy"; packageName = "grammy"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.17.1.tgz"; - sha512 = "ba1xsEVMoEjvTZNhOvSYt/dgoIFbMKYnFKHw3iioKYbQMCBsoX+FbO5hRse+sxhNwQzkDmiUtzAcK5elpEJg2w=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.17.2.tgz"; + sha512 = "5TuAzqxupkVcKXB5Jfl8F9GMXgGh/h/RcoOJThlQSJz2MMT2+2o+W/7C8ZULzrZ4TEB9TIIliPR6UW0J+1fT4w=="; }; }; "grant-5.4.21" = { @@ -39313,13 +38449,13 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; - "graphology-0.25.1" = { + "graphology-0.25.4" = { name = "graphology"; packageName = "graphology"; - version = "0.25.1"; + version = "0.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphology/-/graphology-0.25.1.tgz"; - sha512 = "yYA7BJCcXN2DrKNQQ9Qf22zBHm/yTbyBR71T1MYBbGtywNHsv0QZtk8zaR6zxNcp2hCCZayUkHp9DyMSZCpoxQ=="; + url = "https://registry.npmjs.org/graphology/-/graphology-0.25.4.tgz"; + sha512 = "33g0Ol9nkWdD6ulw687viS8YJQBxqG5LWII6FI6nul0pq6iM2t5EKquOTFDbyTblRB3O9I+7KX4xI8u5ffekAQ=="; }; }; "graphology-types-0.24.7" = { @@ -39457,13 +38593,13 @@ let sha512 = "duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA=="; }; }; - "graphql-language-service-server-2.11.2" = { + "graphql-language-service-server-2.11.3" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.11.2.tgz"; - sha512 = "oq++JbYDXml2gJkXNXnuNzH+KZeDPKBbrIleEKzqQkWjMTBLAYWpB24tAtAXqkJFB9p0t56SpVsojgGIf7XbRA=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.11.3.tgz"; + sha512 = "pkH29NNjbus/lmlzGW5SOlL6iVvtj46ImG+UgXdv8uOLfv6wQHOX6aOFeCx7NpGVlCZYDxyPp220NQIyO5RucA=="; }; }; "graphql-language-service-types-1.8.7" = { @@ -39493,13 +38629,13 @@ let sha512 = "Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA=="; }; }; - "graphql-request-3.4.0" = { + "graphql-request-3.7.0" = { name = "graphql-request"; packageName = "graphql-request"; - version = "3.4.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-request/-/graphql-request-3.4.0.tgz"; - sha512 = "acrTzidSlwAj8wBNO7Q/UQHS8T+z5qRGquCQRv9J1InwR01BBWV9ObnoE+JS5nCCEj8wSGS0yrDXVDoRiKZuOg=="; + url = "https://registry.npmjs.org/graphql-request/-/graphql-request-3.7.0.tgz"; + sha512 = "dw5PxHCgBneN2DDNqpWu8QkbbJ07oOziy8z+bK/TAXufsOLaETuVO4GkXrbs0WjhdKhBMN3BkpN/RIvUHkmNUQ=="; }; }; "graphql-request-5.2.0" = { @@ -40276,15 +39412,6 @@ let sha512 = "yGkCfPkkfCyiLfK6KEl/orMDr/zgCnq/NaO9HfULx6/Zga5fso5eqQA5Ov/JZVqACygvw9shRYWgXNcG2ilo7w=="; }; }; - "hast-util-to-estree-2.3.3" = { - name = "hast-util-to-estree"; - packageName = "hast-util-to-estree"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-2.3.3.tgz"; - sha512 = "ihhPIUPxN0v0w6M5+IiAZZrn0LH2uZomeWwhn7uP7avZC6TE7lIiEh2yBMPr5+zi1aUCXq6VoYRgs2Bw9xmycQ=="; - }; - }; "hast-util-to-nlcst-1.2.8" = { name = "hast-util-to-nlcst"; packageName = "hast-util-to-nlcst"; @@ -40474,15 +39601,6 @@ let sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; }; }; - "here-0.0.2" = { - name = "here"; - packageName = "here"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/here/-/here-0.0.2.tgz"; - sha512 = "U7VYImCTcPoY27TSmzoiFsmWLEqQFaYNdpsPb9K0dXJhE6kufUqycaz51oR09CW85dDU9iWyy7At8M+p7hb3NQ=="; - }; - }; "heroku-cli-util-8.0.12" = { name = "heroku-cli-util"; packageName = "heroku-cli-util"; @@ -41410,13 +40528,13 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; - "https-proxy-agent-7.0.0" = { + "https-proxy-agent-7.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.0.tgz"; - sha512 = "0euwPCRyAPSgGdzD1IVN9nJYHtBhJwb6XPfbpQcYbPCwrBidX6GzxmchnaF4sfF/jPb74Ojx5g4yTg3sixlyPw=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz"; + sha512 = "Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ=="; }; }; "hue-sdk-0.1.0" = { @@ -41941,13 +41059,13 @@ let sha512 = "15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg=="; }; }; - "immutable-4.3.0" = { + "immutable-4.3.1" = { name = "immutable"; packageName = "immutable"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"; - sha512 = "0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.3.1.tgz"; + sha512 = "lj9cnmB/kVS0QHsJnYKD1uo3o39nrbKxszjnqS9Fr6NB7bZzW45U6WSGBPKXDL/CvDKqDNPA4r3DoDQ8GTxo2A=="; }; }; "import-cwd-2.1.0" = { @@ -42184,15 +41302,6 @@ let sha512 = "CnfUJe5o2S9aAQWXGMhDZI4UL39MAJV3guOTfHHIdos4tuVHkl1j/J+1XLQn+CLIvqcpgQR/p+xXYXzcrhCe5w=="; }; }; - "inflation-2.0.0" = { - name = "inflation"; - packageName = "inflation"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz"; - sha512 = "m3xv4hJYR2oXw4o4Y5l6P5P16WYmazYof+el6Al3f+YlggGj6qT9kImBAnzDelRALnP5d3h4jGBPKzYCizjZZw=="; - }; - }; "inflection-1.13.4" = { name = "inflection"; packageName = "inflection"; @@ -42400,15 +41509,6 @@ let sha512 = "0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA=="; }; }; - "inline-style-parser-0.1.1" = { - name = "inline-style-parser"; - packageName = "inline-style-parser"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz"; - sha512 = "7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="; - }; - }; "innertext-1.0.3" = { name = "innertext"; packageName = "innertext"; @@ -42508,13 +41608,22 @@ let sha512 = "QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ=="; }; }; - "inquirer-9.2.7" = { + "inquirer-9.2.8" = { name = "inquirer"; packageName = "inquirer"; - version = "9.2.7"; + version = "9.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.7.tgz"; - sha512 = "Bf52lnfvNxGPJPltiNO2tLBp3zC339KNlGMqOkW+dsvNikBhcVDK5kqU2lVX2FTPzuXUFX5WJDlsw//w3ZwoTw=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.8.tgz"; + sha512 = "SJ0fVfgIzZL1AD6WvFhivlh5/3hN6WeAvpvPrpPXH/8MOcQHeXhinmSm5CDJNRC2Q+sLh9YJ5k8F8/5APMXSfw=="; + }; + }; + "inquirer-9.2.9" = { + name = "inquirer"; + packageName = "inquirer"; + version = "9.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.9.tgz"; + sha512 = "0VXHov2GGwWquYxwxlcIcm3yOHvFb2jh/+HkY8/AUXSTWShpo6QJMlSfHi5Xo74NO40UePBM3rQcI3OkzOF/7A=="; }; }; "inquirer-autocomplete-prompt-1.4.0" = { @@ -44542,13 +43651,13 @@ let sha512 = "xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w=="; }; }; - "is-typed-array-1.1.10" = { + "is-typed-array-1.1.12" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.10"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"; - sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz"; + sha512 = "Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="; }; }; "is-typedarray-1.0.0" = { @@ -44992,13 +44101,13 @@ let sha512 = "NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg=="; }; }; - "istanbul-lib-report-3.0.0" = { + "istanbul-lib-report-3.0.1" = { name = "istanbul-lib-report"; packageName = "istanbul-lib-report"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; + url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz"; + sha512 = "GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw=="; }; }; "istanbul-lib-source-maps-4.0.1" = { @@ -45010,13 +44119,13 @@ let sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; }; - "istanbul-reports-3.1.5" = { + "istanbul-reports-3.1.6" = { name = "istanbul-reports"; packageName = "istanbul-reports"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"; - sha512 = "nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w=="; + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz"; + sha512 = "TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg=="; }; }; "isuri-2.0.3" = { @@ -45091,13 +44200,13 @@ let sha512 = "IoiNVk4SMPu6uTcK+1nA5QaHNok2BMDLjSl5UomrOixe5g4GkylhPwuiGdw00ysSCrXAKNMfFTu+u/Lk5f6OLQ=="; }; }; - "jackspeak-2.2.1" = { + "jackspeak-2.2.2" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz"; - sha512 = "MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.2.tgz"; + sha512 = "mgNtVv4vUuaKA97yxUHoA3+FkuhtxkjdXEWOyB/N76fjy0FjezEt34oy3epBtvCvS+7DyKwqCFWx/oJLV5+kCg=="; }; }; "jade-0.26.3" = { @@ -45163,13 +44272,13 @@ let sha512 = "z35ZSEcXHxLW4yumw0dF6L464NT36vmx3wxJw8MDpraBcWuNVgUPZgPJKcu1HekNgwlMFNqol7i/IpSbjhqwqA=="; }; }; - "jest-diff-29.6.1" = { + "jest-diff-29.6.2" = { name = "jest-diff"; packageName = "jest-diff"; - version = "29.6.1"; + version = "29.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz"; - sha512 = "FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz"; + sha512 = "t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA=="; }; }; "jest-environment-node-27.5.1" = { @@ -45433,13 +44542,13 @@ let sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q=="; }; }; - "jquery.terminal-2.36.0" = { + "jquery.terminal-2.37.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.36.0"; + version = "2.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.36.0.tgz"; - sha512 = "i7znDzcN1JS7gnTSTemATi7JmoV/oEZEBRGWNnxJ/FE2Dt1JtVSq6u6ffiQ32hArhRkhmTXgbuB9GrJzjtDUaQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.37.0.tgz"; + sha512 = "ykFwcz1g7660oNCOyp/zze1t4Zrdbongs22el1Q7c0YRbuZOUdj5kov4SDkaTjwp8BVD1PfqYx8AihFg+Gn9xQ=="; }; }; "js-base64-2.6.3" = { @@ -45469,13 +44578,13 @@ let sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; }; }; - "js-beautify-1.14.8" = { + "js-beautify-1.14.9" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.8"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.8.tgz"; - sha512 = "4S7HFeI9YfRvRgKnEweohs0tgJj28InHVIj4Nl8Htf96Y6pHg3+tJrmo4ucAM9f7l4SHbFI3IvFAZ2a1eQPbyg=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz"; + sha512 = "coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg=="; }; }; "js-git-0.7.8" = { @@ -45523,13 +44632,13 @@ let sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; }; - "js-sdsl-4.4.1" = { + "js-sdsl-4.4.2" = { name = "js-sdsl"; packageName = "js-sdsl"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.1.tgz"; - sha512 = "6Gsx8R0RucyePbWqPssR8DyfuXmLBooYN5cZFZKjHGnQuaf7pEzhtpceagJxVu4LqhYY5EYA7nko3FmeHZ1KbA=="; + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.2.tgz"; + sha512 = "dwXFwByc/ajSV6m5bcKAPwe4yDDF6D614pxmIi5odytzxRlwqF6nwoiCek80Ixc7Cvma5awClxrzFtxCQvcM8w=="; }; }; "js-sha256-0.9.0" = { @@ -45793,58 +44902,58 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.84.0" = { + "jsii-1.85.0" = { name = "jsii"; packageName = "jsii"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.84.0.tgz"; - sha512 = "vtrw3fRrr5Do4LDNxAVXHgtHDyxHvohyzAfBwxcMEYzZ51gJX52wsdlaGE1p0dPe1V9uCAbNQTDKbAMgVJkg0Q=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.85.0.tgz"; + sha512 = "RKB3qZwIXafNUiILD+rKI1EQDtHtfpHN78VVVnfLcp1uAkPLA5zVVqy6cKu2cpAmlz8R5hzIFsw4uEnWA+XE4w=="; }; }; - "jsii-5.1.5" = { + "jsii-5.1.10" = { name = "jsii"; packageName = "jsii"; - version = "5.1.5"; + version = "5.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.1.5.tgz"; - sha512 = "21y6Jz5F1gK6JwEIndiimRO4NqF9sc8AuDLHXJW5XKq2LSxiHsdqrNW+W/w8smITPX6GlWNFuznWJjPJUMrd8w=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.1.10.tgz"; + sha512 = "OvFBUj0V7H+ex7yGyg8bJwghiHnE/T8DmQBxJxUG6qApwKP9lJE+jSz0ONKuqdaxTK1RaLbZhatLkCRrkQrbJQ=="; }; }; - "jsii-pacmak-1.84.0" = { + "jsii-pacmak-1.85.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.84.0.tgz"; - sha512 = "+EGfpQDPSyDNPWclcOes6dUhwDsn5dG0bBgVb3hpRWZ0uDe7wLCVwGxh7fphx2XtNvTwdNfspTSBLBMqscOYmg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.85.0.tgz"; + sha512 = "1pFHp7MtiNgt9lXvtv8Qs2PEwDWZ2eUSylxS+z4jH4Wo6SGq/5M0h8182dagxsJuoId50+5zTjdD1yACFZ3QTw=="; }; }; - "jsii-reflect-1.84.0" = { + "jsii-reflect-1.85.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.84.0.tgz"; - sha512 = "Iuh0GAxsQscK1re9sWEQHG0wKswnr7ha4EZ8j47Sigo8yBIZNp01P+V0kbZ55bDjiT66Sqqu3jaDJdYzR/5o4w=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.85.0.tgz"; + sha512 = "4/2JTt7xVDp717JgxnWbroXPBkXBWd25WEgKkIBxqN5DxGpzd+EPNpNkgJmSOCK5DKl9g1FjCuTkcRw5qMIoEg=="; }; }; - "jsii-rosetta-1.84.0" = { + "jsii-rosetta-1.85.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.84.0.tgz"; - sha512 = "VrXmc6utiNs3eNTKxVky0LTxoQrsh5GuEGyfj9ihwCkojYBJ3w80PdkMQEeRpWGdaCLEocjpy1X67xgZ4ZbPlg=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.85.0.tgz"; + sha512 = "3kGi7xZjA7fpVYmbn2VXvDA6iuva47ffdqyb28DhYxVWnlEJgff8XWuvQJSqrtxEcJF60dVD58N79pPghyvOgg=="; }; }; - "jsii-rosetta-5.1.5" = { + "jsii-rosetta-5.1.9" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "5.1.5"; + version = "5.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.1.5.tgz"; - sha512 = "y5XmuxY/hJzc+AfvQ1T5MdPBgE3eMiPtGVYlZQHS1gTfUR2OypHSx5XLN/DfiOlkdyczMCUQ/utK71PhPB/cmQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.1.9.tgz"; + sha512 = "GgSLaxn9N0xnYBXkK8DIXrp1CWNSz2f7Q04kQW4n2htsLd3diPI3HNbbmJL5V+wwUIZhOpBe++5r1a7T7vFlqg=="; }; }; "jsii-srcmak-0.1.949" = { @@ -46558,13 +45667,13 @@ let sha512 = "C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A=="; }; }; - "jsx-ast-utils-3.3.4" = { + "jsx-ast-utils-3.3.5" = { name = "jsx-ast-utils"; packageName = "jsx-ast-utils"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz"; - sha512 = "fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw=="; + url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz"; + sha512 = "ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ=="; }; }; "jszip-3.10.1" = { @@ -46918,13 +46027,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.5.2" = { + "keyv-4.5.3" = { name = "keyv"; packageName = "keyv"; - version = "4.5.2"; + version = "4.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz"; - sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz"; + sha512 = "QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug=="; }; }; "khroma-2.0.0" = { @@ -47080,15 +46189,6 @@ let sha512 = "VFI2bpJaodz6P7x2uyLiX6RLYpZmOJqNmoCst/Yyd7hQlszyPwG/I9CQJ63nOtKSxpt5M7NH67V6nJL2BwCl7g=="; }; }; - "koa-bodyparser-4.4.0" = { - name = "koa-bodyparser"; - packageName = "koa-bodyparser"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-bodyparser/-/koa-bodyparser-4.4.0.tgz"; - sha512 = "AXPY7wwKZUmbgb8VkTEUFoRNOlx6aWRJwEnQD+zfNf33/7KSAkN4Oo9BqlIk80D+5TvuqlhpQT5dPVcyxl5Zsw=="; - }; - }; "koa-compose-3.2.1" = { name = "koa-compose"; packageName = "koa-compose"; @@ -47116,24 +46216,6 @@ let sha512 = "asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA=="; }; }; - "koa-is-json-1.0.0" = { - name = "koa-is-json"; - packageName = "koa-is-json"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz"; - sha512 = "+97CtHAlWDx0ndt0J8y3P12EWLwTLMXIfMnYDev3wOTwH/RpBGMlfn4bDXlMEg1u73K6XRE9BbUp+5ZAYoRYWw=="; - }; - }; - "koa-json-2.0.2" = { - name = "koa-json"; - packageName = "koa-json"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-json/-/koa-json-2.0.2.tgz"; - sha512 = "8+dz0T2ekDuNN1svYoKPCV2txotQ3Ufg8Fn5bft1T48MPJWiC/HKmkk+3xj9EC/iNZuFYeLRazN2h2o3RSUXuQ=="; - }; - }; "koa-logger-3.2.1" = { name = "koa-logger"; packageName = "koa-logger"; @@ -47305,6 +46387,15 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; + "latest-version-6.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-6.0.0.tgz"; + sha512 = "zfTuGx4PwpoSJ1mABs58AkM6qMzu49LZ7LT5JHprKvpGpQ+cYtfSibi3tLLrH4z7UylYU42rfBdwN8YgqbTljA=="; + }; + }; "latest-version-7.0.0" = { name = "latest-version"; packageName = "latest-version"; @@ -47890,6 +46981,15 @@ let sha512 = "VJhAL13nuWLHr2hJSDbX5gweh2P1AiCBVG85ZPXR0Gf6/x1eTn1RWLRMxgk+5oiuAKa88GcAHXPYpQjWhKyOnQ=="; }; }; + "lightning-9.9.0" = { + name = "lightning"; + packageName = "lightning"; + version = "9.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-9.9.0.tgz"; + sha512 = "SSBzdv7qvxgQWH0a2Q/9hCcfbMH67VPwWm3FtFrl/e/89QVydnb+9yMTDMpPFh8R2E+kN1NiBEy4jihC4Y3EtA=="; + }; + }; "lightningcss-1.21.5" = { name = "lightningcss"; packageName = "lightningcss"; @@ -48088,13 +47188,13 @@ let sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; }; }; - "liquidjs-10.7.1" = { + "liquidjs-10.8.3" = { name = "liquidjs"; packageName = "liquidjs"; - version = "10.7.1"; + version = "10.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/liquidjs/-/liquidjs-10.7.1.tgz"; - sha512 = "tl9nWBZrrKcC61yfih3lbtSjAn+k7e0HhwydPjQKI4+metLk927HYBfXfbf6yrCcYjnBnLzk8xMjUF83yknAQQ=="; + url = "https://registry.npmjs.org/liquidjs/-/liquidjs-10.8.3.tgz"; + sha512 = "LqHLYtH3vrkT3LyfOhPU0FJX5KPO4aB6SzGa4HRI29yz8pS0ZxqIe/fWtic8qiust1+qrHI92J67tdt92V4WOA=="; }; }; "listenercount-1.0.1" = { @@ -48160,13 +47260,13 @@ let sha512 = "mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA=="; }; }; - "listr2-6.6.0" = { + "listr2-6.6.1" = { name = "listr2"; packageName = "listr2"; - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-6.6.0.tgz"; - sha512 = "qkLg7IeYcZGkxo5sZzl676xHwQzNZ8qAQLQSDMA88sLM1SDcabwyXD1mXHi/PGQHyt/mu81adJdkqsCSUSuQzQ=="; + url = "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz"; + sha512 = "+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg=="; }; }; "livereload-0.9.3" = { @@ -48268,6 +47368,15 @@ let sha512 = "TWKfTVMhEb7Df7xB6z3/fiNTaBONwyoqYWgl7dZ9JbdOMLrhtX0y9OJAsFWAgIo0SYDjO2MM7sq1UDfLf3Zcqg=="; }; }; + "ln-service-56.9.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "56.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-56.9.0.tgz"; + sha512 = "cximQT2aIhKOkckuaVO8U4J04HoLWejcFb3aIv2Pas65y7D9VqaIXyb1FCIH4o9Rf0Z9sNSdf5a6RR2G2Ov4uQ=="; + }; + }; "ln-sync-4.2.0" = { name = "ln-sync"; packageName = "ln-sync"; @@ -48475,15 +47584,6 @@ let sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; }; }; - "loader-utils-3.2.1" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"; - sha512 = "ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="; - }; - }; "loady-0.0.5" = { name = "loady"; packageName = "loady"; @@ -48493,15 +47593,6 @@ let sha512 = "uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ=="; }; }; - "local-pkg-0.4.3" = { - name = "local-pkg"; - packageName = "local-pkg"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz"; - sha512 = "SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g=="; - }; - }; "localforage-1.10.0" = { name = "localforage"; packageName = "localforage"; @@ -50591,13 +49682,13 @@ let sha512 = "LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ=="; }; }; - "magic-string-0.30.1" = { + "magic-string-0.30.2" = { name = "magic-string"; packageName = "magic-string"; - version = "0.30.1"; + version = "0.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz"; - sha512 = "mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz"; + sha512 = "lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug=="; }; }; "magicli-0.0.5" = { @@ -50681,6 +49772,15 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; + "make-dir-4.0.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz"; + sha512 = "hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw=="; + }; + }; "make-error-1.3.6" = { name = "make-error"; packageName = "make-error"; @@ -50744,15 +49844,6 @@ let sha512 = "8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="; }; }; - "map-canvas-0.1.5" = { - name = "map-canvas"; - packageName = "map-canvas"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/map-canvas/-/map-canvas-0.1.5.tgz"; - sha512 = "f7M3sOuL9+up0NCOZbb1rQpWDLZwR/ftCiNbyscjl9LUUEwrRaoumH4sz6swgs58lF21DQ0hsYOCw5C6Zz7hbg=="; - }; - }; "map-filter-reduce-2.2.1" = { name = "map-filter-reduce"; packageName = "map-filter-reduce"; @@ -50861,15 +49952,6 @@ let sha512 = "8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="; }; }; - "markdown-extensions-1.1.1" = { - name = "markdown-extensions"; - packageName = "markdown-extensions"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.1.tgz"; - sha512 = "WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q=="; - }; - }; "markdown-it-12.3.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -51356,15 +50438,6 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; - "mdast-util-definitions-5.1.2" = { - name = "mdast-util-definitions"; - packageName = "mdast-util-definitions"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz"; - sha512 = "8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA=="; - }; - }; "mdast-util-find-and-replace-1.1.1" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; @@ -51536,15 +50609,6 @@ let sha512 = "8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw=="; }; }; - "mdast-util-mdx-1.1.0" = { - name = "mdast-util-mdx"; - packageName = "mdast-util-mdx"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-1.1.0.tgz"; - sha512 = "leKb9uG7laXdyFlTleYV4ZEaCpsxeU1LlkkR/xp35pgKrfV1Y0fNCuOw9vaRc2a9YDpH22wd145Wt7UY5yzeZw=="; - }; - }; "mdast-util-mdx-2.0.1" = { name = "mdast-util-mdx"; packageName = "mdast-util-mdx"; @@ -51563,15 +50627,6 @@ let sha512 = "xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA=="; }; }; - "mdast-util-mdx-jsx-1.2.0" = { - name = "mdast-util-mdx-jsx"; - packageName = "mdast-util-mdx-jsx"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-1.2.0.tgz"; - sha512 = "5+ot/kfxYd3ChgEMwsMUO71oAfYjyRI3pADEK4I7xTmWLGQ8Y7ghm1CG36zUoUvDPxMlIYwQV/9DYHAUWdG4dA=="; - }; - }; "mdast-util-mdx-jsx-2.1.4" = { name = "mdast-util-mdx-jsx"; packageName = "mdast-util-mdx-jsx"; @@ -51599,15 +50654,6 @@ let sha512 = "WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg=="; }; }; - "mdast-util-to-hast-11.3.0" = { - name = "mdast-util-to-hast"; - packageName = "mdast-util-to-hast"; - version = "11.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-11.3.0.tgz"; - sha512 = "4o3Cli3hXPmm1LhB+6rqhfsIUBjnKFlIUZvudaermXB+4/KONdd/W4saWWkC+LBLbPMqhFSSTSRgafHsT5fVJw=="; - }; - }; "mdast-util-to-markdown-0.6.5" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; @@ -51761,15 +50807,6 @@ let sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; }; }; - "media-query-parser-2.0.2" = { - name = "media-query-parser"; - packageName = "media-query-parser"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/media-query-parser/-/media-query-parser-2.0.2.tgz"; - sha512 = "1N4qp+jE0pL5Xv4uEcwVUhIkwdUO3S/9gML90nqKA7v7FcOS5vUtatfzok9S9U1EJU8dHWlcv95WLnKmmxZI9w=="; - }; - }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -51941,15 +50978,6 @@ let sha512 = "q0D3m846qY6ZkIt+19ZemU5vH56lpOZZwoJc3AICARKh/menBuayQUjAGPrqtHQQMUYERSdOrej92J9kz7LgYA=="; }; }; - "memory-streams-0.1.3" = { - name = "memory-streams"; - packageName = "memory-streams"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-streams/-/memory-streams-0.1.3.tgz"; - sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA=="; - }; - }; "memorystore-1.6.7" = { name = "memorystore"; packageName = "memorystore"; @@ -51959,15 +50987,6 @@ let sha512 = "OZnmNY/NDrKohPQ+hxp0muBcBKrzKNtHr55DbqSx9hLsYVNnomSAMRAtI7R64t3gf3ID7tHQA7mG4oL3Hu9hdw=="; }; }; - "memorystream-0.3.1" = { - name = "memorystream"; - packageName = "memorystream"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz"; - sha512 = "S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw=="; - }; - }; "meow-10.1.5" = { name = "meow"; packageName = "meow"; @@ -52130,13 +51149,13 @@ let sha512 = "AY9lGmUznFNsLr7Vm3hLCT7Ar0bN6Wninp3qA0E0/JBU4uRTRI4fIgM1I3+nbjLf23mwh+vrHut0ML63QB2acA=="; }; }; - "metalsmith-2.6.0" = { + "metalsmith-2.6.1" = { name = "metalsmith"; packageName = "metalsmith"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.6.0.tgz"; - sha512 = "YgcpGZboY/Sw85a+bkaY+hPaGMONCBjP2X1ila4yYxCJBOwZT+0tg0mIIHmd5bGwADr+TORYhTwTO0sAggSmTA=="; + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.6.1.tgz"; + sha512 = "uI6o6ctECf6ShH5kfrTNoLn2N16pV7AQVQKEBJ04b6uGdNcHknnkkgyhXSHI+khkEo77cXqBqsT0zWkNc1VGhg=="; }; }; "method-missing-1.2.4" = { @@ -52958,13 +51977,13 @@ let sha512 = "LfHUYIA047rrqIZEn0gwbqbzarU5bmZ8yZ9SizeoiPwVq5cemE3foJTJZ3pCktUq/IPkKNGghFHJk1O8149mOA=="; }; }; - "miniflare-3.20230628.0" = { + "miniflare-3.20230724.0" = { name = "miniflare"; packageName = "miniflare"; - version = "3.20230628.0"; + version = "3.20230724.0"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20230628.0.tgz"; - sha512 = "5tg+hWlY9kCZaJ8y1CA7Y1SuPOCjJWFthLLsJKX5Mj1KfUR96MHY2Hcboyk3KbzDiIWUd3eEIoEoriQ/H9egUw=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20230724.0.tgz"; + sha512 = "YU8yUwoVJCiuzY2i9ZBJ+McjL/mqwKnMJfn23QedSCvx82Mys8GAlkHCH69mqSqzlSw8IVcdxec330meRRf9bg=="; }; }; "minilog-3.1.0" = { @@ -53102,6 +52121,15 @@ let sha512 = "W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA=="; }; }; + "minimatch-9.0.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz"; + sha512 = "0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w=="; + }; + }; "minimatch-9.0.3" = { name = "minimatch"; packageName = "minimatch"; @@ -53237,13 +52265,13 @@ let sha512 = "MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w=="; }; }; - "minipass-7.0.1" = { + "minipass-7.0.2" = { name = "minipass"; packageName = "minipass"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-7.0.1.tgz"; - sha512 = "NQ8MCKimInjVlaIqx51RKJJB7mINVkLTJbsZKmto4UAAOC/CWXES8PGaOgoBZyqoUsUA/U3DToGK7GJkkHbjJw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-7.0.2.tgz"; + sha512 = "eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA=="; }; }; "minipass-collect-1.0.2" = { @@ -53498,22 +52526,13 @@ let sha512 = "nbj022D7cd7n6hxDuON08SQciKHSTcRSFlLfCGyIuypo4cl6Z6qJxMVlatFyS6ZbgHqOebkYm/fvwtGiKqmSwQ=="; }; }; - "mlly-1.4.0" = { - name = "mlly"; - packageName = "mlly"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mlly/-/mlly-1.4.0.tgz"; - sha512 = "ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg=="; - }; - }; - "mobx-6.9.0" = { + "mobx-6.10.0" = { name = "mobx"; packageName = "mobx"; - version = "6.9.0"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.9.0.tgz"; - sha512 = "HdKewQEREEJgsWnErClfbFoVebze6rGazxFLU/XUyrII8dORfVszN1V0BMRnQSzcgsNNtkX8DHj3nC6cdWE9YQ=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.10.0.tgz"; + sha512 = "WMbVpCMFtolbB8swQ5E2YRrU+Yu8iLozCVx3CdGjbBKlP7dFiCSuiG06uea3JCFN5DnvtAX7+G5Bp82e2xu0ww=="; }; }; "mobx-react-7.6.0" = { @@ -53678,13 +52697,13 @@ let sha512 = "zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw=="; }; }; - "mongodb-client-encryption-2.8.0" = { + "mongodb-client-encryption-2.9.0" = { name = "mongodb-client-encryption"; packageName = "mongodb-client-encryption"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.8.0.tgz"; - sha512 = "wIcaETX0Acis9hJkUf2SvtPMq/F1G2gxZXgp8QAe2yJzL+cIUpii8Yv4i3LIeZVwYuYSue8F6/e4pHaE21On7A=="; + url = "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.9.0.tgz"; + sha512 = "OGMfTnS+JJ49ksWdExQ5048ynaQJLhPjbOi3i44PbU2sdufKH0Z4YZqn1pvd/eQ4WgLfbmSws3u9kAiFNFxpOg=="; }; }; "mongodb-connection-string-url-2.6.0" = { @@ -55353,15 +54372,6 @@ let sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; }; - "node-fetch-2.6.11" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.11"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz"; - sha512 = "4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w=="; - }; - }; "node-fetch-2.6.12" = { name = "node-fetch"; packageName = "node-fetch"; @@ -55407,6 +54417,15 @@ let sha512 = "cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow=="; }; }; + "node-fetch-3.3.2" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz"; + sha512 = "dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="; + }; + }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -55812,6 +54831,15 @@ let sha512 = "3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ=="; }; }; + "node-watch-0.7.4" = { + name = "node-watch"; + packageName = "node-watch"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-watch/-/node-watch-0.7.4.tgz"; + sha512 = "RinNxoz4W1cep1b928fuFhvAQ5ag/+1UlMDV7rbyGthBIgsiEouS4kvRayvvboxii4m8eolKOIBo3OjDqbc+uQ=="; + }; + }; "node-wsfederation-0.1.1" = { name = "node-wsfederation"; packageName = "node-wsfederation"; @@ -55938,15 +54966,6 @@ let sha512 = "uVTsuT8Hm3aN3VttY+BPKw4KU9lVpI0F22UAr/I1r6+kugMr3oyhMALkycikLcdfvGRsgzCYN48DYLBFcJEUVg=="; }; }; - "nopt-2.1.2" = { - name = "nopt"; - packageName = "nopt"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; - sha512 = "x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA=="; - }; - }; "nopt-3.0.6" = { name = "nopt"; packageName = "nopt"; @@ -56388,6 +55407,15 @@ let sha512 = "mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA=="; }; }; + "npm-pick-manifest-8.0.2" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz"; + sha512 = "1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg=="; + }; + }; "npm-prefix-1.2.0" = { name = "npm-prefix"; packageName = "npm-prefix"; @@ -56676,13 +55704,13 @@ let sha512 = "ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="; }; }; - "nx-16.5.0" = { + "nx-16.6.0" = { name = "nx"; packageName = "nx"; - version = "16.5.0"; + version = "16.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-16.5.0.tgz"; - sha512 = "X95atskaF1ejrF+C80mC4SwFPq0G/yFvxhfeWpPjKj7vUJEy1nZ4SjqlNVMORdN8dKQTE6ss76cIJux3fE7EXw=="; + url = "https://registry.npmjs.org/nx/-/nx-16.6.0.tgz"; + sha512 = "4UaS9nRakpZs45VOossA7hzSQY2dsr035EoPRGOc81yoMFW6Sqn1Rgq4hiLbHZOY8MnWNsLMkgolNMz1jC8YUQ=="; }; }; "nyc-15.1.0" = { @@ -57010,6 +56038,15 @@ let sha512 = "lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="; }; }; + "object.groupby-1.0.0" = { + name = "object.groupby"; + packageName = "object.groupby"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz"; + sha512 = "70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw=="; + }; + }; "object.hasown-1.1.2" = { name = "object.hasown"; packageName = "object.hasown"; @@ -57334,13 +56371,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.84.0" = { + "oo-ascii-tree-1.85.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.84.0"; + version = "1.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.84.0.tgz"; - sha512 = "8bvsAKFAQ7HwU3lAEDwsKYDkTqsDTsRTkr3J0gvH1U805d2no9rUNYptWzg3oYku5h5mr9Bko+BIh1pjSD8qrg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.85.0.tgz"; + sha512 = "5QKNfCtTeW5rcdKbd0owoZFzMxJ7oJl9I+FycBJ0/i8UVJYcZOKctN9TA82unIRgf/BrSaa0X3Nw0RJuiAnMfQ=="; }; }; "open-0.0.2" = { @@ -57541,24 +56578,6 @@ let sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; - "optimist-0.2.8" = { - name = "optimist"; - packageName = "optimist"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; - sha512 = "Wy7E3cQDpqsTIFyW7m22hSevyTLxw850ahYv7FWsw4G6MIKVTZ8NSA95KBrQ95a4SMsMr1UGUUnwEFKhVaSzIg=="; - }; - }; - "optimist-0.3.7" = { - name = "optimist"; - packageName = "optimist"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha512 = "TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ=="; - }; - }; "optimist-0.6.0" = { name = "optimist"; packageName = "optimist"; @@ -57847,15 +56866,6 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "outdent-0.8.0" = { - name = "outdent"; - packageName = "outdent"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/outdent/-/outdent-0.8.0.tgz"; - sha512 = "KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A=="; - }; - }; "ovsx-0.5.2" = { name = "ovsx"; packageName = "ovsx"; @@ -58360,6 +57370,15 @@ let sha512 = "j3M5EDh8iS1ONYu2WrFQ+w9Ap3pw8B9udXh7tHPcvjhKQDA/vt7v3JI8FEo/9R3ayTc3e/My8kSPQ8Rkns/ZMA=="; }; }; + "p2tr-2.0.0" = { + name = "p2tr"; + packageName = "p2tr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p2tr/-/p2tr-2.0.0.tgz"; + sha512 = "2Rp6mshhQc0JSMjXAGTGuvEzNIdzA6QCgzcwguF+/eF39Rglh7y0VsWd14kOmExf/klupOcb5HDkS/7leEGYHg=="; + }; + }; "pac-proxy-agent-4.1.0" = { name = "pac-proxy-agent"; packageName = "pac-proxy-agent"; @@ -58378,13 +57397,13 @@ let sha512 = "CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ=="; }; }; - "pac-proxy-agent-6.0.3" = { + "pac-proxy-agent-7.0.0" = { name = "pac-proxy-agent"; packageName = "pac-proxy-agent"; - version = "6.0.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-6.0.3.tgz"; - sha512 = "5Hr1KgPDoc21Vn3rsXBirwwDnF/iac1jN/zkpsOYruyT+ZgsUhUOgVwq3v9+ukjZd/yGm/0nzO1fDfl7rkGoHQ=="; + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.0.tgz"; + sha512 = "t4tRAMx0uphnZrio0S0Jw9zg3oDbz1zVhQ/Vy18FjLfP1XOLNUEjaVxYCYRI6NS+BsMBXKIzV6cTLOkO9AtywA=="; }; }; "pac-resolver-4.2.0" = { @@ -58405,13 +57424,13 @@ let sha512 = "cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q=="; }; }; - "pac-resolver-6.0.2" = { + "pac-resolver-7.0.0" = { name = "pac-resolver"; packageName = "pac-resolver"; - version = "6.0.2"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-6.0.2.tgz"; - sha512 = "EQpuJ2ifOjpZY5sg1Q1ZeAxvtLwR7Mj3RgY8cysPGbsRu3RBXyJFWxnMus9PScjxya/0LzvVDxNh/gl0eXBU4w=="; + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz"; + sha512 = "Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg=="; }; }; "package-hash-4.0.0" = { @@ -58603,15 +57622,6 @@ let sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; }; - "papaparse-5.4.1" = { - name = "papaparse"; - packageName = "papaparse"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz"; - sha512 = "HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw=="; - }; - }; "parallel-transform-1.2.0" = { name = "parallel-transform"; packageName = "parallel-transform"; @@ -59287,13 +58297,13 @@ let sha512 = "Iu90rROks+uDK00ppSewoZyqeCwjGR6W8PcY0Phl8YFWju/lRmIogQb98+vSb5RUeYkONL3IC4ZLBFg4FiE0Hg=="; }; }; - "password-prompt-1.1.2" = { + "password-prompt-1.1.3" = { name = "password-prompt"; packageName = "password-prompt"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz"; - sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA=="; + url = "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz"; + sha512 = "HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw=="; }; }; "patch-console-1.0.0" = { @@ -59602,15 +58612,6 @@ let sha512 = "TX+cz8Jk+ta7IvRy2FAej8rdlbrP0+uBIkP/5DTODez/AuL/vSb30KuAdDxGVREXzn8QfAiu5mJYJ1XjbOhEPA=="; }; }; - "pathe-1.1.0" = { - name = "pathe"; - packageName = "pathe"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pathe/-/pathe-1.1.0.tgz"; - sha512 = "ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w=="; - }; - }; "pathe-1.1.1" = { name = "pathe"; packageName = "pathe"; @@ -59809,15 +58810,6 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "picture-tuber-1.0.2" = { - name = "picture-tuber"; - packageName = "picture-tuber"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/picture-tuber/-/picture-tuber-1.0.2.tgz"; - sha512 = "49/xq+wzbwDeI32aPvwQJldM8pr7dKDRuR76IjztrkmiCkAQDaWFJzkmfVqCHmt/iFoPFhHmI9L0oKhthrTOQw=="; - }; - }; "pid-from-port-1.1.3" = { name = "pid-from-port"; packageName = "pid-from-port"; @@ -60088,15 +59080,6 @@ let sha512 = "0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA=="; }; }; - "pkg-types-1.0.3" = { - name = "pkg-types"; - packageName = "pkg-types"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz"; - sha512 = "nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A=="; - }; - }; "pkg-up-3.1.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -60160,22 +59143,22 @@ let sha512 = "9l2NKEiOjU+PBOxSnfo8Rsct6WiNXugMtbvxzF0tEWdKlRipINzld9NwTuYMMRuSUQLHgm2DSJqBqX4NMheJ5A=="; }; }; - "playwright-1.35.1" = { + "playwright-1.36.2" = { name = "playwright"; packageName = "playwright"; - version = "1.35.1"; + version = "1.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/playwright/-/playwright-1.35.1.tgz"; - sha512 = "NbwBeGJLu5m7VGM0+xtlmLAH9VUfWwYOhUi/lSEDyGg46r1CA9RWlvoc5yywxR9AzQb0mOCm7bWtOXV7/w43ZA=="; + url = "https://registry.npmjs.org/playwright/-/playwright-1.36.2.tgz"; + sha512 = "4Fmlq3KWsl85Bl4InJw1NC21aeQV0iSZuFvTDcy1F8zVmXmgQRe89GxF8zMSRt/KIS+2tUolak7EXVl9aC+JdA=="; }; }; - "playwright-core-1.35.1" = { + "playwright-core-1.36.2" = { name = "playwright-core"; packageName = "playwright-core"; - version = "1.35.1"; + version = "1.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz"; - sha512 = "pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg=="; + url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.2.tgz"; + sha512 = "sQYZt31dwkqxOrP7xy2ggDfEzUxM1lodjhsQ3NMMv5uGTRDsLxU0e4xf4wwMkF2gplIxf17QMBCodSFgm6bFVQ=="; }; }; "please-update-dependencies-2.0.0" = { @@ -60349,15 +59332,6 @@ let sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; }; }; - "png-js-0.1.1" = { - name = "png-js"; - packageName = "png-js"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz"; - sha512 = "NTtk2SyfjBm+xYl2/VZJBhFnTQ4kU5qWC7VC4/iGbrgiU4FuB4xC+74erxADYJIqZICOR1HCvRA7EBHkpjTg9g=="; - }; - }; "pngjs-3.4.0" = { name = "pngjs"; packageName = "pngjs"; @@ -60493,13 +59467,13 @@ let sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; }; }; - "postcss-8.4.25" = { + "postcss-8.4.27" = { name = "postcss"; packageName = "postcss"; - version = "8.4.25"; + version = "8.4.27"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz"; - sha512 = "7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz"; + sha512 = "gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="; }; }; "postcss-calc-7.0.5" = { @@ -60934,15 +59908,6 @@ let sha512 = "ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g=="; }; }; - "postcss-modules-6.0.0" = { - name = "postcss-modules"; - packageName = "postcss-modules"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-6.0.0.tgz"; - sha512 = "7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ=="; - }; - }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -61996,15 +60961,6 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; - "prettier-2.8.6" = { - name = "prettier"; - packageName = "prettier"; - version = "2.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.8.6.tgz"; - sha512 = "mtuzdiBbHwPEgl7NxWlqOkithPyp4VN93V7VeHVWBF+ad3I5avc0RVDT4oImXQy9H/AqxA2NSQH8pSxHW6FYbQ=="; - }; - }; "prettier-2.8.8" = { name = "prettier"; packageName = "prettier"; @@ -62014,6 +60970,15 @@ let sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="; }; }; + "prettier-3.0.0" = { + name = "prettier"; + packageName = "prettier"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz"; + sha512 = "zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -62032,13 +60997,13 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-plugin-astro-0.10.0" = { + "prettier-plugin-astro-0.11.0" = { name = "prettier-plugin-astro"; packageName = "prettier-plugin-astro"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.10.0.tgz"; - sha512 = "dPzop0gKZyVGpTDQmfy+e7FKXC9JT3mlpfYA2diOVz+Ui+QR1U4G/s+OesKl2Hib2JJOtAYJs/l+ovgT0ljlFA=="; + url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.11.0.tgz"; + sha512 = "rl2hJ4Kty/aEfGjk3i4JS+bpng9MjgvwqLRNzeb9NqYhqKoWNwOR39cIJXFjU1vR3zYOPnwWNRMelKb0orunYA=="; }; }; "prettier-plugin-svelte-2.10.1" = { @@ -62113,13 +61078,13 @@ let sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; - "pretty-format-29.6.1" = { + "pretty-format-29.6.2" = { name = "pretty-format"; packageName = "pretty-format"; - version = "29.6.1"; + version = "29.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz"; - sha512 = "7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz"; + sha512 = "1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg=="; }; }; "pretty-hash-1.0.1" = { @@ -62743,15 +61708,6 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.2.3" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz"; - sha512 = "TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg=="; - }; - }; "protobufjs-7.2.4" = { name = "protobufjs"; packageName = "protobufjs"; @@ -62824,13 +61780,13 @@ let sha512 = "gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g=="; }; }; - "proxy-agent-6.2.1" = { + "proxy-agent-6.3.0" = { name = "proxy-agent"; packageName = "proxy-agent"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.2.1.tgz"; - sha512 = "OIbBKlRAT+ycCm6wAYIzMwPejzRtjy8F3QiDX0eKOA3e4pe3U9F/IvzcHP42bmgQxVv97juG+J8/gx+JIeCX/Q=="; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz"; + sha512 = "0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og=="; }; }; "proxy-from-env-1.1.0" = { @@ -63895,13 +62851,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.316" = { + "pyright-1.1.319" = { name = "pyright"; packageName = "pyright"; - version = "1.1.316"; + version = "1.1.319"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.316.tgz"; - sha512 = "Pdb9AwOO07uNOuEVtwCThyDpB0wigWmLjeCw5vdPG7gVbVYYgY2iw64kBdwTu78NrO0igVKzmoRuApMoL6ZE0w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.319.tgz"; + sha512 = "6AC0r2r5rT0BpcPH7S27JS0CpFNKvvfdTRLinWwzeMdJCma9ceF8zUgnvMahHfLUcXn4fyypfth9Dito9tey8g=="; }; }; "q-1.1.2" = { @@ -64300,31 +63256,31 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quicktype-core-23.0.54" = { + "quicktype-core-23.0.63" = { name = "quicktype-core"; packageName = "quicktype-core"; - version = "23.0.54"; + version = "23.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.54.tgz"; - sha512 = "sQzGy+HyUpGeE6dPcUVgmcbN2saLsnyO4Vvy3NyqmoNJJQzR6uYnQQtmAYnaiR3SCUyMuy1/WPGssB89CcCQ7g=="; + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.63.tgz"; + sha512 = "bVJMCkFE1va8uTNQzTLeJZt0hXfdipkVDxO5g3O/T7DCSVO3oP/yI+Ymv/5+wpS1rcyDBu1pxroedKup6f7htQ=="; }; }; - "quicktype-graphql-input-23.0.54" = { + "quicktype-graphql-input-23.0.63" = { name = "quicktype-graphql-input"; packageName = "quicktype-graphql-input"; - version = "23.0.54"; + version = "23.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-23.0.54.tgz"; - sha512 = "gmn2wnS+45dnR6p9UaK7g+I4QZMlQDRHtLKYWWRTG4hU/Nbpc4UMpuEIyChX7Qc/hzx3j7f3A1Gt3S7QNGo6Kw=="; + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-23.0.63.tgz"; + sha512 = "4EjqeQn6xM/UzG7RKj8a0WVnezq/41j5l4qmThBobM9EAqdbCGVoukxvjAznz6YDMAze1t1bFnoLzifU8TxrEQ=="; }; }; - "quicktype-typescript-input-23.0.54" = { + "quicktype-typescript-input-23.0.63" = { name = "quicktype-typescript-input"; packageName = "quicktype-typescript-input"; - version = "23.0.54"; + version = "23.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-23.0.54.tgz"; - sha512 = "3nUtrmNdU9MnK82yL4sIt6jghmgI5vcBEK+3Y4K0Elw3s4EK57K92OnXs1AzW7mkBYc6Yz+9MWK+vG72FB1BBg=="; + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-23.0.63.tgz"; + sha512 = "VVKlMzMWbXvdWtL+00yOUwAtZC7piC75Ik3bHzdqY0V7bm1j3Lodguq07j4ed96saxqWRh6rfeXXsdbOhRyXRA=="; }; }; "quotation-1.1.3" = { @@ -64570,13 +63526,13 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; - "rate-limiter-flexible-2.4.1" = { + "rate-limiter-flexible-2.4.2" = { name = "rate-limiter-flexible"; packageName = "rate-limiter-flexible"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.4.1.tgz"; - sha512 = "dgH4T44TzKVO9CLArNto62hJOwlWJMLUjVVr/ii0uUzZXEXthDNr7/yefW5z/1vvHAfycc1tnuiYyNJ8CTRB3g=="; + url = "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.4.2.tgz"; + sha512 = "rMATGGOdO1suFyf/mI5LYhts71g1sbdhmd6YvdiXO2gJnd42Tt6QS4JUKJKSWVVkMtBacm6l40FR7Trjo6Iruw=="; }; }; "raven-js-3.27.2" = { @@ -64732,13 +63688,13 @@ let sha512 = "xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA=="; }; }; - "re2-1.19.1" = { + "re2-1.20.1" = { name = "re2"; packageName = "re2"; - version = "1.19.1"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/re2/-/re2-1.19.1.tgz"; - sha512 = "pML2LZvGdjESWAsufwlFwF+TBauIx7ItgcPIL0KiiZ9GrJ5OU3aJEc/EZvygB32nhjrRxe6QQFbie79QhT7gVA=="; + url = "https://registry.npmjs.org/re2/-/re2-1.20.1.tgz"; + sha512 = "JbzIoI5adNCqGUK8wHG1dMSyggvPyA4kx2hewt1lma5sP7/iWCfM15XKbCZlX2yvu5k80jSKAOQqJF7KC+2n8Q=="; }; }; "react-16.14.0" = { @@ -64768,13 +63724,13 @@ let sha512 = "/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="; }; }; - "react-devtools-core-4.27.8" = { + "react-devtools-core-4.28.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.27.8"; + version = "4.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.27.8.tgz"; - sha512 = "KwoH8/wN/+m5wTItLnsgVraGNmFrcTWR3k1VimP1HjtMMw4CNF+F5vg4S/0tzTEKIdpCi2R7mPNTC+/dswZMgw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.0.tgz"; + sha512 = "E3C3X1skWBdBzwpOUbmXG8SgH6BtsluSMe+s6rRcujNKG1DGi8uIfhdhszkgDpAsMoE55hwqRUzeXCmETDBpTg=="; }; }; "react-dom-16.14.0" = { @@ -64903,15 +63859,6 @@ let sha512 = "wa0fGj7Zht1EYMRhKWwoo1H9GApxYLBuhoAuXN0TlltESAjDssB+Apf0T/DngVqaMyPypDmabL37vw/2aRM98Q=="; }; }; - "react-refresh-0.14.0" = { - name = "react-refresh"; - packageName = "react-refresh"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz"; - sha512 = "wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ=="; - }; - }; "react-refresh-0.4.3" = { name = "react-refresh"; packageName = "react-refresh"; @@ -65335,15 +64282,6 @@ let sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; - "readable-stream-4.3.0" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.3.0.tgz"; - sha512 = "MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ=="; - }; - }; "readable-stream-4.4.2" = { name = "readable-stream"; packageName = "readable-stream"; @@ -65488,15 +64426,6 @@ let sha512 = "E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ=="; }; }; - "recast-0.21.5" = { - name = "recast"; - packageName = "recast"; - version = "0.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz"; - sha512 = "hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg=="; - }; - }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -66559,15 +65488,6 @@ let sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; }; }; - "remark-mdx-frontmatter-1.1.1" = { - name = "remark-mdx-frontmatter"; - packageName = "remark-mdx-frontmatter"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-mdx-frontmatter/-/remark-mdx-frontmatter-1.1.1.tgz"; - sha512 = "7teX9DW4tI2WZkXS4DBxneYSY7NHiXl4AKdWDO9LXVweULlCT8OPWsOjLEnMIXViN1j+QcY8mfbq3k0EK6x3uA=="; - }; - }; "remark-message-control-6.0.0" = { name = "remark-message-control"; packageName = "remark-message-control"; @@ -66613,15 +65533,6 @@ let sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; }; }; - "remark-rehype-9.1.0" = { - name = "remark-rehype"; - packageName = "remark-rehype"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-rehype/-/remark-rehype-9.1.0.tgz"; - sha512 = "oLa6YmgAYg19zb0ZrBACh40hpBLteYROaPLhBXzLgjqyHQrN+gVP9N/FJvfzuNNuzCutktkroXEZBrxAxKhh7Q=="; - }; - }; "remark-retext-4.0.0" = { name = "remark-retext"; packageName = "remark-retext"; @@ -67018,15 +65929,6 @@ let sha512 = "efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg=="; }; }; - "require-like-0.1.2" = { - name = "require-like"; - packageName = "require-like"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz"; - sha512 = "oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A=="; - }; - }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -67306,15 +66208,6 @@ let sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; - "resolve.exports-2.0.2" = { - name = "resolve.exports"; - packageName = "resolve.exports"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz"; - sha512 = "X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg=="; - }; - }; "resp-modifier-6.0.2" = { name = "resp-modifier"; packageName = "resp-modifier"; @@ -67774,15 +66667,6 @@ let sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; }; }; - "rollup-3.26.2" = { - name = "rollup"; - packageName = "rollup"; - version = "3.26.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.26.2.tgz"; - sha512 = "6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA=="; - }; - }; "rollup-plugin-inject-3.0.2" = { name = "rollup-plugin-inject"; packageName = "rollup-plugin-inject"; @@ -68314,13 +67198,13 @@ let sha512 = "/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="; }; }; - "sass-1.63.6" = { + "sass-1.64.2" = { name = "sass"; packageName = "sass"; - version = "1.63.6"; + version = "1.64.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz"; - sha512 = "MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz"; + sha512 = "TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg=="; }; }; "sass-formatter-0.7.6" = { @@ -68692,6 +67576,15 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; + "semver-5.7.2" = { + name = "semver"; + packageName = "semver"; + version = "5.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"; + sha512 = "cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="; + }; + }; "semver-6.1.1" = { name = "semver"; packageName = "semver"; @@ -68710,22 +67603,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.0.0" = { + "semver-6.3.1" = { name = "semver"; packageName = "semver"; - version = "7.0.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - }; - "semver-7.2.3" = { - name = "semver"; - packageName = "semver"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.2.3.tgz"; - sha512 = "utbW9Z7ZxVvwiIWkdOMLOR9G/NFXh2aRucghkVrEMJWuC++r3lCkBC3LwqBinyHzGMAJxY5tn6VakZGHObq5ig=="; + url = "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"; + sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; }; }; "semver-7.3.2" = { @@ -68764,15 +67648,6 @@ let sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; - "semver-7.5.1" = { - name = "semver"; - packageName = "semver"; - version = "7.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz"; - sha512 = "Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw=="; - }; - }; "semver-7.5.2" = { name = "semver"; packageName = "semver"; @@ -69637,6 +68512,15 @@ let sha512 = "MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q=="; }; }; + "signal-exit-4.1.0" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz"; + sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="; + }; + }; "signals-1.0.0" = { name = "signals"; packageName = "signals"; @@ -69655,13 +68539,13 @@ let sha512 = "abgDPg1106vuZZOvw7cFwdCABddfJRz5akcCcchzTbhyhYnsG31y4AlZEgp315T7W3nQq5P4xeOm186ZiPVFzw=="; }; }; - "sigstore-1.7.0" = { + "sigstore-1.8.0" = { name = "sigstore"; packageName = "sigstore"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/sigstore/-/sigstore-1.7.0.tgz"; - sha512 = "KP7QULhWdlu3hlp+jw2EvgWKlOGOY9McLj/jrchLjHNlNPK0KWIwF919cbmOp6QiKXLmPijR2qH/5KYWlbtG9Q=="; + url = "https://registry.npmjs.org/sigstore/-/sigstore-1.8.0.tgz"; + sha512 = "ogU8qtQ3VFBawRJ8wjsBEX/vIFeHuGs1fm4jZtjWQwjo8pfAt7T/rh+udlAN4+QUe0IzA8qRSc/YZ7dHP6kh+w=="; }; }; "simple-concat-1.0.1" = { @@ -69736,15 +68620,6 @@ let sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; - "simple-git-3.19.0" = { - name = "simple-git"; - packageName = "simple-git"; - version = "3.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.19.0.tgz"; - sha512 = "hyH2p9Ptxjf/xPuL7HfXbpYt9gKhC1yWDh3KYIAYJJePAKV7AEjLN4xhp7lozOdNiaJ9jlVvAbBymVlcS2jRiA=="; - }; - }; "simple-git-3.19.1" = { name = "simple-git"; packageName = "simple-git"; @@ -69817,13 +68692,13 @@ let sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; }; - "simple-update-notifier-1.1.0" = { + "simple-update-notifier-2.0.0" = { name = "simple-update-notifier"; packageName = "simple-update-notifier"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; - sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; + url = "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz"; + sha512 = "a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w=="; }; }; "simple-websocket-4.3.1" = { @@ -70627,15 +69502,6 @@ let sha512 = "GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw=="; }; }; - "sort-object-keys-1.1.3" = { - name = "sort-object-keys"; - packageName = "sort-object-keys"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.3.tgz"; - sha512 = "855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg=="; - }; - }; "sort-on-4.1.1" = { name = "sort-on"; packageName = "sort-on"; @@ -70645,15 +69511,6 @@ let sha512 = "nj8myvTCEErLMMWnye61z1pV5osa7njoosoQNdylD8WyPYHoHCBQx/xn7mGJL6h4oThvGpYSIAxfm8VUr75qTQ=="; }; }; - "sort-package-json-1.57.0" = { - name = "sort-package-json"; - packageName = "sort-package-json"; - version = "1.57.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.57.0.tgz"; - sha512 = "FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q=="; - }; - }; "sorted-array-functions-1.3.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; @@ -70870,15 +69727,6 @@ let sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="; }; }; - "sparkline-0.1.2" = { - name = "sparkline"; - packageName = "sparkline"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sparkline/-/sparkline-0.1.2.tgz"; - sha512 = "t//aVOiWt9fi/e22ea1vXVWBDX+gp18y+Ch9sKqmHl828bRfvP2VtfTJVEcgWFBQHd0yDPNQRiHdqzCvbcYSDA=="; - }; - }; "sparse-bitfield-3.0.3" = { name = "sparse-bitfield"; packageName = "sparse-bitfield"; @@ -72328,15 +71176,6 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; - "stream-slice-0.1.2" = { - name = "stream-slice"; - packageName = "stream-slice"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz"; - sha512 = "QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA=="; - }; - }; "stream-splicer-2.0.1" = { name = "stream-splicer"; packageName = "stream-splicer"; @@ -72427,15 +71266,6 @@ let sha512 = "ztP79ug6S+I7td0Nd2GBeIKCm+vA54c+e60FY87metz5n/l6ydPELd2lxsljz8OpIhsRM9HkIiAwz85+S5G5/A=="; }; }; - "streaming-json-stringify-3.1.0" = { - name = "streaming-json-stringify"; - packageName = "streaming-json-stringify"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/streaming-json-stringify/-/streaming-json-stringify-3.1.0.tgz"; - sha512 = "axtfs3BDxAsrZ9swD163FBrXZ8dhJJp6kUI6C97TvUZG9RHKfbg9nFbXqEheFNOb3IYMEt2ag9F62sWLFUZ4ug=="; - }; - }; "streamroller-3.1.5" = { name = "streamroller"; packageName = "streamroller"; @@ -73210,13 +72040,13 @@ let sha512 = "qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA=="; }; }; - "stubborn-fs-1.2.4" = { + "stubborn-fs-1.2.5" = { name = "stubborn-fs"; packageName = "stubborn-fs"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-1.2.4.tgz"; - sha512 = "KRa4nIRJ8q6uApQbPwYZVhOof8979fw4xbajBWa5kPJFa4nyY3aFaMWVyIVCDnkNCCG/3HLipUZ4QaNlYsmX1w=="; + url = "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-1.2.5.tgz"; + sha512 = "H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g=="; }; }; "style-loader-0.23.1" = { @@ -73246,15 +72076,6 @@ let sha512 = "Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg=="; }; }; - "style-to-object-0.4.1" = { - name = "style-to-object"; - packageName = "style-to-object"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz"; - sha512 = "HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw=="; - }; - }; "styled-components-5.3.11" = { name = "styled-components"; packageName = "styled-components"; @@ -73426,13 +72247,13 @@ let sha512 = "dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw=="; }; }; - "sucrase-3.32.0" = { + "sucrase-3.34.0" = { name = "sucrase"; packageName = "sucrase"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz"; - sha512 = "ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ=="; + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz"; + sha512 = "70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw=="; }; }; "sudo-block-1.2.0" = { @@ -73714,13 +72535,13 @@ let sha512 = "vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA=="; }; }; - "svelte-4.0.5" = { + "svelte-4.1.2" = { name = "svelte"; packageName = "svelte"; - version = "4.0.5"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-4.0.5.tgz"; - sha512 = "PHKPWP1wiWHBtsE57nCb8xiWB3Ht7/3Kvi3jac0XIxUM2rep8alO7YoAtgWeGD7++tFy46krilOrPW0mG3Dx+A=="; + url = "https://registry.npmjs.org/svelte/-/svelte-4.1.2.tgz"; + sha512 = "/evA8U6CgOHe5ZD1C1W3va9iJG7mWflcCdghBORJaAhD2JzrVERJty/2gl0pIPrJYBGZwZycH6onYf+64XXF9g=="; }; }; "svelte-preprocess-5.0.4" = { @@ -74002,13 +72823,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.18.6" = { + "systeminformation-5.18.10" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.18.6"; + version = "5.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.18.6.tgz"; - sha512 = "pLXv6kjJZ1xUcVs9SrCqbQ9y0x1rgRWxBUc8/KxpOp9IRxFGFfzVK5efsxBn/KdYog4C9rPcKk+kHNIL2SB/8Q=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.18.10.tgz"; + sha512 = "p7Su6y3MhKODBVOeQuJQG8jk3HvaU9dtSgVHT/pkRGj2g97n4fmYhYCJ2+djK0Ed5Zq4nSQ7zzEYFVlW71RbHg=="; }; }; "sywac-1.3.0" = { @@ -74129,13 +72950,13 @@ let sha512 = "y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA=="; }; }; - "tailwindcss-3.3.2" = { + "tailwindcss-3.3.3" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz"; - sha512 = "9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz"; + sha512 = "A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w=="; }; }; "taketalk-1.0.0" = { @@ -74426,15 +73247,6 @@ let sha512 = "B2I9X7+o2wOaW4r/CWMkpOO9mdiTRCxXNgob6iGvPmfPWgH/KyUD6Uy5crtWBxIBe3YrNZKR2lSzv1JJKWD4vA=="; }; }; - "term-canvas-0.0.5" = { - name = "term-canvas"; - packageName = "term-canvas"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/term-canvas/-/term-canvas-0.0.5.tgz"; - sha512 = "eZ3rIWi5yLnKiUcsW8P79fKyooaLmyLWAGqBhFspqMxRNUiB4GmHHk5AzQ4LxvFbJILaXqQZLwbbATLOhCFwkw=="; - }; - }; "term-img-5.0.0" = { name = "term-img"; packageName = "term-img"; @@ -74543,13 +73355,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.18.2" = { + "terser-5.19.2" = { name = "terser"; packageName = "terser"; - version = "5.18.2"; + version = "5.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.18.2.tgz"; - sha512 = "Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w=="; + url = "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz"; + sha512 = "qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -75200,24 +74012,6 @@ let sha512 = "Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg=="; }; }; - "tldts-6.0.5" = { - name = "tldts"; - packageName = "tldts"; - version = "6.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tldts/-/tldts-6.0.5.tgz"; - sha512 = "2JQhXcZbp8eh2Ka81yvu5WzBa7NPKhGhXHy+dz0grD7w3DjgK0CsryEwNjVs6i170VF4sZAkwP8pGb1q53wiiQ=="; - }; - }; - "tldts-core-6.0.9" = { - name = "tldts-core"; - packageName = "tldts-core"; - version = "6.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/tldts-core/-/tldts-core-6.0.9.tgz"; - sha512 = "GYMB8Oh/ivuXHE0NPrcgWyRbmuSYVqt8ouvMhlboQHcR7eys4cTl/uBNPwx+yAAQVpkBo5vkWRR4/pmCcxGRmw=="; - }; - }; "tmp-0.0.29" = { name = "tmp"; packageName = "tmp"; @@ -75236,15 +74030,6 @@ let sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; - "tmp-0.1.0" = { - name = "tmp"; - packageName = "tmp"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz"; - sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; - }; - }; "tmp-0.2.1" = { name = "tmp"; packageName = "tmp"; @@ -75506,15 +74291,6 @@ let sha512 = "6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ=="; }; }; - "toml-3.0.0" = { - name = "toml"; - packageName = "toml"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz"; - sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="; - }; - }; "too-hot-1.0.1" = { name = "too-hot"; packageName = "too-hot"; @@ -75794,13 +74570,13 @@ let sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; }; }; - "tree-kit-0.7.4" = { + "tree-kit-0.7.5" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.4.tgz"; - sha512 = "Of3tPmVs3b6BhzyUJ7t0olisf47kYr9qAm0XaUpURMjdBn6TwiVaaMuTFoKkkvPGojd9trKAHlrGGcGKcdR1DA=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.5.tgz"; + sha512 = "CmyY7d0OYE5W6UCmvij+SaocG7z+q4roF+Oj7BtU8B+KlpdiRZRMUwNyqfmWYcpYgsOcY1/dfIx/VsLmbAOLGg=="; }; }; "treeify-1.1.0" = { @@ -75911,13 +74687,13 @@ let sha512 = "rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="; }; }; - "triple-beam-1.3.0" = { + "triple-beam-1.4.1" = { name = "triple-beam"; packageName = "triple-beam"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"; - sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; + url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz"; + sha512 = "aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg=="; }; }; "trough-1.0.5" = { @@ -76010,6 +74786,15 @@ let sha512 = "Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="; }; }; + "ts-is-present-1.2.2" = { + name = "ts-is-present"; + packageName = "ts-is-present"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-is-present/-/ts-is-present-1.2.2.tgz"; + sha512 = "cA5MPLWGWYXvnlJb4TamUUx858HVHBsxxdy8l7jxODOLDyGYnQOllob2A2jyDghGa5iJHs2gzFNHvwGJ0ZfR8g=="; + }; + }; "ts-loader-9.4.4" = { name = "ts-loader"; packageName = "ts-loader"; @@ -76046,13 +74831,13 @@ let sha512 = "FZIXf1ksVyLcfr7M317jbB67XFJhOO1YqdTcuGaq9q5jLUoTikukZ+98TPjKiP2jC5CgmYdWWYs0s2nLSU0/1A=="; }; }; - "tsconfck-2.1.1" = { + "tsconfck-2.1.2" = { name = "tsconfck"; packageName = "tsconfck"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.1.1.tgz"; - sha512 = "ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww=="; + url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.1.2.tgz"; + sha512 = "ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg=="; }; }; "tsconfig-5.0.3" = { @@ -76163,13 +74948,13 @@ let sha512 = "mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="; }; }; - "tslib-2.6.0" = { + "tslib-2.6.1" = { name = "tslib"; packageName = "tslib"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz"; - sha512 = "7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz"; + sha512 = "t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="; }; }; "tslint-5.20.1" = { @@ -76595,6 +75380,15 @@ let sha512 = "qj9wWsnFvVEMUDbESiilKeXeHL7FwwiFcogfhfyjmvT968RXSvnl23f1JOClTHYItsi7o501C/7qVllscUP3oA=="; }; }; + "type-fest-3.13.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz"; + sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; + }; + }; "type-fest-3.5.1" = { name = "type-fest"; packageName = "type-fest"; @@ -76622,6 +75416,15 @@ let sha512 = "hR8JP2e8UiH7SME5JZjsobBlEiatFoxpzCP+R3ZeCo7kAaG1jXQE5X/buLzogM6GJu8le9Y4OcfNuIQX0rZskA=="; }; }; + "type-fest-4.0.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.0.0.tgz"; + sha512 = "d/oYtUnPM9zar2fqqGLYPzgcY0qUlYK0evgNVti93xpzfjGkMgZHu9Lvgrkn0rqGXTgsFRxFamzjGoD9Uo+dgw=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -76631,6 +75434,33 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; + "typed-array-buffer-1.0.0" = { + name = "typed-array-buffer"; + packageName = "typed-array-buffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"; + sha512 = "Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="; + }; + }; + "typed-array-byte-length-1.0.0" = { + name = "typed-array-byte-length"; + packageName = "typed-array-byte-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"; + sha512 = "Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA=="; + }; + }; + "typed-array-byte-offset-1.0.0" = { + name = "typed-array-byte-offset"; + packageName = "typed-array-byte-offset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"; + sha512 = "RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg=="; + }; + }; "typed-array-length-1.0.4" = { name = "typed-array-length"; packageName = "typed-array-length"; @@ -76802,13 +75632,13 @@ let sha512 = "zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA=="; }; }; - "typescript-5.2.0-dev.20230708" = { + "typescript-5.2.0-dev.20230801" = { name = "typescript"; packageName = "typescript"; - version = "5.2.0-dev.20230708"; + version = "5.2.0-dev.20230801"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.2.0-dev.20230708.tgz"; - sha512 = "2qQLKn6o4SCe1BuM4TAYVogdK+od0G2rjw61On6LE0am9aFuPxtGJg2SwVlJxDwVE7p7JdCFquhVTU+enDVRtw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.2.0-dev.20230801.tgz"; + sha512 = "f8FmzL+1+agawPPUzsd38vTiZD/z+RtGax/3+tzxsBP15O/4lMsliTEXRXF7ESC7a1s/f9HsNNRMne438PPZsw=="; }; }; "typescript-auto-import-cache-0.2.1" = { @@ -76838,13 +75668,13 @@ let sha512 = "IKawLTu4A2xN3aN/cPLxvZ0bhxZHILGDKTZWvWNJ3sLNhJ3PjfMEDQmR2VMpdRPrmWOadgWXRwjLBzSA8AGsaQ=="; }; }; - "typescript-json-schema-0.45.1" = { + "typescript-json-schema-0.59.0" = { name = "typescript-json-schema"; packageName = "typescript-json-schema"; - version = "0.45.1"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.45.1.tgz"; - sha512 = "Iz1NKVtJi09iZSzXj3J350GekBrZ1TiNw6Cbf42jLOGyooh9BWoi8XP6XlTIMOI3aMD8XxuL9hEvIEq8FD/WUw=="; + url = "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.59.0.tgz"; + sha512 = "eYB9RO8p4PntznWUukdDQHckNfxzjEFCJUgsWeCE43mcFioE0wXGTSECGk1uhty9XQMxkpuI4pKAqqnb62ln3Q=="; }; }; "typescript-tslint-plugin-0.5.4" = { @@ -76964,15 +75794,6 @@ let sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; - "ufo-1.1.2" = { - name = "ufo"; - packageName = "ufo"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ufo/-/ufo-1.1.2.tgz"; - sha512 = "TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ=="; - }; - }; "uglify-es-3.3.10" = { name = "uglify-es"; packageName = "uglify-es"; @@ -77126,15 +75947,6 @@ let sha512 = "vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ=="; }; }; - "ulid-2.3.0" = { - name = "ulid"; - packageName = "ulid"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz"; - sha512 = "keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw=="; - }; - }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -77684,15 +76496,6 @@ let sha512 = "VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ=="; }; }; - "unist-builder-3.0.1" = { - name = "unist-builder"; - packageName = "unist-builder"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.1.tgz"; - sha512 = "gnpOw7DIpCA0vpr6NqdPvTWnlPTApCTRzr+38E6hCWx3rz/cjo83SsKIlS1Z+L5ttScQ2AwutNnb8+tAvpb6qQ=="; - }; - }; "unist-util-find-1.0.2" = { name = "unist-util-find"; packageName = "unist-util-find"; @@ -77747,15 +76550,6 @@ let sha512 = "cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg=="; }; }; - "unist-util-generated-2.0.1" = { - name = "unist-util-generated"; - packageName = "unist-util-generated"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.1.tgz"; - sha512 = "qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A=="; - }; - }; "unist-util-inspect-4.1.4" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; @@ -79907,24 +78701,6 @@ let sha512 = "NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA=="; }; }; - "vite-4.4.2" = { - name = "vite"; - packageName = "vite"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.4.2.tgz"; - sha512 = "zUcsJN+UvdSyHhYa277UHhiJ3iq4hUBwHavOpsNUGsTgjBeoBlK8eDt+iT09pBq0h9/knhG/SPrZiM7cGmg7NA=="; - }; - }; - "vite-node-0.28.5" = { - name = "vite-node"; - packageName = "vite-node"; - version = "0.28.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vite-node/-/vite-node-0.28.5.tgz"; - sha512 = "LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA=="; - }; - }; "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; @@ -80006,58 +78782,58 @@ let sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; }; }; - "volar-service-css-0.0.7" = { + "volar-service-css-0.0.11" = { name = "volar-service-css"; packageName = "volar-service-css"; - version = "0.0.7"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.7.tgz"; - sha512 = "GKkPGlv/TymLm2HD4VwIxcA+VLmKd9ppxexr58RlHlCV4HYL7IBwASyEbIK1uS43UUhzDkzJHYzEuZkaiubE9w=="; + url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.11.tgz"; + sha512 = "8wkycHM+wSbsRSEvW4GCj3rKJRj+KxnGfRhQC1GfQVx4eMHJHHeSrB4ANPm5mBYbmnJPIxxIgZHp7VoMqDZH4g=="; }; }; - "volar-service-emmet-0.0.7" = { + "volar-service-emmet-0.0.11" = { name = "volar-service-emmet"; packageName = "volar-service-emmet"; - version = "0.0.7"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.7.tgz"; - sha512 = "6Pu642zl+6u7hzM2gv/sEmhdK4zDaJDVDZ1sbzgI6WaPae0m1zsPxgpP2b133aXFEVpT5fjpv8/TLM6AM3GG7g=="; + url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.11.tgz"; + sha512 = "9q6F1FaL3q/kxvt8EhbAmW8FtIf8Zi9FMHbuPSOQMn7/JlfXBtkB7y97uXvtQWpoxCumkuhY7kb1iBwtu7U+Eg=="; }; }; - "volar-service-html-0.0.7" = { + "volar-service-html-0.0.11" = { name = "volar-service-html"; packageName = "volar-service-html"; - version = "0.0.7"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.7.tgz"; - sha512 = "Ud1LTzD8SSKR5N6CQO94AEBPoVw+5x3SWZCK0s9kujWUG2tVdFBuApCxHdD+WstcOBolriJ1wY9PNhG4CHFpJA=="; + url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.11.tgz"; + sha512 = "Lm8ynBTDI8wMsPwZCoo5s195HBOGCONSZq4sUvrVXPjD1i5eKf+rYIVm7+h/cgbdqZApe8dWFbbqXgLGLodwIA=="; }; }; - "volar-service-prettier-0.0.7" = { + "volar-service-prettier-0.0.11" = { name = "volar-service-prettier"; packageName = "volar-service-prettier"; - version = "0.0.7"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.7.tgz"; - sha512 = "m96M64q3nmpu6IwjLDg/GQEAUaXmbxt+JVpvjU2WRz0TFE4ZQhhb+jsWM202URk0vcsn+LgCarjLmiOaKcyNOQ=="; + url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.11.tgz"; + sha512 = "A4vEU5BUitNNAySb+t/fCjEoL01uYUkoe/Fe5UxR3JJbdgr2nTeXb5IlW90/1vzmnTKZznadJV4i1SoAf2CRbg=="; }; }; - "volar-service-typescript-0.0.7" = { + "volar-service-typescript-0.0.11" = { name = "volar-service-typescript"; packageName = "volar-service-typescript"; - version = "0.0.7"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.7.tgz"; - sha512 = "3g5WBSjYF73kT/JePwOt2s3YMP4g9i+6Qg6f7gPKO0yOQ94hjRR5CLBTLhQcwj4SRv/7XYJsE+EtBO28L3A4dg=="; + url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.11.tgz"; + sha512 = "l0zY4RuqmLFIdqcKk8IfG2F1M0cn9Km1AdtTld1/kj8KyGhQfe2PsuVjz9wCG6SsR6kQt97YrpscZDvhb5aqQA=="; }; }; - "volar-service-typescript-twoslash-queries-0.0.7" = { + "volar-service-typescript-twoslash-queries-0.0.11" = { name = "volar-service-typescript-twoslash-queries"; packageName = "volar-service-typescript-twoslash-queries"; - version = "0.0.7"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.7.tgz"; - sha512 = "fNbHWQylkkoIfnfiXswXpa0e4Oa2mgj76sv1PwFMtPjW1Z0ZGT91BkU5OJh1NQaJOVfqcHo0Mh/X8DQJtXCtBg=="; + url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.11.tgz"; + sha512 = "onNK1g3vZVlPiD9HHFrGVNkdFWndosDSkMUWOWN5PxcocvVuZRZ8TN2iB2Ct0VDIZaXN3PK+fQpPCpq+yy1fXA=="; }; }; "vsce-2.15.0" = { @@ -80870,15 +79646,6 @@ let sha512 = "rWkTAGqs4TN6qreS06+irmFUMrQVx5KoFjD8CxMHUsAwmxw/upDcfleaEYOLsonUbornahg+VJ9xrWxp4udyJA=="; }; }; - "web-encoding-1.1.5" = { - name = "web-encoding"; - packageName = "web-encoding"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/web-encoding/-/web-encoding-1.1.5.tgz"; - sha512 = "HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA=="; - }; - }; "web-namespaces-1.1.4" = { name = "web-namespaces"; packageName = "web-namespaces"; @@ -81068,22 +79835,13 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.78.0" = { + "webpack-5.88.2" = { name = "webpack"; packageName = "webpack"; - version = "5.78.0"; + version = "5.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.78.0.tgz"; - sha512 = "gT5DP72KInmE/3azEaQrISjTvLYlSM0j1Ezhht/KLVkrqtv10JoP/RXhwmX/frrutOPuSq3o5Vq0ehR/4Vmd1g=="; - }; - }; - "webpack-5.88.1" = { - name = "webpack"; - packageName = "webpack"; - version = "5.88.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz"; - sha512 = "FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz"; + sha512 = "JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -81275,15 +80033,6 @@ let sha512 = "UlTm7Yz4meJV0THhZMrgRTE9v/vZ0xfUoJ/eOig98TvzsqNiW+FLSv5WaZeML3uJUPrMQ6K5jo1FJJFXNCc8+g=="; }; }; - "webpod-0.0.2" = { - name = "webpod"; - packageName = "webpod"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webpod/-/webpod-0.0.2.tgz"; - sha512 = "cSwwQIeg8v4i3p4ajHhwgR7N6VyxAf+KYSSsY6Pd3aETE+xEU4vbitz7qQkB0I321xnhDdgtxuiSfk5r/FVtjg=="; - }; - }; "websocket-driver-0.7.4" = { name = "websocket-driver"; packageName = "websocket-driver"; @@ -81338,13 +80087,13 @@ let sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; }; }; - "whatwg-fetch-3.6.2" = { + "whatwg-fetch-3.6.17" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.6.2"; + version = "3.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; - sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz"; + sha512 = "c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -81536,13 +80285,13 @@ let sha512 = "n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA=="; }; }; - "which-typed-array-1.1.9" = { + "which-typed-array-1.1.11" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.9"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; - sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz"; + sha512 = "qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="; }; }; "wide-align-1.1.5" = { @@ -81797,6 +80546,15 @@ let sha512 = "vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg=="; }; }; + "winston-3.10.0" = { + name = "winston"; + packageName = "winston"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-3.10.0.tgz"; + sha512 = "nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g=="; + }; + }; "winston-3.3.3" = { name = "winston"; packageName = "winston"; @@ -81824,15 +80582,6 @@ let sha512 = "MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew=="; }; }; - "winston-3.9.0" = { - name = "winston"; - packageName = "winston"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.9.0.tgz"; - sha512 = "jW51iW/X95BCW6MMtZWr2jKQBP4hV5bIDq9QrIjfDk6Q9QuxvTKEAlpUNAzP+HYHFFCeENhph16s0zEunu4uuQ=="; - }; - }; "winston-daily-rotate-file-4.7.1" = { name = "winston-daily-rotate-file"; packageName = "winston-daily-rotate-file"; @@ -81887,13 +80636,13 @@ let sha512 = "U0IUQHKXXn6PFo9nqsHphVCE5m3IntqZNB9Jjn7EB1lrR7YTDY3YWgFvEvwniTzXSvOH/XMzAZaIfJF/LvHYXg=="; }; }; - "wonka-6.3.2" = { + "wonka-6.3.3" = { name = "wonka"; packageName = "wonka"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/wonka/-/wonka-6.3.2.tgz"; - sha512 = "2xXbQ1LnwNS7egVm1HPhW2FyKrekolzhpM3mCwXdQr55gO+tAiY76rhb32OL9kKsW8taj++iP7C6hxlVzbnvrw=="; + url = "https://registry.npmjs.org/wonka/-/wonka-6.3.3.tgz"; + sha512 = "id4wYGsT6aEc8/3+by7NTHvTe0DwsOjv7vah0K0+AorV1MHKuS3OQ2g8DGsem1OEXrNShbVLPsg4kG2O6GZ2SQ=="; }; }; "word-wrap-1.2.3" = { @@ -81905,6 +80654,15 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; + "word-wrap-1.2.5" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"; + sha512 = "BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="; + }; + }; "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; @@ -81968,13 +80726,13 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "workerd-1.20230628.0" = { + "workerd-1.20230724.0" = { name = "workerd"; packageName = "workerd"; - version = "1.20230628.0"; + version = "1.20230724.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerd/-/workerd-1.20230628.0.tgz"; - sha512 = "V4b+xfsBtogUmDa5yYWWROgTAVkKi09sqbT/2dBh1KhEuRgENScgo/VysTtZsX5Fmxd8qEo1phpNJeTC+DW1iA=="; + url = "https://registry.npmjs.org/workerd/-/workerd-1.20230724.0.tgz"; + sha512 = "++D7JqS4/dk7zvtGpk+i/7G9bZtEl6lTtgAsIoSSGR1qJAxxEu21ktm9+FH0EYh7uKfizuM5H9lrTsR+3u44PA=="; }; }; "workerpool-6.2.1" = { @@ -82382,15 +81140,6 @@ let sha512 = "GojqklwG8gpzOVEVki5KudKNoq7MbbjYZCbyWzEz7tyPA7eleiE0+ePwOWQQRb5fm86rD3S8Tc0tSFf3AOv50w=="; }; }; - "x256-0.0.2" = { - name = "x256"; - packageName = "x256"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/x256/-/x256-0.0.2.tgz"; - sha512 = "ZsIH+sheoF8YG9YG+QKEEIdtqpHRA9FYuD7MqhfyB1kayXU43RUNBFSxBEnF8ywSUxdg+8no4+bPr5qLbyxKgA=="; - }; - }; "xcase-2.0.1" = { name = "xcase"; packageName = "xcase"; @@ -82463,15 +81212,6 @@ let sha512 = "KghrOEEEz6TOd2oTG28aP/rqsjCzVBttbY+le02KZr8xySxlxX0ssUCMyTzxcKaAIXOPFxyP6zFAs2V70E2xYg=="; }; }; - "xdm-2.1.0" = { - name = "xdm"; - packageName = "xdm"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdm/-/xdm-2.1.0.tgz"; - sha512 = "3LxxbxKcRogYY7cQSMy1tUuU1zKNK9YPqMT7/S0r7Cz2QpyF8O9yFySGD7caOZt+LWUOQioOIX+6ZzCoBCpcAA=="; - }; - }; "xenvar-0.5.1" = { name = "xenvar"; packageName = "xenvar"; @@ -82878,6 +81618,15 @@ let sha512 = "oFjw2YZPyu6HeO0JWCSqfhAALsjFPURsrD2FUFN3u213dWwYU68RFuLtSHco+cEUhpQFW+hRG3PNYgq8HatudQ=="; }; }; + "xstate-4.38.2" = { + name = "xstate"; + packageName = "xstate"; + version = "4.38.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xstate/-/xstate-4.38.2.tgz"; + sha512 = "Fba/DwEPDLneHT3tbJ9F3zafbQXszOlyCJyQqqdzmtlY/cwE2th462KK48yaANf98jHlP6lJvxfNtN0LFKXPQg=="; + }; + }; "xstream-11.14.0" = { name = "xstream"; packageName = "xstream"; @@ -83652,22 +82401,22 @@ let sha512 = "m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="; }; }; - "zod-to-json-schema-3.21.1" = { + "zod-to-json-schema-3.21.3" = { name = "zod-to-json-schema"; packageName = "zod-to-json-schema"; - version = "3.21.1"; + version = "3.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.21.1.tgz"; - sha512 = "y5g0MPxDq+YG/T+cHGPYH4PcBpyCqwK6wxeJ76MR563y0gk/14HKfebq8xHiItY7lkc9GDFygCnkvNDTvAhYAg=="; + url = "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.21.3.tgz"; + sha512 = "09W/9oyxeF1/wWnzCb6MursW+lOzgKi91QwE7eTBbC+t/qgfuLsUVDai3lHemSQnQu/UONAcT/fv3ZnDvbTeKg=="; }; }; - "zwave-js-11.4.0" = { + "zwave-js-11.8.1" = { name = "zwave-js"; packageName = "zwave-js"; - version = "11.4.0"; + version = "11.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-11.4.0.tgz"; - sha512 = "WojKQv2sEInP0HJz6O52f1qiQsighIwXA4uI0db/DCPWKtBg7k+9Lt6UAhR1RPoCQs7jUpqUPNLzUdbtFLBZjw=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-11.8.1.tgz"; + sha512 = "lza3wJdDGS60cEKm/CoIyzaSxF+xf+ExYM131UAjPlN9JQKIiFG+cZH1tWg6bw4O+L6WRNaOl27afFjFWEnz2Q=="; }; }; "zwitch-1.0.5" = { @@ -83688,30 +82437,21 @@ let sha512 = "bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="; }; }; - "zxcvbn-4.4.2" = { - name = "zxcvbn"; - packageName = "zxcvbn"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz"; - sha512 = "Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="; - }; - }; }; in { "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "16.1.4"; + version = "16.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-16.1.4.tgz"; - sha512 = "coSOLVLpOCOD5q9K9EAFFMrTES+HtdJiLy/iI9kdKNCKWUJpm8/svZ3JZOej3vPxYEp0AokXNOwORQnX21/qZQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-16.1.6.tgz"; + sha512 = "yXVgUKMXxlAHkhc6xk3ljR7TXpMLBykyu8do+ooSP08VKEQnWjTdVgrcOHd0n5w9YHXUQgBSmjDKxtQaBmvyZQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1601.4" - sources."@angular-devkit/core-16.1.4" - sources."@angular-devkit/schematics-16.1.4" + sources."@angular-devkit/architect-0.1601.6" + sources."@angular-devkit/core-16.1.6" + sources."@angular-devkit/schematics-16.1.6" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -83730,9 +82470,10 @@ in sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.2" sources."@pkgjs/parseargs-0.11.0" - sources."@schematics/angular-16.1.4" - sources."@sigstore/protobuf-specs-0.1.0" - sources."@sigstore/tuf-1.0.2" + sources."@schematics/angular-16.1.6" + sources."@sigstore/bundle-1.0.0" + sources."@sigstore/protobuf-specs-0.2.0" + sources."@sigstore/tuf-1.0.3" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" (sources."@tufjs/models-1.0.4" // { @@ -83766,7 +82507,7 @@ in (sources."cacache-17.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -83813,7 +82554,7 @@ in sources."fill-range-7.0.1" (sources."foreground-child-3.1.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) sources."fs-minipass-3.0.2" @@ -83860,7 +82601,7 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."json-parse-even-better-errors-3.0.0" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" @@ -83947,7 +82688,7 @@ in (sources."read-package-json-6.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -83973,7 +82714,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-1.7.0" + sources."sigstore-1.8.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" @@ -84003,7 +82744,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tuf-js-1.1.7" sources."type-fest-0.21.3" sources."unique-filename-3.0.0" @@ -84036,10 +82777,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.21.4"; + version = "0.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.21.4.tgz"; - sha512 = "O0Uv9LbLDSoEg26fnMDdDRiPwFJnQSoD4WnrflDwKCJm8Cx/0mV4cGxwBLXan5mGIrpK4Dd7vizf4rQm0QCEAA=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.21.5.tgz"; + sha512 = "rFmuqZMFa1OTRbxdu3vmfytsy1CtsIUFH0bO85rZ1xdu2uLoioSaEi6iOULDVTQUrnes50jMs+UW355Ndj7Oxg=="; }; buildInputs = globalBuildInputs; meta = { @@ -84054,13 +82795,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "2.0.17"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.0.17.tgz"; - sha512 = "FHW77ypcviluoirLZVFCWp3N+xWmlc+3GlfmQsuk+abozEziIPLXkkWGNboy567kW0yeS9UyiHN6wSEo8+J+dw=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.2.0.tgz"; + sha512 = "zyEumkwcep3pGyMpcEJFEn96jV6pEg3CUtjehnT9KseDFqf+gPYTbw5nwOpN9uXIJ/E5bAxhqpkr3J2LCQHRrg=="; }; dependencies = [ - sources."@astrojs/compiler-1.5.5" + sources."@astrojs/compiler-1.5.7" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -84068,12 +82809,12 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@volar/kit-1.7.4" - sources."@volar/language-core-1.7.4" - sources."@volar/language-server-1.7.4" - sources."@volar/language-service-1.7.4" - sources."@volar/source-map-1.7.4" - sources."@volar/typescript-1.7.4" + sources."@volar/kit-1.10.0" + sources."@volar/language-core-1.10.0" + sources."@volar/language-server-1.10.0" + sources."@volar/language-service-1.10.0" + sources."@volar/source-map-1.10.0" + sources."@volar/typescript-1.10.0" (sources."@vscode/emmet-helper-2.9.2" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -84081,8 +82822,8 @@ in }) sources."@vscode/l10n-0.0.11" sources."braces-3.0.2" - sources."emmet-2.4.5" - sources."fast-glob-3.3.0" + sources."emmet-2.4.6" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -84095,8 +82836,8 @@ in sources."micromatch-4.0.5" sources."muggle-string-0.3.1" sources."picomatch-2.3.1" - sources."prettier-2.8.8" - sources."prettier-plugin-astro-0.10.0" + sources."prettier-3.0.0" + sources."prettier-plugin-astro-0.11.0" sources."queue-microtask-1.2.3" sources."request-light-0.7.0" sources."reusify-1.0.4" @@ -84109,12 +82850,12 @@ in sources."typesafe-path-0.2.2" sources."typescript-5.1.6" sources."typescript-auto-import-cache-0.3.0" - sources."volar-service-css-0.0.7" - sources."volar-service-emmet-0.0.7" - sources."volar-service-html-0.0.7" - sources."volar-service-prettier-0.0.7" - sources."volar-service-typescript-0.0.7" - sources."volar-service-typescript-twoslash-queries-0.0.7" + sources."volar-service-css-0.0.11" + sources."volar-service-emmet-0.0.11" + sources."volar-service-html-0.0.11" + sources."volar-service-prettier-0.0.11" + sources."volar-service-typescript-0.0.11" + sources."volar-service-typescript-twoslash-queries-0.0.11" (sources."vscode-css-languageservice-6.2.6" // { dependencies = [ sources."@vscode/l10n-0.0.14" @@ -84147,23 +82888,31 @@ in "@babel/cli" = nodeEnv.buildNodePackage { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.22.6"; + version = "7.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.22.6.tgz"; - sha512 = "Be3/RfEDmkMRGT1+ru5nTkfcvWz5jDOYg1V9rXqTz2u9Qt96O1ryboGvxVBp7wOnYWDB8DNHIWb6DThrpudfOw=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.22.9.tgz"; + sha512 = "nb2O7AThqRo7/E53EGiuAkMaRbb7J5Qp3RvN+dmua1U+kydm0oznkhqbTEG15yk26G/C3yL6OdZjzgl+DMXVVA=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.22.9" + (sources."@babel/helper-compilation-targets-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -84180,12 +82929,11 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.9" - sources."caniuse-lite-1.0.30001513" + sources."browserslist-4.21.10" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -84193,7 +82941,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.9.0" sources."debug-4.3.4" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -84216,7 +82964,7 @@ in sources."path-is-absolute-1.0.1" sources."picocolors-1.0.0" sources."pify-4.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."slash-2.0.0" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" @@ -84234,457 +82982,13 @@ in bypassCache = true; reconstructLock = true; }; - "@bitwarden/cli" = nodeEnv.buildNodePackage { - name = "_at_bitwarden_slash_cli"; - packageName = "@bitwarden/cli"; - version = "2023.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2023.5.0.tgz"; - sha512 = "y8g6yYGN5oykbk7iOvC/XDg4tUq4yG5PpM5kX5symMjGpLHhLyzLhRtI24Mgx5oprHaJYth7WPVA6QEPtxe1mw=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.1" - sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helpers-7.22.6" - (sources."@babel/highlight-7.22.5" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."@babel/parser-7.22.7" - sources."@babel/plugin-proposal-export-namespace-from-7.18.9" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.22.5" - sources."@babel/template-7.22.5" - sources."@babel/traverse-7.22.8" - sources."@babel/types-7.22.5" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - (sources."@jridgewell/trace-mapping-0.3.18" // { - dependencies = [ - sources."@jridgewell/sourcemap-codec-1.4.14" - ]; - }) - (sources."@koa/multer-3.0.2" // { - dependencies = [ - sources."multer-1.4.4" - ]; - }) - sources."@koa/router-10.1.1" - sources."@mapbox/node-pre-gyp-1.0.10" - sources."@nicolo-ribaudo/semver-v6-6.3.3" - sources."@phc/format-1.0.0" - sources."@tootallnate/once-1.1.2" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."accepts-1.3.8" - sources."acorn-8.10.0" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."append-field-1.0.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."argon2-0.30.3" - sources."asynckit-0.4.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."big-integer-1.6.51" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."browser-hrtime-1.1.8" - sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.9" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."busboy-0.2.14" - sources."bytes-3.1.2" - sources."cache-content-type-1.0.1" - sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001513" - sources."canvas-2.11.2" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."co-4.6.0" - sources."co-body-6.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."commander-7.2.0" - sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."string_decoder-1.1.1" - ]; - }) - sources."console-control-strings-1.1.0" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" - (sources."cookies-0.8.0" // { - dependencies = [ - sources."depd-2.0.0" - ]; - }) - sources."copy-to-2.0.1" - sources."core-util-is-1.0.3" - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - sources."data-urls-2.0.0" - sources."debug-4.3.4" - sources."decimal.js-10.4.3" - sources."decompress-response-4.2.1" - sources."deep-equal-1.0.1" - sources."defaults-1.0.4" - sources."define-lazy-prop-2.0.0" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.2.0" - sources."detect-libc-2.0.1" - sources."dicer-0.2.5" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."external-editor-3.1.0" - sources."figures-3.2.0" - sources."fix-esm-1.0.1" - sources."form-data-4.0.0" - sources."fresh-0.5.2" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gauge-3.0.2" - sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" - sources."glob-7.2.3" - sources."globals-11.12.0" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-2.0.1" - sources."http-assert-1.5.0" - sources."http-errors-1.8.1" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."immediate-3.0.6" - sources."inflation-2.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."inquirer-8.2.5" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-interactive-1.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."is-promise-2.2.2" - sources."is-unicode-supported-0.1.0" - sources."is-wsl-2.2.0" - sources."isarray-0.0.1" - sources."js-tokens-4.0.0" - (sources."jsdom-16.7.0" // { - dependencies = [ - sources."form-data-3.0.1" - ]; - }) - sources."jsesc-2.5.2" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.3" - (sources."jszip-3.10.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."string_decoder-1.1.1" - ]; - }) - sources."keygrip-1.1.0" - (sources."koa-2.14.2" // { - dependencies = [ - sources."depd-2.0.0" - ]; - }) - sources."koa-bodyparser-4.4.0" - sources."koa-compose-4.2.0" - sources."koa-convert-2.0.0" - sources."koa-is-json-1.0.0" - sources."koa-json-2.0.2" - sources."lie-3.3.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lowdb-1.0.0" - sources."lru-cache-5.1.1" - sources."lunr-2.3.9" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."media-typer-0.3.0" - sources."methods-1.1.2" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - (sources."multer-1.4.5-lts.1" // { - dependencies = [ - sources."busboy-1.6.0" - sources."streamsearch-1.1.0" - ]; - }) - sources."mute-stream-0.0.8" - sources."nan-2.17.0" - sources."negotiator-0.6.3" - sources."node-addon-api-5.1.0" - (sources."node-fetch-2.6.11" // { - dependencies = [ - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) - sources."node-forge-1.3.1" - sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.13" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.7" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."only-0.0.2" - sources."open-8.4.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."pako-1.0.11" - sources."papaparse-5.4.1" - sources."parse5-6.0.1" - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-6.2.1" - sources."picocolors-1.0.0" - sources."pify-3.0.0" - sources."process-nextick-args-2.0.1" - sources."proper-lockfile-4.1.2" - sources."psl-1.9.0" - sources."punycode-2.3.0" - sources."qs-6.11.2" - sources."querystringify-2.2.0" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."depd-2.0.0" - sources."http-errors-2.0.0" - sources."statuses-2.0.1" - ]; - }) - sources."readable-stream-1.1.14" - sources."requires-port-1.0.0" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."rxjs-7.8.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."saxes-5.0.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - sources."set-blocking-2.0.0" - sources."setimmediate-1.0.5" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."source-map-0.6.1" - sources."statuses-1.5.0" - sources."steno-0.4.4" - (sources."streaming-json-stringify-3.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."string_decoder-1.1.1" - ]; - }) - sources."streamsearch-0.1.2" - sources."string-width-4.2.3" - sources."string_decoder-0.10.31" - sources."strip-ansi-6.0.1" - sources."supports-color-5.5.0" - sources."symbol-tree-3.2.4" - (sources."tar-6.1.15" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."yallist-4.0.0" - ]; - }) - sources."through-2.3.8" - sources."tldts-6.0.5" - sources."tldts-core-6.0.9" - sources."tmp-0.0.33" - sources."to-fast-properties-2.0.0" - sources."toidentifier-1.0.1" - sources."tough-cookie-4.1.3" - sources."tr46-2.1.0" - sources."tslib-2.6.0" - sources."tsscmp-1.0.6" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."universalify-0.2.0" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.11" - sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."vary-1.1.2" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-6.1.0" - sources."whatwg-encoding-1.0.5" - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.7.0" - sources."wide-align-1.1.5" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-7.5.9" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" - sources."xtend-4.0.2" - sources."yallist-3.1.1" - sources."ylru-1.3.2" - sources."zxcvbn-4.4.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A secure and free password manager for all of your devices."; - homepage = "https://bitwarden.com"; - license = "GPL-3.0-only"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "17.6.6"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.6.6.tgz"; - sha512 = "sTKpr2i/Fjs9OmhU+beBxjPavpnLSqZaO6CzwKVq2Tc4UYVTMFgpKOslDhUBVlfAUBfjVO8ParxC/MXkIOevEA=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.6.7.tgz"; + sha512 = "nzZmfO5KIOupYppn1MsnYX/80I+KDlxiwkks3CJT0XT+t34UgqGi3eSyEuzgcIjPlORk5/GMaAEiys78iLfGMg=="; }; dependencies = [ sources."@babel/code-frame-7.22.5" @@ -84699,18 +83003,18 @@ in sources."supports-color-5.5.0" ]; }) - sources."@commitlint/config-validator-17.4.4" - sources."@commitlint/ensure-17.4.4" + sources."@commitlint/config-validator-17.6.7" + sources."@commitlint/ensure-17.6.7" sources."@commitlint/execute-rule-17.4.0" sources."@commitlint/format-17.4.4" - sources."@commitlint/is-ignored-17.6.6" - sources."@commitlint/lint-17.6.6" - sources."@commitlint/load-17.5.0" + sources."@commitlint/is-ignored-17.6.7" + sources."@commitlint/lint-17.6.7" + sources."@commitlint/load-17.6.7" sources."@commitlint/message-17.4.2" - sources."@commitlint/parse-17.6.5" + sources."@commitlint/parse-17.6.7" sources."@commitlint/read-17.5.1" - sources."@commitlint/resolve-extends-17.4.4" - sources."@commitlint/rules-17.6.5" + sources."@commitlint/resolve-extends-17.6.7" + sources."@commitlint/rules-17.6.7" sources."@commitlint/to-lines-17.4.0" (sources."@commitlint/top-level-17.4.0" // { dependencies = [ @@ -84725,25 +83029,25 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/minimist-1.2.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" sources."acorn-8.10.0" @@ -84766,7 +83070,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" sources."cosmiconfig-8.2.0" - sources."cosmiconfig-typescript-loader-4.3.0" + sources."cosmiconfig-typescript-loader-4.4.0" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -84861,7 +83165,7 @@ in dependencies = [ sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."type-fest-0.6.0" ]; }) @@ -84899,7 +83203,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."ts-node-10.9.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-fest-0.18.1" sources."typescript-5.1.6" sources."universalify-2.0.0" @@ -84933,10 +83237,10 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "17.6.6"; + version = "17.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.6.6.tgz"; - sha512 = "phqPz3BDhfj49FUYuuZIuDiw+7T6gNAEy7Yew1IBHqSohVUCWOK2FXMSAExzS2/9X+ET93g0Uz83KjiHDOOFag=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.6.7.tgz"; + sha512 = "4oTpEUC0HRM54QRHBPMOJW1pETp7usxXn9RuNYNWHcmu8wi1mpws95hvS20u2n6HtIkTn0jfn7vHioCm4AGUTw=="; }; dependencies = [ sources."array-ify-1.0.0" @@ -84996,10 +83300,10 @@ in "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; - version = "6.14.1"; + version = "6.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-6.14.1.tgz"; - sha512 = "4YWTEAiIgr5rpVQBKMfx13JYjTzD4zfW6pXCqxg0vWQJ51xAJXS840E/BIknt0QdbVvUZo1bZ5I2S6LiWgVgvw=="; + url = "https://registry.npmjs.org/@forge/cli/-/cli-6.16.0.tgz"; + sha512 = "4sX1hrTWUxKXat4dmAcgrjR9NN4qTLegq9nL3D/rClj+j5p9nPixhtjPC5Zjyrgs2EAWKwzTNd2Z66HwqeRmhg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" @@ -85010,21 +83314,33 @@ in ]; }) sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" - sources."@babel/helper-create-class-features-plugin-7.22.6" + (sources."@babel/helper-compilation-targets-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-class-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-replace-supers-7.22.5" + sources."@babel/helper-replace-supers-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -85034,40 +83350,47 @@ in sources."@babel/helpers-7.22.6" sources."@babel/highlight-7.22.5" sources."@babel/parser-7.22.7" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.21.0" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-jsx-7.22.5" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-typescript-7.22.5" + sources."@babel/plugin-transform-class-properties-7.22.5" + sources."@babel/plugin-transform-class-static-block-7.22.5" sources."@babel/plugin-transform-modules-commonjs-7.22.5" + sources."@babel/plugin-transform-numeric-separator-7.22.5" + sources."@babel/plugin-transform-optional-chaining-7.22.6" sources."@babel/plugin-transform-react-jsx-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.5" + sources."@babel/plugin-transform-typescript-7.22.9" sources."@babel/preset-typescript-7.22.5" sources."@babel/template-7.22.5" sources."@babel/traverse-7.22.8" sources."@babel/types-7.22.5" sources."@colors/colors-1.5.0" + (sources."@cspotcode/source-map-support-0.8.1" // { + dependencies = [ + sources."@jridgewell/trace-mapping-0.3.9" + ]; + }) sources."@discoveryjs/json-ext-0.5.7" - sources."@forge/api-2.18.1" - sources."@forge/auth-0.0.2" - sources."@forge/babel-plugin-transform-ui-1.1.3" - sources."@forge/bundler-4.10.2" - sources."@forge/cli-shared-3.15.1" - sources."@forge/csp-2.1.3" - (sources."@forge/egress-1.2.1" // { + sources."@forge/api-2.18.3" + sources."@forge/auth-0.0.3" + sources."@forge/babel-plugin-transform-ui-1.1.5" + sources."@forge/bundler-4.10.4" + sources."@forge/cli-shared-3.17.0" + sources."@forge/csp-2.1.5" + (sources."@forge/egress-1.2.2" // { dependencies = [ sources."brace-expansion-2.0.1" sources."minimatch-5.1.6" ]; }) - sources."@forge/lint-3.6.1" - sources."@forge/manifest-4.16.0" - sources."@forge/runtime-4.4.3" - sources."@forge/storage-1.5.4" - sources."@forge/tunnel-3.6.2" - sources."@forge/util-1.2.3" + sources."@forge/lint-3.6.3" + sources."@forge/manifest-4.18.0" + sources."@forge/runtime-4.4.5" + sources."@forge/storage-1.5.5" + sources."@forge/tunnel-3.6.4" + sources."@forge/util-1.3.1" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -85080,30 +83403,46 @@ in }) sources."@jsdevtools/ono-7.1.3" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" - sources."@sentry-internal/tracing-7.57.0" - sources."@sentry/core-7.57.0" - (sources."@sentry/node-7.57.0" // { + sources."@sentry-internal/tracing-7.61.0" + sources."@sentry/core-7.61.0" + (sources."@sentry/node-7.61.0" // { dependencies = [ sources."cookie-0.4.2" ]; }) - sources."@sentry/types-7.57.0" - sources."@sentry/utils-7.57.0" + sources."@sentry/types-7.61.0" + sources."@sentry/utils-7.61.0" sources."@sindresorhus/is-4.6.0" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" + sources."@swc/helpers-0.5.1" + sources."@swc/wasm-1.3.73" sources."@szmarczak/http-timer-4.0.6" + sources."@tsconfig/node10-1.0.9" + sources."@tsconfig/node12-1.0.11" + sources."@tsconfig/node14-1.0.3" + sources."@tsconfig/node16-1.0.4" sources."@types/body-parser-1.19.2" sources."@types/bonjour-3.5.10" sources."@types/cacheable-request-6.0.3" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.5.0" - sources."@types/eslint-8.44.0" + sources."@types/eslint-8.44.1" sources."@types/eslint-scope-3.7.4" - sources."@types/estree-0.0.51" + sources."@types/estree-1.0.1" sources."@types/express-4.17.17" sources."@types/express-serve-static-core-4.17.35" sources."@types/html-minifier-terser-6.1.0" @@ -85113,7 +83452,7 @@ in sources."@types/json-schema-7.0.12" sources."@types/keyv-3.1.4" sources."@types/mime-1.3.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/node-fetch-2.6.4" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -85125,30 +83464,24 @@ in sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.5" sources."@types/yauzl-2.10.0" - sources."@typescript-eslint/types-5.61.0" - (sources."@typescript-eslint/typescript-estree-5.61.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.5.4" - sources."yallist-4.0.0" - ]; - }) - sources."@typescript-eslint/visitor-keys-5.61.0" - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-buffer-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/helper-wasm-section-1.11.1" - sources."@webassemblyjs/ieee754-1.11.1" - sources."@webassemblyjs/leb128-1.11.1" - sources."@webassemblyjs/utf8-1.11.1" - sources."@webassemblyjs/wasm-edit-1.11.1" - sources."@webassemblyjs/wasm-gen-1.11.1" - sources."@webassemblyjs/wasm-opt-1.11.1" - sources."@webassemblyjs/wasm-parser-1.11.1" - sources."@webassemblyjs/wast-printer-1.11.1" + sources."@typescript-eslint/types-5.62.0" + sources."@typescript-eslint/typescript-estree-5.62.0" + sources."@typescript-eslint/visitor-keys-5.62.0" + sources."@webassemblyjs/ast-1.11.6" + sources."@webassemblyjs/floating-point-hex-parser-1.11.6" + sources."@webassemblyjs/helper-api-error-1.11.6" + sources."@webassemblyjs/helper-buffer-1.11.6" + sources."@webassemblyjs/helper-numbers-1.11.6" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.6" + sources."@webassemblyjs/helper-wasm-section-1.11.6" + sources."@webassemblyjs/ieee754-1.11.6" + sources."@webassemblyjs/leb128-1.11.6" + sources."@webassemblyjs/utf8-1.11.6" + sources."@webassemblyjs/wasm-edit-1.11.6" + sources."@webassemblyjs/wasm-gen-1.11.6" + sources."@webassemblyjs/wasm-opt-1.11.6" + sources."@webassemblyjs/wasm-parser-1.11.6" + sources."@webassemblyjs/wast-printer-1.11.6" sources."@webpack-cli/configtest-1.2.0" sources."@webpack-cli/info-1.5.0" sources."@webpack-cli/serve-1.7.0" @@ -85162,14 +83495,12 @@ in sources."agent-base-6.0.2" (sources."ajv-6.12.6" // { dependencies = [ - sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-0.4.1" ]; }) (sources."ajv-formats-2.1.1" // { dependencies = [ sources."ajv-8.12.0" - sources."fast-deep-equal-3.1.3" ]; }) sources."ajv-keywords-3.5.2" @@ -85188,11 +83519,13 @@ in sources."string_decoder-1.1.1" ]; }) + sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array.prototype.flatmap-1.3.1" + sources."arraybuffer.prototype.slice-1.0.1" (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -85208,6 +83541,7 @@ in sources."async-request-handler-0.8.8" sources."asynckit-0.4.0" sources."atlassian-openapi-1.0.17" + sources."atomically-1.7.0" sources."available-typed-arrays-1.0.5" sources."babel-loader-8.3.0" sources."balanced-match-1.0.2" @@ -85225,7 +83559,6 @@ in (sources."body-parser-1.20.1" // { dependencies = [ sources."debug-2.6.9" - sources."iconv-lite-0.4.24" sources."ms-2.0.0" sources."qs-6.11.0" ]; @@ -85233,7 +83566,6 @@ in (sources."bonjour-service-1.1.1" // { dependencies = [ sources."array-flatten-2.1.2" - sources."fast-deep-equal-3.1.3" ]; }) sources."boolbase-1.0.0" @@ -85250,7 +83582,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" @@ -85262,7 +83594,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."case-1.6.3" sources."chai-4.3.7" (sources."chalk-2.4.2" // { @@ -85299,7 +83631,7 @@ in sources."cli-spinners-2.9.0" sources."cli-table3-0.6.3" sources."cli-width-3.0.0" - sources."cliui-7.0.4" + sources."cliui-8.0.1" sources."clone-1.0.4" sources."clone-deep-4.0.1" (sources."clone-response-1.0.3" // { @@ -85325,11 +83657,15 @@ in ]; }) sources."concat-map-0.0.1" - sources."conf-6.2.4" + (sources."conf-10.2.0" // { + dependencies = [ + sources."ajv-8.12.0" + ]; + }) sources."connect-history-api-fallback-2.0.0" sources."console-browserify-1.2.0" sources."content-disposition-0.5.4" - sources."content-security-policy-parser-0.3.0" + sources."content-security-policy-parser-0.4.1" sources."content-type-1.0.5" sources."convert-source-map-1.9.0" sources."cookie-0.5.0" @@ -85344,21 +83680,15 @@ in }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - (sources."cross-fetch-3.1.8" // { - dependencies = [ - sources."node-fetch-2.6.12" - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) + sources."create-require-1.1.1" + sources."cross-fetch-3.1.8" sources."cross-spawn-7.0.3" sources."crypto-browserify-3.12.0" sources."css-select-4.3.0" sources."css-what-6.1.0" sources."d-1.0.1" sources."dayjs-1.11.9" - sources."debounce-fn-3.0.1" + sources."debounce-fn-4.0.0" sources."debug-4.3.4" sources."decompress-response-6.0.0" sources."deep-eql-4.1.3" @@ -85373,9 +83703,10 @@ in sources."depd-2.0.0" sources."des.js-1.1.0" sources."destroy-1.2.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."detect-node-2.1.0" sources."didyoumean-1.2.2" + sources."diff-4.0.2" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -85390,11 +83721,10 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-case-3.0.4" - sources."dot-prop-5.3.0" + sources."dot-prop-6.0.1" sources."duplexer-0.1.2" - sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -85404,14 +83734,18 @@ in sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" - sources."encoding-0.1.13" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.15.0" sources."entities-2.2.0" sources."env-paths-2.2.1" sources."envinfo-7.10.0" - sources."es-abstract-1.21.2" - sources."es-module-lexer-0.9.3" + sources."es-abstract-1.22.1" + sources."es-module-lexer-1.3.0" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" @@ -85423,7 +83757,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.1" - sources."eslint-visitor-keys-3.4.1" + sources."eslint-visitor-keys-3.4.2" sources."esprima-4.0.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -85457,14 +83791,13 @@ in }) (sources."external-editor-3.1.0" // { dependencies = [ - sources."iconv-lite-0.4.24" sources."tmp-0.0.33" ]; }) sources."extract-files-9.0.0" sources."extract-zip-2.0.1" - sources."fast-deep-equal-2.0.1" - sources."fast-glob-3.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" @@ -85484,7 +83817,7 @@ in sources."for-each-0.3.3" sources."form-data-3.0.1" sources."forwarded-0.2.0" - sources."fp-ts-2.16.0" + sources."fp-ts-2.16.1" sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" @@ -85514,7 +83847,7 @@ in sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."graphql-15.8.0" - sources."graphql-request-3.4.0" + sources."graphql-request-3.7.0" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" sources."has-1.0.3" @@ -85570,7 +83903,7 @@ in sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" - sources."iconv-lite-0.6.3" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.4" sources."ignore-walk-3.0.4" @@ -85601,6 +83934,7 @@ in sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-interactive-1.0.0" sources."is-negative-zero-2.0.2" @@ -85615,8 +83949,7 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" - sources."is-typedarray-1.0.0" + sources."is-typed-array-1.1.12" sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" @@ -85637,20 +83970,19 @@ in sources."json-schema-to-typescript-9.1.1" sources."json-schema-traverse-1.0.0" sources."json-schema-typed-7.0.3" - sources."json-stable-stringify-1.0.2" sources."json-stringify-safe-5.0.1" sources."json5-2.2.3" sources."jsonfile-4.0.0" - sources."jsonify-0.0.1" sources."jsonpointer-5.0.1" sources."keytar-7.9.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kind-of-6.0.3" - sources."latest-version-5.1.0" + sources."latest-version-6.0.0" sources."launch-editor-2.6.0" sources."launchdarkly-eventsource-1.4.3" (sources."launchdarkly-js-sdk-common-4.3.3" // { dependencies = [ + sources."fast-deep-equal-2.0.1" sources."uuid-8.3.2" ]; }) @@ -85695,7 +84027,12 @@ in sources."lru-cache-5.1.1" sources."lru-queue-0.1.0" sources."lru_map-0.3.3" - sources."make-dir-3.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."make-error-1.3.6" sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."memfs-3.6.0" @@ -85713,7 +84050,7 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-3.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -85740,23 +84077,17 @@ in (sources."nock-10.0.6" // { dependencies = [ sources."mkdirp-0.5.6" - sources."semver-5.7.1" - ]; - }) - (sources."node-abi-3.45.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.5.4" - sources."yallist-4.0.0" + sources."semver-5.7.2" ]; }) + sources."node-abi-3.45.0" sources."node-addon-api-4.3.0" (sources."node-cache-5.1.2" // { dependencies = [ sources."clone-2.1.2" ]; }) - (sources."node-fetch-2.6.11" // { + (sources."node-fetch-2.6.12" // { dependencies = [ sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -85765,11 +84096,7 @@ in }) sources."node-forge-1.3.1" sources."node-gyp-build-4.6.0" - (sources."node-localstorage-1.3.1" // { - dependencies = [ - sources."write-file-atomic-1.3.4" - ]; - }) + sources."node-localstorage-1.3.1" sources."node-machine-id-1.1.12" sources."node-releases-2.0.13" sources."normalize-path-3.0.0" @@ -85786,7 +84113,11 @@ in sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-5.1.2" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."open-8.4.2" sources."opener-1.5.2" (sources."ora-4.1.1" // { @@ -85812,35 +84143,14 @@ in sources."p-locate-4.1.0" sources."p-retry-4.6.2" sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."get-stream-4.1.0" - sources."got-9.6.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."lowercase-keys-1.0.1" - sources."mimic-response-1.0.1" - sources."normalize-url-4.5.1" - sources."p-cancelable-1.1.0" - sources."responselike-1.0.2" - ]; - }) + sources."package-json-7.0.0" sources."pako-1.0.11" sources."param-case-3.0.4" sources."parse-asn1-5.1.6" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" sources."path-browserify-1.0.1" + sources."path-equal-1.2.5" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -85869,7 +84179,6 @@ in ]; }) sources."prebuild-install-7.1.1" - sources."prepend-http-2.0.0" sources."prettier-2.8.8" sources."pretty-error-4.0.0" sources."process-0.11.10" @@ -85891,11 +84200,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) + sources."raw-body-2.5.1" sources."rc-1.2.8" (sources."readable-stream-3.6.2" // { dependencies = [ @@ -85932,14 +84237,25 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-7.8.1" + (sources."safe-array-concat-1.0.0" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) 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."sanitize-filename-1.6.3" sources."schema-utils-2.7.1" sources."select-hose-2.0.0" sources."selfsigned-2.1.1" - sources."semver-6.3.0" + (sources."semver-7.5.4" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -86008,7 +84324,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.18.2" // { + (sources."terser-5.19.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -86026,13 +84342,8 @@ in sources."timers-browserify-2.0.12" sources."timers-ext-0.1.7" sources."tiny-each-async-2.0.3" - (sources."tmp-0.1.0" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) + sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."totalist-1.1.0" @@ -86042,15 +84353,14 @@ in ]; }) sources."truncate-utf8-bytes-1.0.2" + sources."ts-is-present-1.2.2" (sources."ts-loader-9.4.4" // { dependencies = [ sources."chalk-4.1.2" - sources."lru-cache-6.0.0" - sources."semver-7.5.4" - sources."yallist-4.0.0" ]; }) - sources."tslib-2.6.0" + sources."ts-node-10.9.1" + sources."tslib-2.6.1" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -86061,10 +84371,16 @@ in sources."type-detect-4.0.8" sources."type-fest-0.21.3" sources."type-is-1.6.18" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" - sources."typedarray-to-buffer-3.1.5" sources."typescript-4.9.5" - sources."typescript-json-schema-0.45.1" + (sources."typescript-json-schema-0.59.0" // { + dependencies = [ + sources."@types/node-16.18.39" + ]; + }) sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -86077,24 +84393,24 @@ in sources."urijs-1.19.11" sources."url-0.11.1" sources."url-parse-1.5.10" - sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."utf8-byte-length-1.0.4" - (sources."util-0.11.1" // { + (sources."util-0.12.5" // { dependencies = [ - sources."inherits-2.0.3" + sources."inherits-2.0.4" ]; }) sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."v8-compile-cache-lib-3.0.1" sources."vary-1.1.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."webpack-5.78.0" // { + (sources."webpack-5.88.2" // { dependencies = [ sources."schema-utils-3.3.0" ]; @@ -86109,7 +84425,6 @@ in dependencies = [ sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" - sources."fast-deep-equal-3.1.3" sources."schema-utils-4.2.0" ]; }) @@ -86117,7 +84432,6 @@ in dependencies = [ sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" - sources."fast-deep-equal-3.1.3" sources."http-proxy-middleware-2.0.6" sources."ipaddr.js-2.1.0" sources."schema-utils-4.2.0" @@ -86131,19 +84445,20 @@ in sources."whatwg-url-7.1.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wildcard-2.0.1" sources."winattr-3.0.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" + sources."write-file-atomic-1.3.4" sources."ws-7.5.9" sources."y18n-5.0.8" sources."yallist-3.1.1" sources."yaml-1.10.2" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" + sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" + sources."yn-3.1.1" sources."zip-stream-4.1.0" ]; buildInputs = globalBuildInputs; @@ -86186,6 +84501,7 @@ in sources."path-exists-4.0.0" ]; }) + sources."@ljharb/through-2.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -86203,11 +84519,11 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.683" + sources."all-package-names-2.0.706" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -86303,7 +84619,7 @@ in sources."decamelize-6.0.0" (sources."decamelize-keys-2.0.1" // { dependencies = [ - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) (sources."decompress-response-6.0.0" // { @@ -86314,7 +84630,7 @@ in sources."deep-extend-0.6.0" (sources."default-browser-4.0.0" // { dependencies = [ - sources."execa-7.1.1" + sources."execa-7.2.0" sources."human-signals-4.3.1" sources."is-stream-3.0.0" sources."mimic-fn-4.0.0" @@ -86346,7 +84662,7 @@ in sources."execa-5.1.1" sources."exit-hook-3.2.0" sources."external-editor-3.1.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -86490,7 +84806,7 @@ in sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-6.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kind-of-6.0.3" sources."latest-version-7.0.0" sources."lines-and-columns-1.2.4" @@ -86564,13 +84880,13 @@ in sources."lru-cache-7.18.3" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."map-obj-4.3.0" (sources."meow-12.0.1" // { dependencies = [ - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."merge-stream-2.0.0" @@ -86595,10 +84911,10 @@ in sources."chalk-5.3.0" sources."cli-width-4.0.0" sources."escape-string-regexp-5.0.0" - sources."execa-7.1.1" + sources."execa-7.2.0" sources."figures-5.0.0" sources."human-signals-4.3.1" - sources."inquirer-9.2.7" + sources."inquirer-9.2.9" sources."is-stream-3.0.0" sources."mimic-fn-4.0.0" sources."mute-stream-1.0.0" @@ -86629,7 +84945,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-1.1.1" // { dependencies = [ - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."callsites-4.0.0" ]; }) @@ -86641,17 +84957,17 @@ in (sources."p-memoize-7.1.1" // { dependencies = [ sources."mimic-fn-4.0.0" - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."p-timeout-6.1.2" sources."p-try-2.2.0" (sources."package-json-8.1.1" // { dependencies = [ - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."got-12.6.1" sources."http2-wrapper-2.2.0" sources."lowercase-keys-3.0.0" @@ -86771,7 +85087,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-5.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."types-eslintrc-1.0.3" @@ -86815,7 +85131,7 @@ in sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."pupa-2.1.1" @@ -86823,7 +85139,7 @@ in sources."responselike-1.0.2" (sources."semver-diff-3.1.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."type-fest-0.20.2" @@ -86909,7 +85225,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -87128,7 +85444,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -87585,7 +85901,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -87768,7 +86084,7 @@ in sources."which-module-2.0.1" sources."which-pm-runs-1.1.0" sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wordwrap-1.0.0" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" @@ -87799,10 +86115,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "10.2.4"; + version = "10.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.2.4.tgz"; - sha512 = "5y2wPpLE8AJiCODVXmcccTAbSvkCQ1EtJJahQoGsbcyTTVMrr7C7sW8VUELHI4JjlekU5+czAyDH2+PJI0ZBkQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.3.0.tgz"; + sha512 = "pbLhEJL99HHKDPUTnswotqfy+Zm/TsX9oseSNikrz07e47jq+UpVBJ22e9Co5qxPlP/E9VKoZHxkIz/A6M/2Ng=="; }; dependencies = [ sources."@babel/code-frame-7.22.5" @@ -87813,7 +86129,7 @@ in ]; }) sources."@puppeteer/browsers-0.5.0" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-regex-5.0.1" @@ -87920,68 +86236,68 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.100.1"; + version = "5.100.2"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.100.1.tgz"; - sha512 = "3AUAgLYDJ73dDIwy4ixTgQn9l1mZ+Ek7KfoPuJ61aQNS1A7r5JvQw4TdnAO3Lw0dTQ6Pdo7aOutz/zzpsHXyvA=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.100.2.tgz"; + sha512 = "tASyUwsXoClXZM/CXD1OlBJO08OIDKL+NR+QQGCj1FJ49ELKqn6icpozIpuAEzTSxvRZwCNnCTMgbiTg48mqOw=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/core-auth-1.4.0" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/core-client-1.7.3" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/core-http-2.3.2" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."form-data-4.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) - (sources."@azure/core-lro-2.5.3" // { + (sources."@azure/core-lro-2.5.4" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/core-paging-1.5.0" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/core-rest-pipeline-1.11.0" // { dependencies = [ sources."form-data-4.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/core-tracing-1.0.1" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/core-util-1.3.2" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/identity-2.1.0" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/logger-1.0.4" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@azure/msal-browser-2.38.0" // { @@ -87998,11 +86314,11 @@ in (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) sources."@babel/code-frame-7.22.5" - sources."@babel/generator-7.22.7" + sources."@babel/generator-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" @@ -88032,17 +86348,13 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@microsoft/rush-lib-5.100.1" + sources."@microsoft/rush-lib-5.100.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@opentelemetry/api-1.4.1" sources."@pnpm/crypto.base32-hash-2.0.0" - (sources."@pnpm/dependency-path-2.1.2" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) + sources."@pnpm/dependency-path-2.1.3" sources."@pnpm/error-1.4.0" (sources."@pnpm/link-bins-5.3.25" // { dependencies = [ @@ -88066,31 +86378,35 @@ in sources."graceful-fs-4.2.4" ]; }) - sources."@pnpm/types-9.1.0" + sources."@pnpm/types-9.2.0" (sources."@pnpm/write-project-manifest-1.1.7" // { dependencies = [ sources."@pnpm/types-6.4.0" ]; }) - sources."@rushstack/heft-config-file-0.12.4" - (sources."@rushstack/node-core-library-3.59.3" // { + sources."@rushstack/heft-config-file-0.13.2" + (sources."@rushstack/node-core-library-3.59.6" // { dependencies = [ sources."import-lazy-4.0.0" ]; }) - sources."@rushstack/package-deps-hash-4.0.30" - sources."@rushstack/package-extractor-0.2.17" - (sources."@rushstack/rig-package-0.3.20" // { + sources."@rushstack/package-deps-hash-4.0.41" + (sources."@rushstack/package-extractor-0.3.11" // { + dependencies = [ + sources."minimatch-3.0.8" + ]; + }) + (sources."@rushstack/rig-package-0.4.0" // { dependencies = [ sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.100.1" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.100.1" - sources."@rushstack/rush-sdk-5.100.1" - sources."@rushstack/stream-collator-4.0.248" - sources."@rushstack/terminal-0.5.23" - (sources."@rushstack/ts-command-line-4.15.0" // { + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.100.2" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.100.2" + sources."@rushstack/rush-sdk-5.100.2" + sources."@rushstack/stream-collator-4.0.259" + sources."@rushstack/terminal-0.5.34" + (sources."@rushstack/ts-command-line-4.15.1" // { dependencies = [ sources."argparse-1.0.10" ]; @@ -88099,10 +86415,10 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-2.0.0" sources."@types/argparse-1.0.38" - sources."@types/lodash-4.14.195" + sources."@types/lodash-4.14.196" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/node-fetch-2.6.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" @@ -88262,7 +86578,7 @@ in sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."figures-3.0.0" sources."fill-range-7.0.1" @@ -88331,7 +86647,7 @@ in sources."ignore-5.1.9" sources."ignore-walk-3.0.4" sources."immediate-3.0.6" - sources."immutable-4.3.0" + sources."immutable-4.3.1" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -88434,10 +86750,10 @@ in sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."magic-string-0.30.1" + sources."magic-string-0.30.2" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."map-age-cleaner-0.1.3" @@ -88492,7 +86808,7 @@ in (sources."npm-package-arg-6.1.1" // { dependencies = [ sources."hosted-git-info-2.8.9" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."npm-packlist-2.1.5" // { @@ -88531,7 +86847,7 @@ in sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."pako-1.0.11" @@ -88556,7 +86872,7 @@ in ]; }) sources."please-upgrade-node-3.2.0" - sources."postcss-8.4.25" + sources."postcss-8.4.27" (sources."preferred-pm-3.0.3" // { dependencies = [ sources."find-up-5.0.0" @@ -88588,7 +86904,7 @@ in sources."glob-7.2.3" sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."read-package-tree-5.1.6" @@ -88596,7 +86912,7 @@ in dependencies = [ sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."read-pkg-up-7.0.1" // { @@ -88630,14 +86946,14 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sass-1.63.6" + sources."sass-1.64.2" sources."sax-1.2.4" sources."scss-parser-1.0.6" - sources."semver-7.3.8" + sources."semver-7.5.4" sources."semver-compare-1.0.0" (sources."semver-diff-3.1.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."set-immediate-shim-1.0.1" @@ -88867,10 +87183,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.47.3"; + version = "3.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.47.3.tgz"; - sha512 = "G2dc8IytuC0LFykJkRcZmZlCo2ttn1YTIcT5fI3HfMotNYH2qBiyXb1LXbHWldUKsnRl+kvnCqRdu5wn6aEYoQ=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.48.0.tgz"; + sha512 = "0YTvLfECeAoVAx73/EcdTadgbm1vnyebuVB4qgYhPHUnG/Z+FlXOO4Y7jPP6ifALzF2BLn/A01atVh4yYFnNzQ=="; }; dependencies = [ sources."@bugsnag/browser-7.20.2" @@ -88890,10 +87206,10 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/color-1.0.7" - sources."@oclif/core-2.8.5" - sources."@oclif/plugin-commands-2.2.15" - sources."@oclif/plugin-help-5.2.9" + sources."@oclif/color-1.0.10" + sources."@oclif/core-2.8.11" + sources."@oclif/plugin-commands-2.2.17" + sources."@oclif/plugin-help-5.2.11" sources."@oclif/plugin-plugins-2.4.7" sources."@pnpm/config.env-replace-1.1.0" (sources."@pnpm/network.ca-file-1.0.2" // { @@ -88902,37 +87218,37 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - (sources."@shopify/cli-kit-3.47.3" // { + (sources."@shopify/cli-kit-3.48.0" // { dependencies = [ sources."ansi-escapes-6.2.0" sources."ansi-regex-6.0.1" sources."argparse-2.0.1" - sources."chalk-5.2.0" - sources."fast-glob-3.2.12" + sources."chalk-5.3.0" + sources."fast-glob-3.3.0" sources."fs-extra-11.1.0" sources."js-yaml-4.1.0" - sources."semver-7.5.1" + sources."semver-7.5.3" sources."strip-ansi-7.1.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-3.0.0" - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) - sources."@shopify/plugin-did-you-mean-3.47.3" - sources."@sindresorhus/is-5.4.1" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@shopify/plugin-did-you-mean-3.48.0" + sources."@sindresorhus/is-5.6.0" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@szmarczak/http-timer-5.0.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" @@ -88941,9 +87257,9 @@ in sources."@types/archiver-5.3.2" sources."@types/cli-progress-3.11.0" sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.14" + sources."@types/react-18.2.18" sources."@types/readdir-glob-1.1.1" sources."@types/scheduler-0.16.3" sources."@types/tinycolor2-1.4.3" @@ -88975,7 +87291,7 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."atomically-2.0.1" + sources."atomically-2.0.2" sources."auto-bind-5.0.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -88988,7 +87304,7 @@ in sources."bufferutil-4.0.7" sources."byline-5.0.0" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."camel-case-4.1.2" sources."capital-case-1.0.4" sources."cardinal-2.1.1" @@ -89037,11 +87353,7 @@ in sources."node-fetch-2.6.12" ]; }) - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."cross-zip-4.0.0" (sources."crypto-random-string-4.0.0" // { dependencies = [ @@ -89061,7 +87373,7 @@ in sources."deepmerge-4.3.1" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - sources."del-6.0.0" + sources."del-6.1.1" sources."delayed-stream-1.0.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" @@ -89085,22 +87397,14 @@ in sources."event-target-shim-5.0.1" (sources."execa-6.0.0" // { dependencies = [ - sources."cross-spawn-7.0.3" sources."is-stream-3.0.0" - (sources."npm-run-path-5.1.0" // { - dependencies = [ - sources."path-key-4.0.0" - ]; - }) - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" + sources."npm-run-path-5.1.0" + sources."path-key-4.0.0" ]; }) sources."extract-files-9.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fetch-blob-3.2.0" (sources."figures-5.0.0" // { @@ -89177,7 +87481,7 @@ in dependencies = [ (sources."ansi-escapes-6.2.0" // { dependencies = [ - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."ansi-regex-6.0.1" @@ -89221,7 +87525,7 @@ in sources."json-schema-traverse-1.0.0" sources."json-schema-typed-8.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kill-port-process-3.1.0" sources."latest-version-7.0.0" (sources."lazystream-1.0.1" // { @@ -89230,7 +87534,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."liquidjs-10.7.1" // { + (sources."liquidjs-10.8.3" // { dependencies = [ sources."commander-10.0.1" ]; @@ -89271,7 +87575,6 @@ in sources."ms-2.1.2" sources."n-gram-2.0.2" sources."natural-orderby-2.0.3" - sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-abort-controller-3.1.1" sources."node-domexception-1.0.0" @@ -89279,11 +87582,7 @@ in sources."node-gyp-build-4.6.0" sources."normalize-path-3.0.0" sources."normalize-url-8.0.0" - (sources."npm-run-path-4.0.1" // { - dependencies = [ - sources."path-key-3.1.1" - ]; - }) + sources."npm-run-path-4.0.1" sources."object-treeify-1.1.33" sources."once-1.4.0" sources."onetime-6.0.0" @@ -89297,19 +87596,15 @@ in sources."param-case-3.0.4" sources."parse-json-4.0.0" sources."pascal-case-3.1.2" - (sources."password-prompt-1.1.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - ]; - }) + sources."password-prompt-1.1.3" sources."patch-console-2.0.0" sources."path-case-3.0.4" sources."path-exists-5.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."pathe-1.1.0" + sources."pathe-1.1.1" sources."picomatch-2.3.1" (sources."pid-from-port-1.1.3" // { dependencies = [ @@ -89319,6 +87614,10 @@ in sources."is-stream-1.1.0" sources."lru-cache-4.1.5" sources."npm-run-path-2.0.2" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" sources."yallist-2.1.2" ]; }) @@ -89333,7 +87632,7 @@ in sources."quick-lru-5.1.1" sources."rc-1.2.8" sources."react-18.2.0" - (sources."react-devtools-core-4.27.8" // { + (sources."react-devtools-core-4.28.0" // { dependencies = [ sources."utf-8-validate-5.0.10" sources."ws-7.5.9" @@ -89369,13 +87668,13 @@ in sources."semver-7.5.4" sources."semver-regex-4.0.5" sources."sentence-case-3.0.4" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" sources."shelljs-0.8.5" sources."shelljs.exec-1.1.8" sources."signal-exit-3.0.7" - sources."simple-git-3.19.0" + sources."simple-git-3.19.1" sources."slash-3.0.0" (sources."slice-ansi-6.0.0" // { dependencies = [ @@ -89406,7 +87705,7 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-3.0.0" sources."strip-json-comments-2.0.1" - sources."stubborn-fs-1.2.4" + sources."stubborn-fs-1.2.5" sources."supports-color-8.1.1" (sources."supports-hyperlinks-2.3.0" // { dependencies = [ @@ -89436,7 +87735,7 @@ in sources."tree-kill-1.2.2" sources."ts-error-1.0.6" sources."ts-node-10.9.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."typescript-5.1.6" @@ -89452,7 +87751,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."when-exit-2.1.0" - sources."which-1.3.1" + sources."which-2.0.2" sources."widest-line-3.1.0" sources."wordwrap-1.0.0" sources."wrap-ansi-7.0.0" @@ -89465,7 +87764,7 @@ in sources."yoga-wasm-web-0.3.3" sources."zip-stream-4.1.0" sources."zod-3.21.4" - sources."zod-to-json-schema-3.21.1" + sources."zod-to-json-schema-3.21.3" ]; buildInputs = globalBuildInputs; meta = { @@ -89552,24 +87851,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -89592,7 +87891,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.0" // { + (sources."fast-glob-3.3.1" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -89631,7 +87930,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -89645,9 +87944,9 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" - sources."sucrase-3.32.0" + sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.3.2" + sources."tailwindcss-3.3.3" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -89657,7 +87956,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -89678,10 +87977,10 @@ in "@tailwindcss/forms" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_forms"; packageName = "@tailwindcss/forms"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz"; - sha512 = "y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q=="; + url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.4.tgz"; + sha512 = "YAm12D3R7/9Mh4jFbYSMnsd6jG++8KxogWgqs7hbdo/86aWjjlIEvL7+QYdVELmAI0InXTpZqFIg5e7aDVWI2Q=="; }; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -89694,24 +87993,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -89734,7 +88033,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.0" // { + (sources."fast-glob-3.3.1" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -89774,7 +88073,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -89788,9 +88087,9 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" - sources."sucrase-3.32.0" + sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.3.2" + sources."tailwindcss-3.3.3" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -89800,7 +88099,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -89855,24 +88154,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -89895,7 +88194,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.0" // { + (sources."fast-glob-3.3.1" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -89934,7 +88233,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -89948,9 +88247,9 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" - sources."sucrase-3.32.0" + sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.3.2" + sources."tailwindcss-3.3.3" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -89960,7 +88259,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -89997,24 +88296,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -90037,7 +88336,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.0" // { + (sources."fast-glob-3.3.1" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -90079,7 +88378,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -90097,9 +88396,9 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" - sources."sucrase-3.32.0" + sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tailwindcss-3.3.2" // { + (sources."tailwindcss-3.3.3" // { dependencies = [ sources."postcss-selector-parser-6.0.13" ]; @@ -90113,7 +88412,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -90134,10 +88433,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.6.0.tgz"; - sha512 = "NG8eb/lECCENPUVAQwK145jhLLLMVZzB4YdkmU8Hag9pCRESf8wWXAo/11ZiPbwAxm3fSQLVJ29GHbYqmQy2PQ=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.7.0.tgz"; + sha512 = "l+zraNuMhY8F6xAhM7HlgI31RPWg1mmvfVOuasdDi+yP9S0UHisbAFpHe63RDqa1FeYOLBLtzhLcxOHbk9/adA=="; }; dependencies = [ (sources."@aws-crypto/crc32-3.0.0" // { @@ -90180,54 +88479,58 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/chunked-blob-reader-3.310.0" - sources."@aws-sdk/chunked-blob-reader-native-3.310.0" - sources."@aws-sdk/client-s3-3.367.0" - sources."@aws-sdk/client-sso-3.363.0" - sources."@aws-sdk/client-sso-oidc-3.363.0" - sources."@aws-sdk/client-sts-3.363.0" - sources."@aws-sdk/credential-provider-env-3.363.0" - sources."@aws-sdk/credential-provider-ini-3.363.0" - sources."@aws-sdk/credential-provider-node-3.363.0" - sources."@aws-sdk/credential-provider-process-3.363.0" - sources."@aws-sdk/credential-provider-sso-3.363.0" - sources."@aws-sdk/credential-provider-web-identity-3.363.0" - sources."@aws-sdk/hash-blob-browser-3.367.0" - sources."@aws-sdk/hash-stream-node-3.357.0" - sources."@aws-sdk/is-array-buffer-3.310.0" - (sources."@aws-sdk/lib-storage-3.367.0" // { + sources."@aws-sdk/client-s3-3.382.0" + sources."@aws-sdk/client-sso-3.382.0" + sources."@aws-sdk/client-sso-oidc-3.382.0" + sources."@aws-sdk/client-sts-3.382.0" + sources."@aws-sdk/credential-provider-env-3.378.0" + sources."@aws-sdk/credential-provider-ini-3.382.0" + sources."@aws-sdk/credential-provider-node-3.382.0" + sources."@aws-sdk/credential-provider-process-3.378.0" + sources."@aws-sdk/credential-provider-sso-3.382.0" + sources."@aws-sdk/credential-provider-web-identity-3.378.0" + (sources."@aws-sdk/lib-storage-3.379.1" // { dependencies = [ sources."buffer-5.6.0" ]; }) - sources."@aws-sdk/md5-js-3.357.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.363.0" - sources."@aws-sdk/middleware-expect-continue-3.363.0" - sources."@aws-sdk/middleware-flexible-checksums-3.363.0" - sources."@aws-sdk/middleware-host-header-3.363.0" - sources."@aws-sdk/middleware-location-constraint-3.363.0" - sources."@aws-sdk/middleware-logger-3.363.0" - sources."@aws-sdk/middleware-recursion-detection-3.363.0" - sources."@aws-sdk/middleware-sdk-s3-3.363.0" - sources."@aws-sdk/middleware-sdk-sts-3.363.0" - sources."@aws-sdk/middleware-signing-3.363.0" - sources."@aws-sdk/middleware-ssec-3.363.0" - sources."@aws-sdk/middleware-user-agent-3.363.0" - sources."@aws-sdk/s3-presigned-post-3.367.0" - sources."@aws-sdk/s3-request-presigner-3.367.0" - sources."@aws-sdk/signature-v4-crt-3.363.0" - sources."@aws-sdk/signature-v4-multi-region-3.363.0" - sources."@aws-sdk/token-providers-3.363.0" - sources."@aws-sdk/types-3.357.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.378.0" + sources."@aws-sdk/middleware-expect-continue-3.378.0" + sources."@aws-sdk/middleware-flexible-checksums-3.378.0" + sources."@aws-sdk/middleware-host-header-3.379.1" + sources."@aws-sdk/middleware-location-constraint-3.379.1" + sources."@aws-sdk/middleware-logger-3.378.0" + sources."@aws-sdk/middleware-recursion-detection-3.378.0" + sources."@aws-sdk/middleware-sdk-s3-3.379.1" + sources."@aws-sdk/middleware-sdk-sts-3.379.1" + sources."@aws-sdk/middleware-signing-3.379.1" + sources."@aws-sdk/middleware-ssec-3.378.0" + sources."@aws-sdk/middleware-user-agent-3.382.0" + (sources."@aws-sdk/s3-presigned-post-3.379.1" // { + dependencies = [ + sources."@aws-sdk/client-s3-3.379.1" + sources."@aws-sdk/client-sso-3.379.1" + sources."@aws-sdk/client-sso-oidc-3.379.1" + sources."@aws-sdk/client-sts-3.379.1" + sources."@aws-sdk/credential-provider-ini-3.379.1" + sources."@aws-sdk/credential-provider-node-3.379.1" + sources."@aws-sdk/credential-provider-sso-3.379.1" + sources."@aws-sdk/middleware-user-agent-3.379.1" + sources."@aws-sdk/token-providers-3.379.1" + sources."@aws-sdk/util-endpoints-3.378.0" + ]; + }) + sources."@aws-sdk/s3-request-presigner-3.379.1" + sources."@aws-sdk/signature-v4-crt-3.378.0" + sources."@aws-sdk/signature-v4-multi-region-3.378.0" + sources."@aws-sdk/token-providers-3.382.0" + sources."@aws-sdk/types-3.378.0" sources."@aws-sdk/util-arn-parser-3.310.0" - sources."@aws-sdk/util-base64-3.310.0" - sources."@aws-sdk/util-buffer-from-3.310.0" - sources."@aws-sdk/util-endpoints-3.357.0" - sources."@aws-sdk/util-format-url-3.363.0" + sources."@aws-sdk/util-endpoints-3.382.0" + sources."@aws-sdk/util-format-url-3.378.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.363.0" - sources."@aws-sdk/util-user-agent-node-3.363.0" - sources."@aws-sdk/util-utf8-3.310.0" + sources."@aws-sdk/util-user-agent-browser-3.378.0" + sources."@aws-sdk/util-user-agent-node-3.378.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/xml-builder-3.310.0" sources."@httptoolkit/websocket-stream-6.0.1" @@ -90242,54 +88545,59 @@ in sources."@redis/search-1.0.6" sources."@redis/time-series-1.0.3" sources."@sindresorhus/is-4.6.0" - sources."@smithy/abort-controller-1.0.2" - sources."@smithy/config-resolver-1.0.2" - sources."@smithy/credential-provider-imds-1.0.2" - sources."@smithy/eventstream-codec-1.0.2" - sources."@smithy/eventstream-serde-browser-1.0.2" - sources."@smithy/eventstream-serde-config-resolver-1.0.2" - sources."@smithy/eventstream-serde-node-1.0.2" - sources."@smithy/eventstream-serde-universal-1.0.2" - sources."@smithy/fetch-http-handler-1.0.2" - sources."@smithy/hash-node-1.0.2" - sources."@smithy/invalid-dependency-1.0.2" - sources."@smithy/is-array-buffer-1.0.2" - sources."@smithy/middleware-content-length-1.0.2" - sources."@smithy/middleware-endpoint-1.0.3" - sources."@smithy/middleware-retry-1.0.4" - sources."@smithy/middleware-serde-1.0.2" - sources."@smithy/middleware-stack-1.0.2" - sources."@smithy/node-config-provider-1.0.2" - sources."@smithy/node-http-handler-1.0.3" - sources."@smithy/property-provider-1.0.2" - sources."@smithy/protocol-http-1.1.1" - sources."@smithy/querystring-builder-1.0.2" - sources."@smithy/querystring-parser-1.0.2" - sources."@smithy/service-error-classification-1.0.3" - sources."@smithy/shared-ini-file-loader-1.0.2" - sources."@smithy/signature-v4-1.0.2" - sources."@smithy/smithy-client-1.0.4" - sources."@smithy/types-1.1.1" - sources."@smithy/url-parser-1.0.2" - sources."@smithy/util-base64-1.0.2" - sources."@smithy/util-body-length-browser-1.0.2" - sources."@smithy/util-body-length-node-1.0.2" - sources."@smithy/util-buffer-from-1.0.2" - sources."@smithy/util-config-provider-1.0.2" - sources."@smithy/util-defaults-mode-browser-1.0.2" - sources."@smithy/util-defaults-mode-node-1.0.2" - sources."@smithy/util-hex-encoding-1.0.2" - sources."@smithy/util-middleware-1.0.2" - sources."@smithy/util-retry-1.0.4" - sources."@smithy/util-stream-1.0.2" - sources."@smithy/util-uri-escape-1.0.2" - sources."@smithy/util-utf8-1.0.2" - sources."@smithy/util-waiter-1.0.2" + sources."@smithy/abort-controller-2.0.1" + sources."@smithy/chunked-blob-reader-2.0.0" + sources."@smithy/chunked-blob-reader-native-2.0.0" + sources."@smithy/config-resolver-2.0.1" + sources."@smithy/credential-provider-imds-2.0.1" + sources."@smithy/eventstream-codec-2.0.1" + sources."@smithy/eventstream-serde-browser-2.0.1" + sources."@smithy/eventstream-serde-config-resolver-2.0.1" + sources."@smithy/eventstream-serde-node-2.0.1" + sources."@smithy/eventstream-serde-universal-2.0.1" + sources."@smithy/fetch-http-handler-2.0.1" + sources."@smithy/hash-blob-browser-2.0.1" + sources."@smithy/hash-node-2.0.1" + sources."@smithy/hash-stream-node-2.0.1" + sources."@smithy/invalid-dependency-2.0.1" + sources."@smithy/is-array-buffer-2.0.0" + sources."@smithy/md5-js-2.0.1" + sources."@smithy/middleware-content-length-2.0.1" + sources."@smithy/middleware-endpoint-2.0.1" + sources."@smithy/middleware-retry-2.0.1" + sources."@smithy/middleware-serde-2.0.1" + sources."@smithy/middleware-stack-2.0.0" + sources."@smithy/node-config-provider-2.0.1" + sources."@smithy/node-http-handler-2.0.1" + sources."@smithy/property-provider-2.0.1" + sources."@smithy/protocol-http-2.0.1" + sources."@smithy/querystring-builder-2.0.1" + sources."@smithy/querystring-parser-2.0.1" + sources."@smithy/service-error-classification-2.0.0" + sources."@smithy/shared-ini-file-loader-2.0.1" + sources."@smithy/signature-v4-2.0.1" + sources."@smithy/smithy-client-2.0.1" + sources."@smithy/types-2.0.2" + sources."@smithy/url-parser-2.0.1" + 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-buffer-from-2.0.0" + sources."@smithy/util-config-provider-2.0.0" + sources."@smithy/util-defaults-mode-browser-2.0.1" + sources."@smithy/util-defaults-mode-node-2.0.1" + 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.1" + sources."@smithy/util-uri-escape-2.0.0" + sources."@smithy/util-utf8-2.0.0" + sources."@smithy/util-waiter-2.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" sources."@types/ws-8.5.5" sources."accepts-1.3.8" @@ -90301,7 +88609,7 @@ in sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-crt-1.15.20" + sources."aws-crt-1.17.0" sources."axios-0.24.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -90351,7 +88659,7 @@ in (sources."cmake-js-6.3.2" // { dependencies = [ sources."axios-0.21.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."tar-4.4.19" ]; }) @@ -90502,13 +88810,13 @@ in dependencies = [ sources."jwa-1.4.1" sources."jws-3.2.2" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."jwa-2.0.0" sources."jwk-to-pem-2.0.5" sources."jws-4.0.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."lcid-1.0.0" sources."leven-2.1.0" sources."listenercount-1.0.1" @@ -90694,7 +89002,7 @@ in sources."tdigest-0.1.2" sources."toidentifier-1.0.1" sources."traverse-0.3.9" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tus-js-client-3.1.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" @@ -90787,7 +89095,7 @@ in sources."call-bind-1.0.2" sources."character-parser-2.2.0" sources."de-indent-1.0.2" - sources."emmet-2.4.5" + sources."emmet-2.4.6" sources."estree-walker-2.0.2" sources."function-bind-1.1.1" sources."get-intrinsic-1.2.1" @@ -90800,13 +89108,13 @@ in sources."is-regex-1.1.4" sources."jsonc-parser-3.2.0" sources."lru-cache-6.0.0" - sources."magic-string-0.30.1" + sources."magic-string-0.30.2" sources."minimatch-9.0.3" sources."muggle-string-0.2.2" sources."nanoid-3.3.6" sources."object-assign-4.1.1" sources."picocolors-1.0.0" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" sources."pug-parser-6.0.0" @@ -90882,37 +89190,50 @@ in sources."@apollographql/apollo-tools-0.5.4" sources."@apollographql/graphql-playground-html-1.6.29" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.5" - (sources."@babel/helper-compilation-targets-7.22.6" // { + (sources."@babel/helper-compilation-targets-7.22.9" // { dependencies = [ sources."lru-cache-5.1.1" + sources."semver-6.3.1" sources."yallist-3.1.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.22.6" - sources."@babel/helper-create-regexp-features-plugin-7.22.6" - sources."@babel/helper-define-polyfill-provider-0.4.1" + (sources."@babel/helper-create-class-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/helper-define-polyfill-provider-0.4.2" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.5" - sources."@babel/helper-replace-supers-7.22.5" + sources."@babel/helper-remap-async-to-generator-7.22.9" + sources."@babel/helper-replace-supers-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helper-wrap-function-7.22.5" + sources."@babel/helper-wrap-function-7.22.9" sources."@babel/helpers-7.22.6" (sources."@babel/highlight-7.22.5" // { dependencies = [ @@ -90998,20 +89319,24 @@ in sources."@babel/plugin-transform-sticky-regex-7.22.5" sources."@babel/plugin-transform-template-literals-7.22.5" sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.5" + sources."@babel/plugin-transform-typescript-7.22.9" sources."@babel/plugin-transform-unicode-escapes-7.22.5" sources."@babel/plugin-transform-unicode-property-regex-7.22.5" sources."@babel/plugin-transform-unicode-regex-7.22.5" sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - sources."@babel/preset-env-7.22.7" + (sources."@babel/preset-env-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/preset-flow-7.22.5" - sources."@babel/preset-modules-0.1.5" + sources."@babel/preset-modules-0.1.6" sources."@babel/preset-typescript-7.22.5" (sources."@babel/register-7.22.5" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."@babel/regjsgen-0.8.0" @@ -91043,7 +89368,6 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@node-ipc/js-queue-2.0.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -91079,7 +89403,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -91140,9 +89464,13 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."babel-core-7.0.0-bridge.0" - sources."babel-plugin-polyfill-corejs2-0.4.4" - sources."babel-plugin-polyfill-corejs3-0.8.2" - sources."babel-plugin-polyfill-regenerator-0.5.1" + (sources."babel-plugin-polyfill-corejs2-0.4.5" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.8.3" + sources."babel-plugin-polyfill-regenerator-0.5.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -91165,7 +89493,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -91184,7 +89512,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -91233,12 +89561,12 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.31.1" + sources."core-js-compat-3.32.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."cssfilter-0.0.10" @@ -91294,7 +89622,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -91358,7 +89686,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -91388,7 +89716,7 @@ in sources."path-exists-3.0.0" sources."pify-4.0.1" sources."pkg-dir-3.0.0" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."find-up-5.0.0" @@ -91405,7 +89733,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.211.1" + sources."flow-parser-0.213.1" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -91604,7 +89932,7 @@ in sources."node-releases-2.0.13" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."normalize-url-2.0.1" // { @@ -91687,7 +90015,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-8.4.25" // { + (sources."postcss-8.4.27" // { dependencies = [ sources."nanoid-3.3.6" ]; @@ -91897,7 +90225,7 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."type-fest-0.6.0" sources."type-is-1.6.18" @@ -92108,7 +90436,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.5" - sources."@babel/generator-7.22.7" + sources."@babel/generator-7.22.9" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" sources."@babel/highlight-7.22.5" @@ -92203,7 +90531,7 @@ in sources."@npmcli/config-6.2.1" (sources."@npmcli/map-workspaces-3.0.4" // { dependencies = [ - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -92216,24 +90544,24 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/acorn-4.0.6" sources."@types/concat-stream-2.0.0" sources."@types/debug-4.1.8" sources."@types/estree-1.0.1" sources."@types/estree-jsx-1.0.0" - sources."@types/hast-2.3.4" + sources."@types/hast-2.3.5" sources."@types/http-cache-semantics-4.0.1" sources."@types/is-empty-1.2.1" - sources."@types/mdast-3.0.11" + sources."@types/mdast-3.0.12" sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" - sources."@types/nlcst-1.0.0" - sources."@types/node-18.16.19" + sources."@types/nlcst-1.0.1" + sources."@types/node-18.17.1" sources."@types/normalize-package-data-2.4.1" sources."@types/supports-color-8.1.1" - sources."@types/unist-3.0.0" + sources."@types/unist-2.0.7" sources."abbrev-2.0.0" sources."acorn-8.10.0" sources."acorn-jsx-5.3.2" @@ -92260,7 +90588,7 @@ in sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."camelcase-7.0.1" (sources."camelcase-keys-8.0.2" // { dependencies = [ @@ -92325,11 +90653,7 @@ in sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" sources."estree-util-is-identifier-name-2.1.0" - (sources."estree-util-visit-1.2.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."estree-util-visit-1.2.1" sources."event-stream-3.1.7" sources."extend-3.0.2" sources."fault-2.0.1" @@ -92356,25 +90680,13 @@ in sources."has-flag-3.0.0" sources."has-yarn-3.0.0" sources."hast-util-embedded-2.0.1" - (sources."hast-util-from-parse5-7.1.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."hast-util-from-parse5-7.1.2" sources."hast-util-has-property-2.0.1" sources."hast-util-is-body-ok-link-2.0.0" - (sources."hast-util-is-element-2.1.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."hast-util-is-element-2.1.3" sources."hast-util-parse-selector-3.1.1" sources."hast-util-phrasing-2.0.2" - (sources."hast-util-to-nlcst-2.2.0" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."hast-util-to-nlcst-2.2.0" sources."hast-util-to-string-2.0.0" sources."hast-util-whitespace-2.0.1" sources."hastscript-7.2.0" @@ -92412,11 +90724,11 @@ in sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kind-of-6.0.3" sources."kleur-4.1.5" sources."latest-version-7.0.0" @@ -92436,11 +90748,7 @@ in sources."escape-string-regexp-5.0.0" ]; }) - (sources."mdast-util-from-markdown-1.3.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."mdast-util-from-markdown-1.3.1" sources."mdast-util-frontmatter-1.0.1" sources."mdast-util-gfm-2.0.2" sources."mdast-util-gfm-autolink-literal-1.0.3" @@ -92450,23 +90758,11 @@ in sources."mdast-util-gfm-task-list-item-1.0.2" sources."mdast-util-mdx-2.0.1" sources."mdast-util-mdx-expression-1.3.2" - (sources."mdast-util-mdx-jsx-2.1.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."mdast-util-mdx-jsx-2.1.4" sources."mdast-util-mdxjs-esm-1.3.1" sources."mdast-util-phrasing-3.0.1" - (sources."mdast-util-to-markdown-1.5.0" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."mdast-util-to-nlcst-5.2.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."mdast-util-to-markdown-1.5.0" + sources."mdast-util-to-nlcst-5.2.1" sources."mdast-util-to-string-3.2.0" sources."meow-11.0.0" sources."micromark-3.2.0" @@ -92497,11 +90793,7 @@ in sources."micromark-util-decode-numeric-character-reference-1.1.0" sources."micromark-util-decode-string-1.1.0" sources."micromark-util-encode-1.1.0" - (sources."micromark-util-events-to-acorn-1.2.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."micromark-util-events-to-acorn-1.2.3" sources."micromark-util-html-tag-name-1.2.0" sources."micromark-util-normalize-identifier-1.1.0" sources."micromark-util-resolve-all-1.1.0" @@ -92514,20 +90806,12 @@ in sources."minimatch-5.1.6" sources."minimist-1.2.8" sources."minimist-options-4.1.0" - sources."minipass-7.0.1" + sources."minipass-7.0.2" sources."mri-1.2.0" sources."ms-2.1.2" - (sources."nlcst-is-literal-2.1.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."nlcst-is-literal-2.1.1" sources."nlcst-normalize-3.1.1" - (sources."nlcst-search-3.1.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."nlcst-search-3.1.1" sources."nlcst-to-string-3.1.1" sources."nopt-7.2.0" sources."normalize-package-data-4.0.1" @@ -92544,15 +90828,10 @@ in sources."nlcst-to-string-2.0.4" ]; }) - (sources."parse-entities-4.0.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."parse-entities-4.0.1" sources."parse-json-5.2.0" (sources."parse-latin-5.0.1" // { dependencies = [ - sources."@types/unist-2.0.6" sources."unist-util-modify-children-3.1.1" sources."unist-util-visit-children-2.0.2" ]; @@ -92604,29 +90883,17 @@ in sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."rehype-parse-8.0.4" - (sources."rehype-retext-3.0.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."rehype-retext-3.0.2" sources."remark-frontmatter-4.0.1" sources."remark-gfm-3.0.1" sources."remark-mdx-2.0.0" sources."remark-message-control-7.1.1" sources."remark-parse-10.0.2" - (sources."remark-retext-5.0.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."remark-retext-5.0.1" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" sources."retext-english-4.1.0" - (sources."retext-equality-6.6.0" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."retext-equality-6.6.0" sources."retext-profanities-7.2.2" sources."sade-1.8.1" sources."safe-buffer-5.2.1" @@ -92638,7 +90905,7 @@ in sources."semver-diff-4.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."sliced-1.0.1" sources."space-separated-tokens-2.0.2" (sources."spawn-to-readstream-0.1.3" // { @@ -92687,20 +90954,18 @@ in sources."to-vfile-7.2.4" sources."trim-newlines-4.1.1" sources."trough-2.1.0" - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.1" (sources."unified-10.1.2" // { dependencies = [ - sources."@types/unist-2.0.6" sources."is-plain-obj-4.1.0" ]; }) sources."unified-diff-4.0.1" (sources."unified-engine-10.1.0" // { dependencies = [ - sources."@types/unist-2.0.6" sources."is-plain-obj-4.1.0" sources."lines-and-columns-2.0.3" sources."parse-json-6.0.2" @@ -92708,58 +90973,25 @@ in }) (sources."unified-message-control-4.0.0" // { dependencies = [ - sources."@types/unist-2.0.6" sources."unist-util-visit-3.1.0" sources."unist-util-visit-parents-4.1.1" ]; }) sources."unique-string-3.0.0" - (sources."unist-util-inspect-7.0.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-is-5.2.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.1" (sources."unist-util-modify-children-2.0.0" // { dependencies = [ sources."array-iterate-1.1.4" ]; }) - (sources."unist-util-position-4.0.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-position-from-estree-1.1.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-remove-position-4.0.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-stringify-position-3.0.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-visit-4.1.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."unist-util-position-4.0.4" + sources."unist-util-position-from-estree-1.1.2" + sources."unist-util-remove-position-4.0.2" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" sources."unist-util-visit-children-1.1.4" - (sources."unist-util-visit-parents-5.1.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."unist-util-visit-parents-5.1.3" (sources."update-notifier-6.0.2" // { dependencies = [ sources."chalk-5.3.0" @@ -92768,22 +91000,10 @@ in sources."util-deprecate-1.0.2" sources."uvu-0.5.6" sources."validate-npm-package-license-3.0.4" - (sources."vfile-5.3.7" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."vfile-5.3.7" sources."vfile-find-up-6.1.0" - (sources."vfile-location-4.1.0" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."vfile-message-3.1.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."vfile-location-4.1.0" + sources."vfile-message-3.1.4" (sources."vfile-reporter-7.0.5" // { dependencies = [ sources."supports-color-9.4.0" @@ -92845,15 +91065,15 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -92874,16 +91094,15 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" sources."async-3.2.4" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."browserslist-4.21.9" - sources."caniuse-lite-1.0.30001513" + sources."browserslist-4.21.10" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -92893,7 +91112,7 @@ in sources."convert-source-map-1.9.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -92966,6 +91185,7 @@ in sources."pkginfo-0.4.1" sources."resolve-1.22.3" sources."sax-0.5.8" + sources."semver-6.3.1" sources."source-map-0.7.4" sources."strip-ansi-0.1.1" sources."supports-color-5.5.0" @@ -93195,7 +91415,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-5.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -93279,16 +91499,16 @@ in sha512 = "FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ=="; }; dependencies = [ - sources."browserslist-4.21.9" - sources."caniuse-lite-1.0.30001513" - sources."electron-to-chromium-1.4.454" + sources."browserslist-4.21.10" + sources."caniuse-lite-1.0.30001518" + sources."electron-to-chromium-1.4.480" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."nanoid-3.3.6" sources."node-releases-2.0.13" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-value-parser-4.2.0" sources."source-map-js-1.0.2" sources."update-browserslist-db-1.0.11" @@ -93351,7 +91571,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/yauzl-2.10.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" @@ -93361,7 +91581,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1413.0" // { + (sources."aws-sdk-2.1427.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -93469,7 +91689,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-interactive-1.0.0" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."jmespath-0.16.0" @@ -93543,7 +91763,7 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-check-0.3.2" sources."type-fest-0.21.3" (sources."unbzip2-stream-1.4.3" // { @@ -93562,8 +91782,8 @@ in sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."which-typed-array-1.1.9" - sources."word-wrap-1.2.3" + sources."which-typed-array-1.1.11" + sources."word-wrap-1.2.5" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."ws-8.5.0" @@ -93586,10 +91806,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.87.0"; + version = "2.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.87.0.tgz"; - sha512 = "dBm74nl3dMUxoAzgjcfKnzJyoVNIV//B1sqDN11cC3LXEflYapcBxPxZHAyGcRXg5dW3m14dMdKVQfmt4N970g=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.89.0.tgz"; + sha512 = "4FF/5jNd86x9iSk/xQB1KRFWkhMWd/Z7x7tOwztgZYDj6aYR/3Xru7pb2BD6s6Oli/eeQaXTG11+eY9zdrJIQA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -93633,10 +91853,10 @@ in sources."@types/eslint-7.29.0" sources."@types/estree-1.0.1" sources."@types/json-schema-7.0.12" - sources."@types/mdast-3.0.11" + sources."@types/mdast-3.0.12" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" - sources."@types/unist-3.0.0" + sources."@types/unist-2.0.7" sources."aggregate-error-3.1.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -93707,7 +91927,7 @@ in sources."eslint-rule-docs-1.1.235" sources."execa-1.0.0" sources."extend-3.0.2" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -93779,7 +91999,6 @@ in sources."mdast-util-heading-style-1.0.6" (sources."mdast-util-to-markdown-0.6.5" // { dependencies = [ - sources."@types/unist-2.0.6" sources."mdast-util-to-string-2.0.0" ]; }) @@ -93915,7 +92134,7 @@ in sources."rmfr-2.0.0" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.7" @@ -93982,11 +92201,7 @@ in sources."unist-util-is-3.0.0" sources."unist-util-map-1.0.5" sources."unist-util-position-3.1.0" - (sources."unist-util-stringify-position-2.0.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."unist-util-stringify-position-2.0.3" (sources."unist-util-to-list-of-char-0.1.3" // { dependencies = [ sources."unist-util-visit-1.4.1" @@ -93994,7 +92209,6 @@ in }) (sources."unist-util-visit-2.0.3" // { dependencies = [ - sources."@types/unist-2.0.6" sources."unist-util-is-4.1.0" sources."unist-util-visit-parents-3.1.1" ]; @@ -94004,17 +92218,9 @@ in sources."util-deprecate-1.0.2" sources."validate-glob-opts-1.0.2" sources."validate-npm-package-license-3.0.4" - (sources."vfile-4.2.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."vfile-4.2.1" sources."vfile-location-3.2.0" - (sources."vfile-message-2.0.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."vfile-message-2.0.4" sources."vfile-reporter-pretty-5.0.0" sources."vfile-statistics-1.1.4" sources."vfile-to-eslint-2.0.2" @@ -94039,10 +92245,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "15.8.13"; + version = "15.8.15"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-15.8.13.tgz"; - sha512 = "hTRX28Fd4o3GeMLfZ1WED3siPPmzNp4j9w+BB0seAlFuwlYwYI5B54CsdjyVXtPbLop8gp2ij5C8IQ10HU56vw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-15.8.15.tgz"; + sha512 = "qrmkze/jcPAU9uj7cuxPpPC0DY7pjbZwHTiQuegUyDhfCnpjY1Y06DHh7MxHROsa7Ah/m8bOkbFmG4/a1+f93A=="; }; dependencies = [ sources."@alexbosworth/blockchain-1.5.0" @@ -94097,7 +92303,7 @@ in sources."@types/http-errors-2.0.1" sources."@types/long-4.0.2" sources."@types/mime-1.3.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -94105,7 +92311,7 @@ in sources."@types/serve-static-1.15.2" sources."@types/tough-cookie-4.0.2" sources."@types/triple-beam-1.3.2" - sources."@types/ws-8.5.4" + sources."@types/ws-8.5.5" sources."abort-controller-3.0.0" sources."accepts-1.3.8" (sources."agent-base-7.1.0" // { @@ -94148,7 +92354,7 @@ in sources."bolt01-2.0.0" sources."bolt03-1.3.1" sources."bolt07-1.8.4" - sources."bolt09-0.2.5" + sources."bolt09-1.0.0" sources."bs58-5.0.0" sources."bs58check-3.0.1" sources."buffer-5.7.1" @@ -94238,8 +92444,12 @@ in sources."gauge-1.2.7" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.1" - sources."goldengate-13.0.0" - (sources."grammy-1.17.1" // { + (sources."goldengate-13.0.2" // { + dependencies = [ + sources."ln-service-56.8.0" + ]; + }) + (sources."grammy-1.17.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -94268,7 +92478,7 @@ in sources."import-lazy-4.0.0" sources."inherits-2.0.4" sources."ini-4.1.1" - (sources."inquirer-9.2.7" // { + (sources."inquirer-9.2.8" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" @@ -94285,17 +92495,13 @@ in sources."restore-cursor-3.1.0" sources."run-async-3.0.0" sources."tmp-0.0.33" + sources."type-fest-0.21.3" sources."wrap-ansi-6.2.0" ]; }) - (sources."invoices-2.2.3" // { + (sources."invoices-3.0.0" // { dependencies = [ - sources."base-x-3.0.9" - sources."bitcoinjs-lib-6.1.0" - sources."bolt07-1.8.3" - sources."bs58-4.0.1" - sources."bs58check-2.1.2" - sources."tiny-secp256k1-2.2.1" + sources."tiny-secp256k1-2.2.2" ]; }) sources."ip-2.0.0" @@ -94319,33 +92525,21 @@ in sources."jstat-1.9.6" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lightning-7.1.4" // { + (sources."lightning-9.8.0" // { dependencies = [ - sources."@grpc/grpc-js-1.8.12" - sources."@grpc/proto-loader-0.7.5" - sources."@types/node-18.15.0" - sources."asyncjs-util-1.2.11" - sources."base-x-3.0.9" - sources."bitcoinjs-lib-6.1.0" - sources."bolt07-1.8.3" - sources."bs58-4.0.1" - sources."bs58check-2.1.2" - sources."cbor-8.1.0" - sources."cliui-7.0.4" - sources."psbt-2.7.2" - sources."tiny-secp256k1-2.2.1" - sources."type-fest-3.6.1" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" + sources."@types/node-20.3.2" ]; }) (sources."ln-accounting-7.0.2" // { dependencies = [ sources."@grpc/grpc-js-1.8.13" sources."@grpc/proto-loader-0.7.6" + sources."@types/node-18.15.0" + sources."@types/ws-8.5.4" sources."base-x-3.0.9" sources."bolt01-1.2.6" sources."bolt07-1.8.3" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" sources."cbor-8.1.0" @@ -94358,6 +92552,42 @@ in sources."ln-service-54.10.5" ]; }) + (sources."invoices-2.2.3" // { + dependencies = [ + sources."bitcoinjs-lib-6.1.0" + ]; + }) + (sources."lightning-7.1.4" // { + dependencies = [ + sources."@grpc/grpc-js-1.8.12" + sources."@grpc/proto-loader-0.7.5" + sources."asyncjs-util-1.2.11" + sources."bitcoinjs-lib-6.1.0" + ]; + }) + (sources."ln-service-56.8.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.8.17" + sources."@grpc/proto-loader-0.7.7" + sources."@types/node-20.3.2" + sources."@types/ws-8.5.5" + sources."bolt07-1.8.4" + sources."bolt09-1.0.0" + sources."cbor-9.0.0" + sources."cliui-8.0.1" + sources."invoices-3.0.0" + (sources."lightning-9.8.0" // { + dependencies = [ + sources."tiny-secp256k1-2.2.3" + ]; + }) + sources."psbt-3.0.0" + sources."tiny-secp256k1-2.2.2" + sources."type-fest-3.12.0" + sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" + ]; + }) (sources."ln-sync-4.3.2" // { dependencies = [ sources."asyncjs-util-1.2.11" @@ -94365,32 +92595,32 @@ in sources."ln-service-54.10.5" ]; }) + sources."p2tr-1.3.3" (sources."psbt-2.7.2" // { dependencies = [ sources."bitcoinjs-lib-6.1.0" ]; }) sources."tiny-secp256k1-2.2.1" + sources."type-fest-3.6.1" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; }) - (sources."ln-service-56.8.0" // { + (sources."ln-service-56.9.0" // { dependencies = [ - sources."@types/node-20.3.2" - sources."@types/ws-8.5.5" - sources."bolt09-1.0.0" - sources."invoices-3.0.0" - (sources."lightning-9.8.0" // { - dependencies = [ - sources."tiny-secp256k1-2.2.3" - ]; - }) - sources."tiny-secp256k1-2.2.2" - sources."type-fest-3.12.0" + sources."@grpc/grpc-js-1.8.18" + sources."@grpc/proto-loader-0.7.8" + sources."@types/node-20.4.2" + sources."lightning-9.9.0" + sources."type-fest-4.0.0" + ]; + }) + (sources."ln-sync-5.2.3" // { + dependencies = [ + sources."ln-service-56.8.0" ]; }) - sources."ln-sync-5.2.3" (sources."ln-telegram-4.6.1" // { dependencies = [ sources."@alexbosworth/fiat-1.0.4" @@ -94402,12 +92632,14 @@ in sources."@streamparser/json-0.0.10" sources."@types/express-4.17.15" sources."@types/node-18.11.18" + sources."@types/ws-8.5.4" sources."asyncjs-util-1.2.11" sources."base-x-3.0.9" sources."bitcoinjs-lib-6.1.0" sources."body-parser-1.20.1" sources."bolt01-1.2.6" sources."bolt07-1.8.3" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" sources."cbor-8.1.0" @@ -94420,6 +92652,7 @@ in ]; }) sources."grammy-1.13.1" + sources."invoices-2.2.3" (sources."lightning-7.0.3" // { dependencies = [ sources."@grpc/grpc-js-1.8.1" @@ -94429,6 +92662,7 @@ in sources."ln-service-54.9.0" sources."ln-sync-4.3.0" sources."ms-2.1.2" + sources."p2tr-1.3.3" (sources."paid-services-4.3.0" // { dependencies = [ sources."ln-sync-4.2.0" @@ -94517,22 +92751,20 @@ in }) sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - (sources."p2tr-1.3.3" // { - dependencies = [ - sources."tiny-secp256k1-2.2.1" - ]; - }) + sources."p2tr-2.0.0" (sources."paid-services-5.0.4" // { dependencies = [ sources."@alexbosworth/fiat-1.0.4" sources."@grpc/grpc-js-1.8.13" sources."@grpc/proto-loader-0.7.6" - sources."@types/node-18.16.3" + sources."@types/node-18.15.0" + sources."@types/ws-8.5.4" sources."asyncjs-util-1.2.11" sources."base-x-3.0.9" sources."bitcoinjs-lib-6.1.0" sources."bolt01-1.2.6" sources."bolt07-1.8.3" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" sources."cbor-8.1.0" @@ -94544,20 +92776,30 @@ in sources."ln-sync-4.3.2" ]; }) - (sources."lightning-9.3.0" // { + sources."invoices-2.2.3" + (sources."lightning-7.1.4" // { dependencies = [ - sources."@grpc/grpc-js-1.8.14" + sources."@grpc/grpc-js-1.8.12" + sources."@grpc/proto-loader-0.7.5" + ]; + }) + (sources."ln-service-56.3.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.8.14" + sources."@types/node-18.16.3" + sources."lightning-9.3.0" + sources."type-fest-3.9.0" ]; }) - sources."ln-service-56.3.0" (sources."ln-sync-5.2.0" // { dependencies = [ sources."colorette-2.0.20" ]; }) + sources."p2tr-1.3.3" sources."psbt-2.7.2" sources."tiny-secp256k1-2.2.1" - sources."type-fest-3.9.0" + sources."type-fest-3.6.1" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -94570,15 +92812,25 @@ in dependencies = [ sources."@grpc/grpc-js-1.8.16" sources."@types/node-20.3.1" - sources."@types/ws-8.5.5" sources."base-x-3.0.9" sources."bitcoinjs-lib-6.1.0" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" + (sources."invoices-2.2.3" // { + dependencies = [ + sources."bolt07-1.8.3" + ]; + }) (sources."lightning-9.7.1" // { dependencies = [ sources."asyncjs-util-1.2.11" + sources."base-x-4.0.0" + sources."bitcoinjs-lib-6.1.3" sources."bolt07-1.8.3" + sources."bs58-5.0.0" + sources."bs58check-3.0.1" + sources."tiny-secp256k1-2.2.2" ]; }) (sources."ln-service-56.7.1" // { @@ -94587,8 +92839,7 @@ in ]; }) sources."psbt-2.7.2" - sources."tiny-secp256k1-2.2.2" - sources."type-fest-3.12.0" + sources."tiny-secp256k1-2.2.1" ]; }) sources."process-nextick-args-2.0.1" @@ -94669,12 +92920,12 @@ in sources."tmp-0.0.29" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."triple-beam-1.3.0" + sources."triple-beam-1.4.1" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-0.21.3" + sources."type-fest-3.12.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typeforce-1.18.0" @@ -94733,10 +92984,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.10.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.10.1.tgz"; - sha512 = "yNHApNZUnetRC8w6GioGdS/HrNr3pecMTTXb20YZNLxqA70HfUwT37Gts+kCZ6XLEEffkwL5j6Pt3nzACBZVaw=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.0.0.tgz"; + sha512 = "1S5PMQO4PwXDIiPHUE6dYd8vZF1NZqb3i4Astd7UXD4lSWnSo71MqSmTpTs/dTYcvo2/9z2IymbNPPyn/VuM2w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -94745,7 +92996,7 @@ in sources."braces-3.0.2" sources."domino-2.1.6" sources."encoding-0.1.13" - sources."fast-glob-3.2.12" + sources."fast-glob-3.3.0" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fuzzy-search-3.2.1" @@ -94756,7 +93007,7 @@ in sources."is-number-7.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."node-fetch-2.6.11" + sources."node-fetch-2.6.12" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" @@ -94785,24 +93036,6 @@ in bypassCache = true; reconstructLock = true; }; - bibtex-tidy = nodeEnv.buildNodePackage { - name = "bibtex-tidy"; - packageName = "bibtex-tidy"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bibtex-tidy/-/bibtex-tidy-1.11.0.tgz"; - sha512 = "jbY7PxjYQlRQIWpqdCxEVtW0T9xTLecXxvGPFGMs3FlzKNTylTr5yutC2qWsFyfNQgMHvAzyCdqT5YIU9p/ZHg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Tidy bibtex files"; - homepage = "https://github.com/FlamingTempura/bibtex-tidy"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; @@ -94924,7 +93157,7 @@ in sources."glob-7.2.3" ]; }) - sources."semver-5.7.1" + sources."semver-5.7.2" sources."signal-exit-3.0.7" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -95069,7 +93302,7 @@ in sources."is-callable-1.2.7" sources."is-core-module-2.12.1" sources."is-generator-function-1.0.10" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -95154,7 +93387,7 @@ in sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -95180,7 +93413,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -95415,49 +93648,40 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/chunked-blob-reader-3.310.0" - sources."@aws-sdk/chunked-blob-reader-native-3.310.0" - sources."@aws-sdk/client-cognito-identity-3.363.0" - sources."@aws-sdk/client-s3-3.367.0" - sources."@aws-sdk/client-sso-3.363.0" - sources."@aws-sdk/client-sso-oidc-3.363.0" - sources."@aws-sdk/client-sts-3.363.0" - sources."@aws-sdk/credential-provider-cognito-identity-3.363.0" - sources."@aws-sdk/credential-provider-env-3.363.0" - sources."@aws-sdk/credential-provider-ini-3.363.0" - sources."@aws-sdk/credential-provider-node-3.363.0" - sources."@aws-sdk/credential-provider-process-3.363.0" - sources."@aws-sdk/credential-provider-sso-3.363.0" - sources."@aws-sdk/credential-provider-web-identity-3.363.0" - sources."@aws-sdk/credential-providers-3.363.0" - sources."@aws-sdk/hash-blob-browser-3.367.0" - sources."@aws-sdk/hash-stream-node-3.357.0" - sources."@aws-sdk/is-array-buffer-3.310.0" - sources."@aws-sdk/md5-js-3.357.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.363.0" - sources."@aws-sdk/middleware-expect-continue-3.363.0" - sources."@aws-sdk/middleware-flexible-checksums-3.363.0" - sources."@aws-sdk/middleware-host-header-3.363.0" - sources."@aws-sdk/middleware-location-constraint-3.363.0" - sources."@aws-sdk/middleware-logger-3.363.0" - sources."@aws-sdk/middleware-recursion-detection-3.363.0" - sources."@aws-sdk/middleware-sdk-s3-3.363.0" - sources."@aws-sdk/middleware-sdk-sts-3.363.0" - sources."@aws-sdk/middleware-signing-3.363.0" - sources."@aws-sdk/middleware-ssec-3.363.0" - sources."@aws-sdk/middleware-user-agent-3.363.0" - sources."@aws-sdk/signature-v4-crt-3.363.0" - sources."@aws-sdk/signature-v4-multi-region-3.363.0" - sources."@aws-sdk/token-providers-3.363.0" - sources."@aws-sdk/types-3.357.0" + sources."@aws-sdk/client-cognito-identity-3.382.0" + sources."@aws-sdk/client-s3-3.382.0" + sources."@aws-sdk/client-sso-3.382.0" + sources."@aws-sdk/client-sso-oidc-3.382.0" + sources."@aws-sdk/client-sts-3.382.0" + sources."@aws-sdk/credential-provider-cognito-identity-3.382.0" + sources."@aws-sdk/credential-provider-env-3.378.0" + sources."@aws-sdk/credential-provider-ini-3.382.0" + sources."@aws-sdk/credential-provider-node-3.382.0" + sources."@aws-sdk/credential-provider-process-3.378.0" + sources."@aws-sdk/credential-provider-sso-3.382.0" + sources."@aws-sdk/credential-provider-web-identity-3.378.0" + sources."@aws-sdk/credential-providers-3.382.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.378.0" + sources."@aws-sdk/middleware-expect-continue-3.378.0" + sources."@aws-sdk/middleware-flexible-checksums-3.378.0" + sources."@aws-sdk/middleware-host-header-3.379.1" + sources."@aws-sdk/middleware-location-constraint-3.379.1" + sources."@aws-sdk/middleware-logger-3.378.0" + sources."@aws-sdk/middleware-recursion-detection-3.378.0" + sources."@aws-sdk/middleware-sdk-s3-3.379.1" + sources."@aws-sdk/middleware-sdk-sts-3.379.1" + sources."@aws-sdk/middleware-signing-3.379.1" + sources."@aws-sdk/middleware-ssec-3.378.0" + sources."@aws-sdk/middleware-user-agent-3.382.0" + sources."@aws-sdk/signature-v4-crt-3.378.0" + sources."@aws-sdk/signature-v4-multi-region-3.378.0" + sources."@aws-sdk/token-providers-3.382.0" + sources."@aws-sdk/types-3.378.0" sources."@aws-sdk/util-arn-parser-3.310.0" - sources."@aws-sdk/util-base64-3.310.0" - sources."@aws-sdk/util-buffer-from-3.310.0" - sources."@aws-sdk/util-endpoints-3.357.0" + sources."@aws-sdk/util-endpoints-3.382.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.363.0" - sources."@aws-sdk/util-user-agent-node-3.363.0" - sources."@aws-sdk/util-utf8-3.310.0" + sources."@aws-sdk/util-user-agent-browser-3.378.0" + sources."@aws-sdk/util-user-agent-node-3.378.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/xml-builder-3.310.0" sources."@babel/code-frame-7.22.5" @@ -95509,52 +93733,57 @@ in sources."@redis/search-1.1.3" sources."@redis/time-series-1.0.4" sources."@scure/base-1.1.1" - sources."@smithy/abort-controller-1.0.2" - sources."@smithy/config-resolver-1.0.2" - sources."@smithy/credential-provider-imds-1.0.2" - sources."@smithy/eventstream-codec-1.0.2" - sources."@smithy/eventstream-serde-browser-1.0.2" - sources."@smithy/eventstream-serde-config-resolver-1.0.2" - sources."@smithy/eventstream-serde-node-1.0.2" - sources."@smithy/eventstream-serde-universal-1.0.2" - sources."@smithy/fetch-http-handler-1.0.2" - sources."@smithy/hash-node-1.0.2" - sources."@smithy/invalid-dependency-1.0.2" - sources."@smithy/is-array-buffer-1.0.2" - sources."@smithy/middleware-content-length-1.0.2" - sources."@smithy/middleware-endpoint-1.0.3" - sources."@smithy/middleware-retry-1.0.4" - sources."@smithy/middleware-serde-1.0.2" - sources."@smithy/middleware-stack-1.0.2" - sources."@smithy/node-config-provider-1.0.2" - sources."@smithy/node-http-handler-1.0.3" - sources."@smithy/property-provider-1.0.2" - sources."@smithy/protocol-http-1.1.1" - sources."@smithy/querystring-builder-1.0.2" - sources."@smithy/querystring-parser-1.0.2" - sources."@smithy/service-error-classification-1.0.3" - sources."@smithy/shared-ini-file-loader-1.0.2" - sources."@smithy/signature-v4-1.0.2" - sources."@smithy/smithy-client-1.0.4" - sources."@smithy/types-1.1.1" - sources."@smithy/url-parser-1.0.2" - sources."@smithy/util-base64-1.0.2" - sources."@smithy/util-body-length-browser-1.0.2" - sources."@smithy/util-body-length-node-1.0.2" - sources."@smithy/util-buffer-from-1.0.2" - sources."@smithy/util-config-provider-1.0.2" - sources."@smithy/util-defaults-mode-browser-1.0.2" - sources."@smithy/util-defaults-mode-node-1.0.2" - sources."@smithy/util-hex-encoding-1.0.2" - sources."@smithy/util-middleware-1.0.2" - sources."@smithy/util-retry-1.0.4" - sources."@smithy/util-stream-1.0.2" - sources."@smithy/util-uri-escape-1.0.2" - sources."@smithy/util-utf8-1.0.2" - sources."@smithy/util-waiter-1.0.2" + sources."@smithy/abort-controller-2.0.1" + sources."@smithy/chunked-blob-reader-2.0.0" + sources."@smithy/chunked-blob-reader-native-2.0.0" + sources."@smithy/config-resolver-2.0.1" + sources."@smithy/credential-provider-imds-2.0.1" + sources."@smithy/eventstream-codec-2.0.1" + sources."@smithy/eventstream-serde-browser-2.0.1" + sources."@smithy/eventstream-serde-config-resolver-2.0.1" + sources."@smithy/eventstream-serde-node-2.0.1" + sources."@smithy/eventstream-serde-universal-2.0.1" + sources."@smithy/fetch-http-handler-2.0.1" + sources."@smithy/hash-blob-browser-2.0.1" + sources."@smithy/hash-node-2.0.1" + sources."@smithy/hash-stream-node-2.0.1" + sources."@smithy/invalid-dependency-2.0.1" + sources."@smithy/is-array-buffer-2.0.0" + sources."@smithy/md5-js-2.0.1" + sources."@smithy/middleware-content-length-2.0.1" + sources."@smithy/middleware-endpoint-2.0.1" + sources."@smithy/middleware-retry-2.0.1" + sources."@smithy/middleware-serde-2.0.1" + sources."@smithy/middleware-stack-2.0.0" + sources."@smithy/node-config-provider-2.0.1" + sources."@smithy/node-http-handler-2.0.1" + sources."@smithy/property-provider-2.0.1" + sources."@smithy/protocol-http-2.0.1" + sources."@smithy/querystring-builder-2.0.1" + sources."@smithy/querystring-parser-2.0.1" + sources."@smithy/service-error-classification-2.0.0" + sources."@smithy/shared-ini-file-loader-2.0.1" + sources."@smithy/signature-v4-2.0.1" + sources."@smithy/smithy-client-2.0.1" + sources."@smithy/types-2.0.2" + sources."@smithy/url-parser-2.0.1" + 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-buffer-from-2.0.0" + sources."@smithy/util-config-provider-2.0.0" + sources."@smithy/util-defaults-mode-browser-2.0.1" + sources."@smithy/util-defaults-mode-node-2.0.1" + 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.1" + sources."@smithy/util-uri-escape-2.0.0" + sources."@smithy/util-utf8-2.0.0" + sources."@smithy/util-waiter-2.0.1" sources."@types/connect-3.4.35" sources."@types/minimist-1.2.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/normalize-package-data-2.4.1" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" @@ -95579,7 +93808,7 @@ in sources."assert-never-1.2.1" sources."async-3.2.4" sources."asynckit-0.4.0" - (sources."aws-crt-1.15.20" // { + (sources."aws-crt-1.17.0" // { dependencies = [ sources."axios-0.24.0" ]; @@ -95615,7 +93844,7 @@ in sources."iconv-lite-0.4.24" ]; }) - sources."bootstrap-5.3.0" + sources."bootstrap-5.3.1" sources."bowser-2.11.0" sources."brace-expansion-1.1.11" sources."bs58-4.0.1" @@ -95644,7 +93873,7 @@ in sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."charenc-0.0.2" - sources."chart.js-4.3.0" + sources."chart.js-4.3.2" sources."chownr-1.1.4" sources."cipher-base-1.0.4" sources."cliui-3.2.0" @@ -95652,7 +93881,7 @@ in (sources."cmake-js-6.3.2" // { dependencies = [ sources."axios-0.21.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."tar-4.4.19" ]; }) @@ -95718,7 +93947,7 @@ in sources."delegates-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."dijkstrajs-1.0.3" sources."doctypes-1.1.0" sources."dotenv-13.0.1" @@ -95905,7 +94134,7 @@ in sources."moment-2.29.4" sources."moment-duration-format-2.3.2" sources."mongodb-5.7.0" - sources."mongodb-client-encryption-2.8.0" + sources."mongodb-client-encryption-2.9.0" sources."mongodb-connection-string-url-2.6.0" (sources."morgan-1.10.0" // { dependencies = [ @@ -96009,7 +94238,7 @@ in dependencies = [ sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."type-fest-0.6.0" ]; }) @@ -96133,7 +94362,7 @@ in sources."tr46-3.0.0" sources."traverse-0.3.9" sources."trim-newlines-3.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tsscmp-1.0.6" sources."tunnel-agent-0.6.0" sources."type-fest-0.18.1" @@ -96213,8 +94442,8 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.4.1" - sources."@xmldom/xmldom-0.8.8" + sources."@types/node-20.4.5" + sources."@xmldom/xmldom-0.8.10" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -96512,7 +94741,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-2.8.2" @@ -96675,7 +94904,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@playwright/test-1.35.1" + sources."@playwright/test-1.36.2" sources."@pnpm/config.env-replace-1.1.0" (sources."@pnpm/network.ca-file-1.0.2" // { dependencies = [ @@ -96683,13 +94912,13 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/minimist-1.2.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/normalize-package-data-2.4.1" - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -96741,7 +94970,7 @@ in sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."chalk-4.1.2" @@ -96814,7 +95043,12 @@ in sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" + (sources."enquirer-2.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) sources."error-ex-1.3.2" sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" @@ -96822,7 +95056,7 @@ in sources."execa-5.1.1" sources."exif-parser-0.1.12" sources."external-editor-3.1.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."figures-2.0.0" sources."file-exists-5.0.1" @@ -96909,11 +95143,11 @@ in sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-6.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kind-of-6.0.3" sources."latest-version-7.0.0" sources."lines-and-columns-1.2.4" - sources."listr2-6.6.0" + sources."listr2-6.6.1" sources."load-bmfont-1.4.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" @@ -96986,8 +95220,8 @@ in sources."phin-2.9.3" sources."picomatch-2.3.1" sources."pixelmatch-4.0.2" - sources."playwright-1.35.1" - sources."playwright-core-1.35.1" + sources."playwright-1.36.2" + sources."playwright-core-1.36.2" (sources."plist-3.1.0" // { dependencies = [ sources."xmlbuilder-15.1.1" @@ -97040,7 +95274,7 @@ in sources."rxjs-6.6.7" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."semver-diff-4.0.0" // { dependencies = [ sources."semver-7.5.4" @@ -97254,16 +95488,16 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.2.97"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.2.97.tgz"; - sha512 = "A+UOQi8xDIpfRh7hIF52Hs3OZ082O3TkEIrMPrmUvQBmRzk7+dBu/oSE5JbmL+bZe8EkbAmEvBuodWb7QHNl0w=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.15.1.tgz"; + sha512 = "Ydx9EhMTvJTp0X11y5FtAkeTCokxOdhg525MYTe98iMiLIIeZA0DFZxNN+q3CGrHm5z2PhlWCZnMWawt+oBAog=="; }; dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@jsii/check-node-1.84.0" - sources."@jsii/spec-1.84.0" + sources."@jsii/check-node-1.85.0" + sources."@jsii/spec-1.85.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -97279,9 +95513,9 @@ in sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" - sources."@types/node-16.18.38" + sources."@types/node-16.18.39" sources."@types/triple-beam-1.3.2" - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" sources."ansi-escapes-4.3.2" @@ -97313,8 +95547,8 @@ in sources."buffer-5.7.1" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.7.97" - sources."cdk8s-plus-25-2.8.76" + sources."cdk8s-2.29.0" + sources."cdk8s-plus-25-2.16.0" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" @@ -97323,7 +95557,7 @@ in sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.84.0" // { + (sources."codemaker-1.85.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -97362,7 +95596,7 @@ in sources."dotenv-16.3.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.2.0-dev.20230708" + sources."typescript-5.2.0-dev.20230801" ]; }) sources."emoji-regex-8.0.0" @@ -97377,7 +95611,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fecha-4.2.3" (sources."figures-3.2.0" // { @@ -97428,25 +95662,25 @@ in sources."is-plain-object-5.0.0" sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" - (sources."jsii-1.84.0" // { + (sources."jsii-1.85.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.84.0" // { + (sources."jsii-pacmak-1.85.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.84.0" // { + (sources."jsii-reflect-1.85.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.84.0" // { + (sources."jsii-rosetta-1.85.0" // { dependencies = [ sources."yargs-16.2.0" ]; @@ -97455,7 +95689,7 @@ in dependencies = [ sources."cliui-8.0.1" sources."fs-extra-9.1.0" - (sources."jsii-5.1.5" // { + (sources."jsii-5.1.10" // { dependencies = [ sources."yargs-17.7.2" ]; @@ -97479,7 +95713,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."mdurl-1.0.1" @@ -97498,7 +95732,7 @@ in sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.84.0" + sources."oo-ascii-tree-1.85.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" @@ -97532,7 +95766,7 @@ in sources."semver-7.5.4" (sources."semver-intersect-1.4.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."set-blocking-2.0.0" @@ -97564,8 +95798,8 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."triple-beam-1.3.0" - sources."tslib-2.6.0" + sources."triple-beam-1.4.1" + sources."tslib-2.6.1" sources."type-fest-0.21.3" sources."typescript-3.9.10" sources."universal-user-agent-6.0.0" @@ -97577,7 +95811,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.1" - sources."winston-3.9.0" + sources."winston-3.10.0" sources."winston-transport-4.5.0" sources."workerpool-6.4.0" sources."wrap-ansi-7.0.0" @@ -97612,14 +95846,14 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.17.1"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.17.1.tgz"; - sha512 = "AANv8eXTSqbjFc32MPMfLYXdU0Uqn7W9IWOFvJulCPL/aHXXKna1buofbhUcNDwyl0+f2npwAJfCEN/NrNk4XA=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.17.3.tgz"; + sha512 = "wVOjzfwF4KUkGbdxuQ+/TfLuENbl0Lymp4Kz3cwbxXdEOOy//GlYjHIV+HA+kIl7bS6UtcyfKFXP3QDjjyb/3w=="; }; dependencies = [ sources."@babel/code-frame-7.22.5" - sources."@babel/generator-7.22.7" + sources."@babel/generator-7.22.9" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" (sources."@babel/highlight-7.22.5" // { @@ -97636,18 +95870,18 @@ in sources."@babel/parser-7.22.7" sources."@babel/template-7.22.5" sources."@babel/types-7.22.5" - sources."@cdktf/cli-core-0.17.1" - sources."@cdktf/commons-0.17.1" - (sources."@cdktf/hcl2cdk-0.17.1" // { + sources."@cdktf/cli-core-0.17.3" + sources."@cdktf/commons-0.17.3" + (sources."@cdktf/hcl2cdk-0.17.3" // { dependencies = [ sources."brace-expansion-2.0.1" sources."camelcase-6.3.0" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" sources."zod-3.21.4" ]; }) - (sources."@cdktf/hcl2json-0.17.1" // { + (sources."@cdktf/hcl2json-0.17.3" // { dependencies = [ sources."fs-extra-11.1.1" sources."jsonfile-6.1.0" @@ -97655,26 +95889,61 @@ in ]; }) sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" - (sources."@cdktf/provider-generator-0.17.1" // { + (sources."@cdktf/provider-generator-0.17.3" // { dependencies = [ sources."@types/node-16.18.23" ]; }) - sources."@inquirer/checkbox-1.3.3" - sources."@inquirer/confirm-2.0.4" - (sources."@inquirer/core-2.3.0" // { + (sources."@inquirer/checkbox-1.3.6" // { + dependencies = [ + sources."@inquirer/core-3.1.0" + sources."cli-spinners-2.9.0" + ]; + }) + (sources."@inquirer/confirm-2.0.7" // { + dependencies = [ + sources."@inquirer/core-3.1.0" + sources."cli-spinners-2.9.0" + ]; + }) + (sources."@inquirer/core-2.3.1" // { dependencies = [ sources."cli-spinners-2.9.0" ]; }) - sources."@inquirer/editor-1.2.2" - sources."@inquirer/expand-1.1.3" - sources."@inquirer/input-1.2.3" - sources."@inquirer/password-1.1.3" - sources."@inquirer/prompts-2.3.0" - sources."@inquirer/rawlist-1.2.3" - sources."@inquirer/select-1.2.3" - sources."@inquirer/type-1.1.0" + (sources."@inquirer/editor-1.2.5" // { + dependencies = [ + sources."@inquirer/core-3.1.0" + sources."cli-spinners-2.9.0" + ]; + }) + (sources."@inquirer/expand-1.1.6" // { + dependencies = [ + sources."@inquirer/core-3.1.0" + sources."cli-spinners-2.9.0" + ]; + }) + (sources."@inquirer/input-1.2.6" // { + dependencies = [ + sources."@inquirer/core-3.1.0" + sources."cli-spinners-2.9.0" + ]; + }) + sources."@inquirer/password-1.1.6" + sources."@inquirer/prompts-2.3.1" + (sources."@inquirer/rawlist-1.2.6" // { + dependencies = [ + sources."@inquirer/core-3.1.0" + sources."cli-spinners-2.9.0" + ]; + }) + (sources."@inquirer/select-1.2.6" // { + dependencies = [ + sources."@inquirer/core-3.1.0" + sources."cli-spinners-2.9.0" + ]; + }) + sources."@inquirer/type-1.1.1" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -97694,8 +95963,8 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@jsii/check-node-1.84.0" - sources."@jsii/spec-1.84.0" + sources."@jsii/check-node-1.85.0" + sources."@jsii/spec-1.85.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -97707,13 +95976,15 @@ in sources."@sentry/node-6.19.7" sources."@sentry/types-6.19.7" sources."@sentry/utils-6.19.7" - sources."@types/node-20.4.1" + sources."@types/mute-stream-0.0.1" + sources."@types/node-20.4.5" sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.14" + sources."@types/react-18.2.18" sources."@types/scheduler-0.16.3" + sources."@types/wrap-ansi-3.0.0" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."address-1.2.2" sources."agent-base-6.0.2" sources."ajv-8.12.0" @@ -97752,7 +96023,7 @@ in sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."case-1.6.3" - sources."cdktf-0.17.1" + sources."cdktf-0.17.3" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -97766,7 +96037,7 @@ in sources."cliui-6.0.0" sources."clone-2.1.2" sources."code-excerpt-3.0.0" - (sources."codemaker-1.84.0" // { + (sources."codemaker-1.85.0" // { dependencies = [ sources."camelcase-6.3.0" sources."decamelize-5.0.1" @@ -97793,7 +96064,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decompress-response-6.0.0" - (sources."deep-equal-2.2.1" // { + (sources."deep-equal-2.2.2" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -97802,12 +96073,12 @@ in sources."deepmerge-4.3.1" sources."define-properties-1.2.0" sources."detect-indent-5.0.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."detect-newline-2.1.0" sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.2.0-dev.20230708" + sources."typescript-5.2.0-dev.20230801" ]; }) sources."eastasianwidth-0.2.0" @@ -97836,7 +96107,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { @@ -97851,7 +96122,7 @@ in sources."for-each-0.3.3" (sources."foreground-child-3.1.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) sources."fs-constants-1.0.0" @@ -97872,7 +96143,7 @@ in sources."glob-parent-5.1.2" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."graphology-0.25.1" + sources."graphology-0.25.4" sources."graphology-types-0.24.7" sources."has-1.0.3" sources."has-bigints-1.0.2" @@ -97923,24 +96194,24 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-valid-domain-0.1.6" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."jsii-5.1.5" - (sources."jsii-pacmak-1.84.0" // { + sources."jsii-5.1.10" + (sources."jsii-pacmak-1.85.0" // { dependencies = [ sources."cliui-7.0.4" sources."escape-string-regexp-4.0.0" sources."fs-extra-10.1.0" - sources."jsii-1.84.0" - sources."jsii-rosetta-1.84.0" + sources."jsii-1.85.0" + sources."jsii-rosetta-1.85.0" sources."jsonfile-6.1.0" sources."typescript-3.9.10" sources."universalify-2.0.0" @@ -97950,7 +96221,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.84.0" // { + (sources."jsii-reflect-1.85.0" // { dependencies = [ sources."cliui-7.0.4" sources."fs-extra-10.1.0" @@ -97962,7 +96233,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."jsii-rosetta-5.1.5" + sources."jsii-rosetta-5.1.9" (sources."jsii-srcmak-0.1.949" // { dependencies = [ sources."fs-extra-9.1.0" @@ -98004,7 +96275,7 @@ in ]; }) sources."minimist-1.2.8" - sources."minipass-7.0.1" + sources."minipass-7.0.2" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."mute-stream-1.0.0" @@ -98025,7 +96296,7 @@ in sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.84.0" + sources."oo-ascii-tree-1.85.0" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" @@ -98062,7 +96333,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."react-18.2.0" - sources."react-devtools-core-4.27.8" + sources."react-devtools-core-4.28.0" (sources."react-reconciler-0.26.2" // { dependencies = [ sources."react-17.0.2" @@ -98090,7 +96361,7 @@ in sources."semver-7.5.4" (sources."semver-intersect-1.4.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."set-blocking-2.0.0" @@ -98143,7 +96414,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."widest-line-3.1.0" sources."workerpool-6.4.0" sources."wrap-ansi-6.2.0" @@ -98152,7 +96423,7 @@ in sources."ws-7.5.9" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" - sources."xstate-4.38.0" + sources."xstate-4.38.2" sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-17.7.2" // { @@ -98382,7 +96653,7 @@ in sources."tr46-1.0.1" sources."universal-url-2.0.0" sources."webidl-conversions-4.0.2" - sources."whatwg-fetch-3.6.2" + sources."whatwg-fetch-3.6.17" sources."whatwg-url-7.1.0" (sources."winston-2.4.7" // { dependencies = [ @@ -98403,10 +96674,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.29.0"; + version = "0.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.29.0.tgz"; - sha512 = "fYiXQ4B/Z7GieZmKi7oacygxLKpZiJ4RBnE7Fde4iu3p9/g7VHd7bMU1TE2xRjl8KcuvDfHqnrYbQHiQCZCWMg=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.29.1.tgz"; + sha512 = "jk91ANSAWOxt5FXMvEPDAojjv2U97UQ5QSghCPbTyC9jxnszH1NS8rxIJGG72h/WY889s7JgWClLIte8v4V13w=="; }; buildInputs = globalBuildInputs; meta = { @@ -98484,7 +96755,7 @@ in sources."dockerfile-language-server-nodejs-0.9.0" sources."dockerfile-language-service-0.9.0" sources."dockerfile-utils-0.10.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" (sources."vscode-languageserver-protocol-3.17.3" // { @@ -98666,14 +96937,14 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.17"; + version = "1.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.17.tgz"; - sha512 = "wn3SgiCxaK+geUZomquc7WaACu/zPBtIA0rXJNjCGJWdK3L1d2QL3KzbGBq3A5JZRLNBpzQkD+t4uLBu9HsTfQ=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.20.tgz"; + sha512 = "o2Ofmpz0DDg+O4K34v99RA8U7lJKHeHKfMi5qLuSIGFvwbBUI1dP4C7WR/QTv0DoRnttwDkUtMqnbvRUAB8k8g=="; }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."vscode-languageserver-textdocument-1.0.10" sources."vscode-uri-3.0.7" sources."which-3.0.1" @@ -98870,10 +97141,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.28.0.tgz"; - sha512 = "/B1KkqPLplbjsT3WtMHRb9LRuk414gOVnqXJIn0hivMVVcSt9wAWW3QQi6rN4HQGkkTsGLazZfxhwlaW3tajWQ=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.29.0.tgz"; + sha512 = "LBWrDE8NpdL0AzT3sR1RlzAsbHsV6FuOZloJ8bjQjcVJe1XdsIWEXMvG9KC1aajylQ+SBUJGH44AVCUFavZZkA=="; }; buildInputs = globalBuildInputs; meta = { @@ -98900,6 +97171,7 @@ in sources."agent-base-6.0.2" sources."arch-2.2.0" sources."array-buffer-byte-length-1.0.0" + sources."arraybuffer.prototype.slice-1.0.1" sources."async-2.6.4" sources."available-typed-arrays-1.0.5" sources."await-semaphore-0.1.3" @@ -98922,7 +97194,7 @@ in sources."core-util-is-1.0.3" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" sources."which-1.3.1" ]; }) @@ -98934,7 +97206,7 @@ in sources."duplexer2-0.1.4" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."execa-1.0.0" @@ -98943,7 +97215,7 @@ in sources."flatted-3.2.7" sources."follow-redirects-1.15.2" sources."for-each-0.3.3" - sources."fp-ts-2.16.0" + sources."fp-ts-2.16.1" sources."fs-extra-8.1.0" (sources."fs-minipass-2.1.0" // { dependencies = [ @@ -98995,10 +97267,10 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" - sources."isarray-1.0.0" + sources."isarray-2.0.5" sources."isexe-2.0.0" sources."isuri-2.0.3" sources."jsonc-parser-2.3.1" @@ -99006,7 +97278,7 @@ in sources."listenercount-1.0.1" (sources."locate-java-home-1.1.2" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."lodash-4.17.21" @@ -99049,6 +97321,7 @@ in sources."rc-1.2.8" (sources."readable-stream-2.3.8" // { dependencies = [ + sources."isarray-1.0.0" sources."safe-buffer-5.1.2" ]; }) @@ -99056,6 +97329,7 @@ in sources."rfc-3986-1.0.1" sources."rfdc-1.3.0" sources."rimraf-3.0.2" + sources."safe-array-concat-1.0.0" sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" @@ -99080,7 +97354,10 @@ in sources."tar-6.1.15" sources."tr46-0.0.3" sources."traverse-0.3.9" - sources."tslib-2.6.0" + sources."tslib-2.6.1" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" @@ -99100,7 +97377,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -99161,7 +97438,8 @@ in sha512 = "ETYx8Hq41MP7Zd2lGnLtro8nuqnjWLFeOygcWabI5YDDOjXf5P59ZB1UBZFte/FRh5/8jiFDxYW18lwnDmC6Xw=="; }; dependencies = [ - sources."pyright-1.1.316" + sources."fsevents-2.3.2" + sources."pyright-1.1.319" ]; buildInputs = globalBuildInputs; meta = { @@ -99262,11 +97540,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."bash-language-server-4.10.1" + sources."bash-language-server-4.10.3" sources."braces-3.0.2" sources."domino-2.1.6" sources."encoding-0.1.13" - sources."fast-glob-3.2.12" + sources."fast-glob-3.3.0" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fuzzy-search-3.2.1" @@ -99277,7 +97555,7 @@ in sources."is-number-7.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."node-fetch-2.6.11" + sources."node-fetch-2.6.12" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" @@ -99285,7 +97563,7 @@ in sources."safer-buffer-2.1.2" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."turndown-7.1.2" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" @@ -99465,7 +97743,7 @@ in sources."resolve-global-1.0.0" sources."rxjs-6.6.7" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."signal-exit-3.0.7" sources."to-regex-range-5.0.1" sources."tslib-1.14.1" @@ -99505,15 +97783,15 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -99538,17 +97816,16 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.3" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.11" + sources."@types/mdast-3.0.12" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/unist-3.0.0" + sources."@types/unist-2.0.7" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -99568,11 +97845,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -99609,7 +97886,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -99619,7 +97896,7 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.3.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" @@ -99695,11 +97972,7 @@ in sources."map-obj-4.3.0" sources."mathml-tag-names-2.1.3" sources."mdast-util-from-markdown-0.8.5" - (sources."mdast-util-to-markdown-0.6.5" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."mdast-util-to-markdown-0.6.5" sources."mdast-util-to-string-2.0.0" sources."meow-9.0.0" sources."merge2-1.4.1" @@ -99715,7 +97988,13 @@ in }) sources."ms-2.1.2" sources."node-releases-2.0.13" - sources."normalize-package-data-3.0.3" + (sources."normalize-package-data-3.0.3" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."semver-7.5.4" + sources."yallist-4.0.0" + ]; + }) sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" sources."num2fraction-1.2.2" @@ -99755,7 +98034,7 @@ in dependencies = [ sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."type-fest-0.6.0" ]; }) @@ -99777,12 +98056,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) + sources."semver-6.3.1" sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -99818,26 +98092,14 @@ in sources."unified-9.2.2" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" - (sources."unist-util-stringify-position-2.0.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."unist-util-stringify-position-2.0.3" sources."update-browserslist-db-1.0.11" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" sources."validate-npm-package-license-3.0.4" - (sources."vfile-4.2.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."vfile-message-2.0.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."vfile-4.2.1" + sources."vfile-message-2.0.4" sources."vscode-jsonrpc-5.1.0-next.1" sources."vscode-languageserver-6.2.0-next.2" (sources."vscode-languageserver-protocol-3.16.0-next.2" // { @@ -100010,7 +98272,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."resolve-1.22.3" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" @@ -100156,12 +98418,12 @@ in sources."diff-4.0.2" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" - sources."enquirer-2.3.6" + sources."enquirer-2.4.1" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" (sources."eslint-plugin-vue-7.20.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."eslint-scope-5.1.1" @@ -100279,7 +98541,7 @@ in dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."tsutils-2.29.0" @@ -100293,7 +98555,7 @@ in dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."which-2.0.2" @@ -100409,7 +98671,7 @@ in sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; }; dependencies = [ - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."@xstate/fsm-1.6.5" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" @@ -100531,7 +98793,7 @@ in sources."commander-2.20.3" ]; }) - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.7" @@ -100673,7 +98935,7 @@ in sources."strip-ansi-6.0.1" sources."supports-color-8.1.1" sources."tree-kill-1.2.2" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.7.2" @@ -100733,7 +98995,7 @@ in sources."string_decoder-1.3.0" sources."tdigest-0.1.2" sources."text-hex-1.0.0" - sources."triple-beam-1.3.0" + sources."triple-beam-1.4.1" sources."util-deprecate-1.0.2" sources."winston-3.8.2" sources."winston-transport-4.5.0" @@ -100794,7 +99056,7 @@ in sources."conventional-changelog-jquery-4.0.0" sources."conventional-changelog-jshint-3.0.0" sources."conventional-changelog-preset-loader-3.0.0" - sources."conventional-changelog-writer-6.0.0" + sources."conventional-changelog-writer-6.0.1" sources."conventional-commits-filter-3.0.0" sources."conventional-commits-parser-4.0.0" sources."core-util-is-1.0.3" @@ -100817,7 +99079,7 @@ in sources."get-pkg-repo-4.2.1" sources."git-raw-commits-3.0.0" sources."git-remote-origin-url-2.0.0" - sources."git-semver-tags-5.0.0" + sources."git-semver-tags-5.0.1" sources."gitconfiglocal-1.0.0" sources."graceful-fs-4.2.11" sources."handlebars-4.7.7" @@ -100872,7 +99134,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."min-indent-1.0.1" @@ -100880,11 +99142,7 @@ in sources."minimist-options-4.1.0" sources."modify-values-1.0.1" sources."neo-async-2.6.2" - (sources."normalize-package-data-3.0.3" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) + sources."normalize-package-data-3.0.3" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -100903,7 +99161,7 @@ in dependencies = [ sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."read-pkg-up-3.0.0" @@ -100912,7 +99170,7 @@ in sources."require-directory-2.1.1" sources."resolve-1.22.3" sources."safe-buffer-5.2.1" - sources."semver-6.3.0" + sources."semver-7.5.4" sources."source-map-0.6.1" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" @@ -100994,17 +99252,17 @@ in (sources."@npmcli/map-workspaces-3.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) sources."@npmcli/metavuln-calculator-5.0.1" sources."@npmcli/name-from-folder-2.0.0" sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/package-json-4.0.0" // { + (sources."@npmcli/package-json-4.0.1" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -101020,8 +99278,9 @@ in ]; }) sources."@pkgjs/parseargs-0.11.0" - sources."@sigstore/protobuf-specs-0.1.0" - sources."@sigstore/tuf-1.0.2" + sources."@sigstore/bundle-1.0.0" + sources."@sigstore/protobuf-specs-0.2.0" + sources."@sigstore/tuf-1.0.3" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" (sources."@tufjs/models-1.0.4" // { @@ -101030,7 +99289,7 @@ in sources."minimatch-9.0.3" ]; }) - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -101059,9 +99318,9 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.51" - (sources."bin-links-4.0.1" // { + (sources."bin-links-4.0.2" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."write-file-atomic-5.0.1" ]; }) @@ -101083,7 +99342,7 @@ in dependencies = [ sources."brace-expansion-2.0.1" sources."fs-minipass-3.0.2" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."lru-cache-7.18.3" sources."minimatch-9.0.3" sources."minipass-5.0.0" @@ -101140,7 +99399,7 @@ in (sources."cordova-lib-12.0.1" // { dependencies = [ sources."pify-5.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."write-file-atomic-5.0.1" ]; }) @@ -101201,7 +99460,7 @@ in }) sources."extsprintf-1.4.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" @@ -101216,7 +99475,7 @@ in sources."find-up-3.0.0" (sources."foreground-child-3.1.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) sources."forever-agent-0.6.1" @@ -101329,7 +99588,7 @@ in sources."isexe-2.0.0" sources."isobject-4.0.0" sources."isstream-0.1.2" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."jsbn-0.1.1" sources."json-parse-even-better-errors-3.0.0" sources."json-schema-0.4.0" @@ -101358,7 +99617,7 @@ in sources."macos-release-2.5.1" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) (sources."make-fetch-happen-11.1.1" // { @@ -101379,7 +99638,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minipass-7.0.1" + sources."minipass-7.0.2" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -101436,7 +99695,7 @@ in sources."npm-normalize-package-bin-3.0.1" sources."npm-package-arg-10.1.0" sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.1" + sources."npm-pick-manifest-8.0.2" (sources."npm-registry-fetch-14.0.5" // { dependencies = [ sources."minipass-5.0.0" @@ -101445,11 +99704,11 @@ in sources."npm-run-path-4.0.1" (sources."npmlog-7.0.1" // { dependencies = [ - sources."are-we-there-yet-4.0.0" + sources."are-we-there-yet-4.0.1" sources."emoji-regex-8.0.0" sources."gauge-5.0.1" sources."readable-stream-4.4.2" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" ]; @@ -101520,7 +99779,7 @@ in (sources."read-package-json-6.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -101574,7 +99833,7 @@ in sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."sigstore-1.7.0" + sources."sigstore-1.8.0" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" @@ -101609,7 +99868,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.18.6" + sources."systeminformation-5.18.10" (sources."tar-6.1.15" // { dependencies = [ sources."minipass-5.0.0" @@ -101731,7 +99990,7 @@ in sources."dir-glob-3.0.1" sources."error-ex-1.3.2" sources."escape-string-regexp-5.0.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-6.3.0" @@ -101816,7 +100075,7 @@ in sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" sources."trim-newlines-5.0.0" - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" sources."validate-npm-package-license-3.0.4" sources."yallist-4.0.0" sources."yargs-parser-21.1.1" @@ -101851,7 +100110,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -102117,10 +100376,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "6.31.1"; + version = "6.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-6.31.1.tgz"; - sha512 = "gyCtpkOpwI/TGibbtIgMBFnAUUp2hnYdvW/9Ky4RcneHtLH0+V/jUEbZD8HbRKz0GVZ6mhKWbNRSEyP9p3Cejw=="; + url = "https://registry.npmjs.org/cspell/-/cspell-6.31.2.tgz"; + sha512 = "HJcQ8jqL/1N3Mj5dufFnIZCX3ACuRoFTSVY6h3Bo5wBqd2iiJTyeQ1SY9Zymlxtb2KyJ6jQRiFmkWeFx2HVs7w=="; }; dependencies = [ sources."@babel/code-frame-7.22.5" @@ -102135,27 +100394,27 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-6.31.1" + sources."@cspell/cspell-bundled-dicts-6.31.2" sources."@cspell/cspell-pipe-6.31.1" sources."@cspell/cspell-service-bus-6.31.1" sources."@cspell/cspell-types-6.31.1" - sources."@cspell/dict-ada-4.0.1" + sources."@cspell/dict-ada-4.0.2" sources."@cspell/dict-aws-3.0.0" sources."@cspell/dict-bash-4.1.1" - sources."@cspell/dict-companies-3.0.16" - sources."@cspell/dict-cpp-5.0.3" + sources."@cspell/dict-companies-3.0.17" + sources."@cspell/dict-cpp-5.0.4" sources."@cspell/dict-cryptocurrencies-3.0.1" sources."@cspell/dict-csharp-4.0.2" sources."@cspell/dict-css-4.0.6" - sources."@cspell/dict-dart-2.0.2" - sources."@cspell/dict-data-science-1.0.6" + sources."@cspell/dict-dart-2.0.3" + sources."@cspell/dict-data-science-1.0.8" sources."@cspell/dict-django-4.1.0" - sources."@cspell/dict-docker-1.1.6" + sources."@cspell/dict-docker-1.1.7" sources."@cspell/dict-dotnet-5.0.0" sources."@cspell/dict-elixir-4.0.3" sources."@cspell/dict-en-common-misspellings-1.0.2" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.3.4" + sources."@cspell/dict-en_us-4.3.6" sources."@cspell/dict-filetypes-3.0.1" sources."@cspell/dict-fonts-3.0.2" sources."@cspell/dict-fullstack-3.1.5" @@ -102174,14 +100433,14 @@ in sources."@cspell/dict-npm-5.0.7" sources."@cspell/dict-php-4.0.1" sources."@cspell/dict-powershell-5.0.2" - sources."@cspell/dict-public-licenses-2.0.2" - sources."@cspell/dict-python-4.1.1" + sources."@cspell/dict-public-licenses-2.0.3" + sources."@cspell/dict-python-4.1.4" sources."@cspell/dict-r-2.0.1" sources."@cspell/dict-ruby-5.0.0" sources."@cspell/dict-rust-4.0.1" sources."@cspell/dict-scala-5.0.0" - sources."@cspell/dict-software-terms-3.1.18" - sources."@cspell/dict-sql-2.1.0" + sources."@cspell/dict-software-terms-3.2.0" + sources."@cspell/dict-sql-2.1.1" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-typescript-3.1.1" @@ -102211,11 +100470,11 @@ in sources."cosmiconfig-8.0.0" sources."crypto-random-string-2.0.0" sources."cspell-dictionary-6.31.1" - sources."cspell-gitignore-6.31.1" - sources."cspell-glob-6.31.1" + sources."cspell-gitignore-6.31.2" + sources."cspell-glob-6.31.2" sources."cspell-grammar-6.31.1" - sources."cspell-io-6.31.1" - sources."cspell-lib-6.31.1" + sources."cspell-io-6.31.2" + sources."cspell-lib-6.31.2" sources."cspell-trie-lib-6.31.1" sources."dot-prop-5.3.0" sources."encoding-0.1.13" @@ -102223,7 +100482,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fast-equals-4.0.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" @@ -102266,7 +100525,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."merge2-1.4.1" @@ -102777,7 +101036,7 @@ in sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."semver-diff-2.1.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -103028,7 +101287,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.1.1" sources."dir-glob-3.0.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -103138,7 +101397,7 @@ in sources."pump-3.0.0" sources."require-directory-2.1.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.7" @@ -103197,6 +101456,34 @@ in bypassCache = true; reconstructLock = true; }; + dotenv-cli = nodeEnv.buildNodePackage { + name = "dotenv-cli"; + packageName = "dotenv-cli"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.2.1.tgz"; + sha512 = "ODHbGTskqRtXAzZapDPvgNuDVQApu4oKX8lZW7Y0+9hKA6le1ZJlyRS687oU9FXjOVEDU/VFV6zI125HzhM1UQ=="; + }; + dependencies = [ + sources."cross-spawn-7.0.3" + sources."dotenv-16.3.1" + sources."dotenv-expand-10.0.0" + sources."isexe-2.0.0" + sources."minimist-1.2.8" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A global executable to run applications with the ENV variables loaded by dotenv"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; dotenv-vault = nodeEnv.buildNodePackage { name = "dotenv-vault"; packageName = "dotenv-vault"; @@ -103213,54 +101500,49 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/color-1.0.7" + sources."@oclif/color-1.0.10" sources."@oclif/core-1.26.2" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/plugin-help-5.2.11" // { + (sources."@oclif/plugin-help-5.2.15" // { dependencies = [ - sources."@oclif/core-2.8.11" + sources."@oclif/core-2.11.5" ]; }) - (sources."@oclif/plugin-not-found-2.3.26" // { + (sources."@oclif/plugin-not-found-2.3.34" // { dependencies = [ - sources."@oclif/core-2.8.11" + sources."@oclif/core-2.11.5" ]; }) - (sources."@oclif/plugin-update-3.1.22" // { + (sources."@oclif/plugin-update-3.1.28" // { dependencies = [ - sources."@oclif/core-2.8.11" - sources."cross-spawn-7.0.3" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" + sources."@oclif/core-2.11.5" ]; }) - (sources."@oclif/plugin-warn-if-update-available-2.0.41" // { + (sources."@oclif/plugin-warn-if-update-available-2.0.46" // { dependencies = [ - sources."@oclif/core-2.8.11" + sources."@oclif/core-2.11.5" ]; }) - sources."@oclif/screen-3.0.4" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@oclif/screen-3.0.6" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/cli-progress-3.11.0" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."ansi-escapes-4.3.2" @@ -103270,6 +101552,7 @@ in sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-union-2.1.0" + sources."astral-regex-2.0.0" sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" @@ -103301,11 +101584,7 @@ in sources."concat-map-0.0.1" sources."content-type-1.0.5" sources."create-require-1.1.1" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."debug-4.3.4" sources."defaults-1.0.4" sources."delayed-stream-1.0.0" @@ -103319,7 +101598,7 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."external-editor-3.1.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-levenshtein-3.0.0" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" @@ -103388,19 +101667,14 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" - sources."nice-try-1.0.5" sources."object-treeify-1.1.33" sources."once-1.4.0" sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."parse-json-4.0.0" - (sources."password-prompt-1.1.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - ]; - }) - sources."path-key-2.0.1" + sources."password-prompt-1.1.3" + sources."path-key-3.1.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pump-3.0.0" @@ -103415,10 +101689,11 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.5.4" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" sources."slash-3.0.0" + sources."slice-ansi-4.0.0" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -103435,7 +101710,7 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."ts-node-10.9.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."typescript-5.1.6" @@ -103443,7 +101718,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wcwidth-1.0.1" - sources."which-1.3.1" + sources."which-2.0.2" sources."widest-line-3.1.0" sources."wordwrap-1.0.0" sources."wrap-ansi-7.0.0" @@ -103473,7 +101748,7 @@ in sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" sources."@search-dump/jsonstream-1.5.0" - sources."@types/node-14.18.53" + sources."@types/node-14.18.54" sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -103531,7 +101806,7 @@ in sources."is-arguments-1.1.1" sources."is-callable-1.2.7" sources."is-generator-function-1.0.10" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -103612,7 +101887,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.0.0" sources."verror-1.10.0" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" ]; @@ -103654,7 +101929,7 @@ in dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."universalify-0.1.2" ]; }) @@ -103684,10 +101959,10 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.3.0" @@ -103719,7 +101994,7 @@ in (sources."cacache-17.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -103782,7 +102057,7 @@ in sources."define-properties-1.2.0" sources."delegates-1.0.0" sources."depd-2.0.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."detect-node-2.1.0" sources."dir-compare-3.3.0" sources."eastasianwidth-0.2.0" @@ -103790,7 +102065,11 @@ in sources."emoji-regex-9.2.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" + (sources."enquirer-2.4.1" // { + dependencies = [ + sources."strip-ansi-6.0.1" + ]; + }) sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" @@ -103802,7 +102081,7 @@ in sources."cross-spawn-6.0.5" sources."get-stream-4.1.0" sources."path-key-2.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.7" @@ -103812,7 +102091,7 @@ in sources."expand-tilde-2.0.2" sources."exponential-backoff-3.1.1" sources."extract-zip-2.0.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."filename-reserved-regex-2.0.0" @@ -103913,12 +102192,12 @@ in sources."is-wsl-2.2.0" sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."json-buffer-3.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."junk-3.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" (sources."listr2-5.0.8" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -103997,7 +102276,7 @@ in sources."nopt-6.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."normalize-url-6.1.0" @@ -104094,7 +102373,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -104145,7 +102424,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-fest-0.13.1" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" @@ -104189,7 +102468,7 @@ in dependencies = [ sources."cross-spawn-6.0.5" sources."path-key-2.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."which-1.3.1" @@ -104211,12 +102490,13 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "3.15.0"; + version = "3.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.15.0.tgz"; - sha512 = "Ju7INN1YY5Cu0zIDFEs5MkAi9HMWKyjdOWafrYL7eGhTpuEFd0UGNn394/o4MsHoG8lyFpzH0eeyR+j9UkVV1g=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.17.1.tgz"; + sha512 = "+lntd0QFJyZcg6HaFYVc1R9DVk6jPyHq9vXcmQWQNdL8CzkpdqooZE1KYJ/sQoTeyHRO90rEuSr+ocUu3njgKg=="; }; dependencies = [ + sources."@0no-co/graphql.web-1.0.4" sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.22.5" (sources."@babel/highlight-7.22.5" // { @@ -104231,26 +102511,19 @@ in ]; }) sources."@expo/code-signing-certificates-0.0.5" - (sources."@expo/config-7.0.3" // { + (sources."@expo/config-8.1.2" // { dependencies = [ - (sources."@expo/config-plugins-5.0.4" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."@expo/json-file-8.2.36" - sources."@expo/plist-0.0.18" - sources."semver-7.3.2" + sources."semver-7.5.3" ]; }) - (sources."@expo/config-plugins-6.0.2" // { + (sources."@expo/config-plugins-7.2.4" // { dependencies = [ - sources."@expo/config-types-48.0.0" + sources."semver-7.5.4" ]; }) - sources."@expo/config-types-47.0.0" + sources."@expo/config-types-49.0.0" sources."@expo/eas-build-job-1.0.13" - (sources."@expo/eas-json-3.13.0" // { + (sources."@expo/eas-json-3.17.0" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; @@ -104263,34 +102536,29 @@ in sources."semver-7.3.2" ]; }) - (sources."@expo/json-file-8.2.37" // { - dependencies = [ - sources."json5-2.2.3" - ]; - }) + sources."@expo/json-file-8.2.37" sources."@expo/logger-1.0.21" sources."@expo/multipart-body-parser-1.1.0" sources."@expo/osascript-2.0.33" (sources."@expo/package-manager-0.0.57" // { dependencies = [ sources."@expo/json-file-8.2.36" + sources."json5-1.0.2" ]; }) sources."@expo/pkcs12-0.0.8" - sources."@expo/plist-0.0.20" + (sources."@expo/plist-0.0.20" // { + dependencies = [ + sources."@xmldom/xmldom-0.7.13" + sources."xmlbuilder-14.0.0" + ]; + }) sources."@expo/plugin-help-5.1.22" sources."@expo/plugin-warn-if-update-available-2.5.0" - (sources."@expo/prebuild-config-5.0.7" // { + (sources."@expo/prebuild-config-6.2.5" // { dependencies = [ - (sources."@expo/config-plugins-5.0.4" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."@expo/json-file-8.2.36" - sources."@expo/plist-0.0.18" sources."fs-extra-9.1.0" - sources."semver-7.3.2" + sources."semver-7.5.3" sources."universalify-2.0.0" ]; }) @@ -104310,7 +102578,13 @@ in sources."which-2.0.2" ]; }) - sources."@expo/steps-1.0.23" + (sources."@expo/steps-1.0.28" // { + dependencies = [ + sources."@expo/package-manager-1.0.2" + sources."fs-extra-11.1.1" + sources."universalify-2.0.0" + ]; + }) sources."@expo/timeago.js-1.0.0" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" @@ -104344,18 +102618,18 @@ in sources."universalify-2.0.0" ]; }) - sources."@oclif/screen-3.0.4" + sources."@oclif/screen-3.0.6" sources."@react-native/normalize-color-2.1.0" - sources."@segment/ajv-human-errors-2.7.0" + sources."@segment/ajv-human-errors-2.11.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@types/bunyan-1.8.8" - sources."@types/node-20.4.1" - sources."@urql/core-3.1.1" - sources."@urql/exchange-retry-1.0.0" - sources."@xmldom/xmldom-0.7.11" + sources."@types/node-20.4.5" + sources."@urql/core-4.0.11" + sources."@urql/exchange-retry-1.2.0" + sources."@xmldom/xmldom-0.8.10" sources."agent-base-6.0.2" sources."ajv-8.11.0" sources."ajv-formats-2.1.1" @@ -104415,7 +102689,7 @@ in sources."content-type-1.0.5" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."crypt-0.0.2" @@ -104443,15 +102717,9 @@ in sources."exec-async-2.2.0" (sources."expo-modules-autolinking-1.5.0" // { dependencies = [ - sources."@expo/config-8.1.2" - sources."@expo/config-plugins-7.2.5" - sources."@expo/config-types-49.0.0" sources."commander-7.2.0" sources."fs-extra-9.1.0" - sources."semver-7.5.3" sources."universalify-2.0.0" - sources."xml2js-0.6.0" - sources."xmlbuilder-11.0.1" ]; }) sources."fast-deep-equal-3.1.3" @@ -104464,7 +102732,6 @@ in sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."form-data-4.0.0" - sources."freeport-async-2.0.0" (sources."fs-extra-10.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -104527,7 +102794,7 @@ in sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" - sources."json5-1.0.2" + sources."json5-2.2.3" (sources."jsonfile-6.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -104537,6 +102804,8 @@ in sources."kleur-3.0.3" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.get-4.4.2" sources."lodash.merge-4.6.2" sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" @@ -104582,7 +102851,7 @@ in sources."node-rsa-1.1.1" (sources."npm-package-arg-7.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."nullthrows-1.1.1" @@ -104604,9 +102873,13 @@ in sources."pngjs-3.4.0" ]; }) - (sources."password-prompt-1.1.2" // { + (sources."password-prompt-1.1.3" // { dependencies = [ - sources."ansi-escapes-3.2.0" + sources."cross-spawn-7.0.3" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" ]; }) sources."path-exists-4.0.0" @@ -104623,12 +102896,7 @@ in sources."p-locate-4.1.0" ]; }) - (sources."plist-3.1.0" // { - dependencies = [ - sources."@xmldom/xmldom-0.8.8" - sources."xmlbuilder-15.1.1" - ]; - }) + sources."plist-3.1.0" sources."pngjs-6.0.0" sources."promise-limit-2.7.0" sources."promise-retry-2.0.1" @@ -104664,7 +102932,7 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."structured-headers-0.4.1" - sources."sucrase-3.32.0" + sources."sucrase-3.34.0" sources."sudo-prompt-9.1.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.3.0" // { @@ -104703,7 +102971,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."widest-line-3.1.0" - sources."wonka-6.3.2" + sources."wonka-6.3.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -104718,12 +102986,12 @@ in sources."uuid-7.0.3" ]; }) - (sources."xml2js-0.4.23" // { + (sources."xml2js-0.6.0" // { dependencies = [ sources."xmlbuilder-11.0.1" ]; }) - sources."xmlbuilder-14.0.0" + sources."xmlbuilder-15.1.1" sources."yallist-4.0.0" sources."yaml-2.3.1" sources."yocto-queue-0.1.0" @@ -104829,13 +103097,18 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" - (sources."@babel/helper-compilation-targets-7.22.6" // { + (sources."@babel/helper-compilation-targets-7.22.9" // { dependencies = [ sources."lru-cache-5.1.1" + sources."semver-6.3.1" sources."yallist-3.1.1" ]; }) @@ -104843,7 +103116,7 @@ in sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -104871,11 +103144,10 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.14" + sources."@types/react-18.2.18" sources."@types/scheduler-0.16.3" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" @@ -104893,14 +103165,14 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."bufferutil-4.0.7" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -104930,7 +103202,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -105002,7 +103274,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."map-age-cleaner-0.1.3" @@ -105056,7 +103328,7 @@ in sources."punycode-2.3.0" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.27.8" + sources."react-devtools-core-4.28.0" sources."react-is-16.13.1" (sources."react-reconciler-0.26.2" // { dependencies = [ @@ -105083,7 +103355,7 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."scheduler-0.20.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.8.1" @@ -105182,17 +103454,17 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.44.0"; + version = "8.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz"; - sha512 = "0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz"; + sha512 = "cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - sources."@eslint/eslintrc-2.1.0" - sources."@eslint/js-8.44.0" + sources."@eslint-community/regexpp-4.6.2" + sources."@eslint/eslintrc-2.1.1" + sources."@eslint/js-8.46.0" sources."@humanwhocodes/config-array-0.11.10" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -105217,10 +103489,10 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.44.0" - sources."eslint-scope-7.2.0" - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-8.46.0" + sources."eslint-scope-7.2.2" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -105323,42 +103595,52 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.22.6" - (sources."@babel/core-7.22.8" // { + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { dependencies = [ sources."@babel/code-frame-7.22.5" sources."json5-2.2.3" + sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.7" + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.5" - (sources."@babel/helper-compilation-targets-7.22.6" // { + (sources."@babel/helper-compilation-targets-7.22.9" // { dependencies = [ sources."lru-cache-5.1.1" + sources."semver-6.3.1" sources."yallist-3.1.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.22.6" - sources."@babel/helper-create-regexp-features-plugin-7.22.6" - sources."@babel/helper-define-polyfill-provider-0.4.1" + (sources."@babel/helper-create-class-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/helper-define-polyfill-provider-0.4.2" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.5" - sources."@babel/helper-replace-supers-7.22.5" + sources."@babel/helper-remap-async-to-generator-7.22.9" + sources."@babel/helper-replace-supers-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helper-wrap-function-7.22.5" + sources."@babel/helper-wrap-function-7.22.9" sources."@babel/helpers-7.22.6" (sources."@babel/highlight-7.22.5" // { dependencies = [ @@ -105445,19 +103727,27 @@ in sources."@babel/plugin-transform-react-jsx-source-7.22.5" sources."@babel/plugin-transform-regenerator-7.22.5" sources."@babel/plugin-transform-reserved-words-7.22.5" - sources."@babel/plugin-transform-runtime-7.22.7" + (sources."@babel/plugin-transform-runtime-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/plugin-transform-shorthand-properties-7.22.5" sources."@babel/plugin-transform-spread-7.22.5" sources."@babel/plugin-transform-sticky-regex-7.22.5" sources."@babel/plugin-transform-template-literals-7.22.5" sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.5" + sources."@babel/plugin-transform-typescript-7.22.9" sources."@babel/plugin-transform-unicode-escapes-7.22.5" sources."@babel/plugin-transform-unicode-property-regex-7.22.5" sources."@babel/plugin-transform-unicode-regex-7.22.5" sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - sources."@babel/preset-env-7.22.7" - sources."@babel/preset-modules-0.1.5" + (sources."@babel/preset-env-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/preset-modules-0.1.6" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.22.5" // { @@ -105521,10 +103811,10 @@ in sources."node-forge-1.3.1" (sources."npm-package-arg-7.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) - sources."semver-6.3.0" + sources."semver-6.3.1" sources."temp-dir-1.0.0" sources."type-fest-0.3.1" sources."universalify-1.0.0" @@ -105582,7 +103872,7 @@ in sources."@expo/json-file-8.2.36" sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."@expo/plist-0.0.20" @@ -105622,7 +103912,6 @@ in ]; }) sources."@leichtgewicht/ip-codec-2.0.4" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -105650,7 +103939,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.5.0" - sources."@types/eslint-8.44.0" + sources."@types/eslint-8.44.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/express-4.17.17" @@ -105667,7 +103956,7 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-1.3.2" sources."@types/minimatch-5.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" @@ -105696,7 +103985,7 @@ in sources."@webassemblyjs/wasm-opt-1.11.6" sources."@webassemblyjs/wasm-parser-1.11.6" sources."@webassemblyjs/wast-printer-1.11.6" - sources."@xmldom/xmldom-0.7.11" + sources."@xmldom/xmldom-0.7.13" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."abab-2.0.6" @@ -105738,9 +104027,13 @@ in sources."axios-0.21.1" sources."babel-loader-8.3.0" sources."babel-plugin-module-resolver-4.1.0" - sources."babel-plugin-polyfill-corejs2-0.4.4" - sources."babel-plugin-polyfill-corejs3-0.8.2" - sources."babel-plugin-polyfill-regenerator-0.5.1" + (sources."babel-plugin-polyfill-corejs2-0.4.5" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.8.3" + sources."babel-plugin-polyfill-regenerator-0.5.2" sources."babel-plugin-react-native-web-0.18.12" sources."babel-preset-expo-9.3.2" sources."balanced-match-1.0.2" @@ -105772,7 +104065,7 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -105793,7 +104086,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -105869,17 +104162,17 @@ in sources."slash-4.0.0" ]; }) - sources."core-js-compat-3.31.1" + sources."core-js-compat-3.32.0" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."crypt-0.0.2" sources."crypto-random-string-1.0.0" - sources."css-declaration-sorter-6.4.0" + sources."css-declaration-sorter-6.4.1" (sources."css-loader-6.8.1" // { dependencies = [ sources."semver-7.5.4" @@ -105935,7 +104228,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -106056,7 +104349,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."faye-websocket-0.11.4" @@ -106232,7 +104525,7 @@ in sources."json5-1.0.2" sources."jsonfile-6.1.0" sources."keychain-1.3.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kleur-3.0.3" sources."latest-version-5.1.0" sources."launch-editor-2.6.0" @@ -106262,7 +104555,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."md5-2.3.0" @@ -106324,7 +104617,7 @@ in (sources."npm-package-arg-6.1.0" // { dependencies = [ sources."hosted-git-info-2.8.9" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."npm-run-path-2.0.2" @@ -106384,16 +104677,20 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-5.1.0" sources."responselike-1.0.2" - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."param-case-3.0.4" sources."parse-png-2.1.0" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" - (sources."password-prompt-1.1.2" // { + (sources."password-prompt-1.1.3" // { dependencies = [ - sources."ansi-escapes-3.2.0" + sources."cross-spawn-7.0.3" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" ]; }) sources."path-browserify-1.0.1" @@ -106429,12 +104726,12 @@ in }) (sources."plist-3.1.0" // { dependencies = [ - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."xmlbuilder-15.1.1" ]; }) sources."pngjs-3.4.0" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-calc-8.2.4" sources."postcss-colormin-5.3.1" sources."postcss-convert-values-5.1.3" @@ -106659,7 +104956,7 @@ in sources."structured-headers-0.4.1" sources."style-loader-3.3.3" sources."stylehacks-5.1.1" - (sources."sucrase-3.32.0" // { + (sources."sucrase-3.34.0" // { dependencies = [ sources."commander-4.1.1" ]; @@ -106694,7 +104991,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.18.2" // { + (sources."terser-5.19.2" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -106721,7 +105018,7 @@ in sources."traverse-0.6.7" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."turndown-7.0.0" sources."type-fest-0.12.0" sources."type-is-1.6.18" @@ -106759,7 +105056,7 @@ in sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-5.88.1" // { + (sources."webpack-5.88.2" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -106866,16 +105163,16 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -106903,12 +105200,11 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@types/minimist-1.2.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.14" + sources."@types/react-18.2.18" sources."@types/scheduler-0.16.3" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -106927,7 +105223,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.7" @@ -106936,7 +105232,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -106962,7 +105258,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -107069,13 +105365,13 @@ in }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.27.8" + sources."react-devtools-core-4.28.0" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."type-fest-0.6.0" ]; }) @@ -107093,7 +105389,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scheduler-0.20.2" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."shell-quote-1.8.1" sources."signal-exit-3.0.7" (sources."slice-ansi-3.0.0" // { @@ -107182,16 +105478,17 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.30" - sources."@oclif/config-1.18.11" + sources."@oclif/command-1.8.35" + sources."@oclif/config-1.18.16" sources."@oclif/errors-1.3.6" - (sources."@oclif/help-1.0.9" // { + (sources."@oclif/help-1.0.14" // { dependencies = [ + sources."@oclif/config-1.18.15" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.13" + sources."@oclif/parser-3.8.16" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -107241,7 +105538,11 @@ in ]; }) sources."bluebird-3.7.2" - sources."boxen-5.1.2" + (sources."boxen-5.1.2" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) sources."braces-3.0.2" sources."btoa-lite-1.0.0" sources."buffer-5.7.1" @@ -107277,7 +105578,7 @@ in sources."fs-extra-7.0.1" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."strip-ansi-5.2.0" sources."tslib-1.14.1" ]; @@ -107292,11 +105593,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."csv-parse-5.4.0" sources."csv-stream-0.2.0" sources."dashdash-1.14.1" @@ -107321,14 +105618,23 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-0.10.0" + (sources."execa-0.10.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."semver-5.7.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) sources."exponential-backoff-3.1.1" sources."extend-3.0.2" sources."external-editor-3.1.0" sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -107380,7 +105686,6 @@ in (sources."inquirer-8.2.5" // { dependencies = [ sources."ansi-escapes-4.3.2" - sources."type-fest-0.21.3" ]; }) sources."into-stream-3.1.0" @@ -107435,7 +105740,11 @@ in sources."node-abort-controller-3.1.1" sources."node-fetch-2.6.12" sources."normalize-url-2.0.1" - sources."npm-run-path-2.0.2" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-sizeof-1.6.3" @@ -107448,8 +105757,12 @@ in sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" sources."p-timeout-2.0.1" - sources."password-prompt-1.1.2" - sources."path-key-2.0.1" + (sources."password-prompt-1.1.3" // { + dependencies = [ + sources."ansi-escapes-4.3.2" + ]; + }) + sources."path-key-3.1.1" sources."path-type-4.0.0" sources."performance-now-2.1.0" sources."picomatch-2.3.1" @@ -107463,7 +105776,7 @@ in sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" - sources."rate-limiter-flexible-2.4.1" + sources."rate-limiter-flexible-2.4.2" (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -107482,8 +105795,8 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.5.4" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sort-keys-2.0.0" @@ -107514,11 +105827,11 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."treeify-1.1.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."type-fest-0.20.2" + sources."type-fest-0.21.3" sources."universalify-0.1.2" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" @@ -107533,9 +105846,9 @@ in sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."which-1.3.1" + sources."which-2.0.2" sources."widest-line-3.1.0" - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wrap-ansi-7.0.0" sources."yallist-4.0.0" ]; @@ -107552,10 +105865,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "12.4.3"; + version = "12.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-12.4.3.tgz"; - sha512 = "B/E4kV7bzpzT3nLgbU34ImZs1Z/RwdvQGjbvtJ1+Tvs28ml7tpdf2b6yJchZIsK9ALHNcOfYPGSbWoLRaykZAA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-12.4.6.tgz"; + sha512 = "WcHCxBsmFschPDdiKrVQla7kGdTDHuDBKbL01yYEVXCQA3lPXUUfTRS5D1LKi/8RH3Kv0MkvO2eXNuxIGo2qmg=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { @@ -107570,13 +105883,13 @@ in sources."@google-cloud/precise-date-3.0.1" sources."@google-cloud/projectify-3.0.0" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-3.7.1" // { + (sources."@google-cloud/pubsub-3.7.3" // { dependencies = [ sources."google-auth-library-8.9.0" ]; }) - sources."@grpc/grpc-js-1.8.17" - sources."@grpc/proto-loader-0.7.7" + sources."@grpc/grpc-js-1.8.21" + sources."@grpc/proto-loader-0.7.8" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -107589,11 +105902,7 @@ in }) sources."@jsdevtools/ono-7.1.3" sources."@jsdoc/salty-0.2.5" - (sources."@npmcli/fs-3.1.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) + sources."@npmcli/fs-3.1.0" sources."@opentelemetry/api-1.4.1" sources."@opentelemetry/semantic-conventions-1.3.1" sources."@pkgjs/parseargs-0.11.0" @@ -107614,7 +105923,8 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" + sources."@tootallnate/quickjs-emscripten-0.23.0" sources."@types/duplexify-3.6.1" sources."@types/glob-8.1.0" sources."@types/json-schema-7.0.12" @@ -107623,7 +105933,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/rimraf-3.0.2" sources."@types/triple-beam-1.3.2" sources."abbrev-1.1.1" @@ -107631,7 +105941,6 @@ in sources."accepts-1.3.8" sources."acorn-8.10.0" sources."acorn-jsx-5.3.2" - sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."agentkeepalive-4.3.0" sources."aggregate-error-3.1.0" @@ -107678,6 +105987,7 @@ in ]; }) sources."basic-auth-connect-1.0.0" + sources."basic-ftp-5.0.3" sources."bcrypt-pbkdf-1.0.2" sources."bignumber.js-9.1.1" sources."binary-extensions-2.2.0" @@ -107703,7 +106013,7 @@ in sources."bytes-3.1.2" (sources."cacache-17.1.3" // { dependencies = [ - sources."glob-10.3.2" + sources."glob-10.3.3" sources."lru-cache-7.18.3" sources."minimatch-9.0.3" ]; @@ -107782,6 +106092,7 @@ in (sources."cross-env-5.2.1" // { dependencies = [ sources."cross-spawn-6.0.5" + sources."semver-5.7.2" ]; }) (sources."cross-spawn-7.0.3" // { @@ -107795,13 +106106,17 @@ in sources."crypto-random-string-2.0.0" sources."csv-parse-5.4.0" sources."dashdash-1.14.1" - sources."data-uri-to-buffer-3.0.1" + sources."data-uri-to-buffer-5.0.1" sources."debug-4.3.4" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.4" sources."defaults-1.0.4" - sources."degenerator-3.0.4" + (sources."degenerator-5.0.1" // { + dependencies = [ + sources."escodegen-2.1.0" + ]; + }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" @@ -107833,8 +106148,8 @@ in sources."estraverse-4.3.0" ]; }) - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" sources."esprima-4.0.1" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -107845,7 +106160,6 @@ in dependencies = [ sources."ajv-8.12.0" sources."json-schema-traverse-1.0.0" - sources."semver-7.5.4" ]; }) sources."exegesis-express-4.0.0" @@ -107880,7 +106194,6 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."file-uri-to-path-2.0.0" sources."filesize-6.4.0" sources."fill-range-7.0.1" (sources."finalhandler-1.2.0" // { @@ -107892,7 +106205,7 @@ in sources."fn.name-1.1.0" (sources."foreground-child-3.1.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) sources."forever-agent-0.6.1" @@ -107904,20 +106217,13 @@ in sources."fs-minipass-3.0.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) sources."function-bind-1.1.1" sources."gauge-4.0.4" sources."gaxios-5.1.3" sources."gcp-metadata-5.3.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.1" - (sources."get-uri-3.0.2" // { + (sources."get-uri-6.0.1" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" @@ -107938,7 +106244,7 @@ in sources."gtoken-5.3.2" ]; }) - (sources."google-gax-3.6.0" // { + (sources."google-gax-3.6.1" // { dependencies = [ sources."google-auth-library-8.9.0" ]; @@ -107957,7 +106263,11 @@ in sources."heap-js-2.3.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" + (sources."http-proxy-agent-7.0.0" // { + dependencies = [ + sources."agent-base-7.1.0" + ]; + }) sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" @@ -107999,7 +106309,7 @@ in sources."isexe-2.0.0" sources."isomorphic-fetch-3.0.0" sources."isstream-0.1.2" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."jju-1.4.0" sources."join-path-1.1.1" (sources."js-yaml-3.14.1" // { @@ -108021,7 +106331,6 @@ in dependencies = [ sources."jwa-1.4.1" sources."jws-3.2.2" - sources."semver-7.5.4" ]; }) sources."jsprim-1.4.2" @@ -108057,12 +106366,11 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) (sources."make-fetch-happen-11.1.1" // { dependencies = [ - sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" sources."lru-cache-7.18.3" sources."socks-proxy-agent-7.0.0" @@ -108075,7 +106383,7 @@ in dependencies = [ sources."ansi-escapes-6.2.0" sources."chalk-5.3.0" - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."mdurl-1.0.1" @@ -108138,7 +106446,6 @@ in sources."node-forge-1.3.1" (sources."node-gyp-9.4.0" // { dependencies = [ - sources."semver-7.5.4" sources."which-2.0.2" ]; }) @@ -108163,8 +106470,13 @@ in sources."p-defer-3.0.0" sources."p-limit-3.1.0" sources."p-map-4.0.0" - sources."pac-proxy-agent-5.0.0" - sources."pac-resolver-5.0.1" + (sources."pac-proxy-agent-7.0.0" // { + dependencies = [ + sources."agent-base-7.1.0" + sources."https-proxy-agent-7.0.1" + ]; + }) + sources."pac-resolver-7.0.0" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -108194,7 +106506,7 @@ in }) sources."proto-list-1.2.4" sources."proto3-json-serializer-1.1.1" - (sources."protobufjs-7.2.3" // { + (sources."protobufjs-7.2.4" // { dependencies = [ sources."long-5.2.3" ]; @@ -108203,14 +106515,14 @@ in dependencies = [ sources."glob-8.1.0" sources."minimatch-5.1.6" - sources."semver-7.5.4" ]; }) sources."proxy-addr-2.0.7" - (sources."proxy-agent-5.0.0" // { + (sources."proxy-agent-6.3.0" // { dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.1.1" + sources."agent-base-7.1.0" + sources."https-proxy-agent-7.0.1" + sources."lru-cache-7.18.3" ]; }) sources."proxy-from-env-1.1.0" @@ -108227,7 +106539,7 @@ in sources."strip-json-comments-2.0.1" ]; }) - sources."re2-1.19.1" + sources."re2-1.20.1" sources."readable-stream-3.6.2" (sources."readdir-glob-1.1.3" // { dependencies = [ @@ -108264,10 +106576,10 @@ in sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.3" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-7.5.4" (sources."semver-diff-3.1.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) (sources."send-0.18.0" // { @@ -108295,7 +106607,11 @@ in sources."ip-2.0.0" ]; }) - sources."socks-proxy-agent-5.0.1" + (sources."socks-proxy-agent-8.0.1" // { + dependencies = [ + sources."agent-base-7.1.0" + ]; + }) sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" @@ -108344,8 +106660,8 @@ in sources."tough-cookie-2.5.0" sources."toxic-1.0.1" sources."tr46-0.0.3" - sources."triple-beam-1.3.0" - sources."tslib-2.6.0" + sources."triple-beam-1.4.1" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -108361,11 +106677,7 @@ in sources."universal-analytics-0.5.3" sources."universalify-2.0.0" sources."unpipe-1.0.0" - (sources."update-notifier-cjs-5.1.6" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) + sources."update-notifier-cjs-5.1.6" sources."uri-js-4.4.1" sources."url-join-0.0.1" sources."utf-8-validate-5.0.10" @@ -108379,17 +106691,16 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.19" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.2" + sources."whatwg-fetch-3.6.17" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - sources."winston-3.9.0" + sources."winston-3.10.0" sources."winston-transport-4.5.0" - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wrap-ansi-7.0.0" sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" @@ -108397,7 +106708,6 @@ in sources."ws-7.5.9" sources."xdg-basedir-4.0.0" sources."xmlcreate-2.0.4" - sources."xregexp-2.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-2.3.1" @@ -108535,7 +106845,7 @@ in ]; }) sources."find-up-5.0.0" - sources."fkill-8.1.0" + sources."fkill-8.1.1" sources."function-bind-1.1.1" sources."fuzzy-search-3.2.1" sources."get-stream-6.0.1" @@ -108658,7 +106968,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."trim-newlines-4.1.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -108699,7 +107009,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.1" sources."@types/inquirer-6.5.0" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -108911,24 +107221,6 @@ in bypassCache = true; reconstructLock = true; }; - flood = nodeEnv.buildNodePackage { - name = "flood"; - packageName = "flood"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.7.0.tgz"; - sha512 = "MAm4Yok64VPa49DM+0TxBBP0mScW5ILGCsY/HJLbATjHEkJFnwD1mkPndruZxO1vXBaFdPzoLl+gYThAUxWQjA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "A modern Web UI for various torrent clients with multi-user and multi-client support"; - homepage = "https://github.com/jesec/flood#readme"; - license = "GPL-3.0-only"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; @@ -109028,7 +107320,7 @@ in sources."cycle-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.2" - sources."deep-equal-2.2.1" + sources."deep-equal-2.2.2" sources."define-properties-1.2.0" sources."define-property-2.0.2" sources."director-1.2.7" @@ -109143,7 +107435,7 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.2" sources."is-windows-1.0.2" @@ -109325,7 +107617,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."triple-beam-1.3.0" + sources."triple-beam-1.4.1" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" @@ -109354,8 +107646,8 @@ in }) sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.9" - (sources."winston-3.9.0" // { + sources."which-typed-array-1.1.11" + (sources."winston-3.10.0" // { dependencies = [ sources."async-3.2.4" sources."readable-stream-3.6.2" @@ -109411,7 +107703,7 @@ in sources."@trufflesuite/uws-js-unofficial-20.10.0-unofficial.2" sources."@types/bn.js-5.1.1" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -109459,21 +107751,33 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" - sources."@babel/helper-create-class-features-plugin-7.22.6" + (sources."@babel/helper-compilation-targets-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-class-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-replace-supers-7.22.5" + sources."@babel/helper-replace-supers-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -109490,7 +107794,7 @@ in sources."@babel/plugin-syntax-jsx-7.22.5" sources."@babel/plugin-syntax-typescript-7.22.5" sources."@babel/plugin-transform-modules-commonjs-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.5" + sources."@babel/plugin-transform-typescript-7.22.9" sources."@babel/preset-typescript-7.22.5" sources."@babel/runtime-7.22.6" sources."@babel/template-7.22.5" @@ -109519,7 +107823,6 @@ in sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.2" sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.2" sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.2" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" @@ -109532,7 +107835,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/node-fetch-2.6.4" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -109551,7 +107854,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.4" // { dependencies = [ @@ -109559,7 +107862,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109599,7 +107902,7 @@ in sources."create-gatsby-3.11.0" (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."crypto-random-string-2.0.0" @@ -109620,7 +107923,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -109702,7 +108005,7 @@ in sources."json-buffer-3.0.1" sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kleur-3.0.3" sources."lmdb-2.5.3" sources."locate-path-5.0.0" @@ -109712,7 +108015,7 @@ in sources."lru-cache-5.1.1" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."merge-stream-2.0.0" @@ -110070,8 +108373,9 @@ in sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" sources."@pkgjs/parseargs-0.11.0" - sources."@sigstore/protobuf-specs-0.1.0" - sources."@sigstore/tuf-1.0.2" + sources."@sigstore/bundle-1.0.0" + sources."@sigstore/protobuf-specs-0.2.0" + sources."@sigstore/tuf-1.0.3" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" (sources."@tufjs/models-1.0.4" // { @@ -110128,7 +108432,7 @@ in sources."builtins-5.0.1" (sources."cacache-17.1.3" // { dependencies = [ - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -110198,7 +108502,7 @@ in sources."iconv-lite-0.4.24" ]; }) - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-plist-0.1.3" sources."fastq-1.15.0" sources."figures-3.2.0" @@ -110213,7 +108517,7 @@ in sources."first-chunk-stream-2.0.0" (sources."foreground-child-3.1.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) sources."fs-minipass-3.0.2" @@ -110284,7 +108588,7 @@ in sources."isarray-1.0.0" sources."isbinaryfile-5.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" (sources."jake-10.8.7" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -110375,7 +108679,7 @@ in sources."npm-normalize-package-bin-3.0.1" sources."npm-package-arg-10.1.0" sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.1" + sources."npm-pick-manifest-8.0.2" sources."npm-registry-fetch-14.0.5" sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" @@ -110438,7 +108742,7 @@ in sources."read-cmd-shim-3.0.1" (sources."read-package-json-6.0.4" // { dependencies = [ - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -110447,7 +108751,7 @@ in dependencies = [ sources."hosted-git-info-2.8.9" sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."type-fest-0.6.0" ]; }) @@ -110480,7 +108784,7 @@ in sources."shebang-regex-3.0.0" sources."shelljs-0.8.5" sources."signal-exit-3.0.7" - sources."sigstore-1.7.0" + sources."sigstore-1.8.0" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" @@ -110521,7 +108825,7 @@ in sources."tr46-0.0.3" sources."treeverse-1.0.4" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tuf-js-1.1.7" sources."type-fest-0.8.1" sources."unique-filename-3.0.0" @@ -110868,7 +109172,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.2.1" sources."secret-handshake-1.1.21" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."separator-escape-0.0.1" sources."sha.js-2.4.5" sources."smart-buffer-4.2.0" @@ -110968,15 +109272,15 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "39.5.1"; + version = "39.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.5.1.tgz"; - sha512 = "hqphaoyfETGcDytPNN8swAeiy77yJ04mZataHd1eGyk2I7fthUqusI3bH7YW4iFcgn/G2wyqEqB5L7Yr5jQNPw=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.10.2.tgz"; + sha512 = "kDM08MsuMDs2cjt7XvKKxpziCsewVIbBu9wUl/RRuaXtqneUyFJB4eD80w3T2xwAzOJ5Py1Qj/CaIxc+BGqQCA=="; }; dependencies = [ - sources."@gitbeaker/core-39.5.1" - sources."@gitbeaker/requester-utils-39.5.1" - sources."@gitbeaker/rest-39.5.1" + sources."@gitbeaker/core-39.10.2" + sources."@gitbeaker/requester-utils-39.10.2" + sources."@gitbeaker/rest-39.10.2" sources."ansi-styles-4.3.0" sources."call-bind-1.0.2" sources."chalk-4.1.2" @@ -111027,6 +109331,7 @@ in sources."supports-color-5.5.0" ]; }) + sources."@ljharb/through-2.3.9" sources."@pnpm/config.env-replace-1.1.0" (sources."@pnpm/network.ca-file-1.0.2" // { dependencies = [ @@ -111034,7 +109339,7 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@tootallnate/once-1.1.2" sources."@types/http-cache-semantics-4.0.1" @@ -111055,7 +109360,7 @@ in sources."ansi-styles-4.3.0" sources."arrify-1.0.1" sources."ast-types-0.13.4" - sources."atomically-2.0.1" + sources."atomically-2.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" (sources."boxen-7.1.1" // { @@ -111071,7 +109376,7 @@ in sources."buffer-5.7.1" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."camelcase-7.0.1" sources."camelcase-keys-8.0.2" sources."chalk-5.3.0" @@ -111134,7 +109439,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-7.1.1" + sources."execa-7.2.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" @@ -111188,7 +109493,7 @@ in sources."indent-string-5.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-9.2.7" // { + (sources."inquirer-9.2.9" // { dependencies = [ sources."is-unicode-supported-0.1.0" (sources."ora-5.4.1" // { @@ -111202,7 +109507,7 @@ in dependencies = [ sources."ansi-escapes-6.2.0" sources."run-async-2.4.1" - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."ip-1.1.8" @@ -111228,7 +109533,7 @@ in sources."json-schema-traverse-1.0.0" sources."json-schema-typed-8.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kind-of-6.0.3" sources."latest-version-7.0.0" sources."levn-0.3.0" @@ -111246,7 +109551,7 @@ in sources."map-obj-4.3.0" (sources."meow-11.0.0" // { dependencies = [ - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."merge-stream-2.0.0" @@ -111259,7 +109564,7 @@ in sources."mute-stream-1.0.0" sources."netmask-2.0.2" sources."node-domexception-1.0.0" - sources."node-fetch-3.3.1" + sources."node-fetch-3.3.2" sources."normalize-package-data-4.0.1" sources."normalize-url-8.0.0" (sources."npm-run-path-5.1.0" // { @@ -111365,13 +109670,12 @@ in sources."strip-final-newline-3.0.0" sources."strip-indent-4.0.0" sources."strip-json-comments-2.0.1" - sources."stubborn-fs-1.2.4" + sources."stubborn-fs-1.2.5" sources."supports-color-7.2.0" - sources."through-2.3.8" sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."trim-newlines-4.1.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-check-0.3.2" sources."type-fest-2.19.0" sources."typedarray-to-buffer-3.1.5" @@ -111396,7 +109700,7 @@ in sources."strip-ansi-7.1.0" ]; }) - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wrap-ansi-6.2.0" sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" @@ -111418,10 +109722,10 @@ in glob = nodeEnv.buildNodePackage { name = "glob"; packageName = "glob"; - version = "10.3.2"; + version = "10.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.2.tgz"; - sha512 = "vsuLzB3c/uyDLLEdBZtT8vGnN0z57rwOxHV2oYZib/7HWmBspUaja/McYIobBjC4qaUTuNpUyFO2IdqM4DZIJA=="; + url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; + sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -111438,15 +109742,15 @@ in sources."foreground-child-3.1.1" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."lru-cache-10.0.0" sources."minimatch-9.0.3" - sources."minipass-7.0.1" + sources."minipass-7.0.2" sources."path-key-3.1.1" sources."path-scurry-1.10.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -111623,7 +109927,7 @@ in sources."unbzip2-stream-1.4.3" sources."util-deprecate-1.0.2" sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.2" + sources."whatwg-fetch-3.6.17" sources."whatwg-url-5.0.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" @@ -111727,7 +110031,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.1" + sources."@exodus/schemasafe-1.1.1" sources."@graphql-cli/common-4.1.0" (sources."@graphql-cli/init-4.1.0" // { dependencies = [ @@ -111765,7 +110069,7 @@ in (sources."@graphql-tools/import-6.7.18" // { dependencies = [ sources."@graphql-tools/utils-9.2.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -111777,7 +110081,7 @@ in }) (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) ]; @@ -111793,7 +110097,7 @@ in dependencies = [ sources."@graphql-tools/merge-8.3.1" sources."@graphql-tools/utils-8.9.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { @@ -111824,7 +110128,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -111908,7 +110212,7 @@ in sources."dataloader-2.0.0" sources."debug-4.3.4" sources."decompress-response-3.3.0" - sources."deep-equal-2.2.1" + sources."deep-equal-2.2.2" sources."deep-extend-0.6.0" sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" @@ -111937,7 +110241,7 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" @@ -112037,7 +110341,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-weakmap-2.0.1" @@ -112081,7 +110385,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) sources."lowercase-keys-1.0.1" @@ -112108,7 +110412,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) sources."node-emoji-1.10.0" @@ -112159,7 +110463,7 @@ in sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."parent-module-1.0.1" @@ -112167,7 +110471,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) sources."passwd-user-3.0.0" @@ -112205,7 +110509,7 @@ in }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."should-13.2.3" @@ -112263,7 +110567,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -112298,24 +110602,24 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.3.24"; + version = "3.3.25"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.24.tgz"; - sha512 = "Nysc3rTNQZa0KREI9JwStAljDl0yl+5Py7MVWg0ZD4aXOmgPmN63IemiWBNFgWcPx7kv51A4Xmm4wKX+MWlZog=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.25.tgz"; + sha512 = "Zqqs0m+qrUySidmuSCcB/p/qkbPe7PQAv0p8Ar20xo/Oz0YWfloXVVvlgSsJ/g386+p7NlC+FMImrOyG0HGM5w=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@ardatan/sync-fetch-0.0.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -112334,8 +110638,8 @@ in sources."@graphql-tools/code-file-loader-8.0.1" sources."@graphql-tools/delegate-10.0.0" sources."@graphql-tools/executor-1.1.0" - sources."@graphql-tools/executor-graphql-ws-1.0.2" - sources."@graphql-tools/executor-http-1.0.1" + sources."@graphql-tools/executor-graphql-ws-1.1.0" + sources."@graphql-tools/executor-http-1.0.2" sources."@graphql-tools/executor-legacy-ws-1.0.1" sources."@graphql-tools/graphql-file-loader-8.0.0" sources."@graphql-tools/graphql-tag-pluck-8.0.1" @@ -112345,7 +110649,7 @@ in sources."@graphql-tools/merge-9.0.0" sources."@graphql-tools/schema-10.0.0" sources."@graphql-tools/url-loader-8.0.0" - sources."@graphql-tools/utils-10.0.3" + sources."@graphql-tools/utils-10.0.4" sources."@graphql-tools/wrap-10.0.0" sources."@graphql-typed-document-node/core-3.2.0" sources."@iarna/toml-2.2.5" @@ -112358,13 +110662,12 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@repeaterjs/repeater-3.0.4" sources."@types/estree-1.0.1" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/ws-8.5.5" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" @@ -112375,8 +110678,8 @@ in sources."@vue/reactivity-transform-3.3.4" sources."@vue/shared-3.3.4" sources."@whatwg-node/events-0.1.1" - sources."@whatwg-node/fetch-0.9.7" - sources."@whatwg-node/node-fetch-0.4.6" + sources."@whatwg-node/fetch-0.9.9" + sources."@whatwg-node/node-fetch-0.4.11" sources."acorn-8.10.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -112387,11 +110690,11 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."bufferutil-4.0.7" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.3" // { @@ -112414,7 +110717,7 @@ in sources."dir-glob-3.0.1" sources."dotenv-8.2.0" sources."dset-3.1.2" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -112423,7 +110726,7 @@ in sources."estree-walker-2.0.2" sources."extract-files-11.0.0" sources."fast-decode-uri-component-1.0.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-querystring-1.1.2" sources."fast-url-parser-1.1.3" sources."fastq-1.15.0" @@ -112442,7 +110745,7 @@ in ]; }) sources."graphql-language-service-5.1.7" - sources."graphql-language-service-server-2.11.2" + sources."graphql-language-service-server-2.11.3" sources."graphql-ws-5.14.0" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" @@ -112471,7 +110774,7 @@ in sources."locate-character-3.0.0" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" - sources."magic-string-0.30.1" + sources."magic-string-0.30.2" sources."mdn-data-2.0.30" sources."merge2-1.4.1" sources."meros-1.3.0" @@ -112501,7 +110804,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."punycode-1.4.1" sources."queue-microtask-1.2.3" sources."regenerator-runtime-0.13.11" @@ -112511,6 +110814,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" + sources."semver-6.3.1" sources."slash-3.0.0" sources."source-map-js-1.0.2" sources."streamsearch-1.1.0" @@ -112518,7 +110822,7 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - (sources."svelte-4.0.5" // { + (sources."svelte-4.1.2" // { dependencies = [ sources."estree-walker-3.0.3" ]; @@ -112527,7 +110831,7 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."unixify-1.0.0" sources."update-browserslist-db-1.0.11" @@ -112629,7 +110933,7 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.13" // { + (sources."@oclif/parser-3.8.16" // { dependencies = [ sources."@oclif/errors-1.3.6" ]; @@ -112659,7 +110963,7 @@ in sources."@peculiar/webcrypto-1.4.3" sources."@repeaterjs/repeater-3.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/ws-8.5.5" sources."@whatwg-node/events-0.0.3" sources."@whatwg-node/fetch-0.8.8" @@ -112705,7 +111009,7 @@ in sources."has-flag-3.0.0" sources."indent-string-3.2.0" sources."is-wsl-1.1.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" sources."tslib-1.14.1" @@ -112720,11 +111024,7 @@ in sources."cookie-signature-1.0.6" sources."cosmiconfig-8.0.0" sources."cosmiconfig-toml-loader-1.0.0" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."cwise-compiler-1.1.3" sources."dataloader-2.2.2" sources."debug-4.3.4" @@ -112755,7 +111055,7 @@ in sources."extract-files-11.0.0" sources."extract-stack-1.0.0" sources."fast-decode-uri-component-1.0.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-querystring-1.1.2" sources."fast-url-parser-1.1.3" sources."fastq-1.15.0" @@ -112846,7 +111146,6 @@ in sources."ndarray-pack-1.2.1" sources."negotiator-0.6.3" sources."nextgen-events-1.5.3" - sources."nice-try-1.0.5" sources."node-bitmap-0.0.1" sources."node-fetch-2.6.12" sources."node-gyp-build-4.6.0" @@ -112859,8 +111158,12 @@ in sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."parseurl-1.3.3" - sources."password-prompt-1.1.2" - sources."path-key-2.0.1" + (sources."password-prompt-1.1.3" // { + dependencies = [ + sources."ansi-escapes-4.3.2" + ]; + }) + sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" @@ -112897,8 +111200,8 @@ in sources."setimmediate-1.0.5" sources."setprototypeof-1.1.0" sources."seventh-0.7.40" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."slash-3.0.0" sources."statuses-1.4.0" sources."streamsearch-1.1.0" @@ -112926,9 +111229,10 @@ in sources."terminal-kit-1.49.4" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tree-kit-0.7.4" + sources."tree-kit-0.7.5" sources."treeify-1.1.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" + sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."uniq-1.0.1" sources."universalify-0.1.2" @@ -112943,9 +111247,9 @@ in sources."web-streams-polyfill-3.2.1" sources."webcrypto-core-1.7.7" sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.2" + sources."whatwg-fetch-3.6.17" sources."whatwg-url-5.0.0" - sources."which-1.3.1" + sources."which-2.0.2" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" (sources."ws-7.4.2" // { @@ -113192,99 +111496,6 @@ in bypassCache = true; reconstructLock = true; }; - gtop = nodeEnv.buildNodePackage { - name = "gtop"; - packageName = "gtop"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/gtop/-/gtop-1.1.3.tgz"; - sha512 = "LkZYdWebxn7qeQApnDN7Q50rwCg4raayL4DIQNPdhIyNKwwm3rbKHeX4+K4cV0SKBen7jVkY4s1c7aIdxGsF8A=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - sources."abbrev-1.1.1" - sources."ansi-escapes-6.2.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."ansi-term-0.0.2" - sources."ansicolors-0.3.2" - sources."blessed-0.1.81" - sources."blessed-contrib-4.11.0" - sources."bresenham-0.0.3" - sources."buffers-0.1.1" - sources."cardinal-2.1.1" - sources."chalk-1.1.3" - sources."charm-0.1.2" - sources."cli-table3-0.6.3" - sources."core-util-is-1.0.3" - sources."drawille-blessed-contrib-1.0.0" - sources."drawille-canvas-blessed-contrib-0.1.3" - sources."emoji-regex-8.0.0" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - (sources."event-stream-0.9.8" // { - dependencies = [ - sources."optimist-0.2.8" - ]; - }) - sources."gl-matrix-2.8.1" - sources."has-ansi-2.0.0" - sources."has-flag-4.0.0" - sources."here-0.0.2" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."isarray-0.0.1" - sources."lodash-4.17.21" - sources."map-canvas-0.1.5" - sources."marked-4.3.0" - (sources."marked-terminal-5.2.0" // { - dependencies = [ - sources."chalk-5.3.0" - ]; - }) - sources."memory-streams-0.1.3" - sources."memorystream-0.3.1" - sources."node-emoji-1.11.0" - sources."nopt-2.1.2" - sources."optimist-0.3.7" - sources."picture-tuber-1.0.2" - sources."png-js-0.1.1" - sources."readable-stream-1.0.34" - sources."redeyed-2.1.1" - sources."sax-1.2.4" - sources."sparkline-0.1.2" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) - sources."string_decoder-0.10.31" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - (sources."supports-hyperlinks-2.3.0" // { - dependencies = [ - sources."supports-color-7.2.0" - ]; - }) - sources."systeminformation-5.18.6" - sources."term-canvas-0.0.5" - sources."type-fest-3.12.0" - sources."wordwrap-0.0.3" - sources."x256-0.0.2" - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "graphic top"; - homepage = "https://github.com/aksakalli/gtop#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gulp = nodeEnv.buildNodePackage { name = "gulp"; packageName = "gulp"; @@ -113628,7 +111839,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -114035,7 +112246,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -114294,10 +112505,10 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-5.0.1.tgz"; - sha512 = "G+4iLhKHEEOHYbk/VEvkVO4oNn1rVlH8N3LdsbH+sYZQo8qJTVP5Zwtz1pMa4vWLzA3mjrFSGG3nBFYoIJHpMQ=="; + url = "https://registry.npmjs.org/hsd/-/hsd-5.1.0.tgz"; + sha512 = "t0MWWDMFpjx9UUe1S/kkrnFVxK7FOaQDxZGoMXrsv/UCy+cbTW1OnLqkOIyk8ep5897FsVoCkCgmxvE2JfsXPA=="; }; dependencies = [ sources."bcfg-0.1.8" @@ -114483,7 +112694,7 @@ in sources."@colors/colors-1.5.0" sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.53" + sources."@types/node-14.18.54" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -114493,7 +112704,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1413.0" + sources."aws-sdk-2.1427.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -114566,7 +112777,7 @@ in sources."is-callable-1.2.7" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -114646,7 +112857,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."socks5-client-1.2.8" sources."socks5-http-client-1.0.4" sources."source-map-0.6.1" @@ -114676,13 +112887,13 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.0.0" sources."verror-1.10.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" (sources."winston-2.4.7" // { dependencies = [ sources."colors-1.0.3" ]; }) - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wrap-ansi-7.0.0" sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" @@ -114903,7 +113114,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."semver-diff-2.1.0" sources."slide-1.1.6" sources."source-map-0.5.7" @@ -115016,10 +113227,10 @@ in immich = nodeEnv.buildNodePackage { name = "immich"; packageName = "immich"; - version = "0.39.0"; + version = "0.40.2"; src = fetchurl { - url = "https://registry.npmjs.org/immich/-/immich-0.39.0.tgz"; - sha512 = "FoIj/ZV7QrjuBC7F6o6YZ8jqLZDJCZwrr80CxkzERPI7qX8YrSjR1GM4ocA/9oT7p7iA+dIxT//BF5MKNPkn4g=="; + url = "https://registry.npmjs.org/immich/-/immich-0.40.2.tgz"; + sha512 = "OT3ysAfWq/0XkFNdf+SIJxUYvMoaNNLQZGm6peezzb/jNTkUoEVzE5uZNPqQ08Yy8JEOfB6h5qxOHujMOnPBkA=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -115047,7 +113258,7 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - sources."systeminformation-5.18.6" + sources."systeminformation-5.18.10" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -115076,7 +113287,7 @@ in sources."iconv-lite-0.6.3" sources."node-fetch-2.6.12" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."source-map-0.7.4" sources."tr46-0.0.3" sources."webidl-conversions-3.0.1" @@ -115096,10 +113307,10 @@ in insect = nodeEnv.buildNodePackage { name = "insect"; packageName = "insect"; - version = "5.8.2"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.8.2.tgz"; - sha512 = "tUESkfAyk3IXd+bHPANmW9j8RV/1zz20hxM6qtL6K3j2lEB2nO55GpFXI4eHkbAKCkBaJA65zHbT2bBK0lNwvw=="; + url = "https://registry.npmjs.org/insect/-/insect-5.9.0.tgz"; + sha512 = "F1+BVkyIkzZ/zD1DiNgxcc33lGt7WQ1V8caX2X7JNXo+g0Wnr8339mSHT1PAtfupmTDz/OQ2MmXHPBRIddpt+w=="; }; dependencies = [ sources."@jcubic/lily-0.3.0" @@ -115122,7 +113333,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.7.0" - sources."jquery.terminal-2.36.0" + sources."jquery.terminal-2.37.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" sources."nice-try-1.0.5" @@ -115133,7 +113344,7 @@ in sources."prismjs-1.29.0" sources."pump-3.0.0" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.7" @@ -115170,7 +113381,7 @@ in sources."@azure/logger-1.0.4" sources."@bmewburn/js-beautify-1.14.7" sources."@bmewburn/vscode-html-languageserver-1.9.0" - (sources."@mapbox/node-pre-gyp-1.0.10" // { + (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ sources."nopt-5.0.0" ]; @@ -115180,10 +113391,10 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@opentelemetry/api-1.4.1" - sources."@opentelemetry/core-1.15.0" - sources."@opentelemetry/resources-1.15.0" - sources."@opentelemetry/sdk-trace-base-1.15.0" - sources."@opentelemetry/semantic-conventions-1.15.0" + sources."@opentelemetry/core-1.15.1" + sources."@opentelemetry/resources-1.15.1" + sources."@opentelemetry/sdk-trace-base-1.15.1" + sources."@opentelemetry/semantic-conventions-1.15.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -115195,7 +113406,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" (sources."@types/node-fetch-2.6.4" // { dependencies = [ sources."form-data-3.0.1" @@ -115216,7 +113427,7 @@ in sources."async-hook-jl-1.7.6" (sources."async-listener-0.6.10" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."asynckit-0.4.0" @@ -115230,7 +113441,7 @@ in sources."chownr-2.0.0" (sources."cls-hooked-4.2.2" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."color-support-1.1.3" @@ -115246,10 +113457,10 @@ in sources."deepmerge-4.3.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" (sources."diagnostic-channel-1.1.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."diagnostic-channel-publishers-1.0.5" @@ -115262,7 +113473,7 @@ in (sources."editorconfig-0.15.3" // { dependencies = [ sources."lru-cache-4.1.5" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."emitter-listener-1.1.2" @@ -115327,7 +113538,7 @@ in sources."lru-cache-7.14.1" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."merge2-1.4.1" @@ -115410,7 +113621,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-4.1.3" sources."tr46-0.0.3" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."turndown-7.1.2" @@ -115494,7 +113705,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) sources."astral-regex-2.0.0" @@ -115549,7 +113760,7 @@ in dependencies = [ sources."cross-spawn-6.0.5" sources."path-key-2.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."which-1.3.1" @@ -115690,7 +113901,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -115760,7 +113971,7 @@ in sources."uuid-3.4.0" sources."which-2.0.2" sources."windows-release-3.3.3" - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -116025,7 +114236,7 @@ in sources."@aws-sdk/service-error-classification-3.296.0" sources."@aws-sdk/shared-ini-file-loader-3.296.0" sources."@aws-sdk/signature-v4-3.296.0" - sources."@aws-sdk/signature-v4-crt-3.363.0" + sources."@aws-sdk/signature-v4-crt-3.378.0" sources."@aws-sdk/signature-v4-multi-region-3.296.0" sources."@aws-sdk/smithy-client-3.296.0" sources."@aws-sdk/token-providers-3.296.0" @@ -116056,7 +114267,7 @@ in sources."@aws-sdk/util-waiter-3.296.0" sources."@aws-sdk/xml-builder-3.295.0" sources."@babel/runtime-7.22.6" - sources."@braintree/sanitize-url-6.0.2" + sources."@braintree/sanitize-url-6.0.3" sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" sources."@httptoolkit/websocket-stream-6.0.1" @@ -116069,7 +114280,7 @@ in sources."@joplin/turndown-4.0.67" sources."@joplin/turndown-plugin-gfm-1.0.49" sources."@joplin/utils-2.11.2" - (sources."@mapbox/node-pre-gyp-1.0.10" // { + (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ sources."are-we-there-yet-2.0.0" sources."gauge-3.0.2" @@ -116092,19 +114303,19 @@ in sources."rimraf-3.0.2" ]; }) - sources."@smithy/eventstream-codec-1.0.2" - sources."@smithy/is-array-buffer-1.0.2" - sources."@smithy/querystring-parser-1.0.2" - sources."@smithy/signature-v4-1.0.2" - sources."@smithy/types-1.1.1" - sources."@smithy/util-buffer-from-1.0.2" - sources."@smithy/util-hex-encoding-1.0.2" - sources."@smithy/util-middleware-1.0.2" - sources."@smithy/util-uri-escape-1.0.2" - sources."@smithy/util-utf8-1.0.2" + sources."@smithy/eventstream-codec-2.0.1" + sources."@smithy/is-array-buffer-2.0.0" + sources."@smithy/querystring-parser-2.0.1" + sources."@smithy/signature-v4-2.0.1" + sources."@smithy/types-2.0.2" + sources."@smithy/util-buffer-from-2.0.0" + sources."@smithy/util-hex-encoding-2.0.0" + sources."@smithy/util-middleware-2.0.0" + sources."@smithy/util-uri-escape-2.0.0" + sources."@smithy/util-utf8-2.0.0" sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/ws-8.5.5" sources."abab-2.0.6" sources."abbrev-1.1.1" @@ -116144,7 +114355,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.15.20" + sources."aws-crt-1.17.0" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" @@ -116345,7 +114556,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."diff-match-patch-1.0.5" (sources."dom-serializer-2.0.0" // { dependencies = [ @@ -116523,7 +114734,7 @@ in sources."is-number-7.0.0" sources."is-potential-custom-element-name-1.0.1" sources."is-stream-2.0.1" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-wsl-2.2.0" @@ -116578,7 +114789,7 @@ in sources."magicli-0.0.8" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) (sources."make-fetch-happen-9.1.0" // { @@ -116815,7 +115026,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."saxes-6.0.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" @@ -116959,8 +115170,8 @@ in }) sources."tr46-4.1.1" sources."traverse-0.3.9" - sources."tree-kit-0.7.4" - sources."tslib-2.6.0" + sources."tree-kit-0.7.5" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" @@ -117007,7 +115218,7 @@ in sources."whatwg-mimetype-3.0.0" sources."whatwg-url-12.0.1" sources."which-1.3.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wide-align-1.1.5" sources."window-size-0.1.4" sources."word-wrap-1.2.3" @@ -117042,33 +115253,36 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.8"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.8.tgz"; - sha512 = "4S7HFeI9YfRvRgKnEweohs0tgJj28InHVIj4Nl8Htf96Y6pHg3+tJrmo4ucAM9f7l4SHbFI3IvFAZ2a1eQPbyg=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz"; + sha512 = "coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg=="; }; dependencies = [ + sources."@one-ini/wasm-0.1.1" sources."abbrev-1.1.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."commander-2.20.3" + sources."commander-10.0.1" sources."config-chain-1.1.13" - sources."editorconfig-0.15.3" + sources."editorconfig-1.0.4" sources."fs.realpath-1.0.0" - sources."glob-8.1.0" + (sources."glob-8.1.0" // { + dependencies = [ + sources."minimatch-5.1.6" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."lru-cache-4.1.5" - sources."minimatch-5.1.6" + sources."lru-cache-6.0.0" + sources."minimatch-9.0.1" sources."nopt-6.0.0" sources."once-1.4.0" sources."proto-list-1.2.4" - sources."pseudomap-1.0.2" - sources."semver-5.7.1" - sources."sigmund-1.0.1" + sources."semver-7.5.4" sources."wrappy-1.0.2" - sources."yallist-2.1.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -117324,14 +115538,14 @@ in dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - (sources."@eslint/eslintrc-2.1.0" // { + sources."@eslint-community/regexpp-4.6.2" + (sources."@eslint/eslintrc-2.1.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@eslint/js-8.44.0" + sources."@eslint/js-8.46.0" (sources."@humanwhocodes/config-array-0.11.10" // { dependencies = [ sources."debug-4.3.4" @@ -117354,9 +115568,11 @@ in sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-includes-3.1.6" + sources."array.prototype.findlastindex-1.2.2" sources."array.prototype.flat-1.3.1" sources."array.prototype.flatmap-1.3.1" sources."array.prototype.tosorted-1.1.1" + sources."arraybuffer.prototype.slice-1.0.1" sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" sources."basic-auth-2.0.1" @@ -117403,14 +115619,14 @@ in sources."encodeurl-1.0.2" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.44.0" // { + (sources."eslint-8.46.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117436,7 +115652,7 @@ in sources."eslint-visitor-keys-1.3.0" ]; }) - (sources."eslint-plugin-import-2.27.5" // { + (sources."eslint-plugin-import-2.28.0" // { dependencies = [ sources."debug-3.2.7" sources."doctrine-2.1.0" @@ -117449,20 +115665,20 @@ in ]; }) sources."eslint-plugin-promise-6.1.1" - (sources."eslint-plugin-react-7.32.2" // { + (sources."eslint-plugin-react-7.33.1" // { dependencies = [ sources."doctrine-2.1.0" sources."resolve-2.0.0-next.4" ]; }) - sources."eslint-scope-7.2.0" + sources."eslint-scope-7.2.2" (sources."eslint-utils-3.0.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -117541,7 +115757,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" sources."isarray-0.0.1" sources."isexe-2.0.0" @@ -117553,7 +115769,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-1.0.2" - sources."jsx-ast-utils-3.3.4" + sources."jsx-ast-utils-3.3.5" sources."levn-0.4.1" (sources."load-json-file-5.3.0" // { dependencies = [ @@ -117596,6 +115812,7 @@ in sources."object.assign-4.1.4" sources."object.entries-1.1.6" sources."object.fromentries-2.0.6" + sources."object.groupby-1.0.0" sources."object.hasown-1.1.2" sources."object.values-1.1.6" sources."on-finished-2.4.1" @@ -117642,10 +115859,15 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" + (sources."safe-array-concat-1.0.0" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."semver-compare-1.0.0" (sources."send-0.18.0" // { dependencies = [ @@ -117678,6 +115900,9 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."type-is-1.6.18" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."unpipe-1.0.0" @@ -117687,7 +115912,7 @@ in sources."version-guard-1.1.1" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xdg-basedir-4.0.0" @@ -118171,7 +116396,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."semver-diff-2.1.0" (sources."send-0.18.0" // { dependencies = [ @@ -118328,16 +116553,17 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.30" - sources."@oclif/config-1.18.11" + sources."@oclif/command-1.8.35" + sources."@oclif/config-1.18.16" sources."@oclif/errors-1.3.6" - (sources."@oclif/help-1.0.9" // { + (sources."@oclif/help-1.0.14" // { dependencies = [ + sources."@oclif/config-1.18.15" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.13" + sources."@oclif/parser-3.8.16" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ sources."@oclif/config-1.18.2" @@ -118387,14 +116613,10 @@ in sources."color-name-1.1.4" (sources."conf-6.2.4" // { dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.1" ]; }) + sources."cross-spawn-7.0.3" (sources."d-1.0.1" // { dependencies = [ sources."type-1.2.0" @@ -118417,7 +116639,7 @@ in sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" (sources."figures-3.2.0" // { @@ -118463,7 +116685,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."merge2-1.4.1" @@ -118474,7 +116696,6 @@ in sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" sources."next-tick-1.1.0" - sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.19" sources."object-inspect-1.12.3" sources."object-treeify-1.1.33" @@ -118483,13 +116704,9 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - (sources."password-prompt-1.1.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - ]; - }) + sources."password-prompt-1.1.3" sources."path-exists-3.0.0" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-up-3.1.0" @@ -118508,8 +116725,8 @@ in }) sources."safer-buffer-2.1.2" sources."semver-7.5.4" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."slash-3.0.0" @@ -118521,14 +116738,14 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-2.7.2" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."uri-js-4.4.1" sources."urijs-1.19.11" - sources."which-1.3.1" + sources."which-2.0.2" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" sources."write-file-atomic-3.0.3" @@ -118578,7 +116795,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -118754,18 +116971,26 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.1" - sources."@babel/cli-7.22.6" + sources."@babel/cli-7.22.9" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" + (sources."@babel/helper-compilation-targets-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -118787,19 +117012,18 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - (sources."@mapbox/node-pre-gyp-1.0.10" // { + (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."semver-7.5.4" sources."yallist-4.0.0" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -118856,6 +117080,7 @@ in sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array.prototype.reduce-1.0.5" + sources."arraybuffer.prototype.slice-1.0.1" sources."asn1.js-5.4.1" sources."asn1js-3.0.5" sources."asynckit-0.4.0" @@ -118881,13 +117106,13 @@ in sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.0" @@ -118908,7 +117133,7 @@ in sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.31.1" + sources."core-js-3.32.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -118936,7 +117161,7 @@ in sources."delegates-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."dir-glob-3.0.1" sources."doipjs-0.15.7" (sources."domexception-2.0.1" // { @@ -118946,13 +117171,13 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" - sources."es-abstract-1.21.2" + sources."enquirer-2.4.1" + sources."es-abstract-1.22.1" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -118973,7 +117198,7 @@ in ]; }) sources."express-validator-6.15.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" @@ -119078,7 +117303,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" sources."isarray-2.0.5" @@ -119258,7 +117483,7 @@ in sources."sasl-scram-sha-1-1.2.1" sources."saslmechanisms-0.1.1" sources."saxes-5.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -119319,9 +117544,12 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.1.3" sources."tr46-0.0.3" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."type-is-1.6.18" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."universalify-0.2.0" @@ -119349,7 +117577,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wide-align-1.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -119398,7 +117626,7 @@ in sources."core-util-is-1.0.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."get-caller-file-2.0.5" @@ -119623,7 +117851,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -119668,7 +117896,7 @@ in sources."pkginfo-0.3.1" ]; }) - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wordwrap-1.0.0" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" @@ -119902,7 +118130,7 @@ in sources."pkginfo-0.3.1" ]; }) - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wordwrap-1.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -119940,10 +118168,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "7.1.1"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-7.1.1.tgz"; - sha512 = "rjivAl3bYu2+lWOi90vy0tYFgwBYPMiNkR/DuEWZC08wle5dsbOZ/SlXeLk9+kzbF89Bt5P6p+qF78A2tJsWPA=="; + url = "https://registry.npmjs.org/lerna/-/lerna-7.1.4.tgz"; + sha512 = "/cabvmTTkmayyALIZx7OpHRex72i8xSOkiJchEkrKxAZHoLNaGSwqwKkj+x6WtmchhWl/gLlqwQXGRuxrJKiBw=="; }; dependencies = [ sources."@babel/code-frame-7.22.5" @@ -119961,8 +118189,8 @@ in sources."@hutson/parse-repository-url-3.0.2" sources."@isaacs/cliui-8.0.2" sources."@jest/schemas-29.6.0" - sources."@lerna/child-process-7.1.1" - sources."@lerna/create-7.1.1" + sources."@lerna/child-process-7.1.4" + sources."@lerna/create-7.1.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -119976,24 +118204,24 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.2" - sources."@nrwl/devkit-16.5.0" - sources."@nrwl/tao-16.5.0" - (sources."@nx/devkit-16.5.0" // { + sources."@nrwl/devkit-16.6.0" + sources."@nrwl/tao-16.6.0" + (sources."@nx/devkit-16.6.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.5.3" ]; }) - sources."@nx/nx-darwin-arm64-16.5.0" - sources."@nx/nx-darwin-x64-16.5.0" - sources."@nx/nx-freebsd-x64-16.5.0" - sources."@nx/nx-linux-arm-gnueabihf-16.5.0" - sources."@nx/nx-linux-arm64-gnu-16.5.0" - sources."@nx/nx-linux-arm64-musl-16.5.0" - sources."@nx/nx-linux-x64-gnu-16.5.0" - sources."@nx/nx-linux-x64-musl-16.5.0" - sources."@nx/nx-win32-arm64-msvc-16.5.0" - sources."@nx/nx-win32-x64-msvc-16.5.0" + sources."@nx/nx-darwin-arm64-16.6.0" + sources."@nx/nx-darwin-x64-16.6.0" + sources."@nx/nx-freebsd-x64-16.6.0" + sources."@nx/nx-linux-arm-gnueabihf-16.6.0" + sources."@nx/nx-linux-arm64-gnu-16.6.0" + sources."@nx/nx-linux-arm64-musl-16.6.0" + sources."@nx/nx-linux-x64-gnu-16.6.0" + sources."@nx/nx-linux-x64-musl-16.6.0" + sources."@nx/nx-win32-arm64-msvc-16.6.0" + sources."@nx/nx-win32-x64-msvc-16.6.0" sources."@octokit/auth-token-3.0.4" sources."@octokit/core-4.2.4" sources."@octokit/endpoint-7.0.6" @@ -120014,23 +118242,24 @@ in sources."@octokit/types-9.3.2" sources."@parcel/watcher-2.0.4" sources."@pkgjs/parseargs-0.11.0" - sources."@sigstore/protobuf-specs-0.1.0" - sources."@sigstore/tuf-1.0.2" + sources."@sigstore/bundle-1.0.0" + sources."@sigstore/protobuf-specs-0.2.0" + sources."@sigstore/tuf-1.0.3" sources."@sinclair/typebox-0.27.8" sources."@swc-node/core-1.10.4" sources."@swc-node/register-1.6.6" sources."@swc-node/sourcemap-support-0.3.0" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" @@ -120088,7 +118317,7 @@ in (sources."cacache-17.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" sources."ssri-10.0.4" ]; @@ -120141,11 +118370,7 @@ in sources."conventional-changelog-angular-6.0.0" sources."conventional-changelog-core-5.0.1" sources."conventional-changelog-preset-loader-3.0.0" - (sources."conventional-changelog-writer-6.0.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."conventional-changelog-writer-6.0.1" sources."conventional-commits-filter-3.0.0" sources."conventional-commits-parser-4.0.0" sources."conventional-recommended-bump-7.0.1" @@ -120208,7 +118433,7 @@ in sources."tmp-0.0.33" ]; }) - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { @@ -120223,7 +118448,7 @@ in sources."follow-redirects-1.15.2" (sources."foreground-child-3.1.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) sources."form-data-4.0.0" @@ -120254,11 +118479,7 @@ in sources."pify-2.3.0" ]; }) - (sources."git-semver-tags-5.0.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."git-semver-tags-5.0.1" sources."git-up-7.0.0" sources."git-url-parse-13.1.0" sources."gitconfiglocal-1.0.0" @@ -120340,13 +118561,13 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" (sources."jake-10.8.7" // { dependencies = [ sources."minimatch-3.1.2" ]; }) - sources."jest-diff-29.6.1" + sources."jest-diff-29.6.2" sources."jest-get-type-29.4.3" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -120386,7 +118607,7 @@ in sources."lru-cache-7.18.3" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) (sources."make-fetch-happen-11.1.1" // { @@ -120408,7 +118629,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."merge-stream-2.0.0" @@ -120473,6 +118694,7 @@ in ]; }) sources."node-gyp-build-4.6.0" + sources."node-machine-id-1.1.12" sources."nopt-6.0.0" (sources."normalize-package-data-3.0.3" // { dependencies = [ @@ -120502,7 +118724,7 @@ in sources."npm-normalize-package-bin-1.0.1" ]; }) - (sources."npm-pick-manifest-8.0.1" // { + (sources."npm-pick-manifest-8.0.2" // { dependencies = [ sources."hosted-git-info-6.1.1" sources."npm-package-arg-10.1.0" @@ -120516,7 +118738,7 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-16.5.0" // { + (sources."nx-16.6.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cli-spinners-2.6.1" @@ -120594,7 +118816,7 @@ in sources."pify-5.0.0" sources."pirates-4.0.6" sources."pkg-dir-4.2.0" - (sources."pretty-format-29.6.1" // { + (sources."pretty-format-29.6.2" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -120614,7 +118836,7 @@ in (sources."read-package-json-6.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."hosted-git-info-6.1.1" sources."minimatch-9.0.3" sources."normalize-package-data-5.0.0" @@ -120627,7 +118849,7 @@ in sources."normalize-package-data-2.5.0" sources."parse-json-4.0.0" sources."pify-3.0.0" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."read-pkg-up-3.0.0" // { @@ -120672,7 +118894,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-1.7.0" + sources."sigstore-1.8.0" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" @@ -120738,7 +118960,7 @@ in sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."tsconfig-paths-4.2.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tuf-js-1.1.7" sources."type-fest-0.18.1" sources."typedarray-0.0.6" @@ -120782,14 +119004,14 @@ in sources."wrappy-1.0.2" (sources."write-file-atomic-5.0.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) (sources."write-json-file-3.2.0" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."write-file-atomic-2.4.3" ]; }) @@ -120845,9 +119067,9 @@ in sources."prr-1.0.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."source-map-0.6.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -121807,7 +120029,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -121906,7 +120128,7 @@ in sources."ini-3.0.1" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."js-yaml-4.1.0" sources."jsonc-parser-3.2.0" sources."linkify-it-4.0.1" @@ -121923,7 +120145,7 @@ in sources."run-con-1.2.12" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -121976,7 +120198,7 @@ in sources."braces-3.0.2" sources."dir-glob-3.0.1" sources."entities-3.0.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -122075,17 +120297,25 @@ in src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" + sources."@babel/compat-data-7.22.9" (sources."@babel/core-7.0.0" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."@babel/generator-7.22.7" + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" - sources."@babel/helper-create-regexp-features-plugin-7.22.6" + (sources."@babel/helper-compilation-targets-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/helper-environment-visitor-7.22.5" (sources."@babel/helper-function-name-7.22.5" // { dependencies = [ @@ -122095,26 +120325,18 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.22.5" sources."@babel/helper-module-imports-7.22.5" - (sources."@babel/helper-module-transforms-7.22.5" // { - dependencies = [ - sources."@babel/template-7.22.5" - ]; - }) + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.5" - (sources."@babel/helper-replace-supers-7.22.5" // { - dependencies = [ - sources."@babel/template-7.22.5" - ]; - }) + sources."@babel/helper-remap-async-to-generator-7.22.9" + sources."@babel/helper-replace-supers-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" sources."@babel/helper-validator-option-7.22.5" - (sources."@babel/helper-wrap-function-7.22.5" // { + (sources."@babel/helper-wrap-function-7.22.9" // { dependencies = [ sources."@babel/template-7.22.5" ]; @@ -122206,7 +120428,6 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@webassemblyjs/ast-1.7.8" sources."@webassemblyjs/floating-point-hex-parser-1.7.8" sources."@webassemblyjs/helper-api-error-1.7.8" @@ -122252,6 +120473,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."array.prototype.reduce-1.0.5" + sources."arraybuffer.prototype.slice-1.0.1" sources."arraybuffer.slice-0.0.7" sources."arrify-1.0.1" sources."asap-2.0.6" @@ -122330,7 +120552,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" @@ -122343,7 +120565,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -122430,7 +120652,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -122461,7 +120683,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.1.4" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -122649,7 +120871,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -122891,7 +121113,7 @@ in sources."safer-buffer-2.1.2" sources."scheduler-0.19.1" sources."schema-utils-1.0.0" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."send-0.16.1" // { dependencies = [ sources."debug-2.6.9" @@ -123051,6 +121273,9 @@ in sources."to-regex-range-2.1.1" sources."tslib-1.14.1" sources."tty-browserify-0.0.0" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."uc.micro-1.0.6" @@ -123152,7 +121377,7 @@ in sources."webpackbar-2.6.3" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."worker-farm-1.5.2" (sources."wrap-ansi-3.0.1" // { dependencies = [ @@ -123466,7 +121691,7 @@ in ]; }) sources."vinyl-0.5.3" - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wrappy-1.0.2" sources."write-0.2.1" sources."xml2js-0.4.23" @@ -123828,11 +122053,11 @@ in sources."@jest/environment-27.5.1" sources."@jest/fake-timers-27.5.1" sources."@jest/types-27.5.1" - sources."@ledgerhq/devices-8.0.4" - sources."@ledgerhq/errors-6.12.7" - sources."@ledgerhq/hw-transport-6.28.5" - sources."@ledgerhq/hw-transport-node-hid-6.27.17" - sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.16" + sources."@ledgerhq/devices-8.0.5" + sources."@ledgerhq/errors-6.13.0" + sources."@ledgerhq/hw-transport-6.28.6" + sources."@ledgerhq/hw-transport-node-hid-6.27.19" + sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.17" (sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // { dependencies = [ sources."@ledgerhq/devices-5.51.1" @@ -123866,7 +122091,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/stack-utils-2.0.1" sources."@types/w3c-web-usb-1.0.6" sources."@types/yargs-16.0.5" @@ -123935,7 +122160,7 @@ in sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" sources."depd-2.0.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" sources."emoji-regex-8.0.0" @@ -124014,7 +122239,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."md5-2.3.0" @@ -124050,7 +122275,7 @@ in sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."parse-passwd-1.0.0" @@ -124088,7 +122313,7 @@ in sources."semver-7.5.4" (sources."semver-diff-3.1.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."setprototypeof-1.2.0" @@ -124201,7 +122426,7 @@ in sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" sources."text-hex-1.0.0" - sources."triple-beam-1.3.0" + sources."triple-beam-1.4.1" sources."util-deprecate-1.0.2" sources."winston-3.3.3" sources."winston-transport-4.5.0" @@ -124265,7 +122490,7 @@ in (sources."cacache-17.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."minimatch-9.0.3" ]; }) @@ -124313,7 +122538,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."lru-cache-7.18.3" sources."make-fetch-happen-11.1.1" sources."minimatch-3.1.2" @@ -124372,7 +122597,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" @@ -124607,7 +122832,7 @@ in dependencies = [ sources."glob-7.2.3" sources."rimraf-2.7.1" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."nopt-4.0.3" @@ -124827,7 +123052,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."string-width-1.0.2" @@ -124864,7 +123089,7 @@ in }; dependencies = [ sources."@babel/runtime-7.22.6" - sources."@mapbox/node-pre-gyp-1.0.10" + sources."@mapbox/node-pre-gyp-1.0.11" sources."@node-red/editor-api-3.0.2" sources."@node-red/editor-client-3.0.2" (sources."@node-red/nodes-3.0.2" // { @@ -124883,7 +123108,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -124974,7 +123199,7 @@ in sources."denque-2.1.0" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" @@ -124993,7 +123218,7 @@ in ]; }) sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" + sources."enquirer-2.4.1" sources."entities-2.2.0" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -125064,14 +123289,14 @@ in sources."universalify-2.0.0" ]; }) - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-2.0.0" sources."lru-cache-4.1.5" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."media-typer-0.3.0" @@ -125223,7 +123448,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-0.0.3" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.16.3" @@ -125353,17 +123578,17 @@ in sources."nopt-3.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."npm-package-arg-6.1.1" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."npm-registry-client-8.6.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."npmconf-2.1.3" // { @@ -125464,10 +123689,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.22"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz"; - sha512 = "B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz"; + sha512 = "g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -125488,6 +123713,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" + sources."lru-cache-6.0.0" sources."minimatch-3.1.2" sources."ms-2.1.3" sources."nopt-1.0.10" @@ -125495,16 +123721,13 @@ in sources."picomatch-2.3.1" sources."pstree.remy-1.1.8" sources."readdirp-3.6.0" - sources."semver-5.7.1" - (sources."simple-update-notifier-1.1.0" // { - dependencies = [ - sources."semver-7.0.0" - ]; - }) + sources."semver-7.5.4" + sources."simple-update-notifier-2.0.0" sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" sources."touch-3.1.0" sources."undefsafe-2.0.5" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -125542,6 +123765,7 @@ in sources."path-exists-4.0.0" ]; }) + sources."@ljharb/through-2.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -125559,11 +123783,11 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.683" + sources."all-package-names-2.0.706" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -125650,7 +123874,7 @@ in sources."decamelize-6.0.0" (sources."decamelize-keys-2.0.1" // { dependencies = [ - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) (sources."decompress-response-6.0.0" // { @@ -125678,10 +123902,10 @@ in sources."error-ex-1.3.2" sources."escape-goat-4.0.0" sources."escape-string-regexp-5.0.0" - sources."execa-7.1.1" + sources."execa-7.2.0" sources."exit-hook-3.2.0" sources."external-editor-3.1.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."figures-5.0.0" sources."fill-range-7.0.1" @@ -125739,7 +123963,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-9.2.7" + sources."inquirer-9.2.9" (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -125813,7 +124037,7 @@ in sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kind-of-6.0.3" sources."latest-version-7.0.0" sources."lines-and-columns-1.2.4" @@ -125890,7 +124114,7 @@ in sources."map-obj-4.3.0" (sources."meow-12.0.1" // { dependencies = [ - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."merge-stream-2.0.0" @@ -125942,7 +124166,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-1.1.1" // { dependencies = [ - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."callsites-4.0.0" ]; }) @@ -125954,17 +124178,17 @@ in (sources."p-memoize-7.1.1" // { dependencies = [ sources."mimic-fn-4.0.0" - sources."type-fest-3.12.0" + sources."type-fest-3.13.1" ]; }) sources."p-timeout-6.1.2" sources."p-try-2.2.0" (sources."package-json-8.1.1" // { dependencies = [ - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."got-12.6.1" sources."http2-wrapper-2.2.0" sources."lowercase-keys-3.0.0" @@ -126062,7 +124286,7 @@ in sources."run-parallel-1.2.0" (sources."rxjs-7.8.1" // { dependencies = [ - sources."tslib-2.6.0" + sources."tslib-2.6.1" ]; }) sources."safe-buffer-5.2.1" @@ -126158,10 +124382,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "9.8.0"; + version = "9.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.8.0.tgz"; - sha512 = "AXeiBAdfM5K2jvBwA7EGLKeYyt0VnhmJRnlq4k2+M0Ao9v7yKJBqF8xFPzQL8kAybzwlfpTPCZwM4uTIszb3xA=="; + url = "https://registry.npmjs.org/npm/-/npm-9.8.1.tgz"; + sha512 = "AfDvThQzsIXhYgk9zhbk5R+lh811lKkLAeQMMhSypf1BM7zUafeIIBzMzespeuVEJ0+LvY36oRQYf7IKLzU3rw=="; }; buildInputs = globalBuildInputs; meta = { @@ -126176,10 +124400,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.10.15"; + version = "16.10.17"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.15.tgz"; - sha512 = "tmbFF7J1mIbjmnN4DzFRVlEeAaIB/FPRz4o95DWsGB7fT3ZECuxyMMDnvySfoijuWxx8E7pODN0IoKYnEJVxcg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.10.17.tgz"; + sha512 = "ZoIbWYJhlgMDoByq1WC6Ys3E76IvNCxgS54tPUFbK5J/nqf/BCJt6xiMPAEa7G1HuyAruG+orUF9uTsTGUZl8g=="; }; dependencies = [ sources."@colors/colors-1.5.0" @@ -126208,9 +124432,10 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - sources."@sigstore/protobuf-specs-0.1.0" - sources."@sigstore/tuf-1.0.2" - sources."@sindresorhus/is-5.4.1" + sources."@sigstore/bundle-1.0.0" + sources."@sigstore/protobuf-specs-0.2.0" + sources."@sigstore/tuf-1.0.3" + sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" @@ -126242,11 +124467,11 @@ in sources."builtins-5.0.1" (sources."cacache-17.1.3" // { dependencies = [ - sources."glob-10.3.2" + sources."glob-10.3.3" ]; }) sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."camelcase-7.0.1" sources."chalk-5.3.0" sources."chownr-2.0.0" @@ -126295,14 +124520,14 @@ in sources."err-code-2.0.3" sources."escape-goat-4.0.0" sources."exponential-backoff-3.1.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-memoize-2.5.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" (sources."foreground-child-3.1.1" // { dependencies = [ - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" ]; }) sources."form-data-encoder-2.1.4" @@ -126361,7 +124586,7 @@ in sources."is-typedarray-1.0.0" sources."is-yarn-global-0.4.1" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."jju-1.4.0" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" @@ -126370,7 +124595,7 @@ in sources."json5-2.2.3" sources."jsonlines-0.1.1" sources."jsonparse-1.3.1" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kleur-4.1.5" sources."latest-version-7.0.0" sources."locate-path-6.0.0" @@ -126440,7 +124665,7 @@ in ]; }) sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.1" + sources."npm-pick-manifest-8.0.2" sources."npm-registry-fetch-14.0.5" sources."npmlog-6.0.2" sources."once-1.4.0" @@ -126479,7 +124704,7 @@ in sources."rc-config-loader-4.1.3" (sources."read-package-json-6.0.4" // { dependencies = [ - sources."glob-10.3.2" + sources."glob-10.3.3" ]; }) sources."read-package-json-fast-3.0.2" @@ -126494,7 +124719,7 @@ in sources."reusify-1.0.4" (sources."rimraf-5.0.1" // { dependencies = [ - sources."glob-10.3.2" + sources."glob-10.3.3" ]; }) sources."run-parallel-1.2.0" @@ -126511,7 +124736,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-1.7.0" + sources."sigstore-1.8.0" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."smart-buffer-4.2.0" @@ -126690,10 +124915,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.16.0"; + version = "6.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.16.0.tgz"; - sha512 = "T04wzQr/pQaxpJoLvAnDeWlZCAnGuPteds/5bgGfN3qkx96k4QmmYHonO4N9xyUfxRVBdjWWc+LDxmO/jj/Apw=="; + url = "https://registry.npmjs.org/orval/-/orval-6.17.0.tgz"; + sha512 = "QeK/Zxk9ZnoL//br/2oe5HnB53safd5eKtncCc0/3HjQS2BRtJpAyH8q7sQRFPTV4ToG9duYSQrTjgTvTsLTnQ=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -126703,7 +124928,7 @@ in sources."@asyncapi/specs-4.3.1" sources."@esbuild/android-arm-0.15.18" sources."@esbuild/linux-loong64-0.15.18" - sources."@exodus/schemasafe-1.0.1" + sources."@exodus/schemasafe-1.1.1" sources."@ibm-cloud/openapi-ruleset-0.45.5" sources."@ibm-cloud/openapi-ruleset-utilities-0.0.1" sources."@jsdevtools/ono-7.1.3" @@ -126712,13 +124937,13 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.16.0" - sources."@orval/axios-6.16.0" - sources."@orval/core-6.16.0" - sources."@orval/msw-6.16.0" - sources."@orval/query-6.16.0" - sources."@orval/swr-6.16.0" - sources."@orval/zod-6.16.0" + sources."@orval/angular-6.17.0" + sources."@orval/axios-6.17.0" + sources."@orval/core-6.17.0" + sources."@orval/msw-6.17.0" + sources."@orval/query-6.17.0" + sources."@orval/swr-6.17.0" + sources."@orval/zod-6.17.0" sources."@rollup/plugin-commonjs-22.0.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -126732,55 +124957,42 @@ in sources."tslib-1.14.1" ]; }) - sources."@stoplight/json-ref-resolver-3.1.5" + sources."@stoplight/json-ref-resolver-3.1.6" sources."@stoplight/ordered-object-literal-1.0.4" sources."@stoplight/path-1.3.2" - (sources."@stoplight/spectral-cli-6.8.0" // { + (sources."@stoplight/spectral-cli-6.10.0" // { dependencies = [ - sources."@stoplight/json-3.20.3" sources."fast-glob-3.2.12" ]; }) - (sources."@stoplight/spectral-core-1.18.1" // { + (sources."@stoplight/spectral-core-1.18.3" // { dependencies = [ - sources."@stoplight/json-3.20.3" sources."@stoplight/types-13.6.0" ]; }) sources."@stoplight/spectral-formats-1.5.0" - sources."@stoplight/spectral-formatters-1.1.0" + sources."@stoplight/spectral-formatters-1.2.0" sources."@stoplight/spectral-functions-1.7.2" - (sources."@stoplight/spectral-parsers-1.0.2" // { - dependencies = [ - sources."@stoplight/json-3.20.3" - ]; - }) - sources."@stoplight/spectral-ref-resolver-1.0.3" + sources."@stoplight/spectral-parsers-1.0.3" + sources."@stoplight/spectral-ref-resolver-1.0.4" sources."@stoplight/spectral-ruleset-bundler-1.5.2" - (sources."@stoplight/spectral-ruleset-migrator-1.9.4" // { - dependencies = [ - sources."@stoplight/json-3.20.3" - ]; - }) + sources."@stoplight/spectral-ruleset-migrator-1.9.5" sources."@stoplight/spectral-rulesets-1.16.0" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ sources."@stoplight/types-12.5.0" ]; }) - sources."@stoplight/types-13.15.0" + sources."@stoplight/types-13.17.0" sources."@stoplight/yaml-4.2.3" sources."@stoplight/yaml-ast-parser-0.0.48" - sources."@tootallnate/once-1.1.2" sources."@types/es-aggregate-error-1.0.2" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.12" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" - sources."agent-base-6.0.2" sources."ajv-8.12.0" sources."ajv-draft-04-1.0.0" sources."ajv-errors-3.0.0" @@ -126792,6 +125004,7 @@ in sources."argparse-1.0.10" sources."array-buffer-byte-length-1.0.0" sources."array-union-2.1.0" + sources."arraybuffer.prototype.slice-1.0.1" sources."as-table-1.0.55" sources."ast-types-0.14.2" sources."astring-1.8.6" @@ -126802,7 +125015,6 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."builtins-1.0.3" - sources."bytes-3.1.2" sources."cac-6.7.14" sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" @@ -126816,27 +125028,19 @@ in sources."commondir-1.0.1" sources."compare-versions-4.1.4" sources."concat-map-0.0.1" - sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."cuid-2.1.8" - sources."data-uri-to-buffer-3.0.1" + sources."data-uri-to-buffer-2.0.2" sources."debug-4.3.4" - sources."deep-is-0.1.4" sources."deepmerge-2.2.1" sources."defaults-1.0.4" sources."define-properties-1.2.0" - (sources."degenerator-3.0.4" // { - dependencies = [ - sources."ast-types-0.13.4" - ]; - }) - sources."depd-2.0.0" sources."dependency-graph-0.11.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" - sources."enquirer-2.3.6" - sources."es-abstract-1.21.2" + sources."enquirer-2.4.1" + sources."es-abstract-1.22.1" sources."es-aggregate-error-1.0.9" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -126864,20 +125068,16 @@ in sources."esbuild-windows-arm64-0.15.18" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" sources."esprima-4.0.1" - sources."estraverse-4.3.0" sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."event-target-shim-5.0.1" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" - sources."fast-levenshtein-2.0.6" + sources."fast-glob-3.3.1" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" - sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" (sources."find-up-5.0.0" // { dependencies = [ @@ -126889,32 +125089,17 @@ in }) sources."for-each-0.3.3" sources."format-util-1.0.5" - (sources."fs-extra-10.1.0" // { - dependencies = [ - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" - ]; - }) + sources."fs-extra-10.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."ftp-0.3.10" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.1" - (sources."get-source-2.0.12" // { - dependencies = [ - sources."data-uri-to-buffer-2.0.2" - ]; - }) + sources."get-source-2.0.12" sources."get-stream-6.0.1" sources."get-symbol-description-1.0.0" - (sources."get-uri-3.0.2" // { - dependencies = [ - sources."fs-extra-8.1.0" - ]; - }) sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globalthis-1.0.3" @@ -126928,10 +125113,8 @@ in sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" + sources."hpagent-1.2.0" sources."http2-client-1.3.5" - sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" (sources."ibm-openapi-validator-0.97.5" // { dependencies = [ @@ -126944,7 +125127,6 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internal-slot-1.0.5" - sources."ip-1.1.8" sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -126964,9 +125146,9 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" - sources."isarray-0.0.1" + sources."isarray-2.0.5" sources."isexe-2.0.0" sources."js-yaml-3.14.1" sources."jsep-1.3.8" @@ -126978,12 +125160,11 @@ in }) sources."json-schema-traverse-1.0.0" sources."jsonc-parser-2.2.1" - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" sources."jsonpath-plus-7.1.0" sources."jsonpointer-5.0.1" sources."jsonschema-1.4.1" sources."leven-3.1.0" - sources."levn-0.3.0" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" @@ -126994,7 +125175,6 @@ in sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.uniqwith-4.5.0" - sources."lru-cache-5.1.1" sources."magic-string-0.25.9" sources."matcher-1.1.1" sources."merge-stream-2.0.0" @@ -127003,7 +125183,6 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."netmask-2.0.2" (sources."nimma-0.2.2" // { dependencies = [ sources."jsonpath-plus-6.0.1" @@ -127031,12 +125210,9 @@ in sources."yaml-2.3.1" ]; }) - sources."optionator-0.8.3" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."pac-proxy-agent-5.0.0" - sources."pac-resolver-5.0.1" sources."pad-2.3.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -127045,18 +125221,9 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pony-cause-1.1.1" - sources."prelude-ls-1.1.2" sources."printable-characters-1.0.42" - sources."proxy-agent-5.0.0" - sources."proxy-from-env-1.1.0" sources."punycode-2.3.0" sources."queue-microtask-1.2.3" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."readable-stream-1.1.14" sources."readdirp-3.6.0" sources."reftools-1.1.9" sources."regexp.prototype.flags-1.5.0" @@ -127068,11 +125235,11 @@ in sources."reusify-1.0.4" sources."rollup-2.79.1" sources."run-parallel-1.2.0" + sources."safe-array-concat-1.0.0" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" - sources."setprototypeof-1.2.0" + sources."semver-5.7.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."should-13.2.3" @@ -127085,24 +125252,15 @@ in sources."signal-exit-3.0.7" sources."simple-eval-1.0.0" sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" sources."stacktracey-2.1.8" - sources."statuses-2.0.1" sources."string-argv-0.3.2" sources."string-width-4.2.3" sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" - sources."string_decoder-0.10.31" sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" @@ -127110,34 +125268,30 @@ in sources."swagger2openapi-7.0.8" sources."text-table-0.2.0" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tsconfck-2.1.1" - sources."tslib-2.6.0" - sources."type-check-0.3.2" + sources."tsconfck-2.1.2" + sources."tslib-2.6.1" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."typescript-5.1.6" sources."unbox-primitive-1.0.2" - sources."universalify-0.1.2" - sources."unpipe-1.0.0" + sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."urijs-1.19.11" sources."utility-types-3.10.0" sources."validate-npm-package-name-3.0.0" sources."validator-13.9.0" - sources."vm2-3.9.19" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" - sources."word-wrap-1.2.3" + sources."which-typed-array-1.1.11" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."xregexp-2.0.0" sources."y18n-5.0.8" - sources."yallist-3.1.1" sources."yaml-1.10.2" sources."yaml-js-0.2.3" sources."yargs-17.3.1" @@ -127165,36 +125319,49 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - (sources."@babel/core-7.22.8" // { + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { dependencies = [ sources."json5-2.2.3" + sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.7" + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" - sources."@babel/helper-create-class-features-plugin-7.22.6" - sources."@babel/helper-create-regexp-features-plugin-7.22.6" - sources."@babel/helper-define-polyfill-provider-0.4.1" + (sources."@babel/helper-compilation-targets-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-class-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/helper-define-polyfill-provider-0.4.2" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.5" - sources."@babel/helper-replace-supers-7.22.5" + sources."@babel/helper-remap-async-to-generator-7.22.9" + sources."@babel/helper-replace-supers-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helper-wrap-function-7.22.5" + sources."@babel/helper-wrap-function-7.22.9" sources."@babel/helpers-7.22.6" sources."@babel/highlight-7.22.5" sources."@babel/parser-7.22.7" @@ -127272,8 +125439,12 @@ in sources."@babel/plugin-transform-unicode-property-regex-7.22.5" sources."@babel/plugin-transform-unicode-regex-7.22.5" sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - sources."@babel/preset-env-7.22.7" - sources."@babel/preset-modules-0.1.5" + (sources."@babel/preset-env-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/preset-modules-0.1.6" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.22.6" sources."@babel/template-7.22.5" @@ -127291,7 +125462,6 @@ in ]; }) sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" sources."@parcel/logger-1.11.1" @@ -127325,6 +125495,7 @@ in sources."array-equal-1.0.0" sources."array-unique-0.3.2" sources."array.prototype.reduce-1.0.5" + sources."arraybuffer.prototype.slice-1.0.1" sources."asn1-0.2.6" (sources."asn1.js-5.4.1" // { dependencies = [ @@ -127346,9 +125517,13 @@ in sources."available-typed-arrays-1.0.5" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" - sources."babel-plugin-polyfill-corejs2-0.4.4" - sources."babel-plugin-polyfill-corejs3-0.8.2" - sources."babel-plugin-polyfill-regenerator-0.5.1" + (sources."babel-plugin-polyfill-corejs2-0.4.5" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.8.3" + sources."babel-plugin-polyfill-regenerator-0.5.2" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -127392,7 +125567,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -127409,7 +125584,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -127435,7 +125610,7 @@ in sources."convert-source-map-1.9.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.31.1" + sources."core-js-compat-3.32.0" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -127542,7 +125717,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -127552,7 +125727,7 @@ in sources."entities-2.2.0" sources."envinfo-7.10.0" sources."error-ex-1.3.2" - (sources."es-abstract-1.21.2" // { + (sources."es-abstract-1.22.1" // { dependencies = [ sources."object-inspect-1.12.3" ]; @@ -127660,7 +125835,7 @@ in sources."acorn-8.10.0" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" - sources."terser-5.18.2" + sources."terser-5.19.2" ]; }) (sources."htmlparser2-6.1.0" // { @@ -127722,7 +125897,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-weakref-1.0.2" @@ -128005,7 +126180,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."saxes-3.1.11" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -128112,6 +126287,9 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."unbox-primitive-1.0.2" @@ -128178,8 +126356,8 @@ in sources."whatwg-url-7.1.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" - sources."word-wrap-1.2.3" + sources."which-typed-array-1.1.11" + sources."word-wrap-1.2.5" sources."wrappy-1.0.2" sources."ws-5.2.3" sources."xml-name-validator-3.0.0" @@ -128317,17 +126495,17 @@ in sources."@parcel/watcher-win32-arm64-2.2.0" sources."@parcel/watcher-win32-x64-2.2.0" sources."@parcel/workers-2.9.3" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" sources."@trysound/sax-0.2.0" sources."abab-2.0.6" @@ -128356,11 +126534,11 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -128381,7 +126559,7 @@ in sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cosmiconfig-8.2.0" - sources."css-declaration-sorter-6.4.0" + sources."css-declaration-sorter-6.4.1" sources."css-select-5.1.0" sources."css-tree-2.3.1" sources."css-what-6.1.0" @@ -128410,7 +126588,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."entities-4.5.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -128532,7 +126710,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pn-1.1.0" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-calc-9.0.1" sources."postcss-colormin-6.0.0" sources."postcss-convert-values-6.0.0" @@ -128613,7 +126791,7 @@ in }) sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.18.2" // { + (sources."terser-5.19.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -128622,7 +126800,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -128652,7 +126830,7 @@ in sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" sources."wrappy-1.0.2" sources."ws-6.2.2" sources."xml-name-validator-3.0.0" @@ -128887,7 +127065,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" + sources."semver-6.3.1" (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" @@ -128967,10 +127145,10 @@ in patch-package = nodeEnv.buildNodePackage { name = "patch-package"; packageName = "patch-package"; - version = "7.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/patch-package/-/patch-package-7.0.0.tgz"; - sha512 = "eYunHbnnB2ghjTNc5iL1Uo7TsGMuXk0vibX3RFcE/CdVdXzmdbMsG/4K4IgoSuIkLTI5oHrMQk4+NkFqSed0BQ=="; + url = "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz"; + sha512 = "da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" @@ -128998,8 +127176,11 @@ in sources."is-number-7.0.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" + sources."json-stable-stringify-1.0.2" sources."jsonfile-6.1.0" + sources."jsonify-0.0.1" sources."klaw-sync-6.0.0" + sources."lru-cache-6.0.0" sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."minimist-1.2.8" @@ -129010,7 +127191,7 @@ in sources."path-key-3.1.1" sources."picomatch-2.3.1" sources."rimraf-2.7.1" - sources."semver-5.7.1" + sources."semver-7.5.4" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."slash-2.0.0" @@ -129020,6 +127201,7 @@ in sources."universalify-2.0.0" sources."which-2.0.2" sources."wrappy-1.0.2" + sources."yallist-4.0.0" sources."yaml-2.3.1" ]; buildInputs = globalBuildInputs; @@ -129278,7 +127460,7 @@ in sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."server-destroy-1.0.1" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -129799,14 +127981,14 @@ in sources."debug-4.3.4" sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."escalade-3.1.1" sources."expand-template-2.0.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."from2-2.3.0" @@ -129934,19 +128116,18 @@ in dependencies = [ (sources."@opencensus/core-0.0.9" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."@opencensus/propagation-b3-0.0.8" // { dependencies = [ sources."@opencensus/core-0.0.8" - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) - (sources."@pm2/agent-2.0.1" // { + (sources."@pm2/agent-2.0.3" // { dependencies = [ sources."dayjs-1.8.36" - sources."semver-7.2.3" ]; }) (sources."@pm2/io-5.0.0" // { @@ -129964,10 +128145,8 @@ in ]; }) sources."@pm2/pm2-version-check-1.0.4" - sources."@tootallnate/once-1.1.2" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" - sources."agent-base-6.0.2" + sources."@tootallnate/quickjs-emscripten-0.23.0" + sources."agent-base-7.1.0" sources."amp-0.3.1" sources."amp-message-0.1.2" sources."ansi-colors-4.1.3" @@ -129982,11 +128161,12 @@ in sources."async-3.2.4" (sources."async-listener-0.6.10" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."axios-0.21.4" sources."balanced-match-1.0.2" + sources."basic-ftp-5.0.3" sources."binary-extensions-2.2.0" sources."blessed-0.1.81" sources."bodec-0.1.0" @@ -129994,7 +128174,6 @@ in sources."braces-3.0.2" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" - sources."bytes-3.1.2" sources."chalk-3.0.0" sources."charm-0.1.2" sources."chokidar-3.5.3" @@ -130004,35 +128183,29 @@ in sources."commander-2.15.1" sources."concat-map-0.0.1" sources."continuation-local-storage-3.2.1" - sources."core-util-is-1.0.3" sources."croner-4.1.97" sources."culvert-0.1.2" - sources."data-uri-to-buffer-3.0.1" + sources."data-uri-to-buffer-5.0.1" sources."dayjs-1.11.9" sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."degenerator-3.0.4" - sources."depd-2.0.0" + sources."degenerator-5.0.1" sources."emitter-listener-1.1.2" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."escodegen-1.14.3" + sources."escodegen-2.1.0" sources."esprima-4.0.1" - sources."estraverse-4.3.0" + sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."eventemitter2-5.0.1" sources."fast-json-patch-3.1.1" - sources."fast-levenshtein-2.0.6" sources."fclone-1.0.11" - sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" sources."follow-redirects-1.15.2" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."ftp-0.3.10" sources."function-bind-1.1.1" - sources."get-uri-3.0.2" + sources."get-uri-6.0.1" sources."git-node-fs-1.0.0" sources."git-sha1-0.1.2" sources."glob-7.2.3" @@ -130040,9 +128213,8 @@ in sources."graceful-fs-4.2.11" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" + sources."http-proxy-agent-7.0.0" + sources."https-proxy-agent-7.0.1" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -130053,15 +128225,13 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."isarray-0.0.1" sources."js-git-0.7.8" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."lazy-1.0.11" - sources."levn-0.3.0" sources."lodash-4.17.21" sources."log-driver-1.2.7" - sources."lru-cache-5.1.1" + sources."lru-cache-7.18.3" sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."module-details-from-path-1.0.3" @@ -130081,9 +128251,8 @@ in ]; }) sources."once-1.4.0" - sources."optionator-0.8.3" - sources."pac-proxy-agent-5.0.0" - sources."pac-resolver-5.0.1" + sources."pac-proxy-agent-7.0.0" + sources."pac-resolver-7.0.0" sources."pako-0.2.9" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" @@ -130098,13 +128267,10 @@ in sources."pidusage-2.0.21" ]; }) - sources."prelude-ls-1.1.2" sources."promptly-2.2.0" - sources."proxy-agent-5.0.0" + sources."proxy-agent-6.3.0" sources."proxy-from-env-1.1.0" - sources."raw-body-2.5.2" sources."read-1.0.7" - sources."readable-stream-1.1.14" sources."readdirp-3.6.0" sources."require-in-the-middle-5.2.0" sources."resolve-1.22.3" @@ -130115,10 +128281,8 @@ in (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" - sources."yallist-4.0.0" ]; }) - sources."setprototypeof-1.2.0" sources."shimmer-1.2.1" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" @@ -130127,23 +128291,18 @@ in sources."ip-2.0.0" ]; }) - sources."socks-proxy-agent-5.0.1" + sources."socks-proxy-agent-8.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."sprintf-js-1.1.2" - sources."statuses-2.0.1" - sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.18.6" + sources."systeminformation-5.18.10" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tv4-1.3.0" sources."tx2-1.0.5" - sources."type-check-0.3.2" sources."universalify-0.1.2" - sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" sources."uuid-3.4.0" (sources."vizion-2.2.1" // { @@ -130151,12 +128310,9 @@ in sources."async-2.6.4" ]; }) - sources."vm2-3.9.19" - sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" - sources."xregexp-2.0.0" - sources."yallist-3.1.1" + sources."yallist-4.0.0" sources."yamljs-0.3.0" ]; buildInputs = globalBuildInputs; @@ -130172,10 +128328,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "8.6.6"; + version = "8.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-8.6.6.tgz"; - sha512 = "a51bIJyCmvstgCvsWf6SgZnsXfWmwAW1pHWEaH2gN3vqQGC58yLFL/oKBwcZWH0mjpMzBWRXdS9dLdN6GAK2Rw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-8.6.11.tgz"; + sha512 = "jqknppuj45tDzJsLcLqkAxytBHZXIx9JTYkGNq0/7pSRggpio9wRxTDj4NA2ilOHPlJ5BVjB5Ij5dx65woMi5A=="; }; buildInputs = globalBuildInputs; meta = { @@ -130218,10 +128374,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.25"; + version = "8.4.27"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.25.tgz"; - sha512 = "7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz"; + sha512 = "gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="; }; dependencies = [ sources."nanoid-3.3.6" @@ -130254,24 +128410,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" @@ -130290,7 +128446,7 @@ in sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs-extra-11.1.1" @@ -130321,7 +128477,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-load-config-4.0.1" sources."postcss-reporter-7.0.5" sources."pretty-hrtime-1.0.3" @@ -130338,7 +128494,7 @@ in sources."thenby-1.3.4" sources."to-regex-range-5.0.1" sources."ts-node-10.9.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."universalify-2.0.0" sources."v8-compile-cache-lib-3.0.1" @@ -130374,7 +128530,7 @@ in sources."chownr-1.1.4" sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."end-of-stream-1.4.4" sources."expand-template-2.0.3" sources."fs-constants-1.0.0" @@ -130493,13 +128649,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "4.16.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-4.16.2.tgz"; - sha512 = "SYCsBvDf0/7XSJyf2cHTLjLeTLVXYfqp7pG5eEVafFLeT0u/hLFz/9W196nDRGUOo1JfPatAEb+uEnTQImQC1g=="; + url = "https://registry.npmjs.org/prisma/-/prisma-5.1.0.tgz"; + sha512 = "wkXvh+6wxk03G8qwpZMOed4Y3j+EQ+bMTlvbDZHeal6k1E8QuGKzRO7DRXlE1NV0WNgOAas8kwZqcLETQ2+BiQ=="; }; dependencies = [ - sources."@prisma/engines-4.16.2" + sources."@prisma/engines-5.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -130514,23 +128670,23 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "4.16.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.16.2.tgz"; - sha512 = "WmNPKuEmC4pBJNezJkLw08jUvvH5SB9QuPcB1riBiSiPg1FM0KhfeGO8HzZB4g796BiMot8zdIUybSkqOzfd+A=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.1.0.tgz"; + sha512 = "n7TS0Wgupl4FXytRrR8vCgjfoJEmKuHIHLaYrServN6pWnEyKY/vAYAhDRPYV/IduxV1ZzPqCJvdGRK/53Gf4w=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -130553,8 +128709,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" - sources."@prisma/prisma-fmt-wasm-4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81" + sources."@prisma/prisma-schema-wasm-5.1.0-28.a9b7003df90aa623086e4d6f4e43c72468e6339b" sources."@types/js-levenshtein-1.1.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" @@ -130564,10 +128719,10 @@ in sources."argparse-1.0.10" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -130580,7 +128735,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -130613,14 +128768,18 @@ in sources."istanbul-lib-hook-3.0.0" sources."istanbul-lib-instrument-4.0.3" sources."istanbul-lib-processinfo-2.0.3" - (sources."istanbul-lib-report-3.0.0" // { + (sources."istanbul-lib-report-3.0.1" // { dependencies = [ sources."has-flag-4.0.0" + sources."lru-cache-6.0.0" + sources."make-dir-4.0.0" + sources."semver-7.5.4" sources."supports-color-7.2.0" + sources."yallist-4.0.0" ]; }) sources."istanbul-lib-source-maps-4.0.1" - sources."istanbul-reports-3.1.5" + sources."istanbul-reports-3.1.6" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" @@ -130653,7 +128812,7 @@ in sources."require-main-filename-2.0.0" sources."resolve-from-5.0.0" sources."rimraf-3.0.2" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -130730,7 +128889,7 @@ in sources."foreground-child-3.1.1" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" - (sources."glob-10.3.2" // { + (sources."glob-10.3.3" // { dependencies = [ sources."brace-expansion-2.0.1" sources."minimatch-9.0.3" @@ -130745,19 +128904,19 @@ in sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."keypress-0.2.1" sources."lodash-4.17.21" sources."lru-cache-10.0.0" sources."minimatch-3.0.8" - sources."minipass-7.0.1" + sources."minipass-7.0.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-scurry-1.10.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -131164,8 +129323,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@tootallnate/quickjs-emscripten-0.23.0" sources."agent-base-7.1.0" sources."appdata-path-1.0.0" sources."ast-types-0.13.4" @@ -131187,17 +129345,15 @@ in sources."debug-4.3.4" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" - sources."degenerator-4.0.4" + sources."degenerator-5.0.1" sources."duplexer3-0.1.5" sources."end-of-stream-1.4.4" - sources."escodegen-1.14.3" + sources."escodegen-2.1.0" sources."esprima-4.0.1" - sources."estraverse-4.3.0" + sources."estraverse-5.3.0" sources."esutils-2.0.3" - sources."fast-levenshtein-2.0.6" sources."follow-redirects-1.15.2" sources."fs-extra-11.1.1" sources."function-bind-1.1.1" @@ -131217,7 +129373,7 @@ in sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-7.0.0" - sources."https-proxy-agent-7.0.0" + sources."https-proxy-agent-7.0.1" sources."ini-1.3.8" sources."ip-1.1.8" sources."is-docker-2.2.1" @@ -131228,7 +129384,6 @@ in sources."keyv-3.1.0" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."levn-0.3.0" sources."lodash.flatmap-4.5.0" sources."lowercase-keys-1.0.1" sources."lru-cache-7.18.3" @@ -131242,20 +129397,18 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."open-8.4.2" - sources."optionator-0.8.3" sources."p-cancelable-1.1.0" - sources."pac-proxy-agent-6.0.3" - sources."pac-resolver-6.0.2" + sources."pac-proxy-agent-7.0.0" + sources."pac-resolver-7.0.0" sources."package-json-6.5.0" (sources."pixiv-api-client-0.25.0" // { dependencies = [ sources."axios-0.21.4" ]; }) - sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prompts-2.4.2" - sources."proxy-agent-6.2.1" + sources."proxy-agent-6.3.0" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.11.2" @@ -131265,7 +129418,7 @@ in sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."side-channel-1.0.4" sources."sisteransi-1.0.5" sources."smart-buffer-4.2.0" @@ -131278,13 +129431,10 @@ in sources."source-map-0.6.1" sources."strip-json-comments-2.0.1" sources."to-readable-stream-1.0.0" - sources."tslib-2.6.0" - sources."type-check-0.3.2" + sources."tslib-2.6.1" sources."universalify-2.0.0" sources."url-parse-lax-3.0.0" - sources."vm2-3.9.19" sources."winreg-1.2.4" - sources."word-wrap-1.2.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -131300,11 +129450,14 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.316"; + version = "1.1.319"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.316.tgz"; - sha512 = "Pdb9AwOO07uNOuEVtwCThyDpB0wigWmLjeCw5vdPG7gVbVYYgY2iw64kBdwTu78NrO0igVKzmoRuApMoL6ZE0w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.319.tgz"; + sha512 = "6AC0r2r5rT0BpcPH7S27JS0CpFNKvvfdTRLinWwzeMdJCma9ceF8zUgnvMahHfLUcXn4fyypfth9Dito9tey8g=="; }; + dependencies = [ + sources."fsevents-2.3.2" + ]; buildInputs = globalBuildInputs; meta = { description = "Type checker for the Python language"; @@ -131318,10 +129471,10 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "23.0.54"; + version = "23.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.54.tgz"; - sha512 = "StZHz09bmf6AxZsuSvB4dWNksB4HYTjitv5LTPW4wKD3nMdTwsMWPP3TLNdpX78wkK7iHL94r7txxawVulAtDQ=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.63.tgz"; + sha512 = "ncTNNEHeQJPGZm7uoHdE5RpFNCmOb0DUSp2vi8Dd+IGNwJtHtf5AOIIWWN6f7PnficD+wY8huMmVRYDDxFpjnQ=="; }; dependencies = [ (sources."@75lb/deep-merge-1.1.1" // { @@ -131339,25 +129492,25 @@ in sources."typescript-4.9.4" ]; }) - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/json-schema-7.0.12" - sources."@types/node-16.18.38" + sources."@types/node-16.18.39" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.10.0" @@ -131386,7 +129539,7 @@ in }) sources."concat-map-0.0.1" sources."create-require-1.1.1" - sources."cross-fetch-3.1.8" + sources."cross-fetch-4.0.0" sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" @@ -131420,13 +129573,9 @@ in sources."path-is-absolute-1.0.1" sources."pluralize-8.0.0" sources."process-0.11.10" - (sources."quicktype-core-23.0.54" // { - dependencies = [ - sources."readable-stream-4.3.0" - ]; - }) - sources."quicktype-graphql-input-23.0.54" - sources."quicktype-typescript-input-23.0.54" + sources."quicktype-core-23.0.63" + sources."quicktype-graphql-input-23.0.63" + sources."quicktype-typescript-input-23.0.63" sources."readable-stream-4.4.2" sources."require-directory-2.1.1" sources."safe-buffer-5.2.1" @@ -131453,7 +129602,7 @@ in sources."tiny-inflate-1.0.3" sources."tr46-0.0.3" sources."ts-node-10.9.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-4.9.5" sources."typical-4.0.0" sources."unicode-properties-1.4.1" @@ -131508,7 +129657,7 @@ in sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."deep-equal-2.2.1" + sources."deep-equal-2.2.2" sources."define-properties-1.2.0" sources."es-get-iterator-1.1.3" sources."escape-string-regexp-1.0.5" @@ -131544,7 +129693,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.2" sources."isarray-2.0.5" @@ -131566,7 +129715,7 @@ in sources."regexp.prototype.flags-1.5.0" sources."revalidator-0.1.8" sources."rimraf-2.7.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."side-channel-1.0.4" sources."stack-trace-0.0.10" sources."stop-iteration-iterator-1.0.0" @@ -131575,7 +129724,7 @@ in sources."utile-0.2.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -131603,34 +129752,50 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.1" - sources."@babel/cli-7.22.6" + sources."@babel/cli-7.22.9" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + (sources."@babel/core-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" - sources."@babel/helper-create-class-features-plugin-7.22.6" - sources."@babel/helper-create-regexp-features-plugin-7.22.6" - sources."@babel/helper-define-polyfill-provider-0.4.1" + (sources."@babel/helper-compilation-targets-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-class-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/helper-define-polyfill-provider-0.4.2" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.5" - sources."@babel/helper-replace-supers-7.22.5" + sources."@babel/helper-remap-async-to-generator-7.22.9" + sources."@babel/helper-replace-supers-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helper-wrap-function-7.22.5" + sources."@babel/helper-wrap-function-7.22.9" sources."@babel/helpers-7.22.6" sources."@babel/highlight-7.22.5" sources."@babel/parser-7.22.7" @@ -131704,7 +129869,11 @@ in sources."@babel/plugin-transform-react-pure-annotations-7.22.5" sources."@babel/plugin-transform-regenerator-7.22.5" sources."@babel/plugin-transform-reserved-words-7.22.5" - sources."@babel/plugin-transform-runtime-7.22.7" + (sources."@babel/plugin-transform-runtime-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."@babel/plugin-transform-shorthand-properties-7.22.5" sources."@babel/plugin-transform-spread-7.22.5" sources."@babel/plugin-transform-sticky-regex-7.22.5" @@ -131714,8 +129883,12 @@ in sources."@babel/plugin-transform-unicode-property-regex-7.22.5" sources."@babel/plugin-transform-unicode-regex-7.22.5" sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - sources."@babel/preset-env-7.22.7" - sources."@babel/preset-modules-0.1.5" + (sources."@babel/preset-env-7.22.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/preset-modules-0.1.6" sources."@babel/preset-react-7.22.5" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.22.5" @@ -131729,13 +129902,12 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.12" sources."@types/minimatch-5.1.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/parse-json-4.0.0" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" @@ -131795,6 +129967,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."array.prototype.reduce-1.0.5" + sources."arraybuffer.prototype.slice-1.0.1" sources."arraybuffer.slice-0.0.7" (sources."asn1.js-5.4.1" // { dependencies = [ @@ -131829,13 +130002,17 @@ in sources."p-locate-4.1.0" sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."babel-plugin-macros-2.8.0" - sources."babel-plugin-polyfill-corejs2-0.4.4" - sources."babel-plugin-polyfill-corejs3-0.8.2" - sources."babel-plugin-polyfill-regenerator-0.5.1" + (sources."babel-plugin-polyfill-corejs2-0.4.5" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.8.3" + sources."babel-plugin-polyfill-regenerator-0.5.2" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" (sources."babel-runtime-6.26.0" // { @@ -131894,7 +130071,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -131924,7 +130101,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -132001,7 +130178,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.31.1" + sources."core-js-compat-3.32.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cosmiconfig-6.0.0" @@ -132145,7 +130322,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -132176,7 +130353,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -132483,7 +130660,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -132955,7 +131132,7 @@ in }) sources."select-hose-2.0.0" sources."selfsigned-1.10.14" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -133202,6 +131379,9 @@ in sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."type-is-1.6.18" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" (sources."uglify-js-3.4.10" // { @@ -133335,7 +131515,7 @@ in sources."readdirp-2.2.1" sources."safe-buffer-5.1.2" sources."schema-utils-1.0.0" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" @@ -133355,7 +131535,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."widest-line-2.0.1" sources."worker-farm-1.7.0" (sources."wrap-ansi-5.1.0" // { @@ -133454,16 +131634,16 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -133491,21 +131671,20 @@ in sources."@emotion/memoize-0.8.1" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.1" + sources."@exodus/schemasafe-1.1.1" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@redocly/ajv-8.11.0" - sources."@redocly/openapi-core-1.0.0-beta.130" - sources."@types/eslint-8.44.0" + sources."@redocly/openapi-core-1.0.0" + sources."@types/eslint-8.44.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/json-schema-7.0.12" - sources."@types/node-14.18.53" + sources."@types/node-14.18.54" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -133566,7 +131745,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-xor-1.0.3" @@ -133575,7 +131754,7 @@ in sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" @@ -133591,7 +131770,7 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.9.0" - sources."core-js-3.31.1" + sources."core-js-3.32.0" sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -133612,8 +131791,8 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.4.5" - sources."electron-to-chromium-1.4.454" + sources."dompurify-2.4.7" + sources."electron-to-chromium-1.4.480" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -133715,7 +131894,7 @@ in sources."minimatch-5.1.6" sources."minimist-1.2.8" sources."mkdirp-1.0.4" - sources."mobx-6.9.0" + sources."mobx-6.10.0" sources."mobx-react-7.6.0" sources."mobx-react-lite-3.4.3" sources."ms-2.1.2" @@ -133785,6 +131964,7 @@ in sources."safer-buffer-2.1.2" sources."scheduler-0.20.2" sources."schema-utils-3.3.0" + sources."semver-6.3.1" sources."serialize-javascript-6.0.1" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" @@ -133815,7 +131995,7 @@ in sources."supports-color-7.2.0" sources."swagger2openapi-7.0.8" sources."tapable-2.2.1" - sources."terser-5.18.2" + sources."terser-5.19.2" sources."terser-webpack-plugin-5.3.9" sources."timers-browserify-2.0.12" sources."to-arraybuffer-1.0.1" @@ -133842,7 +132022,7 @@ in sources."vm-browserify-1.1.2" sources."watchpack-2.4.0" sources."webidl-conversions-3.0.1" - sources."webpack-5.88.1" + sources."webpack-5.88.2" sources."webpack-sources-3.2.3" sources."whatwg-url-5.0.0" sources."widest-line-3.1.0" @@ -133876,7 +132056,7 @@ in }; dependencies = [ sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.14" + sources."@types/react-18.2.18" sources."@types/scheduler-0.16.3" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" @@ -133974,7 +132154,7 @@ in sources."resolve-1.22.3" sources."restore-cursor-3.1.0" sources."scheduler-0.18.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."signal-exit-3.0.7" sources."slice-ansi-3.0.0" sources."spdx-correct-3.2.0" @@ -134029,315 +132209,6 @@ in bypassCache = true; reconstructLock = true; }; - reveal-md = nodeEnv.buildNodePackage { - name = "reveal-md"; - packageName = "reveal-md"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.5.0.tgz"; - sha512 = "qxHCjeYjKGHIqfptw7qpy8HuwnpJJufr4baxhNAWC+YltKD0hHmCACXy9+6fAEcKRtb99fase6DtwH/jL5O+Ng=="; - }; - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."accepts-1.3.8" - sources."agent-base-4.3.0" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."argparse-1.0.10" - sources."array-flatten-1.1.1" - sources."async-limiter-1.0.1" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."boxen-5.1.2" - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."call-bind-1.0.2" - sources."camelcase-6.3.0" - sources."chalk-4.1.2" - sources."chokidar-3.5.3" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."clone-response-1.0.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-6.2.1" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."configstore-5.0.1" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."crypto-random-string-2.0.0" - sources."debug-4.3.4" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."define-lazy-prop-2.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.5" - sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."escape-goat-2.1.1" - sources."escape-html-1.0.3" - sources."esprima-4.0.1" - sources."etag-1.8.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (sources."extract-zip-1.7.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."fd-slicer-1.1.0" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-11.1.1" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."get-stream-4.1.0" - sources."glob-8.1.0" - sources."glob-parent-5.1.2" - sources."global-dirs-3.0.1" - sources."got-9.6.0" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-yarn-2.1.0" - sources."highlight.js-11.8.0" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - (sources."https-proxy-agent-2.2.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."iconv-lite-0.4.24" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - sources."ipaddr.js-1.9.1" - sources."is-binary-path-2.1.0" - sources."is-ci-2.0.0" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" - sources."isarray-1.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.0" - sources."jsonfile-6.1.0" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" - sources."livereload-0.9.3" - sources."livereload-js-3.4.1" - sources."lodash-4.17.21" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimatch-5.1.6" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."mustache-4.2.0" - sources."negotiator-0.6.3" - sources."node-gyp-build-4.6.0" - sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."open-8.4.2" - sources."opts-2.0.2" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" - sources."pend-1.2.0" - sources."picomatch-2.3.1" - sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."proxy-addr-2.0.7" - sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."pupa-2.1.1" - (sources."puppeteer-1.20.0" // { - dependencies = [ - sources."mime-2.6.0" - sources."ws-6.2.2" - ]; - }) - sources."qs-6.11.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."readdirp-3.6.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."responselike-1.0.2" - sources."reveal.js-4.5.0" - (sources."rimraf-2.7.1" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - (sources."serve-favicon-2.5.0" // { - dependencies = [ - sources."ms-2.1.1" - sources."safe-buffer-5.1.1" - ]; - }) - sources."serve-static-1.15.0" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."sprintf-js-1.0.3" - sources."statuses-2.0.1" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."try-require-1.2.1" - sources."type-fest-0.20.2" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-2.0.0" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."update-notifier-5.1.0" - sources."url-parse-lax-3.0.0" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.9" - sources."xdg-basedir-4.0.0" - sources."yallist-4.0.0" - sources."yaml-front-matter-4.1.1" - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files."; - homepage = "https://github.com/webpro/reveal-md#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; @@ -134359,18 +132230,18 @@ in sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."foreground-child-3.1.1" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."lru-cache-10.0.0" sources."minimatch-9.0.3" - sources."minipass-7.0.1" + sources."minipass-7.0.2" sources."path-key-3.1.1" sources."path-scurry-1.10.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -134408,14 +132279,11 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.26.2"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.26.2.tgz"; - sha512 = "6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.27.0.tgz"; + sha512 = "aOltLCrYZ0FhJDm7fCqwTjIUEVjWjcydKBV/Zeid6Mn8BWgDCUBBWT5beM5ieForYNo/1ZHuGJdka26kvQ3Gzg=="; }; - dependencies = [ - sources."fsevents-2.3.2" - ]; buildInputs = globalBuildInputs; meta = { description = "Next-generation ES module bundler"; @@ -134429,20 +132297,20 @@ in "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.3.1426"; + version = "0.3.1607"; src = ../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - (sources."@eslint/eslintrc-2.1.0" // { + sources."@eslint-community/regexpp-4.6.2" + (sources."@eslint/eslintrc-2.1.1" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) - sources."@eslint/js-8.44.0" - sources."@hpcc-js/wasm-2.5.0" + sources."@eslint/js-8.46.0" + sources."@hpcc-js/wasm-2.13.1" (sources."@humanwhocodes/config-array-0.11.10" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -134459,15 +132327,15 @@ in sources."@types/node-16.11.68" sources."@types/semver-7.5.0" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.61.0" - sources."@typescript-eslint/parser-5.61.0" - sources."@typescript-eslint/scope-manager-5.61.0" - sources."@typescript-eslint/type-utils-5.61.0" - sources."@typescript-eslint/types-5.61.0" - sources."@typescript-eslint/typescript-estree-5.61.0" - sources."@typescript-eslint/utils-5.61.0" - sources."@typescript-eslint/visitor-keys-5.61.0" - sources."@vscode/test-electron-2.3.3" + sources."@typescript-eslint/eslint-plugin-5.62.0" + sources."@typescript-eslint/parser-5.62.0" + sources."@typescript-eslint/scope-manager-5.62.0" + sources."@typescript-eslint/type-utils-5.62.0" + sources."@typescript-eslint/types-5.62.0" + sources."@typescript-eslint/typescript-estree-5.62.0" + sources."@typescript-eslint/utils-5.62.0" + sources."@typescript-eslint/visitor-keys-5.62.0" + sources."@vscode/test-electron-2.3.4" sources."acorn-8.10.0" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" @@ -134523,7 +132391,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.0" - sources."d3-graphviz-5.0.2" + sources."d3-graphviz-5.1.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -134544,7 +132412,7 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."delaunator-5.0.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."dom-serializer-2.0.0" @@ -134556,19 +132424,19 @@ in sources."entities-4.5.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.44.0" // { + (sources."eslint-8.46.0" // { dependencies = [ sources."brace-expansion-1.1.11" - sources."eslint-scope-7.2.0" + sources."eslint-scope-7.2.2" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" sources."minimatch-3.1.2" ]; }) - sources."eslint-config-prettier-8.8.0" + sources."eslint-config-prettier-8.9.0" sources."eslint-scope-5.1.1" - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" @@ -134583,7 +132451,7 @@ in sources."esutils-2.0.3" sources."expand-template-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -134683,7 +132551,7 @@ in sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."parse5-7.1.2" @@ -134741,7 +132609,7 @@ in sources."text-table-0.2.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -134769,7 +132637,7 @@ in sources."escape-string-regexp-1.0.5" sources."has-flag-3.0.0" sources."minimatch-3.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."supports-color-5.5.0" ]; }) @@ -134784,7 +132652,7 @@ in sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.6.2" + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" sources."yazl-2.5.1" @@ -134809,7 +132677,7 @@ in sources."escalade-3.1.1" sources."nanoid-3.3.6" sources."picocolors-1.0.0" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."source-map-js-1.0.2" sources."strip-json-comments-3.1.1" ]; @@ -134923,10 +132791,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.63.6"; + version = "1.64.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz"; - sha512 = "MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz"; + sha512 = "TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -134936,7 +132804,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."glob-parent-5.1.2" - sources."immutable-4.3.0" + sources."immutable-4.3.1" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -135135,7 +133003,7 @@ in sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/utils-6.11.2" // { + (sources."@serverless/utils-6.13.1" // { dependencies = [ sources."jwt-decode-3.1.2" sources."ms-2.1.3" @@ -135148,8 +133016,8 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/lodash-4.14.195" - sources."@types/node-20.4.1" + sources."@types/lodash-4.14.196" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -135177,7 +133045,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1413.0" // { + (sources."aws-sdk-2.1427.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -135211,7 +133079,7 @@ in sources."get-stream-5.2.0" ]; }) - sources."cachedir-2.3.0" + sources."cachedir-2.4.0" sources."call-bind-1.0.2" (sources."chalk-4.1.2" // { dependencies = [ @@ -135262,7 +133130,7 @@ in }) (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."d-1.0.1" // { @@ -135342,7 +133210,7 @@ in sources."ext-name-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-safe-stringify-2.1.1" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" @@ -135351,7 +133219,7 @@ in sources."file-type-16.5.4" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-10.0.7" + sources."filesize-10.0.8" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -135411,7 +133279,7 @@ in sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" sources."is-stream-1.1.0" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -135444,7 +133312,7 @@ in sources."jsonfile-6.1.0" sources."jszip-3.10.1" sources."jwt-decode-2.2.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."lazystream-1.0.1" sources."lie-3.3.0" sources."lodash-4.17.21" @@ -135460,11 +133328,7 @@ in sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."make-dir-4.0.0" sources."memoizee-0.4.15" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -135604,7 +133468,7 @@ in sources."tr46-0.0.3" sources."traverse-0.6.7" sources."trim-repeated-1.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-2.7.2" sources."type-fest-0.21.3" sources."unbzip2-stream-1.4.3" @@ -135627,7 +133491,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-4.0.2" @@ -136291,17 +134155,17 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1187.0"; + version = "1.1198.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1187.0.tgz"; - sha512 = "TeuYmooBsAfL42DifzswP5LMG6DciBY6ArD+5sKQW/ACTOK12YCsxvxuR7cRrMk4XlMnzgp1lQZawDSTh0MoBA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1198.0.tgz"; + sha512 = "FlG2HYVFJOMqYePririH2wM8hal4SJ/GqRGZ1J/X6hcxs48uEtc53cw1qq/snyPbHVQOlC92itxaVKtEc2uaGA=="; }; dependencies = [ - sources."@sentry-internal/tracing-7.57.0" - sources."@sentry/core-7.57.0" - sources."@sentry/node-7.57.0" - sources."@sentry/types-7.57.0" - sources."@sentry/utils-7.57.0" + sources."@sentry-internal/tracing-7.61.0" + sources."@sentry/core-7.61.0" + sources."@sentry/node-7.61.0" + sources."@sentry/types-7.61.0" + sources."@sentry/utils-7.61.0" sources."agent-base-6.0.2" sources."boolean-3.2.0" sources."cookie-0.4.2" @@ -136330,7 +134194,7 @@ in sources."semver-compare-1.0.0" sources."serialize-error-7.0.1" sources."sprintf-js-1.1.2" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-fest-0.13.1" sources."yallist-4.0.0" ]; @@ -136356,7 +134220,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.7" @@ -136553,15 +134417,16 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "12.2.3"; + version = "12.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.2.3.tgz"; - sha512 = "sVRjEBTKJ5to2kfn11eDHcfVswz1//AL6HdGbPVN8ROWQ/XTv7E3z7rjgRxEimaBq5yDBE55JCljgcJ8a3+s7Q=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.2.4.tgz"; + sha512 = "Qj45LEHSfgrdYDOrAtIkR8SdS10SWcqCIM2WZwQwMKF2v9sM0K2dlThWPS7eYCUrhttZIrU1WwuIwHk7MjsWOw=="; }; dependencies = [ sources."argparse-2.0.1" sources."commander-2.20.3" sources."discontinuous-range-1.0.0" + sources."get-stdin-8.0.0" sources."moo-0.5.2" sources."nearley-2.20.1" sources."railroad-diagrams-1.0.0" @@ -136608,6 +134473,7 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" + sources."arraybuffer.prototype.slice-1.0.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" (sources."async-append-only-log-4.3.10" // { @@ -136756,7 +134622,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" (sources."es-get-iterator-1.1.3" // { dependencies = [ sources."isarray-2.0.5" @@ -136795,7 +134661,7 @@ in sources."flumeview-level-3.0.14" (sources."flumeview-links-1.0.1" // { dependencies = [ - sources."deep-equal-2.2.1" + sources."deep-equal-2.2.2" sources."isarray-2.0.5" sources."map-filter-reduce-3.2.2" ]; @@ -136829,7 +134695,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."futoin-hkdf-1.5.2" + sources."futoin-hkdf-1.5.3" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-intrinsic-1.2.1" @@ -136938,7 +134804,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.20" sources."is-weakmap-2.0.1" @@ -137290,13 +135156,18 @@ in }) sources."rng-0.2.2" sources."rwlock-5.0.0" + (sources."safe-array-concat-1.0.0" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safe-regex-test-1.0.0" sources."sanitize-filename-1.6.3" sources."secret-handshake-1.1.21" sources."secret-stack-6.4.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."separator-escape-0.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -137516,6 +135387,9 @@ in sources."truncate-utf8-bytes-1.0.2" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."typedarray-to-buffer-4.0.0" @@ -137556,8 +135430,8 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.9" - sources."word-wrap-1.2.3" + sources."which-typed-array-1.1.11" + sources."word-wrap-1.2.5" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" sources."ws-7.5.9" @@ -137662,7 +135536,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1413.0" // { + (sources."aws-sdk-2.1427.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -137946,7 +135820,7 @@ in sources."is-property-1.0.2" sources."is-regex-1.1.4" sources."is-stream-1.1.0" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -138202,7 +136076,7 @@ in sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."send-0.18.0" (sources."serve-favicon-2.5.0" // { dependencies = [ @@ -138385,7 +136259,7 @@ in sources."void-elements-2.0.1" sources."which-1.3.1" sources."which-module-2.0.1" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."window-size-0.1.0" (sources."winston-2.4.7" // { dependencies = [ @@ -138469,18 +136343,18 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "15.10.1"; + version = "15.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-15.10.1.tgz"; - sha512 = "CYkzYrCFfA/gnOR+u9kJ1PpzwG10WLVnoxHDuBA/JiwGqdM9+yx9+ou6SE/y9YHtfv1mcLo06fdadHTOx4gBZQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-15.10.2.tgz"; + sha512 = "UxqSb3hB74g4DTO45QhUHkJMjKKU//lNUAOWyvPBVPZbCknJ5HjOWWZo+UDuhHa9FLeVdHBZXxu43eXkjyIPWg=="; }; dependencies = [ sources."@babel/code-frame-7.22.5" sources."@babel/helper-validator-identifier-7.22.5" sources."@babel/highlight-7.22.5" - sources."@csstools/css-parser-algorithms-2.3.0" - sources."@csstools/css-tokenizer-2.1.1" - sources."@csstools/media-query-list-parser-2.1.2" + sources."@csstools/css-parser-algorithms-2.3.1" + sources."@csstools/css-tokenizer-2.2.0" + sources."@csstools/media-query-list-parser-2.1.3" sources."@csstools/selector-specificity-3.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -138510,7 +136384,7 @@ in sources."colord-2.9.3" sources."concat-map-0.0.1" sources."cosmiconfig-8.2.0" - sources."css-functions-list-3.1.0" + sources."css-functions-list-3.2.0" sources."css-tree-2.3.1" sources."cssesc-3.0.0" sources."debug-4.3.4" @@ -138526,7 +136400,7 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" @@ -138601,7 +136475,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" sources."postcss-selector-parser-6.0.13" @@ -138618,7 +136492,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."semver-7.5.4" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -138808,23 +136682,23 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.4.5.tgz"; - sha512 = "FsD/CUVdEI0F9sfylh1Fe15kDjvvbyBxzDpACPsdq0EASgaZukBXaMXofpxlgmWsgVET3OynMQlbtUQoWCz9Rw=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.4.6.tgz"; + sha512 = "OBlY8866Zh1zHQTkBMPS6psPi7o2umTUyj6JWm4SacnIHXpWFm658pG32m3dKvKFL49V4ntAkfFHKo4ztH07og=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -138846,29 +136720,28 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/estree-1.0.1" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/pug-2.0.6" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" @@ -138885,11 +136758,11 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138910,13 +136783,13 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-3.0.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" @@ -138935,7 +136808,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.3.0" + sources."immutable-4.3.1" sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -138963,7 +136836,11 @@ in sources."locate-character-3.0.0" sources."lru-cache-5.1.1" sources."magic-string-0.27.0" - sources."make-dir-2.1.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.2" + ]; + }) sources."make-error-1.3.6" sources."mdn-data-2.0.30" sources."merge2-1.4.1" @@ -138993,7 +136870,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-load-config-4.0.1" sources."promise-7.3.1" sources."prr-1.0.1" @@ -139019,9 +136896,9 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.63.6" + sources."sass-1.64.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-6.3.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -139032,17 +136909,16 @@ in sources."debug-3.1.0" sources."mkdirp-1.0.4" sources."ms-2.0.0" - sources."semver-6.3.0" sources."source-map-0.7.4" ]; }) sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svelte-4.0.5" // { + (sources."svelte-4.1.2" // { dependencies = [ sources."@jridgewell/sourcemap-codec-1.4.15" - sources."magic-string-0.30.1" + sources."magic-string-0.30.2" ]; }) sources."svelte-preprocess-5.0.4" @@ -139050,7 +136926,7 @@ in sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."update-browserslist-db-1.0.11" sources."v8-compile-cache-lib-3.0.1" @@ -139074,23 +136950,23 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.14"; + version = "0.15.16"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.14.tgz"; - sha512 = "HN9jJgfiFYSQNLj1EF5mgJv5Wo5bT/KAW+HP/Yo7r1OALx/k544z0sk0XbZq80ygbhUrVxfydbu/+vK9UN1AzQ=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.16.tgz"; + sha512 = "Nmol92XdL8yCSEN6qNo4Chom1fISX0VcCxmuM9EUf0FuwZsPMEgogn7zHF9R6eKzQSRnwjV5WQ0ZZvcfMYF/ZA=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - sources."@babel/generator-7.22.7" - sources."@babel/helper-compilation-targets-7.22.6" + sources."@babel/compat-data-7.22.9" + sources."@babel/core-7.22.9" + sources."@babel/generator-7.22.9" + sources."@babel/helper-compilation-targets-7.22.9" sources."@babel/helper-environment-visitor-7.22.5" sources."@babel/helper-function-name-7.22.5" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" + sources."@babel/helper-module-transforms-7.22.9" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -139115,28 +136991,27 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/pug-2.0.6" (sources."@vscode/emmet-helper-2.8.4" // { dependencies = [ @@ -139157,10 +137032,10 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -139179,14 +137054,14 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.454" - sources."emmet-2.4.5" + sources."electron-to-chromium-1.4.480" + sources."emmet-2.4.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" @@ -139205,7 +137080,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.3.0" + sources."immutable-4.3.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -139233,7 +137108,11 @@ in sources."lower-case-2.0.2" sources."lru-cache-5.1.1" sources."magic-string-0.27.0" - sources."make-dir-2.1.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.2" + ]; + }) sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -139261,9 +137140,9 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-load-config-4.0.1" - sources."prettier-2.8.6" + sources."prettier-2.8.8" sources."prettier-plugin-svelte-2.10.1" sources."promise-7.3.1" sources."prr-1.0.1" @@ -139287,9 +137166,9 @@ in sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.63.6" + sources."sass-1.64.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-6.3.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -139300,7 +137179,6 @@ in sources."debug-3.1.0" sources."mkdirp-1.0.4" sources."ms-2.0.0" - sources."semver-6.3.0" sources."source-map-0.7.4" ]; }) @@ -139314,7 +137192,7 @@ in sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."update-browserslist-db-1.0.11" sources."v8-compile-cache-lib-3.0.1" @@ -139864,7 +137742,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.3" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."semver-diff-2.1.0" (sources."send-0.18.0" // { dependencies = [ @@ -140056,10 +137934,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz"; - sha512 = "9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz"; + sha512 = "A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w=="; }; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -140072,24 +137950,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -140112,7 +137990,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.0" // { + (sources."fast-glob-3.3.1" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -140151,7 +138029,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.25" + sources."postcss-8.4.27" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -140165,7 +138043,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" - sources."sucrase-3.32.0" + sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -140176,7 +138054,7 @@ in sources."arg-4.1.3" ]; }) - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -140371,7 +138249,7 @@ in sources."safer-buffer-2.1.2" sources."sandwich-stream-2.0.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."simple-markdown-0.4.4" @@ -140522,10 +138400,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.18.2"; + version = "5.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.18.2.tgz"; - sha512 = "Ah19JS86ypbJzTzvUCX7KOsEIhDaRONungA4aYBjEP3JZRf4ocuDzTg4QWZnPn9DEMiMYGJPiSOy7aykoCc70w=="; + url = "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz"; + sha512 = "qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.3" @@ -140582,8 +138460,8 @@ in sources."@textlint/textlint-plugin-text-13.3.3" sources."@textlint/types-13.3.3" sources."@textlint/utils-13.3.3" - sources."@types/mdast-3.0.11" - sources."@types/unist-2.0.6" + sources."@types/mdast-3.0.12" + sources."@types/unist-2.0.7" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -140725,7 +138603,7 @@ in sources."require-from-string-2.0.2" sources."resolve-1.22.3" sources."rimraf-2.6.3" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."slice-ansi-4.0.0" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" @@ -140836,11 +138714,11 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-13.3.3" - sources."@types/hast-2.3.4" + sources."@types/hast-2.3.5" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-5.0.3" - sources."@types/unist-3.0.0" + sources."@types/unist-2.0.7" sources."alex-9.1.1" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -141012,7 +138890,7 @@ in sources."lowercase-keys-1.0.1" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."map-obj-4.3.0" @@ -141043,7 +138921,7 @@ in sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."parse-english-4.2.0" @@ -141095,10 +138973,10 @@ in sources."retext-equality-5.5.0" sources."retext-profanities-6.1.0" sources."safe-buffer-5.2.1" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."semver-diff-3.1.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."signal-exit-3.0.7" @@ -141173,22 +139051,10 @@ in sources."unist-util-modify-children-2.0.0" sources."unist-util-position-3.1.0" sources."unist-util-remove-position-2.0.1" - (sources."unist-util-stringify-position-2.0.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-visit-2.0.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."unist-util-stringify-position-2.0.3" + sources."unist-util-visit-2.0.3" sources."unist-util-visit-children-1.1.4" - (sources."unist-util-visit-parents-3.1.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."unist-util-visit-parents-3.1.1" (sources."update-notifier-4.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -141202,18 +139068,10 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - (sources."vfile-4.2.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."vfile-4.2.1" sources."vfile-find-up-5.0.1" sources."vfile-location-3.2.0" - (sources."vfile-message-2.0.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) + sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."supports-color-6.1.0" @@ -141296,7 +139154,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.6" + sources."@types/unist-2.0.7" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -141342,7 +139200,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.6" + sources."@types/unist-2.0.7" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -141388,7 +139246,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" - sources."@types/unist-2.0.6" + sources."@types/unist-2.0.7" sources."boundary-1.0.1" sources."buffer-from-1.1.2" sources."concat-stream-2.0.0" @@ -141455,7 +139313,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.6" + sources."@types/unist-2.0.7" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" @@ -141485,7 +139343,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.6" + sources."@types/unist-2.0.7" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" @@ -141516,10 +139374,11 @@ in dependencies = [ sources."array-buffer-byte-length-1.0.0" sources."array-includes-3.1.6" + sources."arraybuffer.prototype.slice-1.0.1" sources."available-typed-arrays-1.0.5" sources."call-bind-1.0.2" sources."define-properties-1.2.0" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."for-each-0.3.3" @@ -141549,21 +139408,26 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" + sources."isarray-2.0.5" sources."object-inspect-1.12.3" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."regexp.prototype.flags-1.5.0" + sources."safe-array-concat-1.0.0" sources."safe-regex-test-1.0.0" sources."side-channel-1.0.4" sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" ]; buildInputs = globalBuildInputs; meta = { @@ -141587,14 +139451,14 @@ in sources."@aashutoshrathi/word-wrap-1.2.6" sources."@babel/runtime-7.22.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - (sources."@eslint/eslintrc-2.1.0" // { + sources."@eslint-community/regexpp-4.6.2" + (sources."@eslint/eslintrc-2.1.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@eslint/js-8.44.0" + sources."@eslint/js-8.46.0" (sources."@humanwhocodes/config-array-0.11.10" // { dependencies = [ sources."debug-4.3.4" @@ -141608,7 +139472,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@textlint/ast-node-types-13.3.3" sources."@types/json5-0.0.29" - sources."@types/unist-2.0.6" + sources."@types/unist-2.0.7" sources."acorn-8.10.0" sources."acorn-jsx-5.3.2" sources."adverb-where-0.2.5" @@ -141619,9 +139483,11 @@ in sources."aria-query-5.3.0" sources."array-buffer-byte-length-1.0.0" sources."array-includes-3.1.6" + sources."array.prototype.findlastindex-1.2.2" sources."array.prototype.flat-1.3.1" sources."array.prototype.flatmap-1.3.1" sources."array.prototype.tosorted-1.1.1" + sources."arraybuffer.prototype.slice-1.0.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" sources."axe-core-4.7.2" @@ -141645,12 +139511,12 @@ in sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.44.0" // { + (sources."eslint-8.46.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -141659,17 +139525,17 @@ in }) sources."eslint-import-resolver-node-0.3.7" sources."eslint-module-utils-2.8.0" - sources."eslint-plugin-import-2.27.5" + sources."eslint-plugin-import-2.28.0" sources."eslint-plugin-jsx-a11y-6.7.1" - (sources."eslint-plugin-react-7.32.2" // { + (sources."eslint-plugin-react-7.33.1" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; }) sources."eslint-plugin-react-hooks-4.6.0" - sources."eslint-scope-7.2.0" - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-scope-7.2.2" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -141723,15 +139589,16 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" + sources."isarray-2.0.5" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-1.0.2" - sources."jsx-ast-utils-3.3.4" + sources."jsx-ast-utils-3.3.5" sources."language-subtag-registry-0.3.22" sources."language-tags-1.0.5" sources."levn-0.4.1" @@ -141749,6 +139616,7 @@ in sources."object.assign-4.1.4" sources."object.entries-1.1.6" sources."object.fromentries-2.0.6" + sources."object.groupby-1.0.0" sources."object.hasown-1.1.2" sources."object.values-1.1.6" sources."once-1.4.0" @@ -141773,8 +139641,9 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" + sources."safe-array-concat-1.0.0" sources."safe-regex-test-1.0.0" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" @@ -141794,6 +139663,9 @@ in sources."tsconfig-paths-3.14.2" sources."type-check-0.4.0" sources."type-fest-0.20.2" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."unist-util-is-4.1.0" @@ -141803,7 +139675,7 @@ in sources."weasel-words-0.1.1" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wrappy-1.0.2" sources."write-good-1.0.8" sources."yocto-queue-0.1.0" @@ -141829,7 +139701,7 @@ in dependencies = [ sources."@fastify/busboy-1.0.0" sources."@gar/promisify-1.1.3" - sources."@mapbox/node-pre-gyp-1.0.10" + sources."@mapbox/node-pre-gyp-1.0.11" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" sources."@sindresorhus/is-4.6.0" @@ -141842,7 +139714,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -141907,7 +139779,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.31.1" + sources."core-js-3.32.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141923,7 +139795,7 @@ in sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" @@ -142021,14 +139893,14 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-lambda-1.0.1" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-utf8-0.2.1" sources."isexe-2.0.0" sources."isomorphic-textencoder-1.0.1" sources."json-buffer-3.0.1" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -142037,7 +139909,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) (sources."make-fetch-happen-9.1.0" // { @@ -142198,7 +140070,7 @@ in sources."token-types-4.2.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-is-1.6.18" sources."ua-parser-js-1.0.33" sources."uc.micro-1.0.6" @@ -142222,7 +140094,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" @@ -142335,7 +140207,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.31.1" + sources."core-js-3.32.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142516,7 +140388,7 @@ in sources."node-gyp-build-4.6.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."nopt-4.0.3" @@ -142930,7 +140802,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -143011,7 +140883,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.31.1" + sources."core-js-3.32.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -143145,7 +141017,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -143190,7 +141062,7 @@ in sources."node-gyp-build-4.6.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."nopt-4.0.3" @@ -143232,7 +141104,7 @@ in sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."parse5-3.0.3" @@ -143398,7 +141270,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -143479,7 +141351,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.31.1" + sources."core-js-3.32.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -143613,7 +141485,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -143658,7 +141530,7 @@ in sources."node-gyp-build-4.6.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."nopt-4.0.3" @@ -143700,7 +141572,7 @@ in sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."parse5-3.0.3" @@ -143854,16 +141726,16 @@ in thelounge-theme-gruvbox = nodeEnv.buildNodePackage { name = "thelounge-theme-gruvbox"; packageName = "thelounge-theme-gruvbox"; - version = "1.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge-theme-gruvbox/-/thelounge-theme-gruvbox-1.0.5.tgz"; - sha512 = "Mq1S+oiNz3UmzeG7fhNJUihMps6T+i8x0+7vQ8UTZ00D6TYJ45ftFS3qcSHw/eR/Xu/A99nH3MXwdSwaeGrYQg=="; + url = "https://registry.npmjs.org/thelounge-theme-gruvbox/-/thelounge-theme-gruvbox-2.1.2.tgz"; + sha512 = "+/LN6XrSTl1v5UDtIKzXQ/peqoF5BfdfWujzE0dNae7oipYY4AgOkzFcKZOU/pVxbtgbSISQm8Q6exUNDazznQ=="; }; buildInputs = globalBuildInputs; meta = { - description = "gruvbox monospace"; - homepage = "https://github.com/TheSpiritof69/thelounge-theme-gruvbox"; - license = "MIT"; + description = "The only theme you'll ever need ;P"; + homepage = "https://github.com/brunnre8/thelounge-theme-gruvbox#readme"; + license = "GPLv3"; }; production = true; bypassCache = true; @@ -144250,10 +142122,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.154.0"; + version = "0.155.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.154.0.tgz"; - sha512 = "Uzz8C/5GesJzv8i+Y2prEMYUwodwZySPcNhuJUdsVMH2Yn4Nm8qlbQe6qRN5fOhg55XB0WiLfTPBxVHxpE60ug=="; + url = "https://registry.npmjs.org/three/-/three-0.155.0.tgz"; + sha512 = "sNgCYmDijnIqkD/bMfk+1pHg3YzsxW7V2ChpuP6HCQ8NiZr3RufsXQr8M3SSUMjW4hG+sUk7YbyuY0DncaDTJQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -144297,9 +142169,9 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/responselike-1.0.0" - sources."@xmldom/xmldom-0.8.8" + sources."@xmldom/xmldom-0.8.10" sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -144369,7 +142241,7 @@ in sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."keypress-0.2.1" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mime-db-1.52.0" @@ -144500,31 +142372,31 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" + sources."@swc/wasm-1.3.73" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."arg-4.1.3" sources."create-require-1.1.1" sources."diff-4.0.2" sources."make-error-1.3.6" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."typescript-5.1.6" sources."v8-compile-cache-lib-3.0.1" sources."yn-3.1.1" @@ -144628,13 +142500,13 @@ in sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-2.2.2" sources."@primer/octicons-17.10.2" - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."@socket.io/component-emitter-3.1.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-16.18.38" + sources."@types/node-16.18.39" sources."@types/triple-beam-1.3.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -144693,7 +142565,7 @@ in sources."builtin-status-codes-3.0.0" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.12" + sources."cacheable-request-10.2.13" sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."cipher-base-1.0.4" @@ -144851,7 +142723,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-stream-2.0.1" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -144860,7 +142732,7 @@ in sources."json-buffer-3.0.1" sources."jsonparse-1.3.1" sources."just-detect-adblock-1.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."knockout-3.5.1" sources."kuler-2.0.0" sources."labeled-stream-splicer-2.0.2" @@ -144905,7 +142777,7 @@ in sources."negotiator-0.6.3" sources."node-cache-5.1.2" sources."node-gyp-build-4.6.0" - sources."node-watch-0.7.3" + sources."node-watch-0.7.4" sources."nopt-1.0.10" sources."normalize-url-8.0.0" sources."nprogress-0.2.0" @@ -145049,11 +142921,11 @@ in sources."through2-2.0.5" sources."timers-browserify-1.4.2" sources."toidentifier-1.0.1" - sources."triple-beam-1.3.0" + sources."triple-beam-1.4.1" sources."tsconfig-5.0.3" (sources."tsify-5.0.4" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."tty-browserify-0.0.1" @@ -145071,7 +142943,7 @@ in sources."utils-merge-1.0.1" sources."vary-1.1.2" sources."vm-browserify-1.1.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" (sources."winston-3.8.2" // { dependencies = [ sources."readable-stream-3.6.2" @@ -145123,9 +142995,9 @@ in sources."@types/debug-4.1.8" sources."@types/is-empty-1.2.1" sources."@types/ms-0.7.31" - sources."@types/node-18.16.19" + sources."@types/node-18.17.1" sources."@types/supports-color-8.1.1" - sources."@types/unist-2.0.6" + sources."@types/unist-2.0.7" sources."abbrev-2.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -145154,7 +143026,7 @@ in sources."foreground-child-3.1.1" sources."format-0.2.2" sources."fs.realpath-1.0.0" - sources."glob-10.3.2" + sources."glob-10.3.3" sources."has-flag-3.0.0" sources."ignore-5.2.4" sources."import-meta-resolve-2.2.2" @@ -145167,7 +143039,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-4.1.0" sources."isexe-2.0.0" - sources."jackspeak-2.2.1" + sources."jackspeak-2.2.2" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.0" sources."lines-and-columns-2.0.3" @@ -145175,7 +143047,7 @@ in sources."locate-path-7.2.0" sources."lru-cache-10.0.0" sources."minimatch-9.0.3" - sources."minipass-7.0.1" + sources."minipass-7.0.2" sources."ms-2.1.2" sources."nopt-7.2.0" sources."npm-normalize-package-bin-3.0.1" @@ -145201,7 +143073,7 @@ in }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.0.2" + sources."signal-exit-4.1.0" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -145278,7 +143150,7 @@ in sha512 = "2rVTQY8ryM8/Z9WZ5AxOvYwBjSkfohuJ6j5nwLd9wxMetKlyaOuyts3ezIrScda4dThjPvokPJx9843E2mQ04g=="; }; dependencies = [ - sources."@mapbox/node-pre-gyp-1.0.10" + sources."@mapbox/node-pre-gyp-1.0.11" sources."@types/estree-1.0.1" sources."@types/geojson-7946.0.4" sources."abbrev-1.1.1" @@ -145320,7 +143192,7 @@ in sources."decompress-response-4.2.1" sources."delaunator-5.0.0" sources."delegates-1.0.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."escalade-3.1.1" @@ -145343,7 +143215,7 @@ in sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."mimic-response-2.1.0" @@ -145443,10 +143315,10 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.13.0"; + version = "5.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.13.0.tgz"; - sha512 = "lygGw1KfegtkELn4PbDWwV8AskmUdvDbJ/ZG+IvWiBYUhTGGLIKPy1lnNQzpJG0z6zgD1s1bafAVyO2u2k0AFQ=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.14.1.tgz"; + sha512 = "VFvi0QtUoLQqwfAXTGjo0Acw/OTjiK3zOrcO/HyksGnnNDBHWM1GTcFryiWZYoAi99ehvv7tI/q94O46+fGRSQ=="; }; dependencies = [ sources."@types/clone-2.1.1" @@ -145556,141 +143428,13 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "31.0.1"; + version = "31.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-31.0.1.tgz"; - sha512 = "Tf6PsIseRtAw/PETRfBdGqnbG/el1g0prwaKCXm6Dq5CcKRoya3ntT2E38fHE9pXIPDqE1XdTn9F1crKm8sKAQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-31.2.1.tgz"; + sha512 = "I73NWAHTLYgDYbz16AQdHaxcSBxk2Ck1YRpM+qi3yhr8859bkYEImMJ48UYmFQ+4KrS8y+o+PDhvJL8meB2yvw=="; }; dependencies = [ - sources."@adobe/css-tools-4.2.0" - sources."@ampproject/remapping-2.2.1" - sources."@babel/code-frame-7.22.5" - sources."@babel/compat-data-7.22.6" - sources."@babel/core-7.22.8" - (sources."@babel/generator-7.22.7" // { - dependencies = [ - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.18" - sources."jsesc-2.5.2" - ]; - }) - sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.5" - (sources."@babel/helper-compilation-targets-7.22.6" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.1.1" - ]; - }) - sources."@babel/helper-create-class-features-plugin-7.22.6" - sources."@babel/helper-create-regexp-features-plugin-7.22.6" - sources."@babel/helper-define-polyfill-provider-0.4.1" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.5" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.5" - sources."@babel/helper-replace-supers-7.22.5" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helper-wrap-function-7.22.5" - sources."@babel/helpers-7.22.6" - (sources."@babel/highlight-7.22.5" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."@babel/parser-7.22.7" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5" - sources."@babel/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2" - sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" - sources."@babel/plugin-syntax-import-meta-7.10.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.22.5" - sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-generator-functions-7.22.7" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.22.5" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.5" - sources."@babel/plugin-transform-classes-7.22.6" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.22.5" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-dynamic-import-7.22.5" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.5" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.5" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.5" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.22.5" - sources."@babel/plugin-transform-modules-systemjs-7.22.5" - sources."@babel/plugin-transform-modules-umd-7.22.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.5" - sources."@babel/plugin-transform-numeric-separator-7.22.5" - sources."@babel/plugin-transform-object-rest-spread-7.22.5" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.5" - sources."@babel/plugin-transform-optional-chaining-7.22.6" - sources."@babel/plugin-transform-parameters-7.22.5" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.5" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.5" - sources."@babel/plugin-transform-reserved-words-7.22.5" - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.5" - sources."@babel/plugin-transform-unicode-escapes-7.22.5" - sources."@babel/plugin-transform-unicode-property-regex-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - sources."@babel/preset-env-7.22.7" - sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.22.5" - sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.22.6" - sources."@babel/template-7.22.5" - sources."@babel/traverse-7.22.8" - sources."@babel/types-7.22.5" + sources."@babel/runtime-7.12.1" sources."@cspotcode/source-map-support-0.8.1" sources."@edge-runtime/format-2.1.0" sources."@edge-runtime/node-utils-2.0.3" @@ -145700,149 +143444,53 @@ in sources."@edge-runtime/primitives-3.0.1" ]; }) - sources."@emotion/hash-0.9.1" - sources."@esbuild/android-arm-0.17.6" - sources."@esbuild/android-arm64-0.17.6" - sources."@esbuild/android-x64-0.17.6" - sources."@esbuild/darwin-arm64-0.17.6" - sources."@esbuild/darwin-x64-0.17.6" - sources."@esbuild/freebsd-arm64-0.17.6" - sources."@esbuild/freebsd-x64-0.17.6" - sources."@esbuild/linux-arm-0.17.6" - sources."@esbuild/linux-arm64-0.17.6" - sources."@esbuild/linux-ia32-0.17.6" - sources."@esbuild/linux-loong64-0.17.6" - sources."@esbuild/linux-mips64el-0.17.6" - sources."@esbuild/linux-ppc64-0.17.6" - sources."@esbuild/linux-riscv64-0.17.6" - sources."@esbuild/linux-s390x-0.17.6" - sources."@esbuild/linux-x64-0.17.6" - sources."@esbuild/netbsd-x64-0.17.6" - sources."@esbuild/openbsd-x64-0.17.6" - sources."@esbuild/sunos-x64-0.17.6" - sources."@esbuild/win32-arm64-0.17.6" - sources."@esbuild/win32-ia32-0.17.6" - sources."@esbuild/win32-x64-0.17.6" - sources."@gar/promisify-1.1.3" - sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@jspm/core-2.0.1" - (sources."@mapbox/node-pre-gyp-1.0.10" // { + (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ sources."semver-7.5.4" ]; }) - sources."@nicolo-ribaudo/semver-v6-6.3.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/fs-1.1.1" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."@npmcli/move-file-1.1.2" - sources."@npmcli/package-json-2.0.0" - (sources."@remix-run/dev-1.18.0" // { - dependencies = [ - sources."arg-5.0.2" - sources."brace-expansion-2.0.1" - sources."esbuild-0.17.6" - sources."fast-glob-3.2.11" - sources."minimatch-9.0.3" - sources."semver-7.5.4" - ]; - }) - sources."@remix-run/express-1.18.1" - (sources."@remix-run/node-1.18.1" // { - dependencies = [ - sources."@remix-run/router-1.7.1" - sources."@remix-run/server-runtime-1.18.1" - sources."cookie-signature-1.2.1" - ]; - }) - sources."@remix-run/router-1.7.0" - sources."@remix-run/serve-1.18.1" - sources."@remix-run/server-runtime-1.18.0" - sources."@remix-run/web-blob-3.0.4" - sources."@remix-run/web-fetch-4.3.4" - sources."@remix-run/web-file-3.0.2" - sources."@remix-run/web-form-data-3.0.4" - sources."@remix-run/web-stream-1.0.3" sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" - sources."@sindresorhus/is-4.6.0" - sources."@swc/core-1.3.68" - sources."@swc/core-darwin-arm64-1.3.68" - sources."@swc/core-darwin-x64-1.3.68" - sources."@swc/core-linux-arm-gnueabihf-1.3.68" - sources."@swc/core-linux-arm64-gnu-1.3.68" - sources."@swc/core-linux-arm64-musl-1.3.68" - sources."@swc/core-linux-x64-gnu-1.3.68" - sources."@swc/core-linux-x64-musl-1.3.68" - sources."@swc/core-win32-arm64-msvc-1.3.68" - sources."@swc/core-win32-ia32-msvc-1.3.68" - sources."@swc/core-win32-x64-msvc-1.3.68" + sources."@swc/core-1.3.73" + sources."@swc/core-darwin-arm64-1.3.73" + sources."@swc/core-darwin-x64-1.3.73" + sources."@swc/core-linux-arm-gnueabihf-1.3.73" + sources."@swc/core-linux-arm64-gnu-1.3.73" + sources."@swc/core-linux-arm64-musl-1.3.73" + sources."@swc/core-linux-x64-gnu-1.3.73" + sources."@swc/core-linux-x64-musl-1.3.73" + sources."@swc/core-win32-arm64-msvc-1.3.73" + sources."@swc/core-win32-ia32-msvc-1.3.73" + sources."@swc/core-win32-x64-msvc-1.3.73" sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.66" - sources."@szmarczak/http-timer-4.0.6" - sources."@tootallnate/once-1.1.2" + sources."@swc/wasm-1.3.73" sources."@ts-morph/common-0.11.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/acorn-4.0.6" - sources."@types/cacheable-request-6.0.3" - sources."@types/cookie-0.4.1" - sources."@types/debug-4.1.8" - sources."@types/estree-1.0.1" - sources."@types/estree-jsx-0.0.1" - sources."@types/glob-7.2.0" - sources."@types/hast-2.3.4" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/content-type-1.1.3" sources."@types/json-schema-7.0.12" - sources."@types/keyv-3.1.4" - sources."@types/mdast-3.0.11" - sources."@types/mdurl-1.0.2" - sources."@types/minimatch-5.1.2" - sources."@types/ms-0.7.31" sources."@types/node-14.18.33" sources."@types/node-fetch-2.6.3" - sources."@types/responselike-1.0.0" - sources."@types/unist-3.0.0" - sources."@vanilla-extract/babel-plugin-debug-ids-1.0.3" - sources."@vanilla-extract/css-1.12.0" - (sources."@vanilla-extract/integration-6.2.1" // { - dependencies = [ - sources."esbuild-0.17.6" - ]; - }) - sources."@vanilla-extract/private-1.0.3" - sources."@vercel/build-utils-6.8.0" + sources."@vercel/build-utils-6.8.2" sources."@vercel/error-utils-1.0.10" - (sources."@vercel/gatsby-plugin-vercel-analytics-1.0.10" // { - dependencies = [ - sources."@babel/runtime-7.12.1" - ]; - }) - (sources."@vercel/gatsby-plugin-vercel-builder-1.3.11" // { - dependencies = [ - sources."fs-extra-11.1.0" - ]; - }) + sources."@vercel/gatsby-plugin-vercel-analytics-1.0.10" + sources."@vercel/gatsby-plugin-vercel-builder-1.3.15" sources."@vercel/go-2.5.1" sources."@vercel/hydrogen-0.0.64" - sources."@vercel/next-3.8.8" + sources."@vercel/next-3.9.3" sources."@vercel/nft-0.22.5" - sources."@vercel/node-2.15.3" + sources."@vercel/node-2.15.7" sources."@vercel/python-3.1.60" sources."@vercel/redwood-1.1.15" - (sources."@vercel/remix-builder-1.8.15" // { + (sources."@vercel/remix-builder-1.9.0" // { dependencies = [ sources."semver-7.3.8" ]; @@ -145855,182 +143503,46 @@ in ]; }) sources."@vercel/ruby-1.3.76" - sources."@vercel/static-build-1.3.38" + sources."@vercel/static-build-1.3.43" sources."@vercel/static-config-2.0.17" - sources."@web3-storage/multipart-parser-1.0.0" - sources."@zxing/text-encoding-0.9.0" sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."accepts-1.3.8" sources."acorn-8.10.0" - sources."acorn-jsx-5.3.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."aggregate-error-3.1.0" - sources."ahocorasick-1.0.2" sources."ajv-8.6.3" - sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."anymatch-3.1.3" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" sources."arg-4.1.3" - sources."argparse-2.0.1" - sources."array-flatten-1.1.1" - sources."array-union-2.1.0" - sources."ast-types-0.13.4" - sources."astring-1.8.6" sources."async-listen-3.0.0" sources."async-sema-3.1.1" sources."asynckit-0.4.0" - sources."available-typed-arrays-1.0.5" - sources."babel-plugin-polyfill-corejs2-0.4.4" - sources."babel-plugin-polyfill-corejs3-0.8.2" - sources."babel-plugin-polyfill-regenerator-0.5.1" - sources."bail-2.0.2" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - (sources."basic-auth-2.0.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - sources."bl-4.1.0" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."ms-2.0.0" - ]; - }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserify-zlib-0.1.4" - sources."browserslist-4.21.9" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - sources."cac-6.7.14" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.4" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."pump-3.0.0" - ]; - }) - sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001513" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."character-entities-2.0.2" - sources."character-entities-html4-2.1.0" - sources."character-entities-legacy-3.0.0" - sources."character-reference-invalid-2.0.1" - sources."chardet-0.7.0" - sources."chokidar-3.5.3" sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."clone-response-1.0.3" sources."code-block-writer-10.1.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."color-support-1.1.3" sources."combined-stream-1.0.8" - sources."comma-separated-tokens-2.0.3" - sources."commander-2.20.3" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" + sources."content-type-1.0.4" sources."convert-hrtime-3.0.0" - sources."convert-source-map-1.9.0" - sources."cookie-0.4.2" - sources."cookie-signature-1.0.6" - sources."copy-anything-2.0.6" - sources."core-js-compat-3.31.1" - sources."core-util-is-1.0.3" sources."create-require-1.1.1" - sources."cross-spawn-7.0.3" - sources."css-what-6.1.0" - sources."cssesc-3.0.0" - sources."csstype-3.1.2" - sources."data-uri-to-buffer-3.0.1" - sources."deasync-0.1.28" sources."debug-4.3.4" - sources."decode-named-character-reference-1.0.2" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-is-0.1.4" - sources."deep-object-diff-1.1.9" - sources."deepmerge-4.3.1" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."degenerator-3.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."depd-2.0.0" - sources."dequal-2.0.3" - sources."destroy-1.2.0" - sources."detect-indent-6.1.0" - sources."detect-libc-2.0.1" - sources."detect-newline-3.1.0" + sources."detect-libc-2.0.2" sources."diff-4.0.2" - sources."dir-glob-3.0.1" - sources."dotenv-16.3.1" - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) (sources."edge-runtime-2.4.3" // { dependencies = [ sources."@edge-runtime/primitives-3.0.3" sources."@edge-runtime/vm-3.0.3" ]; }) - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."errno-0.1.8" sources."esbuild-0.14.47" sources."esbuild-android-64-0.14.47" sources."esbuild-android-arm64-0.14.47" @@ -146048,741 +143560,115 @@ in sources."esbuild-linux-s390x-0.14.47" sources."esbuild-netbsd-64-0.14.47" sources."esbuild-openbsd-64-0.14.47" - sources."esbuild-plugins-node-modules-polyfill-1.2.0" sources."esbuild-sunos-64-0.14.47" sources."esbuild-windows-32-0.14.47" sources."esbuild-windows-64-0.14.47" sources."esbuild-windows-arm64-0.14.47" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.14.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."esprima-4.0.1" - sources."estraverse-4.3.0" - sources."estree-util-attach-comments-2.1.1" - (sources."estree-util-build-jsx-2.2.2" // { - dependencies = [ - sources."@types/estree-jsx-1.0.0" - sources."estree-util-is-identifier-name-2.1.0" - sources."estree-walker-3.0.3" - ]; - }) - sources."estree-util-is-identifier-name-1.1.0" - (sources."estree-util-value-to-estree-1.3.0" // { - dependencies = [ - sources."is-plain-obj-3.0.0" - ]; - }) - (sources."estree-util-visit-1.2.1" // { - dependencies = [ - sources."@types/estree-jsx-1.0.0" - sources."@types/unist-2.0.6" - ]; - }) sources."estree-walker-2.0.2" - sources."esutils-2.0.3" sources."etag-1.8.1" - sources."eval-0.1.6" - sources."event-target-shim-5.0.1" - (sources."execa-5.1.1" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) sources."exit-hook-2.2.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."cookie-0.5.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."path-to-regexp-0.1.7" - ]; - }) - sources."extend-3.0.2" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" - sources."fault-2.0.1" - sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."find-up-5.0.0" - sources."for-each-0.3.3" sources."form-data-3.0.1" - sources."format-0.2.2" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" ]; }) sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."function-bind-1.1.1" (sources."gauge-3.0.2" // { dependencies = [ sources."signal-exit-3.0.7" ]; }) - sources."generic-names-4.0.0" - sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" - sources."get-port-5.1.1" - sources."get-stream-6.0.1" - (sources."get-uri-3.0.2" // { - dependencies = [ - sources."file-uri-to-path-2.0.0" - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - sources."git-hooks-list-1.0.3" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-11.12.0" - sources."globby-10.0.0" - sources."gopd-1.0.1" - sources."got-11.8.6" sources."graceful-fs-4.2.11" - sources."gunzip-maybe-1.4.2" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" - (sources."hast-util-to-estree-2.3.3" // { - dependencies = [ - sources."@types/estree-jsx-1.0.0" - sources."@types/unist-2.0.6" - sources."estree-util-is-identifier-name-2.1.0" - ]; - }) - sources."hast-util-whitespace-2.0.1" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" - sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" - sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" - sources."icss-utils-5.1.0" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - sources."image-size-0.5.5" - sources."immutable-4.3.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inline-style-parser-0.1.1" - sources."inquirer-8.2.5" - sources."ip-1.1.8" - sources."ipaddr.js-1.9.1" - sources."is-alphabetical-2.0.1" - sources."is-alphanumerical-2.0.1" - sources."is-arguments-1.1.1" - sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.5" - sources."is-callable-1.2.7" - sources."is-core-module-2.12.1" - sources."is-decimal-2.0.1" - sources."is-deflate-1.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" - sources."is-gzip-1.0.0" - sources."is-hexadecimal-2.0.1" - sources."is-interactive-1.0.0" sources."is-number-7.0.0" - sources."is-plain-obj-4.1.0" - sources."is-reference-3.0.1" - sources."is-stream-2.0.1" - sources."is-typed-array-1.1.10" - sources."is-unicode-supported-0.1.0" - sources."is-what-3.14.1" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."javascript-stringify-2.1.0" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."jsesc-3.0.2" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.1" sources."json-schema-to-ts-1.6.4" sources."json-schema-traverse-1.0.0" - sources."json5-2.2.3" - sources."jsonc-parser-3.2.0" sources."jsonfile-6.1.0" - sources."keyv-4.5.2" - sources."kleur-4.1.5" - (sources."less-4.1.3" // { - dependencies = [ - sources."make-dir-2.1.0" - sources."semver-5.7.1" - sources."source-map-0.6.1" - ]; - }) - sources."levn-0.3.0" - (sources."lightningcss-1.21.5" // { - dependencies = [ - sources."detect-libc-1.0.3" - ]; - }) - sources."lightningcss-darwin-arm64-1.21.5" - sources."lightningcss-darwin-x64-1.21.5" - sources."lightningcss-linux-arm-gnueabihf-1.21.5" - sources."lightningcss-linux-arm64-gnu-1.21.5" - sources."lightningcss-linux-arm64-musl-1.21.5" - sources."lightningcss-linux-x64-gnu-1.21.5" - sources."lightningcss-linux-x64-musl-1.21.5" - sources."lightningcss-win32-x64-msvc-1.21.5" - sources."lilconfig-2.1.0" - sources."loader-utils-3.2.1" - sources."local-pkg-0.4.3" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lodash.camelcase-4.3.0" - sources."lodash.debounce-4.0.8" - sources."log-symbols-4.1.0" - sources."longest-streak-3.1.0" - sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."make-error-1.3.6" - sources."markdown-extensions-1.1.1" - (sources."mdast-util-definitions-5.1.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."mdast-util-from-markdown-1.3.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - sources."mdast-util-frontmatter-1.0.1" - sources."mdast-util-mdx-1.1.0" - (sources."mdast-util-mdx-expression-1.3.2" // { - dependencies = [ - sources."@types/estree-jsx-1.0.0" - ]; - }) - sources."mdast-util-mdx-jsx-1.2.0" - (sources."mdast-util-mdxjs-esm-1.3.1" // { - dependencies = [ - sources."@types/estree-jsx-1.0.0" - ]; - }) - sources."mdast-util-phrasing-3.0.1" - sources."mdast-util-to-hast-11.3.0" - (sources."mdast-util-to-markdown-1.5.0" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - sources."mdast-util-to-string-3.2.0" - sources."mdurl-1.0.1" - sources."media-query-parser-2.0.2" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromark-3.2.0" - sources."micromark-core-commonmark-1.1.0" - sources."micromark-extension-frontmatter-1.1.1" - sources."micromark-extension-mdx-expression-1.0.8" - (sources."micromark-extension-mdx-jsx-1.0.5" // { - dependencies = [ - sources."estree-util-is-identifier-name-2.1.0" - ]; - }) - sources."micromark-extension-mdx-md-1.0.1" - sources."micromark-extension-mdxjs-1.0.1" - sources."micromark-extension-mdxjs-esm-1.0.5" - sources."micromark-factory-destination-1.1.0" - sources."micromark-factory-label-1.1.0" - sources."micromark-factory-mdx-expression-1.0.9" - sources."micromark-factory-space-1.1.0" - sources."micromark-factory-title-1.1.0" - sources."micromark-factory-whitespace-1.1.0" - sources."micromark-util-character-1.2.0" - sources."micromark-util-chunked-1.1.0" - sources."micromark-util-classify-character-1.1.0" - sources."micromark-util-combine-extensions-1.1.0" - sources."micromark-util-decode-numeric-character-reference-1.1.0" - sources."micromark-util-decode-string-1.1.0" - sources."micromark-util-encode-1.1.0" - (sources."micromark-util-events-to-acorn-1.2.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - sources."micromark-util-html-tag-name-1.2.0" - sources."micromark-util-normalize-identifier-1.1.0" - sources."micromark-util-resolve-all-1.1.0" - sources."micromark-util-sanitize-uri-1.2.0" - sources."micromark-util-subtokenize-1.1.0" - sources."micromark-util-symbol-1.1.0" - sources."micromark-util-types-1.1.0" sources."micromatch-4.0.5" - sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.8" sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) sources."mkdirp-1.0.4" - sources."mkdirp-classic-0.5.3" - sources."mlly-1.4.0" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."on-finished-2.3.0" - ]; - }) sources."mri-1.2.0" - sources."mrmime-1.0.1" sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."nanoid-3.3.6" - (sources."needle-3.2.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."negotiator-0.6.3" - sources."netmask-2.0.2" - sources."node-addon-api-1.7.2" sources."node-fetch-2.6.9" sources."node-gyp-build-4.6.0" - sources."node-releases-2.0.13" sources."nopt-5.0.0" - sources."normalize-path-3.0.0" - sources."normalize-url-6.1.0" - sources."npm-run-path-4.0.1" sources."npmlog-5.0.1" sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-5.1.2" - sources."optionator-0.8.3" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."outdent-0.8.0" - sources."p-cancelable-2.1.1" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" - sources."pac-proxy-agent-5.0.0" - sources."pac-resolver-5.0.1" - sources."pako-0.2.9" - (sources."parse-entities-4.0.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) sources."parse-ms-2.1.0" - sources."parse-node-version-1.0.1" - sources."parseurl-1.3.3" sources."path-browserify-1.0.1" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" sources."path-to-regexp-6.2.1" - sources."path-type-4.0.0" - sources."pathe-1.1.1" - sources."peek-stream-1.1.3" - (sources."periscopic-3.1.0" // { - dependencies = [ - sources."estree-walker-3.0.3" - ]; - }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pidtree-0.6.0" - sources."pify-4.0.1" - sources."pkg-types-1.0.3" - sources."postcss-8.4.25" - sources."postcss-discard-duplicates-5.1.0" - sources."postcss-load-config-4.0.1" - sources."postcss-modules-6.0.0" - sources."postcss-modules-extract-imports-3.0.0" - sources."postcss-modules-local-by-default-4.0.3" - sources."postcss-modules-scope-3.0.0" - sources."postcss-modules-values-4.0.0" - sources."postcss-selector-parser-6.0.13" - sources."postcss-value-parser-4.2.0" - sources."prelude-ls-1.1.2" - sources."prettier-2.8.8" sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" - sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" - sources."property-information-6.2.0" - sources."proxy-addr-2.0.7" - (sources."proxy-agent-5.0.0" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."yallist-3.1.1" - ]; - }) - sources."proxy-from-env-1.1.0" - sources."prr-1.0.1" - sources."pump-2.0.1" - sources."pumpify-1.5.1" sources."punycode-2.3.0" - sources."qs-6.11.0" sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."react-refresh-0.14.0" sources."readable-stream-3.6.2" - sources."readdirp-3.6.0" - (sources."recast-0.21.5" // { - dependencies = [ - sources."ast-types-0.15.2" - sources."source-map-0.6.1" - ]; - }) - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" sources."regenerator-runtime-0.13.11" - sources."regenerator-transform-0.15.1" - sources."regexpu-core-5.3.2" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."remark-frontmatter-4.0.1" - sources."remark-mdx-frontmatter-1.1.1" - sources."remark-parse-10.0.2" - sources."remark-rehype-9.1.0" sources."require-from-string-2.0.2" - sources."require-like-0.1.2" - sources."resolve-1.22.3" - sources."resolve-alpn-1.2.1" sources."resolve-from-5.0.0" - sources."resolve.exports-2.0.2" - sources."responselike-2.0.1" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-3.26.2" - sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."sade-1.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sass-1.63.6" - sources."sax-1.2.4" sources."semver-6.1.1" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" sources."set-blocking-2.0.0" - sources."set-cookie-parser-2.6.0" - sources."setprototypeof-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" sources."signal-exit-4.0.2" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-5.0.1" - sources."sort-object-keys-1.1.3" - (sources."sort-package-json-1.57.0" // { - dependencies = [ - sources."is-plain-obj-2.1.0" - ]; - }) - sources."source-map-0.7.4" - sources."source-map-js-1.0.2" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."space-separated-tokens-2.0.2" - (sources."ssri-8.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."statuses-2.0.1" - sources."stream-shift-1.0.1" - sources."stream-slice-0.1.2" - sources."string-hash-1.1.3" sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."stringify-entities-4.0.3" sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-final-newline-2.0.0" - sources."style-to-object-0.4.1" - sources."stylus-0.59.0" - sources."sugarss-4.0.1" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" sources."tar-6.1.15" - (sources."tar-fs-2.1.1" // { - dependencies = [ - sources."chownr-1.1.4" - sources."pump-3.0.0" - ]; - }) - sources."tar-stream-2.2.0" - sources."terser-5.18.2" - sources."through-2.3.8" - (sources."through2-2.0.5" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) sources."time-span-4.0.0" - sources."tmp-0.0.33" - sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."toml-3.0.0" sources."tr46-0.0.3" - sources."trough-2.1.0" sources."ts-morph-12.0.0" sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" - sources."tsconfig-paths-4.2.0" - sources."tslib-2.6.0" - sources."type-check-0.3.2" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" + sources."tslib-2.6.1" sources."typescript-4.9.5" - sources."ufo-1.1.2" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - (sources."unified-10.1.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - (sources."unist-builder-3.0.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - sources."unist-util-generated-2.0.1" - (sources."unist-util-is-5.2.1" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-position-4.0.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-position-from-estree-1.1.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-remove-position-4.0.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-stringify-position-3.0.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-visit-4.1.2" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."unist-util-visit-parents-5.1.3" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.11" sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" - sources."util-0.12.5" sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - (sources."uvu-0.5.6" // { - dependencies = [ - sources."diff-5.1.0" - ]; - }) sources."v8-compile-cache-lib-3.0.1" - sources."vary-1.1.2" - (sources."vfile-5.3.7" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."vfile-message-3.1.4" // { - dependencies = [ - sources."@types/unist-2.0.6" - ]; - }) - (sources."vite-4.4.2" // { - dependencies = [ - sources."@esbuild/android-arm-0.18.11" - sources."@esbuild/android-arm64-0.18.11" - sources."@esbuild/android-x64-0.18.11" - sources."@esbuild/darwin-arm64-0.18.11" - sources."@esbuild/darwin-x64-0.18.11" - sources."@esbuild/freebsd-arm64-0.18.11" - sources."@esbuild/freebsd-x64-0.18.11" - sources."@esbuild/linux-arm-0.18.11" - sources."@esbuild/linux-arm64-0.18.11" - sources."@esbuild/linux-ia32-0.18.11" - sources."@esbuild/linux-loong64-0.18.11" - sources."@esbuild/linux-mips64el-0.18.11" - sources."@esbuild/linux-ppc64-0.18.11" - sources."@esbuild/linux-riscv64-0.18.11" - sources."@esbuild/linux-s390x-0.18.11" - sources."@esbuild/linux-x64-0.18.11" - sources."@esbuild/netbsd-x64-0.18.11" - sources."@esbuild/openbsd-x64-0.18.11" - sources."@esbuild/sunos-x64-0.18.11" - sources."@esbuild/win32-arm64-0.18.11" - sources."@esbuild/win32-ia32-0.18.11" - sources."@esbuild/win32-x64-0.18.11" - sources."esbuild-0.18.11" - ]; - }) - (sources."vite-node-0.28.5" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."vm2-3.9.19" - sources."wcwidth-1.0.1" - sources."web-encoding-1.1.5" - sources."web-streams-polyfill-3.2.1" sources."web-vitals-0.2.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."which-typed-array-1.1.9" sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) sources."wrappy-1.0.2" - sources."ws-7.5.9" - (sources."xdm-2.1.0" // { - dependencies = [ - sources."estree-util-is-identifier-name-2.1.0" - sources."estree-walker-3.0.3" - sources."loader-utils-2.0.4" - ]; - }) - sources."xregexp-2.0.0" - sources."xtend-4.0.2" sources."yallist-4.0.0" - sources."yaml-2.3.1" sources."yn-3.1.1" - sources."yocto-queue-0.1.0" - sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -146836,9 +143722,9 @@ in ]; }) sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - sources."@eslint/eslintrc-2.1.0" - sources."@eslint/js-8.44.0" + sources."@eslint-community/regexpp-4.6.2" + sources."@eslint/eslintrc-2.1.1" + sources."@eslint/js-8.46.0" sources."@humanwhocodes/config-array-0.11.10" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -146870,11 +143756,11 @@ in sources."diff-4.0.2" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.44.0" - sources."eslint-plugin-vue-9.15.1" - sources."eslint-scope-7.2.0" - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-8.46.0" + sources."eslint-plugin-vue-9.16.1" + sources."eslint-scope-7.2.2" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" sources."esprima-4.0.1" sources."esquery-1.5.0" sources."esrecurse-4.3.0" @@ -146973,7 +143859,7 @@ in sources."escape-string-regexp-1.0.5" sources."has-flag-3.0.0" sources."js-yaml-3.14.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."supports-color-5.5.0" ]; }) @@ -147315,7 +144201,7 @@ in sources."pify-3.0.0" ]; }) - (sources."metalsmith-2.6.0" // { + (sources."metalsmith-2.6.1" // { dependencies = [ sources."commander-10.0.1" ]; @@ -147373,7 +144259,7 @@ in sources."safer-buffer-2.1.2" sources."section-matter-1.0.0" sources."seek-bzip-1.0.6" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -147460,6 +144346,7 @@ in sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" + sources."@one-ini/wasm-0.1.1" sources."@sindresorhus/is-0.14.0" sources."@starptech/expression-parser-0.10.0" sources."@starptech/hast-util-from-webparser-0.10.0" @@ -147476,8 +144363,8 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.4.1" - sources."@types/unist-2.0.6" + sources."@types/node-20.4.5" + sources."@types/unist-2.0.7" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" @@ -147624,7 +144511,7 @@ in ]; }) sources."comma-separated-tokens-1.0.8" - sources."commander-2.20.3" + sources."commander-10.0.1" sources."common-tags-1.8.2" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -147663,7 +144550,15 @@ in sources."doctrine-3.0.0" sources."dot-prop-4.2.1" sources."duplexer3-0.1.5" - sources."editorconfig-0.15.3" + (sources."editorconfig-1.0.4" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."lru-cache-6.0.0" + sources."minimatch-9.0.1" + sources."semver-7.5.4" + sources."yallist-4.0.0" + ]; + }) sources."element-helper-json-2.0.6" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -147686,7 +144581,7 @@ in sources."ms-2.1.2" (sources."vue-eslint-parser-7.11.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) ]; @@ -147871,7 +144766,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.14.8" // { + (sources."js-beautify-1.14.9" // { dependencies = [ sources."brace-expansion-2.0.1" sources."glob-8.1.0" @@ -147993,7 +144888,7 @@ in sources."p-try-1.0.0" (sources."package-json-6.5.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."parent-module-1.0.1" @@ -148114,7 +145009,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -148125,7 +145020,6 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."sigmund-1.0.1" sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."slice-ansi-2.1.0" @@ -148232,7 +145126,7 @@ in sources."debug-3.1.0" sources."mkdirp-1.0.4" sources."ms-2.0.0" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."source-map-0.7.4" ]; }) @@ -148283,7 +145177,11 @@ in sources."trim-newlines-2.0.0" sources."trough-1.0.5" sources."tslib-1.14.1" - sources."tslint-5.20.1" + (sources."tslint-5.20.1" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."tsutils-2.29.0" sources."type-check-0.3.2" sources."type-fest-0.3.1" @@ -148405,7 +145303,7 @@ in sources."which-module-2.0.1" sources."widest-line-2.0.1" sources."window-size-0.2.0" - sources."word-wrap-1.2.3" + sources."word-wrap-1.2.5" (sources."wrap-ansi-2.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -148618,12 +145516,12 @@ in sources."@devicefarmer/adbkit-logcat-2.1.3" sources."@devicefarmer/adbkit-monkey-1.2.1" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - (sources."@eslint/eslintrc-2.1.0" // { + sources."@eslint-community/regexpp-4.6.2" + (sources."@eslint/eslintrc-2.1.1" // { dependencies = [ sources."ajv-6.12.6" - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" sources."json-schema-traverse-0.4.1" sources."strip-json-comments-3.1.1" ]; @@ -148644,11 +145542,11 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.4.1" + sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -148712,7 +145610,7 @@ in sources."bunyan-1.8.15" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.12" // { + (sources."cacheable-request-10.2.13" // { dependencies = [ sources."get-stream-6.0.1" ]; @@ -148823,7 +145721,7 @@ in ]; }) sources."eslint-plugin-no-unsanitized-4.0.2" - sources."eslint-scope-7.2.0" + sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.3.0" sources."espree-9.5.0" sources."esprima-4.0.1" @@ -148849,7 +145747,7 @@ in sources."fast-json-patch-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.2.0" + sources."fast-redact-3.3.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."fetch-blob-3.2.0" @@ -148966,7 +145864,7 @@ in sources."isstream-0.1.2" sources."jed-1.1.1" sources."jose-4.13.1" - sources."js-sdsl-4.4.1" + sources."js-sdsl-4.4.2" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -148993,7 +145891,7 @@ in }) sources."jwa-1.4.1" sources."jws-3.2.2" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."latest-version-7.0.0" sources."lcid-3.1.1" sources."levn-0.4.1" @@ -149079,7 +145977,7 @@ in sources."path-key-3.1.1" (sources."path-scurry-1.10.1" // { dependencies = [ - sources."minipass-7.0.1" + sources."minipass-7.0.2" ]; }) sources."path-to-regexp-0.1.7" @@ -149293,10 +146191,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.88.1"; + version = "5.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.88.1.tgz"; - sha512 = "FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz"; + sha512 = "JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.3" @@ -149305,11 +146203,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - sources."@types/eslint-8.44.0" + sources."@types/eslint-8.44.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/json-schema-7.0.12" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -149331,12 +146229,12 @@ in sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.0" sources."escalade-3.1.1" @@ -149372,12 +146270,12 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.18.2" + sources."terser-5.19.2" sources."terser-webpack-plugin-5.3.9" sources."update-browserslist-db-1.0.11" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.88.1" + sources."webpack-5.88.2" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -149406,11 +146304,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.18" - sources."@types/eslint-8.44.0" + sources."@types/eslint-8.44.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/json-schema-7.0.12" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -149435,15 +146333,15 @@ in sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."enhanced-resolve-5.15.0" sources."envinfo-7.10.0" sources."es-module-lexer-1.3.0" @@ -149507,7 +146405,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.18.2" // { + (sources."terser-5.19.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -149516,7 +146414,7 @@ in sources."update-browserslist-db-1.0.11" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.88.1" + sources."webpack-5.88.2" sources."webpack-cli-5.1.4" sources."webpack-merge-5.9.0" sources."webpack-sources-3.2.3" @@ -149553,7 +146451,7 @@ in sources."@types/bonjour-3.5.10" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.5.0" - sources."@types/eslint-8.44.0" + sources."@types/eslint-8.44.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/express-4.17.17" @@ -149562,7 +146460,7 @@ in sources."@types/http-proxy-1.17.11" sources."@types/json-schema-7.0.12" sources."@types/mime-1.3.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.0" @@ -149608,12 +146506,12 @@ in sources."bonjour-service-1.1.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.20" @@ -149641,7 +146539,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.0" @@ -149821,7 +146719,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.18.2" + sources."terser-5.19.2" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -149844,7 +146742,7 @@ in sources."vary-1.1.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - (sources."webpack-5.88.1" // { + (sources."webpack-5.88.2" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -149888,11 +146786,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.44.0" + sources."@types/eslint-8.44.1" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/json-schema-7.0.12" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -149916,13 +146814,13 @@ in sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.2" - sources."browserslist-4.21.9" + sources."browserslist-4.21.10" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001513" + sources."caniuse-lite-1.0.30001518" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.454" + sources."electron-to-chromium-1.4.480" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.0" sources."escalade-3.1.1" @@ -149935,7 +146833,7 @@ in sources."estraverse-4.3.0" sources."events-3.3.0" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.3.0" // { + (sources."fast-glob-3.3.1" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -149981,7 +146879,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.18.2" + sources."terser-5.19.2" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -149994,7 +146892,7 @@ in sources."update-browserslist-db-1.0.11" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - (sources."webpack-5.88.1" // { + (sources."webpack-5.88.2" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -150035,7 +146933,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.4.1" + sources."@types/node-20.4.5" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -150362,7 +147260,7 @@ in ]; }) sources."torrent-piece-2.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."type-fest-0.21.3" sources."typedarray-0.0.6" sources."uint64be-2.0.2" @@ -150421,70 +147319,33 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "0.20.22"; + version = "0.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.22.tgz"; - sha512 = "HJEBYeiJEayvmwtTLWREJwzQO19kTYgjgMDM9jQUcNOvfj62F6fl+HYl2/hQEkZFITS3PMtFBHmShyZQQo/dSA=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.21.5.tgz"; + sha512 = "RD86gEIlbZV7/IRrDvNlCQBiy9kuNNsSom8QV8Kki7ZXhBqHZqa7iFkxALBJl6D2BeEminddxvxjBXO5JbqxMg=="; }; dependencies = [ - sources."@withgraphite/graphite-cli-routes-0.24.0" - sources."@withgraphite/gti-cli-shared-types-0.3.0" - sources."@withgraphite/retype-0.3.15" - sources."@withgraphite/retyped-routes-0.3.7" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" + sources."bufferutil-4.0.7" sources."chalk-4.1.2" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."define-lazy-prop-2.0.0" sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" sources."escalade-3.1.1" - sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-wsl-2.2.0" - sources."isomorphic-fetch-3.0.0" - sources."jsonfile-6.1.0" - sources."kleur-3.0.3" - sources."lru-cache-6.0.0" - sources."minimatch-3.1.2" - sources."node-fetch-2.6.12" - sources."once-1.4.0" - sources."open-8.4.2" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-6.2.1" - sources."prompts-2.4.2" + sources."node-gyp-build-4.6.0" sources."require-directory-2.1.1" - sources."rimraf-3.0.2" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."sisteransi-1.0.5" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" - sources."tmp-0.2.1" - sources."tr46-0.0.3" - sources."universalify-2.0.0" - sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.2" - sources."whatwg-url-5.0.0" + sources."utf-8-validate-6.0.3" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" + sources."ws-8.13.0" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; @@ -150500,18 +147361,18 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "3.1.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.1.2.tgz"; - sha512 = "UvpKpemw2Bt0tSS3Dspkw0tp/d2dR3W3hdHjyM7jEsv+xgmQgEZqoN8gdA/2sgECO3FXRdLuQZDdcuOO43aHFw=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-3.4.0.tgz"; + sha512 = "sATQ84zH/zFUHSaa4hY3V24TBrad3R9HhGV47U6Ek7XRQDLQHBm0jt84mJD3sSV/hhaq5s+xidIYulhm+m1/Tg=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" - sources."@cloudflare/workerd-darwin-64-1.20230628.0" - sources."@cloudflare/workerd-darwin-arm64-1.20230628.0" - sources."@cloudflare/workerd-linux-64-1.20230628.0" - sources."@cloudflare/workerd-linux-arm64-1.20230628.0" - sources."@cloudflare/workerd-windows-64-1.20230628.0" + sources."@cloudflare/workerd-darwin-64-1.20230724.0" + sources."@cloudflare/workerd-darwin-arm64-1.20230724.0" + sources."@cloudflare/workerd-linux-64-1.20230724.0" + sources."@cloudflare/workerd-linux-arm64-1.20230724.0" + sources."@cloudflare/workerd-windows-64-1.20230724.0" sources."@esbuild-plugins/node-globals-polyfill-0.1.1" sources."@esbuild-plugins/node-modules-polyfill-0.1.4" sources."@esbuild/android-arm-0.16.3" @@ -150541,7 +147402,7 @@ in sources."anymatch-3.1.3" sources."as-table-1.0.55" sources."base64-js-1.5.1" - sources."better-sqlite3-8.4.0" + sources."better-sqlite3-8.5.0" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."bl-4.1.0" @@ -150559,7 +147420,7 @@ in sources."debug-4.3.4" sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" - sources."detect-libc-2.0.1" + sources."detect-libc-2.0.2" sources."end-of-stream-1.4.4" sources."esbuild-0.16.3" sources."escape-string-regexp-4.0.0" @@ -150591,7 +147452,7 @@ in sources."magic-string-0.25.9" sources."mime-3.0.0" sources."mimic-response-3.1.0" - sources."miniflare-3.20230628.0" + sources."miniflare-3.20230724.0" sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -150635,12 +147496,12 @@ in sources."tar-fs-2.1.1" sources."tar-stream-2.2.0" sources."to-regex-range-5.0.1" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-agent-0.6.0" sources."undici-5.22.1" sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" - sources."workerd-1.20230628.0" + sources."workerd-1.20230724.0" sources."wrappy-1.0.2" sources."ws-8.13.0" sources."xxhash-wasm-1.0.2" @@ -150688,14 +147549,14 @@ in sources."@aashutoshrathi/word-wrap-1.2.6" sources."@babel/runtime-7.22.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - (sources."@eslint/eslintrc-2.1.0" // { + sources."@eslint-community/regexpp-4.6.2" + (sources."@eslint/eslintrc-2.1.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@eslint/js-8.44.0" + sources."@eslint/js-8.46.0" (sources."@humanwhocodes/config-array-0.11.10" // { dependencies = [ sources."debug-4.3.4" @@ -150718,9 +147579,11 @@ in sources."aria-query-5.3.0" sources."array-buffer-byte-length-1.0.0" sources."array-includes-3.1.6" + sources."array.prototype.findlastindex-1.2.2" sources."array.prototype.flat-1.3.1" sources."array.prototype.flatmap-1.3.1" sources."array.prototype.tosorted-1.1.1" + sources."arraybuffer.prototype.slice-1.0.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" sources."axe-core-4.7.2" @@ -150743,12 +147606,12 @@ in sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.1" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.44.0" // { + (sources."eslint-8.46.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -150757,17 +147620,17 @@ in }) sources."eslint-import-resolver-node-0.3.7" sources."eslint-module-utils-2.8.0" - sources."eslint-plugin-import-2.27.5" + sources."eslint-plugin-import-2.28.0" sources."eslint-plugin-jsx-a11y-6.7.1" - (sources."eslint-plugin-react-7.32.2" // { + (sources."eslint-plugin-react-7.33.1" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; }) sources."eslint-plugin-react-hooks-4.6.0" - sources."eslint-scope-7.2.0" - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.6.0" + sources."eslint-scope-7.2.2" + sources."eslint-visitor-keys-3.4.2" + sources."espree-9.6.1" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -150821,15 +147684,16 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" + sources."isarray-2.0.5" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-1.0.2" - sources."jsx-ast-utils-3.3.4" + sources."jsx-ast-utils-3.3.5" sources."language-subtag-registry-0.3.22" sources."language-tags-1.0.5" sources."levn-0.4.1" @@ -150847,6 +147711,7 @@ in sources."object.assign-4.1.4" sources."object.entries-1.1.6" sources."object.fromentries-2.0.6" + sources."object.groupby-1.0.0" sources."object.hasown-1.1.2" sources."object.values-1.1.6" sources."once-1.4.0" @@ -150871,8 +147736,9 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" + sources."safe-array-concat-1.0.0" sources."safe-regex-test-1.0.0" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" @@ -150890,13 +147756,16 @@ in sources."tsconfig-paths-3.14.2" sources."type-check-0.4.0" sources."type-fest-0.20.2" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."uri-js-4.4.1" sources."weasel-words-0.1.1" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" sources."wrappy-1.0.2" sources."yocto-queue-0.1.0" ]; @@ -150931,10 +147800,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.13.0.tgz"; - sha512 = "CzekVjFOUkiXI6tg3BPuSkxE60keDT4/+LjPLXwnt4gCRzaaWMCjT92NxOHv1derbBLHWoecay48tse/De181Q=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.14.0.tgz"; + sha512 = "HnNiHM5AOTXuM8ZpubzqgTy+7V5kFiMXVedOT2yjhvnxCw6pbMXcD/ymHaaT5v2ue0H8GGH4NFkvCEzcIcTJDg=="; }; dependencies = [ sources."ajv-8.12.0" @@ -151172,7 +148041,7 @@ in sources."bin-version-3.1.0" (sources."bin-version-check-4.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."binaryextensions-4.18.0" @@ -151243,7 +148112,7 @@ in sources."config-chain-1.1.13" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."core-js-3.31.1" + sources."core-js-3.32.0" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -151300,7 +148169,7 @@ in dependencies = [ sources."cross-spawn-6.0.5" sources."path-key-2.0.1" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."which-1.3.1" @@ -151310,7 +148179,7 @@ in sources."exit-hook-1.1.1" sources."extend-3.0.2" sources."external-editor-3.1.0" - sources."fast-glob-3.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { @@ -151576,7 +148445,7 @@ in sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."normalize-path-3.0.0" @@ -151696,7 +148565,7 @@ in sources."got-11.8.6" sources."http-cache-semantics-4.1.1" sources."json-buffer-3.0.1" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."lowercase-keys-2.0.0" sources."mimic-response-3.1.0" sources."normalize-url-6.1.0" @@ -151820,13 +148689,13 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scoped-regex-2.1.0" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."semver-compare-1.0.0" sources."semver-diff-3.1.1" sources."semver-regex-2.0.0" (sources."semver-truncate-1.1.2" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) (sources."serialize-error-7.0.1" // { @@ -151922,7 +148791,7 @@ in sources."to-regex-range-5.0.1" sources."treeverse-1.0.4" sources."trim-newlines-2.0.0" - sources."tslib-2.6.0" + sources."tslib-2.6.1" sources."tunnel-0.0.6" (sources."twig-1.16.0" // { dependencies = [ @@ -152003,7 +148872,7 @@ in sources."prepend-http-1.0.4" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."supports-color-5.5.0" sources."url-parse-lax-1.0.0" ]; @@ -152082,10 +148951,10 @@ in "@zwave-js/server" = nodeEnv.buildNodePackage { name = "_at_zwave-js_slash_server"; packageName = "@zwave-js/server"; - version = "1.29.1"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.29.1.tgz"; - sha512 = "TQV4hOHJMN4ZZeiKFjLEx4hTStYL+IdjSTLXAGWcnTei8+4nbuYQTzwgxwx5Cz7e9Bq9VTfKWUAOG16h8xBDbw=="; + url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.30.0.tgz"; + sha512 = "eDVrjqS4fMAtT7pLe/LyKSX7npu+7MPHLjjvyJVhpFOfpQllqeALPSHBh5fFz9CJsjg3T3Dl5NkbA/dVzXVBzg=="; }; dependencies = [ sources."@alcalzone/jsonl-db-3.1.0" @@ -152102,7 +148971,7 @@ in sources."@esm2cjs/form-data-encoder-2.1.4" sources."@esm2cjs/got-12.5.3" sources."@esm2cjs/http-timer-5.0.1" - sources."@esm2cjs/is-5.4.1" + sources."@esm2cjs/is-5.6.0" sources."@esm2cjs/lowercase-keys-3.0.0" sources."@esm2cjs/mimic-response-4.0.0" sources."@esm2cjs/normalize-url-8.0.0" @@ -152112,12 +148981,12 @@ in sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.7" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@sentry-internal/tracing-7.57.0" - sources."@sentry/core-7.57.0" - sources."@sentry/integrations-7.57.0" - sources."@sentry/node-7.57.0" - sources."@sentry/types-7.57.0" - sources."@sentry/utils-7.57.0" + sources."@sentry-internal/tracing-7.61.0" + sources."@sentry/core-7.61.0" + sources."@sentry/integrations-7.61.0" + sources."@sentry/node-7.61.0" + sources."@sentry/types-7.61.0" + sources."@sentry/utils-7.61.0" sources."@serialport/binding-mock-10.2.2" sources."@serialport/bindings-cpp-10.8.0" sources."@serialport/bindings-interface-1.2.2" @@ -152134,14 +149003,14 @@ in sources."@serialport/stream-10.5.0" sources."@types/http-cache-semantics-4.0.1" sources."@types/triple-beam-1.3.2" - sources."@zwave-js/cc-11.4.0" - sources."@zwave-js/config-11.4.0" - sources."@zwave-js/core-11.4.0" - sources."@zwave-js/host-11.4.0" - sources."@zwave-js/nvmedit-11.4.0" - sources."@zwave-js/serial-11.4.0" - sources."@zwave-js/shared-11.3.0" - sources."@zwave-js/testing-11.4.0" + sources."@zwave-js/cc-11.8.1" + sources."@zwave-js/config-11.8.1" + sources."@zwave-js/core-11.8.1" + sources."@zwave-js/host-11.8.1" + sources."@zwave-js/nvmedit-11.8.1" + sources."@zwave-js/serial-11.8.1" + sources."@zwave-js/shared-11.8.0" + sources."@zwave-js/testing-11.8.1" sources."agent-base-6.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" @@ -152203,7 +149072,7 @@ in sources."json-logic-js-2.0.2" sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kuler-2.0.0" sources."lie-3.1.1" sources."localforage-1.10.0" @@ -152253,13 +149122,13 @@ in sources."strip-final-newline-2.0.0" sources."text-hex-1.0.0" sources."tiny-glob-0.2.9" - sources."triple-beam-1.3.0" - sources."tslib-2.6.0" + sources."triple-beam-1.4.1" + sources."tslib-2.6.1" sources."universalify-2.0.0" sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" sources."which-2.0.2" - sources."winston-3.9.0" + sources."winston-3.10.0" sources."winston-daily-rotate-file-4.7.1" sources."winston-transport-4.5.0" sources."wrap-ansi-7.0.0" @@ -152269,7 +149138,7 @@ in sources."yallist-4.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" - sources."zwave-js-11.4.0" + sources."zwave-js-11.8.1" ]; buildInputs = globalBuildInputs; meta = { @@ -152281,79 +149150,4 @@ in bypassCache = true; reconstructLock = true; }; - zx = nodeEnv.buildNodePackage { - name = "zx"; - packageName = "zx"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-7.2.3.tgz"; - sha512 = "QODu38nLlYXg/B/Gw7ZKiZrvPkEsjPN3LQ5JFXM7h0JvwhEdPNNl+4Ao1y4+o3CLNiDUNcwzQYZ4/Ko7kKzCMA=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/fs-extra-11.0.1" - sources."@types/jsonfile-6.1.1" - sources."@types/minimist-1.2.2" - sources."@types/node-18.16.19" - sources."@types/ps-tree-1.1.2" - sources."@types/which-3.0.0" - sources."braces-3.0.2" - sources."chalk-5.3.0" - sources."data-uri-to-buffer-4.0.1" - sources."dir-glob-3.0.1" - sources."duplexer-0.1.2" - sources."event-stream-3.3.4" - sources."fast-glob-3.3.0" - sources."fastq-1.15.0" - sources."fetch-blob-3.2.0" - sources."fill-range-7.0.1" - sources."formdata-polyfill-4.0.10" - sources."from-0.1.7" - sources."fs-extra-11.1.1" - sources."fx-28.0.0" - sources."glob-parent-5.1.2" - sources."globby-13.2.2" - sources."graceful-fs-4.2.11" - sources."ignore-5.2.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jsonfile-6.1.0" - sources."map-stream-0.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."minimist-1.2.8" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.1" - sources."path-type-4.0.0" - sources."pause-stream-0.0.11" - sources."picomatch-2.3.1" - sources."ps-tree-1.2.0" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."slash-4.0.0" - sources."split-0.3.3" - sources."stream-combiner-0.0.4" - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."universalify-2.0.0" - sources."web-streams-polyfill-3.2.1" - sources."webpod-0.0.2" - sources."which-3.0.1" - sources."yaml-2.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for writing better scripts"; - homepage = "https://github.com/google/zx#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix index c8013fb412..69e5d65bae 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix @@ -93,21 +93,6 @@ final: prev: { ''; }; - bitwarden-cli = prev."@bitwarden/cli".override { - name = "bitwarden-cli"; - nativeBuildInputs = with pkgs; [ - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreText - ]; - buildInputs = with pkgs; [ - pixman - cairo - pango - giflib - ]; - }; - bower2nix = prev.bower2nix.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' @@ -177,10 +162,6 @@ final: prev: { nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; }; - flood = prev.flood.override { - buildInputs = [ final.node-pre-gyp ]; - }; - git-ssb = prev.git-ssb.override (oldAttrs: { buildInputs = [ final.node-gyp-build ]; meta = oldAttrs.meta // { broken = since "10"; }; @@ -188,7 +169,8 @@ final: prev: { graphite-cli = prev."@withgraphite/graphite-cli".override { name = "graphite-cli"; - nativeBuildInputs = [ pkgs.installShellFiles ]; + nativeBuildInputs = with pkgs; [ installShellFiles pkg-config ]; + buildInputs = with pkgs; [ cairo pango pixman ]; # 'gt completion' auto-detects zshell from environment variables: # https://github.com/yargs/yargs/blob/2b6ba3139396b2e623aed404293f467f16590039/lib/completion.ts#L45 postInstall = '' @@ -404,11 +386,12 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha512-L9mqjnSmvWIRCYJ9mQkwCtj4+JDYYTdhoyo8hlsHNDXaZLh/b4hR0IoKIBbTKxZuyHQzLopb/+0Rvb69uGV7uA=="; + hash = "sha256-0NxYp+W2KbR3xEV2OCXCIL3RqkvLfJHNKgl/PxapVbI="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ - --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \ + --set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \ + --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \ --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \ --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \ --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt @@ -433,19 +416,6 @@ final: prev: { ''; }; - reveal-md = prev.reveal-md.override ( - lib.optionalAttrs (!stdenv.isDarwin) { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - prePatch = '' - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 - ''; - postInstall = '' - wrapProgram $out/bin/reveal-md \ - --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium - ''; - } - ); - rush = prev."@microsoft/rush".override { name = "rush"; }; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/remove-attr.py b/third_party/nixpkgs/pkgs/development/node-packages/remove-attr.py index d0f95e3e63..6ab93e64ff 100755 --- a/third_party/nixpkgs/pkgs/development/node-packages/remove-attr.py +++ b/third_party/nixpkgs/pkgs/development/node-packages/remove-attr.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p +#!nix-shell -i python3 -p python3 import collections.abc import fileinput diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 3e581b4b86..114e638fa6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -2,27 +2,16 @@ buildDunePackage rec { pname = "bisect_ppx"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "aantron"; repo = "bisect_ppx"; rev = version; - hash = "sha256-Uc5ZYL6tORcCCvCe9UmOnBF68FqWpQ4bc48fTQwnfis="; + hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o="; }; - patches = [ - # Ppxlib >= 0.28.0 compatibility - # remove when a new version is released - (fetchpatch { - name = "${pname}-${version}-ppxlib-0.28-compatibility.patch"; - url = "https://github.com/anmonteiro/bisect_ppx/commit/cc442a08e3a2e0e18deb48f3a696076ac0986728.patch"; - sha256 = "sha256-pPHhmtd81eWhQd4X0gfZNPYT75+EkurwivP7acfJbNc="; - }) - ]; - minimalOCamlVersion = "4.11"; - duneVersion = "3"; buildInputs = [ cmdliner diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/1_1.nix index 9e7f6db6e6..735496aa45 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/1_1.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cmdliner/1_1.nix @@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") stdenv.mkDerivation rec { pname = "cmdliner"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-oa6Hw6eZQO+NHdWfdED3dtHckm4BmEbdMiAuRkYntfs="; + sha256 = "sha256-r+0QWJAoOU/W9k6XscYX4r5w3m017kfgQjXaMandAHg="; }; nativeBuildInputs = [ ocaml ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix index 8a1df8618d..2cd68dc9cb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "cohttp"; - version = "5.1.0"; + version = "5.3.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; - hash = "sha256-mINgeBO7DSsWd84gYjQNUQFqbh8KBZ+S2bYI/iVWMAc="; + url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz"; + hash = "sha256-s72RxwTl6lEOkkuDqy7eH8RqLM5Eiw+M70iDuaFu7d0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix index 599cc35603..cd3b0bffd2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,29 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ lib, buildDunePackage, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "ocaml-dolog"; - version = "3.0"; +buildDunePackage rec { + pname = "dolog"; + version = "6.0.0"; src = fetchFromGitHub { owner = "UnixJunkie"; - repo = "dolog"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8="; + hash = "sha256-g68260mcb4G4wX8y4T0MTaXsYnM9wn2d0V1VCdSFZjY="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - - strictDeps = true; - - createFindlibDestdir = true; - - doCheck = true; - checkTarget = "test"; - meta = { homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; - platforms = ocaml.meta.platforms or [ ]; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dtools/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dtools/default.nix index 0eaba9fa15..c534bdaad9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dtools/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "dtools"; - version = "0.4.4"; + version = "0.4.5"; minimalOCamlVersion = "4.05"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-dtools"; rev = "v${version}"; - sha256 = "1xbgnij63crikfr2jvar6sf6c7if47qarg5yycdfidip21vhmawf"; + sha256 = "sha256-NLQkQx3ZgxU1zvaQjOi+38nSeX+zKCXW40zOxVNekZA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix index f504e3d7ca..d47b783077 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix @@ -1,21 +1,26 @@ -{stdenv, lib, fetchurl, ocaml, findlib}: +{ stdenv, lib, fetchFromGitHub, fetchurl, ocaml, findlib }: -let - pname = "dypgen"; -in - -if lib.versionAtLeast ocaml.version "4.06" -then throw "${pname} is not available for OCaml ${ocaml.version}" -else +let params = + if lib.versionAtLeast ocaml.version "4.07" then rec { + version = "0.2"; + src = fetchFromGitHub { + owner = "grain-lang"; + repo = "dypgen"; + rev = version; + hash = "sha256-fKuO/e5YbA2B7XcghWl9pXxwvKw9YlhnmZDZcuKe3cs="; + }; + } else if lib.versionOlder ocaml.version "4.06" then { + version = "20120619-1"; + src = fetchurl { + url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; + sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; + }; + } else throw "dypgen is not available for OCaml ${ocaml.version}" +; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "20120619-1"; - - src = fetchurl { - url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; - sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; - }; + pname = "ocaml${ocaml.version}-dypgen"; + inherit (params) src version; nativeBuildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix index 02a49fd717..48dd8817a5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: +{ lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: + +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "gsl is not available for OCaml ${ocaml.version}" buildDunePackage rec { pname = "gsl"; @@ -36,8 +39,6 @@ buildDunePackage rec { }) ]; - duneVersion = "3"; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix index 434482bdc3..f6c9a59193 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/http-mirage-client/default.nix @@ -16,14 +16,13 @@ buildDunePackage rec { pname = "http-mirage-client"; - version = "0.0.3"; + version = "0.0.5"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz"; - hash = "sha256-6PMxZQfPiDTFbj9gOO2tW5FHF0MUP5tOySjkYg+QwGA="; + hash = "sha256-w/dMv5QvgglTFj9V4wRoDqK+36YeE0xWLxcAVS0oHz0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix index 0ea05cb7b9..8d7b3f6893 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/iri/default.nix @@ -4,15 +4,16 @@ buildDunePackage rec { pname = "iri"; - version = "0.6.0"; - duneVersion = "3"; + version = "0.7.0"; + + minimalOCamlVersion = "4.12"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "ocaml-iri"; rev = version; - sha256 = "sha256:0zk8nnwcyljkc1a556byncv6cn1vqhk4267z1lm15flh1k7chyax"; + hash = "sha256-Mkg7kIIVpKbeWUras1RqtJsRx2Q3dBnm4QqSMJFweF8="; }; propagatedBuildInputs = [ sedlex uunf uutf ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix index c1c890f85f..240629fc37 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "mm"; - version = "0.8.3"; + version = "0.8.4"; duneVersion = "3"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-mm"; rev = "v${version}"; - sha256 = "sha256-pL1e7U5EtbI8bVum7mMHUD8QFMV4jc3YFjhTOvR43kg="; + sha256 = "sha256-RM+vsWf2RK5dY84KcqeR/OHwO42EDycrYgfOUFpUE44="; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix index 0e998af86f..215c026856 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -22,6 +22,7 @@ rec { "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM="; "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4="; "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0="; + "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; }."${version}"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix index abd3a33dde..a4492b2ead 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix @@ -4,8 +4,8 @@ let source = if lib.versionAtLeast ocaml.version "4.13" then { - version = "0.21.0"; - sha256 = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; + version = "0.26.0"; + sha256 = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; } else { version = "0.20.0"; sha256 = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index 275c20dea8..9b5b59ffae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -1,5 +1,5 @@ { lib, callPackage, buildDunePackage, re, ocamlformat-lib, menhir -, version ? "0.25.1" }: +, version ? "0.26.0" }: let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix index c450d6ad15..6c125130e8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ogg"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ogg"; rev = "v${version}"; - sha256 = "sha256-D6tLKBSGfWBoMfQrWmamd8jo2AOphJV9xeSm+l06L5c="; + sha256 = "sha256-S6rJw90c//a9d63weCLuOBoQwNqbpTb+lRytvHUOZuc="; }; minimalOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index 3fb52de2b8..9b9e72ed08 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -1,23 +1,23 @@ -{ lib, buildDunePackage, fetchurl, ppxlib, alcotest +{ lib, buildDunePackage, fetchurl, ppxlib, alcotest, mdx , ppx_deriving, yaml }: buildDunePackage rec { pname = "ppx_deriving_yaml"; - version = "0.1.1"; + version = "0.2.1"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz"; - sha256 = "sha256-nR3568ULM6jaGG4H4+lLBTEJqh/ALHPiJxve40jPUxw="; + hash = "sha256-3vmay8UY7d3j96VOQ+D3oYEotzVls91F51ebXWQ/9SQ="; }; propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; doCheck = true; checkInputs = [ alcotest ]; + nativeCheckInputs = [ mdx.bin ]; meta = { description = "A YAML codec generator for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix index 43e7e18566..dd823b2264 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix @@ -1,11 +1,12 @@ -{ buildDunePackage, printbox, uucp, uutf, mdx }: +{ buildDunePackage, lib, ocaml, printbox, uucp, uutf, mdx }: buildDunePackage { pname = "printbox-text"; - inherit (printbox) src version useDune2 doCheck; + inherit (printbox) src version; propagatedBuildInputs = [ printbox uucp uutf ]; + doCheck = printbox.doCheck && lib.versionOlder ocaml.version "5.0"; nativeCheckInputs = [ mdx.bin ]; meta = printbox.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix index ee12abd3e3..9c1914b0f3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,28 +1,40 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv +, lib +, fetchurl +, ocaml +, findlib +, ocamlbuild +, topkg }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "ptime is not available for OCaml ${ocaml.version}" - -stdenv.mkDerivation rec { - version = "1.0.0"; +stdenv.mkDerivation (finalAttrs: { + version = "1.1.0"; pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { - url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "sha256-RByDjAFiyDdR8G663/MxabuSHTTuwVn7urtw7Z3iEQs="; + url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz"; + hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ]; + nativeBuildInputs = [ + findlib + ocaml + ocamlbuild + topkg + ]; + + buildInputs = [ + topkg + ]; strictDeps = true; inherit (topkg) buildPhase installPhase; meta = { - homepage = "https://erratique.ch/software/ptime"; description = "POSIX time for OCaml"; + homepage = "https://erratique.ch/software/ptime"; + license = lib.licenses.isc; longDescription = '' Ptime has platform independent POSIX time support in pure OCaml. It provides a type to represent a well-defined range of POSIX timestamps @@ -35,7 +47,6 @@ stdenv.mkDerivation rec { Ptime is not a calendar library. ''; - license = lib.licenses.isc; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix index b15ad8684e..0cc59fa3e7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix @@ -1,6 +1,7 @@ { lib , buildDunePackage , fetchFromGitHub +, fetchpatch , ocaml , ounit @@ -18,6 +19,12 @@ buildDunePackage rec { sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4="; }; + # Compatibility with OCaml 5.0 + patches = fetchpatch { + url = "https://github.com/burgerdev/ocaml-rfc7748/commit/f66257bae0317c7b24c4b208ee27ab6eb68460e4.patch"; + hash = "sha256-780yy8gLOwwf7xIKIIIaoGpDPcY7+dZ0jPS4nrkH2s8="; + }; + minimalOCamlVersion = "4.05"; propagatedBuildInputs = [ zarith ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix index 623f21748a..1ef11e363f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix @@ -2,9 +2,8 @@ , findlib, ocaml, ocamlbuild }: -if lib.versionOlder ocaml.version "4.02" -then throw "sosa is not available for OCaml ${ocaml.version}" -else +lib.throwIf (lib.versionOlder ocaml.version "4.02") + "sosa is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-sosa"; @@ -17,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; }; + postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") '' + for p in functors list_of of_mutable + do + substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib. + done + ''; + nativeBuildInputs = [ ocaml ocamlbuild findlib ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix new file mode 100644 index 0000000000..208a879b1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "trace"; + version = "0.2"; + + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz"; + hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ="; + }; + + meta = { + description = "Common interface for tracing/instrumentation libraries in OCaml"; + license = lib.licenses.mit; + homepage = "https://c-cube.github.io/trace/"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix new file mode 100644 index 0000000000..c1a6f92515 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, trace, mtime }: + +buildDunePackage { + pname = "trace-tef"; + inherit (trace) src version; + + propagatedBuildInputs = [ mtime trace ]; + + doCheck = true; + + meta = trace.meta // { + description = "A simple backend for trace, emitting Catapult JSON into a file"; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/unix-errno/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/unix-errno/default.nix index 2b8deb6621..d869748ecb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/unix-errno/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/unix-errno/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "unix-errno"; - version = "0.6.1"; + version = "0.6.2"; minimalOCamlVersion = "4.03.0"; # Specified to be 4.01.0, but it's actually 4.03 src = fetchurl { url = "https://github.com/xapi-project/ocaml-unix-errno/releases/download/${version}/unix-errno-${version}.tbz"; - sha256 = "sha256-jZqtHwUKTffjuOP2jdKKQRtEOBKyclhfeiPO96hEj4c="; + sha256 = "sha256-LWqbyGcxs6f/FcOPo3JYR3U+AL0JHeWCiGjuYhxxrWU="; }; propagatedBuildInputs = [ ctypes integers result ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix index 18d3d7795a..6731eb5f1e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,19 +1,18 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if lib.versionOlder ocaml.version "4.08" -|| lib.versionAtLeast ocaml.version "5.0" then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-wasm"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "spec"; rev = "opam-${version}"; - sha256 = "sha256:09s0v79x0ymzcp2114zkm3phxavdfnkkq67qz1ndnknbkziwqf3v"; + hash = "sha256-5eo8MIui2GxRS5X9az0NlLGZfxi5KGsTI/EaP6m/zts="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index 7607603951..aca71e2dfc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; pname = "x509"; - version = "0.16.4"; + version = "0.16.5"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - hash = "sha256-XegxhdASQK/I7Xd0gJSLumTGbCYFpWsjR7PlZSWqaVo="; + hash = "sha256-FJ4lpf6jf2GfsmkL7lwA8BydzzHTNfj/yqs5p1OMzZk="; }; checkInputs = [ alcotest cstruct-unix ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix index b3c8c241ae..e75a203664 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -1,13 +1,15 @@ -{ buildDunePackage, xenstore_transport, xenstore, lwt }: +{ buildDunePackage, camlp-streams, xenstore_transport, xenstore, lwt }: buildDunePackage { pname = "xenstore-tool"; inherit (xenstore_transport) src version; - duneVersion = "3"; + postPatch = '' + substituteInPlace cli/dune --replace 'libraries ' 'libraries camlp-streams ' + ''; - buildInputs = [ xenstore_transport xenstore lwt ]; + buildInputs = [ camlp-streams xenstore_transport xenstore lwt ]; meta = xenstore_transport.meta // { description = "Command line tool for interfacing with xenstore"; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Data-UUID-CVE-2013-4184.patch b/third_party/nixpkgs/pkgs/development/perl-modules/Data-UUID-CVE-2013-4184.patch new file mode 100644 index 0000000000..731e2eeb0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Data-UUID-CVE-2013-4184.patch @@ -0,0 +1,214 @@ +Eliminate use of state/node files in temp directory, which are a security concern due to insecure writing of State/Node files in a temporary directory, with predictable filenames, with a possible symlink attack. + +Fixes CVE-2013-4184 + +https://github.com/bleargh45/Data-UUID/pull/40 by Graham TerMarsch @bleargh45 + + +diff --git a/Makefile.PL b/Makefile.PL +index 4ca26af..fb1a0f0 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -89,30 +89,14 @@ WriteMakefile( + + CONFIGURE => sub { + my %opt; +- GetOptions(\%opt, 's|state-storage-directory:s', 'd|default-umask:s', +- 'help|?', 'man') or pod2usage(2); ++ GetOptions(\%opt, 'help|?', 'man') or pod2usage(2); + pod2usage(1) if $opt{help}; + pod2usage(-verbose => 2) if $opt{man}; + + print "Configured options (run perl Makefile.PL --help for how to change this):\n"; + +- my $d = File::Spec->tmpdir; +- $d = $opt{s} || $d; +- print "\tUUID state storage: $d\n"; +- $d =~ s/\\/\\\\/g if $^O eq 'MSWin32'; +- +- my $m = '0007'; +- unless ($^O eq 'MSWin32') { +- $m = $opt{d} || $m; +- print "\tdefault umask: $m\n"; +- } +- +- chmod(0666, sprintf("%s/%s", $d, ".UUID_NODEID")); +- chmod(0666, sprintf("%s/%s", $d, ".UUID_STATE")); + return { +- DEFINE => '-D_STDIR=' . shell_quote(c_quote($d)) +- . ' -D' . shell_quote("__$Config{osname}__") +- . ' -D_DEFAULT_UMASK=' . shell_quote($m) ++ DEFINE => ' -D' . shell_quote("__$Config{osname}__") + }; + } + ); +@@ -127,11 +111,9 @@ Makefile.PL - configure Makefile for Data::UUID + + perl Makefile.PL [options] [EU::MM options] + +-perl Makefile.PL -s=/var/local/lib/data-uuid -d=0007 ++perl Makefile.PL + + Options: +- --state-storage-directory directory for storing library state information +- --default-umask umask for files in the state storage directory + --help brief help message + --man full documentation + +@@ -141,18 +123,6 @@ Options can be abbreviated, see L. + + =over + +-=item --state-storage-directory +- +-Optional. Takes a string that is interpreted as directory for storing library +-state information. Default is c:/tmp/ on Windows if it already exists, or the +-operating system's temporary directory (see tmpdir in L), +-or /var/tmp as fallback. +- +-=item --default-umask +- +-Optional. Takes a string that is interpreted as umask for the files in the state +-storage directory. Default is 0007. This is ignored on Windows. +- + =item --help + + Print a brief help message and exits. +@@ -165,10 +135,7 @@ Prints the manual page and exits. + + =head1 DESCRIPTION + +-B writes the Makefile for the Data::UUID library. It is configured +-with the options L and L. +-Unless given, default values are used. In any case the values are printed for +-confirmation. ++B writes the Makefile for the Data::UUID library. + + Additionally, the usual EU::MM options are processed, see + L. +diff --git a/README b/README +index 8aaa1c2..34d53a5 100644 +--- a/README ++++ b/README +@@ -23,15 +23,6 @@ To install this module type the following: + make test + make install + +-NOTE: This module is designed to save its state information in a permanent +-storage location. The installation script (i.e. Makefile.PL) prompts for +-a directory name to use as a storage location for state file and defaults +-this directory to "/var/tmp" if no directory name is provided. +-The installation script will not accept names of directories that do not +-exist, however, it will take the locations, which the installing user +-has no write permissions to. In this case, the state information will not be +-saved, which will maximize the chances of generating duplicate UUIDs. +- + COPYRIGHT AND LICENCE + + Copyright (C) 2001, Alexander Golomshtok +diff --git a/UUID.h b/UUID.h +index dc5ea28..11d6e13 100644 +--- a/UUID.h ++++ b/UUID.h +@@ -44,23 +44,6 @@ + #include + #endif + +-#if !defined _STDIR +-# define _STDIR "/var/tmp" +-#endif +-#if !defined _DEFAULT_UMASK +-# define _DEFAULT_UMASK 0007 +-#endif +- +-#define UUID_STATE ".UUID_STATE" +-#define UUID_NODEID ".UUID_NODEID" +-#if defined __mingw32__ || (defined _WIN32 && !defined(__cygwin__)) || defined _MSC_VER +-#define UUID_STATE_NV_STORE _STDIR"\\"UUID_STATE +-#define UUID_NODEID_NV_STORE _STDIR"\\"UUID_NODEID +-#else +-#define UUID_STATE_NV_STORE _STDIR"/"UUID_STATE +-#define UUID_NODEID_NV_STORE _STDIR"/"UUID_NODEID +-#endif +- + #define UUIDS_PER_TICK 1024 + #ifdef _MSC_VER + #define I64(C) C##i64 +@@ -134,7 +117,6 @@ typedef struct _uuid_state_t { + typedef struct _uuid_context_t { + uuid_state_t state; + uuid_node_t nodeid; +- perl_uuid_time_t next_save; + } uuid_context_t; + + static void format_uuid_v1( +diff --git a/UUID.xs b/UUID.xs +index c3496a8..8191727 100644 +--- a/UUID.xs ++++ b/UUID.xs +@@ -356,29 +356,11 @@ PREINIT: + UV one = 1; + CODE: + RETVAL = (uuid_context_t *)PerlMemShared_malloc(sizeof(uuid_context_t)); +- if ((fd = fopen(UUID_STATE_NV_STORE, "rb"))) { +- fread(&(RETVAL->state), sizeof(uuid_state_t), 1, fd); +- fclose(fd); +- get_current_time(×tamp); +- RETVAL->next_save = timestamp; +- } +- if ((fd = fopen(UUID_NODEID_NV_STORE, "rb"))) { +- pid_t *hate = (pid_t *) &(RETVAL->nodeid); +- fread(&(RETVAL->nodeid), sizeof(uuid_node_t), 1, fd ); +- fclose(fd); +- +- *hate += getpid(); +- } else { ++ + get_random_info(seed); + seed[0] |= 0x80; + memcpy(&(RETVAL->nodeid), seed, sizeof(uuid_node_t)); +- mask = umask(_DEFAULT_UMASK); +- if ((fd = fopen(UUID_NODEID_NV_STORE, "wb"))) { +- fwrite(&(RETVAL->nodeid), sizeof(uuid_node_t), 1, fd); +- fclose(fd); +- }; +- umask(mask); +- } ++ + errno = 0; + #if DU_THREADSAFE + MUTEX_LOCK(&instances_mutex); +@@ -415,17 +397,6 @@ PPCODE: + self->state.node = self->nodeid; + self->state.ts = timestamp; + self->state.cs = clockseq; +- if (timestamp > self->next_save ) { +- mask = umask(_DEFAULT_UMASK); +- if((fd = fopen(UUID_STATE_NV_STORE, "wb"))) { +- LOCK(fd); +- fwrite(&(self->state), sizeof(uuid_state_t), 1, fd); +- UNLOCK(fd); +- fclose(fd); +- } +- umask(mask); +- self->next_save = timestamp + (10 * 10 * 1000 * 1000); +- } + ST(0) = make_ret(uuid, ix); + XSRETURN(1); + +@@ -585,14 +556,6 @@ CODE: + MUTEX_UNLOCK(&instances_mutex); + if (count == 0) { + #endif +- mask = umask(_DEFAULT_UMASK); +- if ((fd = fopen(UUID_STATE_NV_STORE, "wb"))) { +- LOCK(fd); +- fwrite(&(self->state), sizeof(uuid_state_t), 1, fd); +- UNLOCK(fd); +- fclose(fd); +- }; +- umask(mask); + PerlMemShared_free(self); + #if DU_THREADSAFE + } + diff --git a/third_party/nixpkgs/pkgs/development/pharo/default.nix b/third_party/nixpkgs/pkgs/development/pharo/default.nix new file mode 100644 index 0000000000..6e83a31d5d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/pharo/default.nix @@ -0,0 +1,99 @@ +{ cairo +, cmake +, fetchurl +, freetype +, gcc +, git +, gnumake +, lib +, libffi +, libgit2 +, libpng +, libuuid +, makeBinaryWrapper +, openssl +, pixman +, runtimeShell +, SDL2 +, stdenv +, unzip +}: +let + inherit (lib.strings) makeLibraryPath; + pharo-sources = fetchurl { + # It is necessary to download from there instead of from the repository because that archive + # also contains artifacts necessary for the bootstrapping. + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.5-2757766-Linux-x86_64-c-src.zip"; + hash = "sha256-i6WwhdVdyzmqGlx1Fn12mCq5+HnRORT65HEiJo0joCE="; + }; + library_path = makeLibraryPath [ + libgit2 + SDL2 + cairo + "$out" + ]; +in +stdenv.mkDerivation { + pname = "pharo"; + version = "10.0.5"; + src = pharo-sources; + + buildInputs = [ + cairo + libgit2 + libpng + pixman + SDL2 + ]; + + nativeBuildInputs = [ + cmake + freetype + gcc + git + gnumake + libffi + libuuid + makeBinaryWrapper + openssl + pixman + SDL2 + unzip + ]; + + cmakeFlags = [ + # Necessary to perform the bootstrapping without already having Pharo available. + "-DGENERATED_SOURCE_DIR=." + "-DGENERATE_SOURCES=OFF" + # Prevents CMake from trying to download stuff. + "-DBUILD_BUNDLE=OFF" + ]; + + installPhase = '' + runHook preInstall + + cmake --build . --target=install + mkdir -p "$out/lib" + mkdir "$out/bin" + cp build/vm/*.so* "$out/lib/" + cp build/vm/pharo "$out/bin/pharo" + patchelf --allowed-rpath-prefixes /nix/store --shrink-rpath "$out/bin/pharo" + wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Clean and innovative Smalltalk-inspired environment"; + homepage = "https://pharo.org"; + license = licenses.mit; + longDescription = '' + Pharo's goal is to deliver a clean, innovative, free open-source + Smalltalk-inspired environment. By providing a stable and small core + system, excellent dev tools, and maintained releases, Pharo is an + attractive platform to build and deploy mission critical applications. + ''; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix b/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix deleted file mode 100644 index d8d3bcb2cd..0000000000 --- a/third_party/nixpkgs/pkgs/development/pharo/launcher/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, stdenv, fetchurl, bash, pharo, unzip, makeDesktopItem }: - -stdenv.mkDerivation rec { - version = "2017.02.28"; - pname = "pharo-launcher"; - src = fetchurl { - url = "http://files.pharo.org/platform/launcher/PharoLauncher-user-stable-${version}.zip"; - sha256 = "1hfwjyx0c47s6ivc1zr2sf5mk1xw2zspsv0ns8mj3kcaglzqwiq0"; - }; - - executable-name = "pharo-launcher"; - - desktopItem = makeDesktopItem { - name = "Pharo"; - exec = executable-name; - icon = "pharo"; - comment = "Launcher for Pharo distributions"; - desktopName = "Pharo"; - genericName = "Pharo"; - categories = [ "Development" ]; - }; - - # because upstream tarball has no top-level directory. - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ bash pharo ]; - - installPhase = '' - mkdir -p $prefix/share/pharo-launcher - mkdir -p $prefix/bin - - mv PharoLauncher.image $prefix/share/pharo-launcher/pharo-launcher.image - mv PharoLauncher.changes $prefix/share/pharo-launcher/pharo-launcher.changes - - mkdir -p $prefix/share/applications - cp "${desktopItem}/share/applications/"* $out/share/applications - - cat > $prefix/bin/${executable-name} < $prefix/bin/pharo-cog <= 4.9 produces a - # binary that crashes when forking a child process. See: - # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html - # - # (stack protection is disabled above for gcc 4.8 compatibility.) - nativeBuildInputs = [ autoreconfHook unzip ]; - buildInputs = [ - bash - glibc - openssl - gcc48 - libGLU libGL - freetype - xorg.libX11 - xorg.libICE - xorg.libSM - alsa-lib - cairo - pharo-share - libuuid - ]; - - enableParallelBuilding = true; - - # Regenerate the configure script. - # Unnecessary? But the build breaks without this. - autoreconfPhase = '' - pushd platforms/unix/config - make - popd - ''; - - # Configure with options modeled on the 'mvm' build script from the vm. - configureScript = "platforms/unix/config/configure"; - configureFlags = [ "--without-npsqueak" - "--with-vmversion=5.0" - "--with-src=${vm}" ]; - - # -fcommon is a workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: vm/vm.a(cogit.o):/build/source/spur64src/vm/cointerp.h:358: multiple definition of `checkAllocFiller'; - # vm/vm.a(gcc3x-cointerp.o):/build/source/spur64src/vm/cointerp.h:358: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - CFLAGS = "-DPharoVM -DIMMUTABILITY=1 -msse2 -D_GNU_SOURCE -DCOGMTVM=0 -g -O2 -DNDEBUG -DDEBUGVM=0"; - LDFLAGS = "-Wl,-z,now"; - - # VM sources require some patching before build. - prePatch = '' - patchShebangs build.${flavor} - # Fix hard-coded path to /bin/rm in a script - sed -i -e 's:/bin/rm:rm:' platforms/unix/config/mkmf - # Fill in mandatory metadata about the VM source version - sed -i -e 's!\$Date\$!$Date: ${source-date} $!' \ - -e 's!\$Rev\$!$Rev: ${version} $!' \ - -e 's!\$URL\$!$URL: ${source-url} $!' \ - platforms/Cross/vm/sqSCCSVersion.h - ''; - - # Note: --with-vmcfg configure option is broken so copy plugin specs to ./ - preConfigure = '' - cp build."${flavor}"/pharo.cog.spur/plugins.{ext,int} . - ''; - - # (No special build phase.) - - installPhase = let - libs = [ - cairo - libgit2 - libGLU libGL - freetype - openssl - libuuid - alsa-lib - xorg.libICE - xorg.libSM - ]; - in '' - # Install in working directory and then copy - make install-squeak install-plugins prefix=$(pwd)/products - - # Copy binaries & rename from 'squeak' to 'pharo' - mkdir -p "$out" - cp products/lib/squeak/5.0-*/squeak "$out/pharo" - cp -r products/lib/squeak/5.0-*/*.so "$out" - ln -s "${pharo-share}/lib/"*.sources "$out" - - # Create a shell script to run the VM in the proper environment. - # - # These wrapper puts all relevant libraries into the - # LD_LIBRARY_PATH. This is important because various C code in the VM - # and Smalltalk code in the image will search for them there. - mkdir -p "$out/bin" - - # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${lib.makeLibraryPath libs} - - # Create the script - cat > "$out/bin/${cmd}" < -# -# Select a VM and run an image based on the image format number - -PATH=$PATH:@file@/bin - -# Search for the image filename in the command line arguments -for arg in $* $SQUEAK_IMAGE; do - case ${arg} in - -*) # ignore - ;; - *) # either an option argument or the image name - if test -e ${arg}; then - magic=$(file -L -b -m @magic@ "$arg") - case "$magic" in - "Smalltalk image V3 32b"*) - image=${arg} - vm=@cog32@/bin/pharo-cog - ;; - "Smalltalk image Spur 32b"*) - image=${arg} - vm=@spur32@/bin/pharo-spur - ;; - "Smalltalk image Spur 64b"*) - if [ "@spur64vm@" == "none" ]; then - echo "error: detected 64-bit image but 64-bit VM is not available" >&2 - exit 1 - fi - image=${arg} - vm=@spur64@/bin/pharo-spur64 - ;; - esac - fi - ;; - esac -done - -# Print a message to explain our DWIM'ery. -if [ -n "$image" ]; then - echo "using VM selected by image type." - echo " image: $image" - echo " type: $magic" - echo " vm: $vm" -else - echo "using default vm; image type not detected" - vm=@cog32@/bin/pharo-cog -fi - -# Run the VM -set -f -exec -- "${vm}" "$@" - diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index df6e87d5a5..00086dfedc 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -2,14 +2,14 @@ let pname = "phpstan"; - version = "1.10.15"; + version = "1.10.26"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-zGrAgQttAvGdRpuOB3V/GprMzc2NMya4d3MY1SIfYOQ="; + sha256 = "sha256-YDRUVctcUs9wUyL/rCUT9W9at+0118VpbV371+amyvg="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix index 264df9fddb..fd0f56924f 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix @@ -31,7 +31,7 @@ buildPecl rec { session ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; configureFlags = [ "--enable-snuffleupagus" diff --git a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index a64c1e3ebe..61e83d9187 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub }: let - version = "3.2.1"; + version = "3.2.2"; in buildPecl { inherit version; @@ -11,7 +11,7 @@ in buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - sha256 = "sha256-WKvMnn8yp6JBFu7xzPOt6sdg5JE8SRniLZbSBvi3ecQ="; + hash = "sha256-zbgJw2oPzyUTK0UwLAqpShBi+toVsEQcjoG4tIBder0="; }; doCheck = true; @@ -19,11 +19,11 @@ in buildPecl { zendExtension = true; - meta = with lib; { + meta = { changelog = "https://github.com/xdebug/xdebug/releases/tag/${version}"; description = "Provides functions for function traces and profiling"; - license = licenses.php301; homepage = "https://xdebug.org/"; - maintainers = teams.php.members; + license = lib.licenses.php301; + maintainers = lib.teams.php.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix index 4f4cfea37c..c2bb581133 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -24,12 +24,12 @@ let in buildPythonPackage rec { pname = "cython"; - version = "0.29.34"; + version = "0.29.36"; src = fetchPypi { pname = "Cython"; inherit version; - hash = "sha256-GQloj117Uhpgw5bSC7qeR6Gy0nhL+whUAeHh59KaKag="; + hash = "sha256-QcDP0tdU44PJ7rle/8mqSrhH0Ml0cHfd18Dctow7wB8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix index 83db24896c..3b92fc06a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/aardwolf/utils/rlers"; + sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; hash = "sha256-JGXTCCyC20EuUX0pP3xSZG3qFB5jRL7+wW2YRC3EiCc="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix index 4de49a21a8..9aefa22948 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix @@ -2,6 +2,8 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch +, pythonAtLeast , pythonOlder , pytestCheckHook , setuptools @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.19.0"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,9 +27,18 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gW4wCpkyxoWfxXu8UHZfgopSQhOoPhGgqEqFiHJ+Db4="; + hash = "sha256-BwM3gyNhsRkxtxLNrycUGwBmXf8eq/7b56/ykMryt5w="; }; + patches = [ + # fix import error when torch>=2.0.1 and torch.distributed is disabled + # https://github.com/huggingface/accelerate/pull/1800 + (fetchpatch { + url = "https://github.com/huggingface/accelerate/commit/32701039d302d3875c50c35ab3e76c467755eae9.patch"; + hash = "sha256-Hth7qyOfx1sC8UaRdbYTnyRXD/VRKf41GtLc0ee1t2I="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -53,15 +64,25 @@ buildPythonPackage rec { # try to download data: "FeatureExamplesTests" "test_infer_auto_device_map_on_t0pp" - # known failure with Torch>2.0; see https://github.com/huggingface/accelerate/pull/1339: - # (remove for next release) - "test_gradient_sync_cpu_multi" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # RuntimeError: torch_shm_manager: execl failed: Permission denied + "CheckpointTest" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # python3.11 not yet supported for torch.compile + "test_dynamo_extract_model" ]; - # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: - doCheck = !stdenv.isDarwin; + + disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ + # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: + "tests/test_cpu.py" + "tests/test_grad_sync.py" + "tests/test_metrics.py" + "tests/test_scheduler.py" + ]; + pythonImportsCheck = [ "accelerate" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix index 7c6d33512b..8b67fa4d9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix @@ -75,6 +75,6 @@ buildPythonPackage rec { description = "Accurate sums and dot products for Python"; homepage = "https://github.com/nschloe/accupy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix index 97e725bb71..531ed8ae8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acme/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "acme" ]; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; meta = certbot.meta // { description = "ACME protocol implementation in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix index 2f3549efb0..0f1e20041a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 337e6fb245..d9fe80fcba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.47.0"; + version = "3.49.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-42YG+brxKCo16xp72+EhmCkgABC2BAFYNWTKqTT1jeE="; + hash = "sha256-bLwPnKLOdk8scKF4hQgkBXRoz0Ph6/pcRLlJdN+cDoA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix index 37c0a26b3b..b0af50573a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-uknXi7fsCWK5ngCEyfpkjovCtvL5v6OwN5kVoBpNZsY="; + hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix index 8140b0e82a..9d1e0ee96b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix @@ -1,6 +1,10 @@ { lib , fetchFromGitHub , buildPythonPackage +, packaging +, setuptools +, pkgconfig +, freetype , pytest , python , pillow @@ -10,6 +14,7 @@ buildPythonPackage rec { pname = "aggdraw"; version = "1.3.16"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytroll"; @@ -18,6 +23,16 @@ buildPythonPackage rec { hash = "sha256-2yajhuRyQ7BqghbSgPClW3inpw4TW2DhgQbomcRFx94="; }; + nativeBuildInputs = [ + packaging + setuptools + pkgconfig + ]; + + buildInputs = [ + freetype + ]; + nativeCheckInputs = [ numpy pillow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 178e609a06..ab46608dde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.59"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1AlmVRiGrYe0fS5Ny1JzyA2gGWKaUVioeZQTGhwMoaM="; + hash = "sha256-a4YRbFOnBTGte52wYlAsh9o4+x+dugHGhU6kboSdU2c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix index f69358a130..db3f27b5d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-mfygibuKSkBrVZ+zILCAYnfzEvrzD7ZXbUtTSZ54rVk="; + hash = "sha256-GOt6oFf1ogxODrgs6/OdgTjA1UNyiNZOPFr+0DRgz0M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix index 5d8c934e42..8bdc72a019 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "AMQP implementation using asyncio"; homepage = "https://github.com/polyconseil/aioamqp"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix index 090b98b9ff..1845a25016 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XR79o65jZFR9jr9ubw7wdxCWNH8ANMrBDTVpLnetsuU="; + hash = "sha256-axUJLh7yg2A+HB0fxBueuNT/rohHVq6svQUZvR2LKzo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix index 9684dc406a..24f6f1b2e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Asyncio support for PEP-567 contextvars backport"; homepage = "https://github.com/fantix/aiocontextvars"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 3badcb481a..b126a756b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "15.1.6"; + version = "15.1.15"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9wz8h0FwkjQywNLEL7gpYdlh+CwMrdUYZtfGw5/i2ME="; + hash = "sha256-qNljw3V0rfMb6GDtTd+jy/hHBaM3kc9y+RCEoNTKHFM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 7cb4fec4a4..290935e8c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Python FTP client/server for asyncio"; homepage = "https://github.com/aio-libs/aioftp"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix new file mode 100644 index 0000000000..ab5499f7ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, aiohttp +, aiohttp-socks +, aioredis +, aresponses +, babel +, certifi +, magic-filter +, pytest-asyncio +, pytest-lazy-fixture +, redis +}: + +buildPythonPackage rec { + pname = "aiogram"; + version = "2.25.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiogram"; + repo = "aiogram"; + rev = "v${version}"; + hash = "sha256-g8nuvna7DpXElvjBehnGKHUsrf+nyQcoKNnyR59RALo="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp>=3.8.0,<3.9.0" "aiohttp" \ + --replace "Babel>=2.9.1,<2.10.0" "Babel" \ + --replace "magic-filter>=1.0.9" "magic-filter" + ''; + + propagatedBuildInputs = [ + aiohttp + babel + certifi + magic-filter + ]; + + nativeCheckInputs = [ + aiohttp-socks + aioredis + aresponses + pytest-asyncio + pytest-lazy-fixture + pytestCheckHook + redis + ]; + + pythonImportsCheck = [ "aiogram" ]; + + meta = with lib; { + description = "Modern and fully asynchronous framework for Telegram Bot API"; + homepage = "https://github.com/aiogram/aiogram"; + changelog = "https://github.com/aiogram/aiogram/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index 104b7d67b3..c0d8da7837 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , aiocoap +, async-interrupt , bleak , bleak-retry-connector , chacha20poly1305 @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.7"; + version = "2.6.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Yzya4sSIjiTLZTy2MTIfyN/yaS/BWN+rCFukWCJ4ijA="; + hash = "sha256-a1qxj/6VCnTqfcCfvjjnfM53JjJXP672wumGCvXwxUY="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiocoap + async-interrupt bleak bleak-retry-connector chacha20poly1305 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 75449c9f62..92f1fbd538 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -48,6 +48,12 @@ buildPythonPackage rec { url = "https://github.com/aio-libs/aiohttp/commit/5718879cdb6a98bf48810a994b78bc02abaf3e07.patch"; hash = "sha256-4UynkTZOzWzusQ2+MPZszhFA8I/PJNLeT/hHF/fASy8="; }) + (fetchpatch { + # https://github.com/aio-libs/aiohttp/pull/7260 + # Merged upstream, should likely be dropped post-3.8.4 + url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; + hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix index 1335db763d..849e51314d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://aiokafka.readthedocs.org"; changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix index 2570552ca7..045168b8d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.4"; + version = "17.3.21"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MSLZWBgky3PwQxBs1Mj8h/HcerlvzpFvNEZAPoidRpc="; + hash = "sha256-NaSwjU4SfUYeUe/3nWQxfgMYrN4Ez1Dc/PE4ffJmlSs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix new file mode 100644 index 0000000000..17f2cb45e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +# build-system +, poetry-core +, poetry-dynamic-versioning + +# dependencies +, paho-mqtt +, typing-extensions + +# tests +, anyio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiomqtt"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "sbtinstruments"; + repo = "aiomqtt"; + rev = "v${version}"; + hash = "sha256-ct4KIGxiC5m0yrid0tOa/snO9oErxbqhLLH9kD69aEQ="; + }; + + patches = [ + (fetchpatch { + # adds test marker for network access + url = "https://github.com/sbtinstruments/aiomqtt/commit/225c1bfc99bc6ff908bd03c1115963e43ab8a9e6.patch"; + hash = "sha256-UMEwCoX2mWBA7+p+JujkH5fc9sd/2hbb28EJ0fN24z4="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + + propagatedBuildInputs = [ + paho-mqtt + typing-extensions + ]; + + pythonImportsCheck = [ "aiomqtt" ]; + + nativeCheckInputs = [ + anyio + pytestCheckHook + ]; + + pytestFlagsArray = [ + "-m" "'not network'" + ]; + + meta = with lib; { + description = "The idiomatic asyncio MQTT client, wrapped around paho-mqtt"; + homepage = "https://github.com/sbtinstruments/aiomqtt"; + changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index 0e3fde70d7..80bc2b2a05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -27,6 +27,12 @@ buildPythonPackage rec { hash = "sha256-hLUITEPUoUKGqN3AnacahnKwoKdfGN3mp34df74gsbE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=src --cov-report=term-missing:skip-covered" "" \ + --replace 'marshmallow = "^3.17"' 'marshmallow = "*"' \ + --replace 'awesomeversion = "^22.6"' 'awesomeversion = "*"' + ''; nativeBuildInputs = [ poetry-core ]; @@ -45,12 +51,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=src --cov-report=term-missing:skip-covered" "" \ - --replace 'marshmallow = "^3.17"' 'marshmallow = "*"' - ''; - pythonImportsCheck = [ "aiomysensors" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix index d9a2569391..3262ec4a1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "MySQL driver for asyncio"; homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix index 03aa8543ff..85561d6472 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiooss2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.6"; + version = "0.2.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-VVfDH9QWF9gBhd2pOjKH5+VdNSvl1q0iauAbo88wNaM="; + hash = "sha256-eMmJpX7bjX5r6GW9N5KmLQpo5V8i6F95TfInct34a2g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix index e4afdbadbf..602128265f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.2.1"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gfF/SFfiZgkWH0cQZF3hxEp6xxRi46nfDBB23Gerv5g="; + hash = "sha256-k02lNjFjOcMfHa1jLJlMFUOOVrdTrACNoEXDSZ693K8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix index 82c6df7413..1103d095d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/cjrh/aiorun"; changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix index c2cdb28e39..af681eec8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "2.3.2"; + version = "2.3.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vKIqBbWQNgv1v73P6K51K+yaqXgC1BtllZ59yTNPr2g="; + hash = "sha256-d+PEzCF1Cw/7NmumxIRRlr3hojpNsZM/JMQ0KWdosXk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix index e9047034c8..97cad03a20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.14"; + version = "0.0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-YVZSqTynlAH7y6vH07wsFCLMWnde/cBx4jjfJ4ZV3LA="; + hash = "sha256-G7A5XXAElPFkuRM5bEcKqqn14tjJLn2lkYyqBtm5giM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix index 6e9ffec337..2da12df9ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/jreese/aiosqlite"; changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 70f1690a2e..d99ff10cfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aioresponses +, async-timeout , buildPythonPackage , fetchFromGitHub , orjson @@ -8,11 +9,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, segno }: buildPythonPackage rec { pname = "aiounifi"; - version = "49"; + version = "51"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,12 +23,14 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GZ++R8NUhpUQbeNhavWnIhk1AuPnEAAHRq9ZYdeHFDc="; + hash = "sha256-XR/yZLxTHVHxm/QLCKrp9XFJ7yZybPjPxKEhf1SOzD0="; }; propagatedBuildInputs = [ aiohttp + async-timeout orjson + segno ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix index e890ed7e20..4cc8203625 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Test asyncio code more easily"; homepage = "https://github.com/kwarunek/aiounittest"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix new file mode 100644 index 0000000000..e2104641b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, opencv4 +, pyyaml +, qudida +, scikit-image +, scipy +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "albumentations"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pqODiP5UbFaAcejIL0FEmOhsntA8CLWOeoizHPeiRMY="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "opencv-python" + ]; + + propagatedBuildInputs = [ + numpy + opencv4 + pyyaml + qudida + scikit-image + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # this test hangs up + "test_transforms" + ]; + + pythonImportsCheck = [ "albumentations" ]; + + meta = with lib; { + description = "Fast image augmentation library and easy to use wrapper around other libraries"; + homepage = "https://github.com/albumentations-team/albumentations"; + changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 15170b8201..43f132b190 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.54.0"; + version = "8.55.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hNEtZQOfhnGNeXkR44fgDKrP+Nut0rqcLlnrDdcuOM4="; + hash = "sha256-cLiOdXZpjZUVJ0O0rykM6GQH0pXaiMQp1zH6kuDLqOY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix index a59a0a9f70..31bc1229e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , setuptools }: @@ -10,14 +10,19 @@ buildPythonPackage rec { version = "2.5.1"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-9p0xo7Vu7hGdHsYGPpxzLdRPu6NS73OMsi2WmfxACf4="; + src = fetchFromGitHub { + owner = "thombashi"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-0wzoQDHB7Tt80ZTlKrNxFutztsgUuin5D2eb80c4PBI="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook - setuptools ]; pythonImportsCheck = [ @@ -29,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/thombashi/allpairspy"; changelog = "https://github.com/thombashi/allpairspy/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix index b939e508bb..82a4fc9d78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -1,62 +1,74 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, entrypoints -, glibcLocales -, ipython -, jinja2 -, jsonschema -, numpy -, pandas -, pytestCheckHook +{ lib +, buildPythonPackage +, fetchFromGitHub , pythonOlder -, recommonmark -, six -, sphinx + +# Runtime dependencies +, hatchling , toolz -, typing ? null +, numpy +, jsonschema +, typing-extensions +, pandas +, jinja2 +, importlib-metadata + +# Build, dev and test dependencies +, ipython +, pytestCheckHook , vega_datasets +, sphinx }: buildPythonPackage rec { pname = "altair"; - version = "4.2.2"; - disabled = isPy27; + version = "5.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OTmaJnxJsw0QLBBBHmerJjdBVqhLGuufzRUUBCm6ScU="; + src = fetchFromGitHub { + owner = "altair-viz"; + repo = "altair"; + rev = "refs/tags/v${version}"; + hash = "sha256-7bTrfryu4oaodVGNFNlVk9vXmDA5/9ahvCmvUGzZ5OQ="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ - entrypoints + jinja2 jsonschema numpy pandas - six toolz - jinja2 - ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata + ++ lib.optional (pythonOlder "3.11") typing-extensions; nativeCheckInputs = [ - glibcLocales ipython - pytestCheckHook - recommonmark sphinx vega_datasets + pytestCheckHook ]; pythonImportsCheck = [ "altair" ]; - # avoid examples directory, which fetches web resources - preCheck = '' - cd altair/tests - ''; + disabledTestPaths = [ + # Disabled because it requires internet connectivity + "tests/test_examples.py" + # TODO: Disabled because of missing altair_viewer package + "tests/vegalite/v5/test_api.py" + # avoid updating files and dependency on black + "tests/test_toplevel.py" + ]; meta = with lib; { description = "A declarative statistical visualization library for Python."; - homepage = "https://github.com/altair-viz/altair"; + homepage = "https://altair-viz.github.io"; + downloadPage = "https://github.com/altair-viz/altair"; license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - platforms = platforms.unix; + maintainers = with maintainers; [ teh vinetos ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/altgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/altgraph/default.nix new file mode 100644 index 0000000000..0f2321c81e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/altgraph/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "altgraph"; + version = "0.17.3"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "ad33358114df7c9416cdb8fa1eaa5852166c505118717021c6a8c7c7abbd03dd"; + }; + + pythonImportsCheck = [ "altgraph" ]; + + meta = with lib; { + changelog = "https://github.com/ronaldoussoren/altgraph/tags${version}"; + description = "A fork of graphlib: a graph (network) package for constructing graphs"; + longDescription = '' + altgraph is a fork of graphlib: a graph (network) package for constructing graphs, + BFS and DFS traversals, topological sort, shortest paths, etc. with graphviz output. + altgraph includes some additional usage of Python 2.6+ features and enhancements related to modulegraph and macholib. + ''; + homepage = "https://altgraph.readthedocs.io/"; + downloadPage = "https://pypi.org/project/altgraph/"; + license = licenses.mit; + maintainers = with maintainers; [ septem9er ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index 856869445d..f2afe52783 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.70"; + version = "0.0.71"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-LKV5aO3sptHz48UYpP+zPk6pPhyHAZWAxiTTIWKHiSg="; + hash = "sha256-vFEMOGxkt4zfOeKTKwr2tcBUSYRPSWNlaKUVcPIM34w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix index a876cf5e18..9640906d16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtvremote2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.0.11"; + version = "0.0.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; rev = "refs/tags/v${version}"; - hash = "sha256-mjhohkAC6g2UJgPbq/29Awyy6c4M8SnLqr5v5g7+IeE="; + hash = "sha256-+9VVUIvM//Fxv1a/+PAKWSQE8/TgBZzeTisgMqj6KPU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 49770ce16d..9d06b45a3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.59"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wel6IxZMAztJj3NZi0hIYMgLa1hsO0apFa6Y29B1Hkg="; + hash = "sha256-GyX0LBXABRRQj3bVW8whxp2T5CSPnfI/Vjlj5V4MqrE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index 8c2bef9746..c18343d46f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "4.1.2"; + version = "4.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aWFi28EiPAtHQTamFmKz/kQRXUkN6NpgaxSc7lcrAe0="; + hash = "sha256-WXyDahhMETH+62sOI82iNsQf7N7mRCc3Unj7aSD9LnQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix index 3a8c871ea5..4acdddb523 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-kernel/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "An Ansible kernel for Jupyter"; homepage = "https://github.com/ansible/ansible-jupyter-kernel"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index ec64e2919e..09cb189f40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -105,6 +105,6 @@ buildPythonPackage rec { description = "Helps when interfacing with Ansible"; homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-vault-rw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-vault-rw/default.nix new file mode 100644 index 0000000000..b5a4c7a036 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-vault-rw/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, ansible-core, ... }: + +buildPythonPackage rec { + pname = "ansible-vault-rw"; + version = "2.1.0"; + src = fetchPypi { + pname = "ansible-vault"; + inherit version; + sha256 = "sha256-XOj9tUcPFEm3a/B64qvFZIDa1INWrkBchbaG77ZNvV4"; + }; + propagatedBuildInputs = [ ansible-core ]; + + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "This project aim to R/W an ansible-vault yaml file."; + homepage = "https://github.com/tomoh1r/ansible-vault"; + changelog = + "https://github.com/tomoh1r/ansible-vault/blob/master/CHANGES.txt"; + license = licenses.gpl3; + maintainers = with maintainers; [ StillerHarpo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 4e95959127..241e9cbd03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -27,11 +27,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.1"; + version = "2.15.2"; src = fetchPypi { inherit pname version; - hash = "sha256-7SjrSUPkgABO3Juh6b7peaBlDLL5Nyzkor1XKDjGDSs="; + hash = "sha256-hCUbAB8vnAkUvu3/zxlSnnRaExCBWdH+J96eOmpjrFo="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix index 3dc3a8df13..7e55912bed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/jonathaneunice/ansiwrap"; changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index c1812f3327..b9248fcb87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -1,43 +1,55 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub +, poetry-core +, anyio +, distro , httpx -, importlib-metadata -, requests +, pydantic +, pytest-asyncio +, respx , tokenizers -, aiohttp +, typing-extensions +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "anthropic"; - version = "0.2.10"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-5NoGGobY/7hgcsCw/q8hmjpPff3dQiTfm6dp5GlJjBk="; + src = fetchFromGitHub { + owner = "anthropics"; + repo = "anthropic-sdk-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-dfMlM7IRP1PG7Ynr+MR4OPeKnHBbhhWKSug7UQ4/4rI="; }; nativeBuildInputs = [ - setuptools + poetry-core ]; propagatedBuildInputs = [ + anyio + distro httpx - requests + pydantic tokenizers - aiohttp - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata + typing-extensions ]; - # try downloading tokenizer in tests - # relates https://github.com/anthropics/anthropic-sdk-python/issues/24 - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + disabledTests = [ + "api_resources" + ]; pythonImportsCheck = [ "anthropic" @@ -49,5 +61,6 @@ buildPythonPackage rec { changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 4f5f25d015..39fef995bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { inherit (antlr4.runtime.cpp) version src; disabled = python.pythonOlder "3.6"; - sourceRoot = "source/runtime/Python3"; + sourceRoot = "${src.name}/runtime/Python3"; # in 4.9, test was renamed to tests checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index ecae25b067..c8bd564697 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { "pyarrow" ]; - sourceRoot = "source/sdks/python"; + sourceRoot = "${src.name}/sdks/python"; nativeBuildInputs = [ cython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix index e3ead0e916..dab433e161 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 64264812b1..58b6cc6c6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.59"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6ELsHKtflvJDmWJDGY73j1J88J/8qt+pFE3rmUMXl2w="; + hash = "sha256-7PNwJMsX3Z/j+zy9CgEvCRpbyJi9qI7ex6KJXwkywgU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix index c04310d28b..24b9668d12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.12.0"; + version = "1.13.2"; optional-dependencies = { server = [ fastapi @@ -125,8 +125,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "argilla-io"; repo = pname; - rev = "v${version}"; - hash = "sha256-NImtS2bbCfbhbrw12xhGdZp/JVfrB6cHnUHYX3xJ7tw="; + rev = "refs/tags/v${version}"; + hash = "sha256-FCPlEbgViWZEyXpdtaa6pJxpgbSXmcfJX/1RUFF7Zs4="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix index 96a42b68a4..8c7da464c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix @@ -6,19 +6,14 @@ buildPythonPackage rec { pname = "arpeggio"; - version = "2.0.0"; + version = "2.0.2"; src = fetchPypi { pname = "Arpeggio"; inherit version; - hash = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0="; + hash = "sha256-x5CysG4ibS3UaOT7+1t/UGzsZkFgMf3hRBzx3ioLpwA="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" - ''; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "arpeggio" ]; @@ -27,6 +22,6 @@ buildPythonPackage rec { description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)"; homepage = "https://github.com/textX/Arpeggio"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix index 9e0ac79eef..ad978efffb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Draws ASCII trees"; homepage = "https://github.com/mbr/asciitree"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix index 406a7ee619..0363eae291 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -93,6 +93,6 @@ buildPythonPackage rec { description = "Python tools to handle ASDF files"; homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix index 058bfe8f34..cad89cd576 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Atomic Simulation Environment"; homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix index b9275db05d..11fd868ebd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Reference ASGI adapters and channel layers"; homepage = "https://github.com/django/asgiref"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix index 9bda0a9e66..8bc58e992c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "ASN.1 parsing, encoding and decoding"; homepage = "https://github.com/eerimoq/asn1tools"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix index 49cf9e21a3..1af34b43fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Python wrapper for aspell (C extension and Python version)"; homepage = "https://github.com/WojciechMula/aspell-python"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix index ccb21a7667..49abd982a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.30"; + version = "0.9.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "newville"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vKPMA8yiTNQPYehDVo6mleOv82ZNxHgi8P/HIOZb9/o="; + hash = "sha256-XIRDm/loZOOPQ7UO/XAo86TzhtHHRrnWFU7MNI4f1vM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix index a3ce19b4fb..fa78f2f5fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "An abstract syntax tree for Python with inference support"; homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-interrupt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-interrupt/default.nix new file mode 100644 index 0000000000..b6e16f5496 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-interrupt/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "async-interrupt"; + version = "1.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "async_interrupt"; + rev = "refs/tags/v${version}"; + hash = "sha256-mbvOj1ybCkDNr3je3PtFwmddkh2k/nHOerpC6hGSUYI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=async_interrupt --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "async_interrupt" + ]; + + meta = with lib; { + description = "Context manager to raise an exception when a future is done"; + homepage = "https://github.com/bdraco/async_interrupt"; + changelog = "https://github.com/bdraco/async_interrupt/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix index 031b8f540c..2f4ef7262a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "async-lru"; - version = "2.0.3"; + version = "2.0.4"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "async-lru"; rev = "refs/tags/v${version}"; - hash = "sha256-5NlcufnCqcB8k8nscFJGwlpEbDJG5KAEwWBat5dvI84="; + hash = "sha256-S2sOkgtS+YdMtVP7UHD3+oR8Fem8roLhhgVVfh33PcM="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 13cbb66055..a3ca61f986 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.34.0"; + version = "0.34.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-nowtQbgYkXOHQcbjlPDzhJORzSla1gmUoW9qrW0QujE="; + hash = "sha256-Ktl6YVYd8QpC6eaz3Xe6YyJZhB92ZLL9/XG4WSc2qS8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix index c5f944d6a5..9257e12f72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.1"; + version = "4.0.2"; format = "flit"; src = fetchFromGitLab { owner = "Taywee"; repo = "asyncinotify"; rev = "v${version}"; - hash = "sha256-DMRuj16KjO+0uAB33UCVPdUiQGzri1b/z9KVqQYp2Po="; + hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index 7e36099f18..0ad561ebfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiofiles , aiosqlite , buildPythonPackage @@ -60,6 +61,17 @@ buildPythonPackage rec { "asyncua" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Failed: DID NOT RAISE + "test_publish" + # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... + "test_anonymous_rejection" + "test_certificate_handling_success" + "test_encrypted_private_key_handling_success" + "test_encrypted_private_key_handling_success_with_cert_props" + "test_encrypted_private_key_handling_failure" + ]; + meta = with lib; { description = "OPC UA / IEC 62541 Client and Server for Python"; homepage = "https://github.com/FreeOpcUa/opcua-asyncio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix index 1b71b66a63..7b32dc9b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix @@ -86,6 +86,6 @@ buildPythonPackage rec { description = "Atomistic Manipulation Toolkit"; homepage = "https://github.com/usnistgov/atomman/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix index b47621730b..f9977ec841 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/mjdrushton/atsim-potentials"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index 19066c748d..44599435f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-enSG8rO0gMpSaf6otdx94xncyxc6Uv570VKVVQkit1g="; + hash = "sha256-Yf8/NmQygdikQXv9sUukQEKKd+FcpSPnGbbi8kzVyLo="; }; propagatedBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/auth0/auth0-python"; changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index a491dfaf94..363763efd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -108,6 +108,6 @@ buildPythonPackage rec { description = "WebSocket and WAMP in Python for Twisted and asyncio"; homepage = "https://crossbar.io/autobahn"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix index 009c0992bf..ca9eaf6684 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = " Autocommand turns a python function into a CLI program "; homepage = "https://github.com/Lucretiel/autocommand"; license = licenses.lgpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix index 5abb1a384d..301e71a0a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix @@ -43,6 +43,6 @@ let automat = buildPythonPackage rec { homepage = "https://github.com/glyph/Automat"; description = "Self-service finite-state machines for the programmer on the go"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in automat diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index fd2f0aa77b..d838a0f287 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "22.9.0"; + version = "23.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - hash = "sha256-OQArggd7210OyFpZKm3kr3fFbakIDG7U3WBNImAAobw="; + hash = "sha256-3bHE3U4MM/fQM9zBYfoLpAObay82vchjX9FpJukMGNg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index 504748f033..47d0039e5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { azure-nspkg ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup - postInstall = if isPy3k then "" else '' + postInstall = lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 4aaee3f68f..08b3c76322 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; + hash = "sha256-abhavAmuZPxyl1vUNDEXDYx+tdFmdUuYqsXzhF3lfcQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index b72ffdd4ea..25dfe383e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.4.0"; + version = "13.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA="; + hash = "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix index 28043046d8..dfd7ac2a3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { msrestazure ]; - postInstall = if isPy3k then "" else '' + postInstall = pkgs.lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index e76e593d29..5a3cb3a370 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.0.0"; + version = "30.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg="; + hash = "sha256-pWN525DU4kwHi8h0XQ5fdzIp+e8GfNcSwQ+qmIYVp1s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index c39d5a7c2a..e3ec3ee71b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "24.0.0"; + version = "25.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-sUp3LDVsc1DmVf4HdaXGSDeEvmAE2weSHHTxL/BwRk8="; + hash = "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index b4321d50db..5195c0102d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc="; + hash = "sha256-zgkFMrufHoX3gq9QXo8SlJYZOfV5GlY3pVQXmIWyx7c="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 4bd9877c48..46061f5a00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "10.0.0"; + version = "10.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9+cXsY8Qr5ds9lYw39duWdcqm6QUTedQbjn8x6zJoyE="; + hash = "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index aacdf91ded..b0bdd1c086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "23.1.0"; + version = "24.0.0"; pname = "azure-mgmt-network"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-NxcmmRE4MdfOG7naNcY1AHxzz/xUmoWlj1VUK1SxK/M="; + hash = "sha256-LtahQ2PnJC2jlD3pHp+IBLaUaNXTamZqdFdE/iJ4840="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix index e4590daa63..a97224b5c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { changelog = "https://github.com/python-babel/babel/releases/tag/v${version}"; description = "Collection of internationalizing tools"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index bfec97496a..88e140ad82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Backport of Python 3.11's datetime.fromisoformat"; homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 9ff04e0e50..669f997f6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Compatibility shim providing selectable entry points for older implementations"; homepage = "https://github.com/jaraco/backports.entry_points_selectable"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix deleted file mode 100644 index 6086178c95..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, future }: - -buildPythonPackage rec { - - pname = "backports.csv"; - version = "1.0.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj"; - }; - - propagatedBuildInputs = [ future ]; - - meta = with lib; { - description = "Backport of Python 3 csv module"; - homepage = "https://github.com/ryanhiebert"; - license = licenses.psfl; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix deleted file mode 100644 index 0045a79503..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -, isPy3k -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "backports.functools_lru_cache"; - version = "1.6.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - # Test fail on Python 2 - doCheck = isPy3k; - - pythonNamespaces = [ "backports" ]; - - meta = { - description = "Backport of functools.lru_cache"; - homepage = "https://github.com/jaraco/backports.functools_lru_cache"; - license = lib.licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix deleted file mode 100644 index 0e0f3ac033..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, unittestCheckHook -, buildPythonPackage -, fetchPypi -, setuptools-scm -, backports_weakref -}: - -buildPythonPackage rec { - pname = "backports.tempfile"; - version = "1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762"; - }; - - buildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ backports_weakref ]; - - # requires https://pypi.org/project/backports.test.support - doCheck = false; - - nativeCheckInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "-s" "tests" ]; - - meta = { - description = "Backport of new features in Python's tempfile module"; - license = lib.licenses.psfl; - homepage = "https://github.com/pjdelport/backports.tempfile"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix deleted file mode 100644 index bf81efce8d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, mock }: - -buildPythonPackage rec { - pname = "backports.unittest_mock"; - version = "1.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "eff58e53de8fdeb27a1c87a9d57e7b91d15d1bc3854e85344b1a2e69f31ecda7"; - }; - - propagatedBuildInputs = [ mock ]; - - buildInputs = [ setuptools-scm ]; - - # does not contain tests - doCheck = false; - pythonImportsCheck = [ "backports.unittest_mock" ]; - - meta = with lib; { - description = "Provides a function install() which makes the mock module"; - homepage = "https://github.com/jaraco/backports.unittest_mock"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix deleted file mode 100644 index 2a0ef0b432..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools-scm -# , backports -, unittestCheckHook -}: - -buildPythonPackage rec { - pname = "backports.weakref"; - version = "1.0.post1"; - src = fetchPypi { - inherit pname version; - sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2"; - }; - - buildInputs = [ setuptools-scm ]; -# nativeCheckInputs = [ backports ]; - - # Requires backports package - doCheck = false; - - nativeCheckInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "tests" ]; - - meta = with lib; { - description = "Backports of new features in Python’s weakref module"; - license = licenses.psfl; - maintainers = with maintainers; [ jyp ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix index 714f4aa6b4..4546843dbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix @@ -10,21 +10,16 @@ buildPythonPackage rec { pname = "bandcamp-api"; - version = "0.1.15"; + version = "0.2.2"; format = "setuptools"; src = fetchPypi { pname = "bandcamp_api"; inherit version; - hash = "sha256-4pnUiAsOLX1BBQjOhUkjSyHnGyQ3rx3JAFFYgEMLpG4="; + hash = "sha256-v/iACVcBFC/3x4v7Q/1p+aHGhfw3AQ43eU3sKz5BskI="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace bs4 beautifulsoup4 - ''; - propagatedBuildInputs = [ beautifulsoup4 demjson3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix index ebdbbe4d15..158c3f3f19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "basemap-data"; inherit (basemap) version src; - sourceRoot = "source/packages/basemap_data"; + sourceRoot = "${src.name}/packages/basemap_data"; # no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix index 8db89a4326..578fd84db7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-oWKCUARTMCiXDp4SCOOrOUQLUDU4DIzwsmUXCXoDvx0="; }; - sourceRoot = "source/packages/basemap"; + sourceRoot = "${src.name}/packages/basemap"; nativeBuildInputs = [ cython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix index 09023536a9..70c64827a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers"; homepage = "https://jupyter.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix index 9d173187ef..0b7d04c69e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.29"; + version = "1.4.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-oMJMiXS4/OU5/LWV2i2CcDQZL5yuusXGwgZG2OMMlaQ="; + hash = "sha256-wq+SKOiMcVO7OiK+RdRk4RNsjSAT7lBdAjLHfurSIRo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcf/default.nix new file mode 100644 index 0000000000..03b53ca2e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcf/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, click +, colorama +, intelhex +, packaging +, pyaml +, pyftdi +, pyserial +, requests +, schema +}: +buildPythonPackage rec { + pname = "bcf"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-firmware-tool"; + rev = "v${version}"; + sha256 = "i28VewTB2XEZSfk0UeCuwB7Z2wz4qPBhzvxJIYkKwJ4="; + }; + + postPatch = '' + sed -ri 's/@@VERSION@@/${version}/g' \ + bcf/__init__.py setup.py + ''; + + propagatedBuildInputs = [ + appdirs + click + colorama + intelhex + packaging + pyaml + pyftdi + pyserial + requests + schema + ]; + + pythonImportsCheck = [ "bcf" ]; + doCheck = false; # Project provides no tests + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-firmware-tool"; + description = "HARDWARIO Firmware Tool"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcg/default.nix new file mode 100644 index 0000000000..ce32e61ff8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcg/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, click +, click-log +, paho-mqtt +, pyaml +, pyserial +, schema +, simplejson +}: +buildPythonPackage rec { + pname = "bcg"; + version = "1.17.0"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-gateway"; + rev = "v${version}"; + sha256 = "2Yh5MeIv+BIxjoO9GOPqq7xTAFhyBvnxPy7DeO2FrkI="; + }; + + postPatch = '' + sed -ri 's/@@VERSION@@/${version}/g' \ + bcg/__init__.py setup.py + ''; + + propagatedBuildInputs = [ + appdirs + click + click-log + paho-mqtt + pyaml + pyserial + schema + simplejson + ]; + + pythonImportsCheck = [ "bcg" ]; + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-gateway"; + description = "HARDWARIO Gateway (Python Application «bcg»)"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bch/default.nix new file mode 100644 index 0000000000..8b9308cf02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bch/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, click-log +, paho-mqtt +, pyaml +}: + +buildPythonPackage rec { + pname = "bch"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-control-tool"; + rev = "v${version}"; + sha256 = "/C+NbJ0RrWZ/scv/FiRBTh4h7u0xS4mHVDWQ0WwmlEY="; + }; + + propagatedBuildInputs = [ + click + click-log + paho-mqtt + pyaml + ]; + + postPatch = '' + sed -ri 's/@@VERSION@@/${version}/g' \ + bch/cli.py setup.py + ''; + + pythonImportsCheck = [ "bch" ]; + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-control-tool"; + description = "HARDWARIO Hub Control Tool"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix new file mode 100644 index 0000000000..0b7aee718f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix @@ -0,0 +1,198 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch-vcs +, aiohttp +, attrs +, cattrs +, circus +, click +, click-option-group +, cloudpickle +, deepmerge +, fs +, jinja2 +, numpy +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-aiohttp-client +, opentelemetry-instrumentation-asgi +, opentelemetry-sdk +, opentelemetry-semantic-conventions +, opentelemetry-util-http +, packaging +, pathspec +, pip-requirements-parser +, pip-tools +, prometheus-client +, psutil +, pynvml +, python-dateutil +, python-json-logger +, python-multipart +, pyyaml +, requests +, rich +, schema +, simple-di +, starlette +, uvicorn +, watchfiles +, fs-s3fs +, grpcio +, grpcio-health-checking +, opentelemetry-instrumentation-grpc +, protobuf +, grpcio-channelz +, grpcio-reflection +, filetype +, pillow +, pydantic +, pandas +, pyarrow +, opentelemetry-exporter-otlp-proto-http +# https://pypi.org/project/opentelemetry-exporter-jaeger-proto-grpc/ +# , opentelemetry-exporter-jaeger # support for this exporter ends in july 2023 +, opentelemetry-exporter-otlp +# , opentelemetry-exporter-zipkin +, tritonclient +# native check inputs +, pytestCheckHook +, scikit-learn +, lxml +, orjson +, pytest-asyncio +, fastapi +}: + +let + version = "1.1.1"; + aws = [ fs-s3fs ]; + grpc = [ + grpcio + grpcio-health-checking + opentelemetry-instrumentation-grpc + protobuf + ]; + io-file = [ filetype ]; + io-image = io-file ++ [ pillow ]; + io-json = [ pydantic ]; + io-pandas = [ pandas pyarrow ]; + grpc-reflection = grpc ++ [ grpcio-reflection ]; + grpc-channelz = grpc ++ [ grpcio-channelz ]; + monitor-otlp = [ opentelemetry-exporter-otlp-proto-http ]; + # tracing-jaeger = [ opentelemetry-exporter-jaeger ]; + tracing-otlp = [ opentelemetry-exporter-otlp ]; + # tracing-zipkin = [ opentelemetry-exporter-zipkin ]; + io = io-json ++ io-image ++ io-pandas ++ io-file; + tracing = tracing-otlp; # ++ tracing-zipkin ++ tracing-jaeger + optional-dependencies = { + all = aws ++ io ++ grpc ++ grpc-reflection ++ grpc-channelz ++ tracing ++ monitor-otlp; + inherit aws grpc io-file io-image io-json io-pandas io grpc-reflection + grpc-channelz monitor-otlp tracing-otlp tracing; + triton = [ tritonclient ] ++ tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc; + }; +in +buildPythonPackage { + pname = "bentoml"; + inherit version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bentoml"; + repo = "BentoML"; + rev = "v${version}"; + hash = "sha256-V5lquPZT7XBnRdPIEfgbxIBHX+i4N081SYQVK0CkSo8="; + }; + + pythonRelaxDeps = [ + "opentelemetry-semantic-conventions" + ]; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + aiohttp + attrs + cattrs + circus + click + click-option-group + cloudpickle + deepmerge + fs + jinja2 + numpy + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-aiohttp-client + opentelemetry-instrumentation-asgi + opentelemetry-sdk + opentelemetry-semantic-conventions + opentelemetry-util-http + packaging + pathspec + pip-requirements-parser + pip-tools + prometheus-client + psutil + pynvml + python-dateutil + python-json-logger + python-multipart + pyyaml + requests + rich + schema + simple-di + starlette + uvicorn + watchfiles + ]; + + passthru.optional-dependencies = optional-dependencies; + + pythonImportsCheck = [ "bentoml" ]; + + preCheck = '' + # required for CI testing + # https://github.com/bentoml/BentoML/pull/4056/commits/66302b502a3f4df4e8e6643d2afefefca974073e + export GITHUB_ACTIONS=1 + ''; + + disabledTestPaths = [ + "tests/e2e" + "tests/integration" + ]; + + disabledTests = [ + # flaky test + "test_store" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + pydantic + scikit-learn + lxml + orjson + pytest-asyncio + pillow + fastapi + starlette + ] ++ optional-dependencies.grpc; + + + meta = with lib; { + description = "Build Production-Grade AI Applications"; + homepage = "https://github.com/bentoml/BentoML"; + changelog = "https://github.com/bentoml/BentoML/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 3d934c49ed..9ce3dbf8bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.7.6"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OAf5Mjwwi8P5tYy+XQTcKPNKwy2FKZkzTalrQvZLU1Y="; + hash = "sha256-zWmpJqM2PiXpSmRAgwMoPFkIW+ltcVJL2+a/yNouNOA="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix index 8f3cd06b4b..7d6f891756 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/digitalbitbox/bitbox02-firmware/"; changelog = "https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 8f027f0e0c..8466845514 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.0.2"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mJQ3Y6o6HAqnktsPVuD9ebGgJo0BjSnlDTyqTpNPb1M="; + hash = "sha256-fw1Eo4f9MdCjICkZiCUX3wa947s1kv9qqYmYjd0zqF4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix index 4e6147bbfb..88bd08c925 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/blinker/"; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index 95c83b9932..ce100622b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix index 8fb575658a..b631846b5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.15.4"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H8QkOs+QPN9jB/g4f3OaGlX/F2SO2hIDptoPB47ogqA="; + hash = "sha256-gbnsTRiT/4YumyaJ1h4VRzDAf8/oSkD3yL9mdACvWWk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index c0047b69dd..c76e979f97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -1,5 +1,6 @@ { lib , async-timeout +, bluetooth-adapters , btsocket , buildPythonPackage , fetchFromGitHub @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uPa8iXG++doRMAK83NSnqiqnZSIjdL7zMTkjdRrSjtA="; + hash = "sha256-5OOIehWb7nxKs1AF9/0yjZhbc3h4MWdgAVCa7irq5YE="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout + bluetooth-adapters btsocket pyric usb-devices diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 71e4078990..918cba4f54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.3.0"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uN3N8/RzZyMp+ljgGYqBLUperNYOnbOPTWjlDlos5QE="; + hash = "sha256-A3zdM2kVmz8cUix9JT8cnIABZK64r6yiZisvb8A1RSQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix index 04cf75a76d..b8b4932583 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Band-structure interpolator and transport coefficient calculator"; homepage = "http://www.boltztrap.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix index 08a773cf6b..f731c0ebcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { future infrastructural services offered by Amazon Web Services. This includes S3, SQS, EC2, among others. ''; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix index 94866e064b..b519021295 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Bash style brace expansion for Python"; homepage = "https://github.com/facelessuser/bracex"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix index 7f34a3c48b..86c7f7b57c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "bravado-core"; - version = "5.17.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "Yelp"; repo = pname; rev = "v${version}"; - hash = "sha256-7LnKNR1/YIzw2iIPYXAuoC6G7fdm4D3frkSl/wJhYG4="; + hash = "sha256-/ePs3znbwamMHHzb/PD4UHq+7v0j1r1X3J3Bnb4S2VU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix index ad78355066..b70302fe9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix index 82459398ca..ee2f5b16ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Python bindings for Oracle Berkeley DB"; homepage = "https://www.jcea.es/programacion/pybsddb.htm"; license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix index 6285f09ec3..31774f9419 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix @@ -2,9 +2,9 @@ , bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage +, cryptography , fetchFromGitHub , poetry-core -, pycryptodomex , pytestCheckHook , pythonOlder , pytz @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.12.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-SonB0pT6sC6kpFmIMzNeASUHyuik4HOOquWx6+K05Y8="; + hash = "sha256-dLXeJojGeiwPPxXES1qzay1kC/YiI6pKyxKD2z32Av8="; }; nativeBuildInputs = [ @@ -32,8 +32,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ bluetooth-data-tools bluetooth-sensor-state-data + cryptography sensor-state-data - pycryptodomex pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugz/default.nix index a57e957efe..f67be664c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { homepage = "https://github.com/williamh/pybugz"; description = "Command line interface for Bugzilla"; license = licenses.gpl2; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix index 61ed10390b..99a128b049 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { homepage = "https://github.com/ionrock/cachecontrol"; changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix index 385a36d46f..15142e3d80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix @@ -98,6 +98,6 @@ in description = "Parametric scripting language for creating and traversing CAD models"; homepage = "https://github.com/CadQuery/cadquery"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc marcus7070 ]; + maintainers = with maintainers; [ marcus7070 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix index 6a60128bac..1eaed132fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/SimonSapin/cairocffi"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; description = "cffi-based cairo bindings for Python"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix index cc03fabcbc..46c556818e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://cairosvg.org"; license = licenses.lgpl3Plus; description = "SVG converter based on Cairo"; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix index f1a37fb70a..6846ed86f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/capstone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = lib.getVersion capstone; src = capstone.src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; postPatch = '' ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 000b35a35a..60693f7818 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.21.0"; + version = "1.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-Zp1JNAm1BpbgsctKDOcoDds5hEHtqi9+a5srZqE7288="; + hash = "sha256-+DoXjIRbXhX3lAOWnDEwG3e0bF9T3dVEU33JMLMAO6Y="; }; propagatedBuildInputs = [ @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/casbin/pycasbin"; changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index fc6a645ade..d60e1e60d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-cloudflare"; + sourceRoot = "${src.name}/certbot-dns-cloudflare"; meta = certbot.meta // { description = "Cloudflare DNS Authenticator plugin for Certbot"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix index 6a320209ec..6ceaac115f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-google"; + sourceRoot = "${src.name}/certbot-dns-google"; meta = certbot.meta // { description = "Google Cloud DNS Authenticator plugin for Certbot"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index 18765f12d2..58319625b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-rfc2136"; + sourceRoot = "${src.name}/certbot-dns-rfc2136"; meta = certbot.meta // { description = "RFC 2136 DNS Authenticator plugin for Certbot"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix index 20df82303a..db923f1a19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-route53"; + sourceRoot = "${src.name}/certbot-dns-route53"; meta = certbot.meta // { description = "Route53 DNS Authenticator plugin for Certbot"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index d0d6280e4e..369879878b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -15,7 +15,7 @@ , pytz , requests , six -, zope_component +, zope-component , zope_interface , dialog , gnureadline @@ -35,7 +35,7 @@ buildPythonPackage rec { hash = "sha256-BQsdhlYABZtz5+SORiCVnWMZdMmiWGM9W1YLqObyFo8="; }; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; propagatedBuildInputs = [ configargparse @@ -50,7 +50,7 @@ buildPythonPackage rec { pytz requests six - zope_component + zope-component zope_interface ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix index 93c3ac801a..7931432bd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2022.12.07"; + version = "2023.05.07"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-r6TJ6YGL0cygz+F6g6wiqBfBa/QKhynZ92C6lHTZ2rI="; + hash = "sha256-KXm0CtuZJL9VgFeY+DV0rdjaKqPQCqcoGPCkeGieTX8="; }; patches = [ @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/certifi/python-certifi"; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; - maintainers = with maintainers; [ koral SuperSandro2000 ]; + maintainers = with maintainers; [ koral ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix index 4efedc3ddc..37a1c750b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "certipy-ad"; - version = "4.5.1"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ly4k"; repo = "Certipy"; rev = "refs/tags/${version}"; - hash = "sha256-OxSTg9yFzyiAnRUcSTG5EzFk5ForzEVt/tUyi+cz9XI="; + hash = "sha256-CkIxk+Aps9TRA2wEE/zZKl9t4CyjxEsgLntbn9kWY6o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix index fd0dbe4ba9..f61e02878c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "C/C++ source generation from an AST"; homepage = "https://github.com/inducer/cgen"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix index c6793137ba..1f5be76e2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , config -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cupy , fetchFromGitHub , filelock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix index d0ced676ed..915e40544a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -105,6 +105,6 @@ buildPythonPackage rec { homepage = "https://github.com/aws/chalice"; changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index e587c281c0..5bcc305049 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-H+p2fPBXn+VqrW63KkdmPn2xqxC9uAOzQUV1ruKEUSs="; }; - sourceRoot = "source/packages/python/chart-studio"; + sourceRoot = "${src.name}/packages/python/chart-studio"; propagatedBuildInputs = [ plotly diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index cd6cabbe57..11ce178e69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -2,8 +2,8 @@ , stdenv , buildPythonPackage , fetchPypi -, jaraco_functools -, jaraco_text +, jaraco-functools +, jaraco-text , more-itertools , portend , pypytools @@ -35,13 +35,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_functools + jaraco-functools more-itertools six ]; nativeCheckInputs = [ - jaraco_text + jaraco-text portend pypytools pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 8c437d8cfb..48b040565f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , cheroot , fetchPypi -, jaraco_collections +, jaraco-collections , more-itertools , objgraph , path @@ -53,7 +53,7 @@ buildPythonPackage rec { portend more-itertools zc_lockfile - jaraco_collections + jaraco-collections ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix index c96c722cc3..5e32d74b43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "chess"; - version = "1.9.4"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-YBABB//53gwJIwrmKJh8W+05hTBhl+49vCYv9//4E+0="; + hash = "sha256-jfPg1W9Qp0DlAbMXaFqZ6Ri2zMOW6EKUHwi7Azn/yl0="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix index 80e39ccc90..a2ed3295f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.8"; + version = "1.0.10"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ilT7tCdX8ak3qmpXJ0LITf0ZGAdFSN4tm6GKw06A/m8="; + hash = "sha256-660Frlaj6WbYOl0sfb5ox6qTzE+jKJR0Qka9nEijSyg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix index c939022a29..141a5f349b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chirpstack-api/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU="; }; - sourceRoot = "source/python/src"; + sourceRoot = "${src.name}/python/src"; propagatedBuildInputs = [ google-api-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix new file mode 100644 index 0000000000..e5420f26c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, psutil +, pytestCheckHook +, pyyaml +, pyzmq +, tornado +}: + +buildPythonPackage rec { + pname = "circus"; + version = "0.18.0"; + format = "flit"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; + }; + + propagatedBuildInputs = [ + psutil + pyzmq + tornado + ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + disabledTests = [ + # these tests raise circus.tests.support.TimeoutException + "test_reload1" + "test_reload2" + "test_reload_sequential" + "test_reload_uppercase" + "test_reload_wid_1_worker" + "test_reload_wid_4_workers" + "test_add" + "test_add_start" + "test_command_already_running" + "test_launch_cli" + "test_handler" + "test_resource_watcher_max_cpu" + "test_resource_watcher_max_mem" + "test_resource_watcher_max_mem_abs" + "test_resource_watcher_min_cpu" + "test_resource_watcher_min_mem" + "test_resource_watcher_min_mem_abs" + "test_full_stats" + "test_watchdog_discovery_found" + "test_watchdog_discovery_not_found" + "test_dummy" + "test_handler" + "test_stdin_socket" + "test_stop_and_restart" + "test_stream" + "test_inherited" + "test_set_before_launch" + "test_set_by_arbiter" + "test_max_age" + "test_signal" + "test_exits_within_graceful_timeout" + "test_kills_after_graceful_timeout" + # this test requires socket communication + "test_plugins" + ]; + + pythonImportsCheck = [ "circus" ]; + + meta = with lib; { + description = "A process and socket manager"; + homepage = "https://github.com/circus-tent/circus"; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix index ae53a5eef6..f8e6fb4a2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-aqt"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix index 4c69172fdd..39e3cf9d47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4="; }; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ # https://github.com/quantumlib/Cirq/pull/5991 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix index c636897fc6..491caa5f92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cirq-google"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix index bf96d35b53..b1f66e25ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-ionq"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix index 5066455e29..4d75526618 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-pasqal"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix index b3bd2d3a05..f09f7ce045 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix index 3488ab5658..ca1c67ad12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cirq-web"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; propagatedBuildInputs = [ cirq-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 9240e64f59..e9b2ded49a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.59"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QVbLliWVY8Si1dcIhCroYH+uF6nxrTKFsRmxP62AfPI="; + hash = "sha256-rjHz0NfxUzEQxDD4XiUlIr/RltXN7GKRojWs/nxs1ac="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 834e2f54ac..17e09f785f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.59"; + version = "9.2.62"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EYNNNWfqvdrkEAMekY42yrHTgisBxmXbol/IwZ5x3o8="; + hash = "sha256-w1U9/Hvu64ULWQouE5gFRxtfUcNdKIIWACaYXtvlCtE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix index a6b2ba5e9f..faf20403e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, backports_csv , configobj , mock , pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliche/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliche/default.nix index 0630381ac5..e0657336a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliche/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliche/default.nix @@ -32,6 +32,6 @@ buildPythonPackage { description = "Build a simple command-line interface from your functions :computer:"; homepage = "https://github.com/kootenpv/cliche"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix index bb86932a70..6844cfb649 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix @@ -5,7 +5,7 @@ , importlib-metadata , pytestCheckHook -# large-rebuild downstream dependencies and applications + # large-rebuild downstream dependencies and applications , flask , black , magic-wormhole @@ -43,6 +43,6 @@ buildPythonPackage rec { composable way, with as little code as necessary. ''; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix index e277ef409d..645fdc4376 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { description = "Numerical Geometric Algebra Module"; homepage = "https://clifford.readthedocs.io"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix index c4bf46135a..c84fd16f82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/sebageek/clintermission"; changelog = "https://github.com/sebageek/clintermission/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix index 92d6239409..a8e9583079 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/cloudflare/python-cloudflare"; changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix index ee3a552b94..82fdcf0715 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization"; homepage = "https://github.com/CMA-ES/pycma"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix index e7a07a8572..1ad80f6d66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { description = "Cross-platform bindings for libsecp256k1"; homepage = "https://github.com/ofek/coincurve"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix index ea3b729032..9167fd5a4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Collection of perceptually uniform colormaps"; homepage = "https://colorcet.pyviz.org"; license = licenses.cc-by-40; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commandparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commandparse/default.nix index 68da870f4e..e146649604 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commandparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commandparse/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "commandparse"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53"; + sha256 = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; # tests only distributed upstream source, not PyPi doCheck = false; - pythonImportsCheck = [ "commandparse" ]; + + pythonImportsCheck = [ + "commandparse" + ]; meta = with lib; { description = "Python module to parse command based CLI application"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix index 78001464bf..d40de1ad8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Add JavaScript or Python style comments in JSON"; homepage = "https://github.com/vaidik/commentjson/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix index 00f69b6949..e08c348f38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fUEpbU+wqh72lt/ZJdKvMifUAwYivpmzx9QQfcb4cTo="; + hash = "sha256-MGulQEUGPrQ30T3VYzwRRlvzvWkFqNzqsNzAjtjX9xU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix index 40e388b065..d4b3152c3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yF+rG0UblGk6BCrqFrWXkB8ET0NPCL7v+4IJTmkYoTY="; + hash = "sha256-OpUMx8hcTnBdaATzRXBICwF6eAGsdyA0jFvX4nVBiM4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/constantly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/constantly/default.nix index b75eca7163..b881635064 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/constantly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/constantly/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi -}: -buildPythonPackage rec { - pname = "constantly"; - version = "15.1.0"; +{ lib, buildPythonPackage, fetchFromGitHub, twisted }: - src = fetchPypi { - inherit pname version; - sha256 = "0dgwdla5kfpqz83hfril716inm41hgn9skxskvi77605jbmp4qsq"; +let + self = buildPythonPackage rec { + pname = "constantly"; + version = "15.1.0"; + + src = fetchFromGitHub { + owner = "twisted"; + repo = "constantly"; + rev = version; + hash = "sha256-0RPK5Vy0b6V4ubvm+vfNOAua7Qpa6j+G+QNExFuHgUU="; + }; + + # would create dependency loop with twisted + doCheck = false; + + nativeCheckInputs = [ twisted ]; + + checkPhase = '' + trial constantly + ''; + + pythonImportsCheck = [ "constantly" ]; + + passthru.tests.constantly = self.overrideAttrs (_: { doInstallCheck = true; }); + + meta = with lib; { + homepage = "https://github.com/twisted/constantly"; + description = "symbolic constant support"; + license = licenses.mit; + maintainers = [ ]; + }; }; - - pythonImportsCheck = [ "constantly" ]; - - meta = with lib; { - homepage = "https://github.com/twisted/constantly"; - description = "symbolic constant support"; - license = licenses.mit; - maintainers = [ ]; - }; -} +in +self diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix new file mode 100644 index 0000000000..1e3375b28b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix @@ -0,0 +1,59 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, async-timeout +, deprecated +, pympler +, wrapt +, pytestCheckHook +, redis +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "coredis"; + version = "4.14.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "alisaifee"; + repo = pname; + rev = version; + hash = "sha256-pHCQ5dePk2VhYNf/Ka+sovIn2OAVYHnLQhPFVjKmgb4="; + }; + + postPatch = '' + substituteInPlace pytest.ini --replace "-K" "" + ''; + + propagatedBuildInputs = [ + async-timeout + deprecated + pympler + wrapt + ]; + + pythonImportsCheck = [ "coredis" ]; + + nativeCheckInputs = [ + pytestCheckHook + redis + pytest-asyncio + ]; + + # all other tests require docker + pytestFlagsArray = [ + "tests/test_lru_cache.py" + "tests/test_parsers.py" + "tests/test_retry.py" + "tests/test_utils.py" + ]; + + meta = with lib; { + changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst"; + homepage = "https://github.com/alisaifee/coredis"; + description = "An async redis client with support for redis server, cluster & sentinel"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix index 9062ad22fd..49825c7af2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla-services/cornice"; description = "Build Web Services with Pyramid"; license = licenses.mpl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix index c6a1c621c8..1ee4fe1658 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.7.2.1.1"; + version = "2.4.7.2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "evhub"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZJKWJhqhnTbTAf/48Whq2mSNIp/Ar17syFWvpD3w4fE="; + hash = "sha256-Y3EyX9Gjssez0DkD6dIaOpazNLy7rDYzjKO1u+lLGFI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix index 0aa879c76b..12268dc72a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/kiorky/croniter"; changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 5133f1642e..07e5c19f8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -5,11 +5,12 @@ , pycryptodome , pythonOlder , setuptools +, solc-select }: buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.0"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,18 +19,22 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; rev = "refs/tags/${version}"; - hash = "sha256-4iTvtu2TmxvLTyWm4PV0+yV1fRLYpJHZNBgjy1MFLjM="; + hash = "sha256-Nx3eKy/0BLg82o3qDHjxcHXtpX3KDdnBKYwCuTLWRUE="; }; propagatedBuildInputs = [ cbor2 pycryptodome setuptools + solc-select ]; # Test require network access doCheck = false; + # required for import check to work + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + env.HOME = "/tmp"; pythonImportsCheck = [ "crytic_compile" ]; @@ -39,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/crytic/crytic-compile"; changelog = "https://github.com/crytic/crytic-compile/releases/tag/${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; + maintainers = with maintainers; [ arturcygan hellwolf ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ctranslate2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ctranslate2/default.nix index 4cbf0ecd71..bfb8c31a48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ctranslate2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ctranslate2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { format = "setuptools"; # https://github.com/OpenNMT/CTranslate2/tree/master/python - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ pybind11 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix index c255857d4c..d7ef1204bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.6.3"; + version = "2023.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2Ejt1fyh8Z81WI+oIFWZxr4M1vfgs6tB4jCCMxBz2Rc="; + hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix index 5ebc0c5738..1d144b3db5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -70,6 +70,6 @@ buildPythonPackage rec { description = "A multi-tenant server for securely deploying and managing multiple Dask clusters"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix index af38853ef2..270999b550 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s="; }; - sourceRoot = "source/dask-gateway"; + sourceRoot = "${src.name}/dask-gateway"; nativeBuildInputs = [ setuptools ]; @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "A client library for interacting with a dask-gateway server"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix index 28bcc8fbb5..77dbf3717d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix index e73d330044..d53fc4ee5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Distributed image processing"; homepage = "https://github.com/dask/dask-image"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index 3f967dbe3d..e403545839 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -82,6 +82,6 @@ buildPythonPackage rec { description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; homepage = "https://github.com/dask/dask-jobqueue"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix index 73645bfb81..3cb7ed9618 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Scalable Machine Learn with Dask"; homepage = "https://github.com/dask/dask-ml"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix index ecc5ebf609..ed3215595c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Deploy Dask using mpi4py"; homepage = "https://github.com/dask/dask-mpi"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix index f3bbe6ace9..2f731daa11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { homepage = "https://github.com/encode/databases"; changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; # https://github.com/encode/databases/issues/530 broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix index bbac242bea..d382794523 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.45.0"; + version = "0.46.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a//tZ0SMtL9d/1WfsqzuHAbn2oYSuOKnNPJ4tQs5ZgM="; + hash = "sha256-5PvJKoXisJGaImiWrkX8Xks1bAxX8cJlllnfvgeJxnQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix index 145342a60a..3804298098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; homepage = "https://github.com/usnistgov/DataModelDict/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix index 5dafa583f1..34a6bbf7db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -102,6 +102,6 @@ buildPythonPackage rec { description = "Multi-tool for exploring and publishing data"; homepage = "https://datasette.io/"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index 919565bb9e..41c0ad418d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -98,6 +98,6 @@ buildPythonPackage rec { description = "Data visualization toolchain based on aggregating into a grid"; homepage = "https://datashader.org"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix index 9a53d92fe7..ba9996bbed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Utilities for working with datetime objects."; homepage = "https://github.com/jmcantrell/python-dateutils"; license = licenses.bsd0; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix index b683db0901..d3fc32ab01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; changelog = "https://github.com/googleapis/python-db-dtypes-pandas/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix new file mode 100644 index 0000000000..9d456c84d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, agate +, dbt-core +, google-cloud-bigquery +, google-cloud-storage +, google-cloud-dataproc +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "dbt-bigquery"; + version = "1.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-mzqUdT+dI7U0tHHcr0joIB1UCfKXrDdqhtVFShjIKus="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "agate" + ]; + + propagatedBuildInputs = [ + agate + dbt-core + google-cloud-bigquery + google-cloud-storage + google-cloud-dataproc + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "dbt.adapters.bigquery" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to operate on a BigQuery database"; + homepage = "https://github.com/dbt-labs/dbt-bigquery"; + changelog = "https://github.com/dbt-labs/dbt-bigquery/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix new file mode 100644 index 0000000000..bd346c3262 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -0,0 +1,113 @@ +{ lib +, python3 +, buildPythonPackage +, fetchFromGitHub +, agate +, cffi +, click +, colorama +, dbt-extractor +, hologram +, idna +, isodate +, jinja2 +, logbook +, mashumaro +, minimal-snowplow-tracker +, networkx +, packaging +, pathspec +, protobuf +, pythonRelaxDepsHook +, pytz +, pyyaml +, requests +, sqlparse +, typing-extensions +, urllib3 +, werkzeug +}: + +buildPythonPackage rec { + pname = "dbt-core"; + version = "1.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ZgP11fVMtXpzo9QaTkejvKl0LzCAkIyGBMcOquBirxQ="; + }; + + sourceRoot = "source/core"; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "agate" + "click" + "mashumaro" + "networkx" + ]; + + propagatedBuildInputs = [ + agate + cffi + click + colorama + dbt-extractor + hologram + idna + isodate + jinja2 + logbook + mashumaro + minimal-snowplow-tracker + networkx + packaging + pathspec + protobuf + pytz + pyyaml + requests + sqlparse + typing-extensions + urllib3 + werkzeug + ] ++ mashumaro.optional-dependencies.msgpack; + + # tests exist for the dbt tool but not for this package specifically + doCheck = false; + + passthru = { + withAdapters = python3.pkgs.callPackage ./with-adapters.nix { }; + }; + + meta = with lib; { + description = "Enables data analysts and engineers to transform their data using the same practices that software engineers use to build applications"; + longDescription = '' + The dbt tool needs adapters to data sources in order to work. The available + adapters are: + + dbt-bigquery + dbt-postgres + dbt-redshift + dbt-snowflake + + An example of building this package with a few adapters: + + dbt.withAdapters (adapters: [ + adapters.dbt-bigquery + adapters.dbt-postgres + ]) + ''; + homepage = "https://github.com/dbt-labs/dbt-core"; + changelog = "https://github.com/dbt-labs/dbt-core/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch tjni ]; + mainProgram = "dbt"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/with-adapters.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/with-adapters.nix new file mode 100644 index 0000000000..006f4a96b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/with-adapters.nix @@ -0,0 +1,18 @@ +{ python3 +, dbt-bigquery +, dbt-core +, dbt-postgres +, dbt-redshift +, dbt-snowflake +}: +let + adapters = { + inherit dbt-bigquery dbt-postgres dbt-redshift dbt-snowflake; + }; +in +adapterFun: (python3.buildEnv.override { + extraLibs = [ dbt-core ] ++ (adapterFun adapters); + ignoreCollisions = true; +}).overrideAttrs { + meta.mainProgram = dbt-core.meta.mainProgram; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/Cargo.lock new file mode 100644 index 0000000000..8b29712370 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/Cargo.lock @@ -0,0 +1,531 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ + "cfg-if", + "lazy_static", +] + +[[package]] +name = "dbt-extractor" +version = "0.4.1" +dependencies = [ + "pyo3", + "quickcheck", + "quickcheck_macros", + "rayon", + "thiserror", + "tree-sitter", + "tree-sitter-jinja2", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +dependencies = [ + "cfg-if", +] + +[[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.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" + +[[package]] +name = "lock_api" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "pyo3" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger", + "log", + "rand", +] + +[[package]] +name = "quickcheck_macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "syn" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "thiserror" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tree-sitter" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad726ec26496bf4c083fff0f43d4eb3a2ad1bba305323af5ff91383c0b6ecac0" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-jinja2" +version = "0.1.0" +source = "git+https://github.com/dbt-labs/tree-sitter-jinja2?tag=v0.1.0#52da7b0b1480b23381ea84cf5ea3bf058dd6d8c4" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix new file mode 100644 index 0000000000..2656be9108 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-extractor/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, rustPlatform +, libiconv +}: + +buildPythonPackage rec { + pname = "dbt-extractor"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "dbt_extractor"; + inherit version; + hash = "sha256-dbHGZWmewPH/zhuj13b3386AIVbyLnCnucjwtNfoD0I="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "tree-sitter-jinja2-0.1.0" = "sha256-lzA2iq4AK0iNwkLvbIt7Jm5WGFbMPFDi6i4AFDm0FOU="; + }; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + # no python tests exist + doCheck = false; + + pythonImportsCheck = [ + "dbt_extractor" + ]; + + meta = with lib; { + description = "A tool that processes the most common jinja value templates in dbt model files"; + homepage = "https://github.com/dbt-labs/dbt-extractor"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix new file mode 100644 index 0000000000..f5be13ccff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, agate +, dbt-core +, psycopg2 +}: + +buildPythonPackage { + pname = "dbt-postgres"; + format = "setuptools"; + + inherit (dbt-core) version src; + + sourceRoot = "source/plugins/postgres"; + + env.DBT_PSYCOPG2_NAME = "psycopg2"; + + propagatedBuildInputs = [ + agate + dbt-core + psycopg2 + ]; + + # tests exist for the dbt tool but not for this package specifically + doCheck = false; + + pythonImportsCheck = [ + "dbt.adapters.postgres" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to work with a Postgres database"; + homepage = "https://github.com/dbt-labs/dbt-core"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix new file mode 100644 index 0000000000..b757683e95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, agate +, boto3 +, dbt-core +, dbt-postgres +, pytestCheckHook +, pythonRelaxDepsHook +, redshift-connector +}: + +buildPythonPackage rec { + pname = "dbt-redshift"; + version = "1.5.8"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-T7cNszIroOT8TNfOzZpdJDR1+5ybhkXvyvvM5zokVgo="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "boto3" + "redshift-connector" + ]; + + propagatedBuildInputs = [ + agate + boto3 + dbt-core + dbt-postgres + redshift-connector + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "dbt.adapters.redshift" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to work with Amazon Redshift"; + homepage = "https://github.com/dbt-labs/dbt-redshift"; + changelog = "https://github.com/dbt-labs/dbt-redshift/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix new file mode 100644 index 0000000000..b32f7fbd9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, dbt-core +, pytestCheckHook +, snowflake-connector-python +}: + +buildPythonPackage rec { + pname = "dbt-snowflake"; + version = "1.5.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Oz9BDvxSG4kOteuwKiPccxlsmQtOEwDLVyirDSWy1kY="; + }; + + propagatedBuildInputs = [ + dbt-core + snowflake-connector-python + ] ++ snowflake-connector-python.optional-dependencies.secure-local-storage; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ + "dbt.adapters.snowflake" + ]; + + meta = with lib; { + description = "Plugin enabling dbt to work with Snowflake"; + homepage = "https://github.com/dbt-labs/dbt-snowflake"; + changelog = "https://github.com/dbt-labs/dbt-snowflake/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 58551be4de..ec01d5ab33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.86.0"; + version = "1.90.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YSkSnRQqalHpRVJx5PUO8EXXV8V6jRNpycO/GqNWmIM="; + hash = "sha256-B+NW7ORKIBtjxeR0W0tX7V1MgBtNoyGFX35TXUl7rVE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix index dfff3a4d36..570f770e77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Database connections for multi-threaded environments"; homepage = "https://webwareforpython.github.io/DBUtils/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix index 5fa306d651..70b33cfa7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://salsa.debian.org/python-debian-team/python-debian"; changelog = "https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix index a918f7e941..c86721f9c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/micheles/decorator"; description = "Better living through Python with decorators"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix index da273415d8..cc750427da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/detectron2/default.nix @@ -1,8 +1,10 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , pythonRelaxDepsHook , ninja +, which # build inputs , pillow , matplotlib @@ -17,8 +19,10 @@ , iopath , omegaconf , hydra-core -, black , packaging +, torch +, pydot +, black # optional dependencies , fairscale , timm @@ -26,10 +30,16 @@ , shapely , pygments , psutil +# check inputs +, pytestCheckHook +, torchvision +, av +, opencv4 +, pytest-mock }: let - name = "detectron2"; + pname = "detectron2"; version = "0.6"; optional-dependencies = { all = [ @@ -43,11 +53,12 @@ let }; in buildPythonPackage { - inherit name version; + inherit pname version; + format = "setuptools"; src = fetchFromGitHub { owner = "facebookresearch"; - repo = name; + repo = "detectron2"; rev = "v${version}"; sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf"; }; @@ -55,12 +66,9 @@ buildPythonPackage { nativeBuildInputs = [ pythonRelaxDepsHook ninja + which ]; - dontUseNinjaBuild = true; - dontUseNinjaInstall = true; - dontUseNinjaCheck = true; - pythonRelaxDeps = [ "black" ]; @@ -79,14 +87,78 @@ buildPythonPackage { iopath omegaconf hydra-core - black packaging - ] ++ optional-dependencies.all; + black + torch # not explicitly declared in setup.py because they expect you to install it yourself + pydot # no idea why this is not in their setup.py + ]; passthru.optional-dependencies = optional-dependencies; - # disable the tests for now until someone can check on a linux machine. - # doCheck = false; + nativeCheckInputs = [ + av + opencv4 + pytest-mock + pytestCheckHook + torchvision + ]; + + preCheck = '' + # prevent import errors for C extension modules + rm -r detectron2 + ''; + + pytestFlagsArray = [ + # prevent include $sourceRoot/projects/*/tests + "tests" + ]; + + disabledTestPaths = [ + # try import caffe2 + "tests/test_export_torchscript.py" + "tests/test_model_analysis.py" + "tests/modeling/test_backbone.py" + "tests/modeling/test_roi_heads.py" + "tests/modeling/test_rpn.py" + "tests/structures/test_instances.py" + # hangs for some reason + "tests/modeling/test_model_e2e.py" + ]; + + disabledTests = [ + # fails for some reason + "test_checkpoint_resume" + "test_map_style" + # requires shapely + "test_resize_and_crop" + # require caffe2 + "test_predict_boxes_tracing" + "test_predict_probs_tracing" + "testMaskRCNN" + "testRetinaNet" + # require coco dataset + "test_default_trainer" + "test_unknown_category" + "test_build_dataloader_train" + "test_build_iterable_dataloader_train" + # require network access + "test_opencv_exif_orientation" + "test_read_exif_orientation" + # use deprecated api, numpy.bool + "test_BWmode_nomask" + "test_draw_binary_mask" + "test_draw_empty_mask_predictions" + "test_draw_instance_predictions" + "test_draw_no_metadata" + "test_overlay_instances" + "test_overlay_instances_no_boxes" + "test_get_bounding_box" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + "test_build_batch_dataloader_inference" + "test_build_dataloader_inference" + "test_build_iterable_dataloader_inference" + "test_to_iterable" + ]; pythonImportsCheck = [ "detectron2" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix index 49a563fcba..ad4268b8f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.6"; + version = "2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; rev = "refs/tags/v${version}"; - hash = "sha256-Si1EH5TalNC3BY7L/GqbGSCjDBWzbodB4NZlNayhZYs="; + hash = "sha256-sTzYhUKPqaCE553FqWR4qdtDDtymhuybHWiDOUwgglA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index 7d34a75a23..cd06f9df5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiohttp , buildPythonPackage , fetchFromGitHub @@ -33,7 +34,7 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace "discord/opus.py" \ - --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" + --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" '' + lib.optionalString withVoice '' substituteInPlace "discord/player.py" \ --replace "executable='ffmpeg'" "executable='${ffmpeg}/bin/ffmpeg'" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix index 30eb172513..6f275a01fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Disk and file backed persistent cache"; homepage = "http://www.grantjenks.com/docs/diskcache/"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 4942730036..c232bdb0bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -64,6 +64,8 @@ buildPythonPackage rec { ]; }; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-httpserver pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix index be2fb48ea8..18f7ca8ecb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { homepage = "https://distributed.readthedocs.io/"; changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ teh costrouc ]; + maintainers = with maintainers; [ teh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix index f539a637d4..5f043f008e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Use an URL to configure email backend settings in your Django Application"; homepage = "https://github.com/migonzalvar/dj-email-url"; license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index 3f480b1d71..2abee722b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Authentication for Django Rest Framework"; homepage = "https://github.com/iMerica/dj-rest-auth"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix index b216c8e62a..410ed08d94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-search-url/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { homepage = "https://github.com/dstufft/dj-search-url"; description = "Use Search URLs in your Django Haystack Application"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix index 379b636423..774bcda4ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -7,7 +7,7 @@ , django-debug-toolbar , django-extensions , django-taggit -, django_tagging +, django-tagging , mock , pytest-django , selenium @@ -41,7 +41,7 @@ buildPythonPackage rec { django-debug-toolbar django-extensions django-taggit - django_tagging + django-tagging mock pytest-django selenium diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix index d70abd2d64..01cccaf8c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/epicserve/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix index f7ce71a84f..566eb06f50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix @@ -55,12 +55,17 @@ buildPythonPackage rec { preCheck = '' redis-server & + REDIS_PID=$! while ! redis-cli --scan ; do echo waiting for redis to be ready sleep 1 done ''; + postCheck = '' + kill $REDIS_PID + ''; + DJANGO_SETTINGS_MODULE = "tests.settings"; meta = with lib; { @@ -69,7 +74,5 @@ buildPythonPackage rec { changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; - # Times out for unknown reasons - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix index 2b2fe06de6..3e413ca4e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix @@ -7,14 +7,15 @@ }: buildPythonPackage rec { - pname = "django_celery_results"; + pname = "django-celery-results"; version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "django_celery_results"; + inherit version; hash = "sha256-dapRlw21aRy/JCxqD/UMjN9BniZc0Om3cjNdBkNsS5k="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-classy-tags/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_classytags/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-classy-tags/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-colorful/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_colorful/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-colorful/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index 8581dcce87..c7fbde5bdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { description = "A helper for organizing Django settings"; homepage = "https://django-configurations.readthedocs.io/"; license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-contrib-comments/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-contrib-comments/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-environ/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-environ/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix index 2842a085d8..0ae0eac3ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Per object permissions for Django"; homepage = "https://github.com/django-guardian/django-guardian"; license = with licenses; [ mit bsd2 ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index 47719995c6..18ef2e3ace 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -11,7 +11,7 @@ # dependencies , django -, django_compat +, django-compat # tests , pytest-django @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - django_compat + django-compat ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix index 8730d367d9..648634b0f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Django model mixins and utilities"; changelog = "https://github.com/jazzband/django-model-utils/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-modelcluster/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-modelcluster/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_nose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-nose/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_nose/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-nose/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix index 5b2a41faf7..b241730313 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-model-utils"; description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix index f9756a8d59..6db31decd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://github.com/django-polymorphic/django-polymorphic"; description = "Improved Django model inheritance with automatic downcasting"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-raster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-raster/default.nix index f590aca527..673a867972 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-raster/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-raster/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, - numpy, django_colorful, pillow, psycopg2, + numpy, django-colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: @@ -17,7 +17,7 @@ buildPythonPackage rec { # Tests require a postgresql + postgis server doCheck = false; - propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 + propagatedBuildInputs = [ numpy django-colorful pillow psycopg2 pyparsing django celery boto3 importlib-metadata ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix index 654118feda..5b8937fb04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Django app that makes registration and authentication easy"; homepage = "https://github.com/Tivix/django-rest-auth"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 5f108f37b1..730d05d445 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Polymorphic serializers for Django REST Framework"; homepage = "https://github.com/apirobot/django-rest-polymorphic"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-sekizai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-sekizai/default.nix index 3c4e351f25..0c28ee283a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-sekizai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-sekizai/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, django_classytags +, django-classy-tags , pytestCheckHook , pytest-django }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django_classytags + django-classy-tags ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-silk/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-silk/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix index 037d1f31ee..fe7e96579c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "4.2.0"; + version = "4.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k7r/gk8KBW5xA2tCO5QqdPB7kJ5F4/o4GFuRD1l8XAg="; + hash = "sha256-2tqzm0bZro83qOh5xZDzmp4EK1ZcA/oMWo91S0QbHyM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix index 41637e7472..9681135126 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-tables2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-tables2"; - version = "2.4.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jieter"; repo = pname; rev = "v${version}"; - sha256 = "04vvgf18diwp0mgp14b71a0dxhgrcslv1ljybi300gvzvzjnp3qv"; + hash = "sha256-n8qvsm/i+2VclFc00jQGO0Z4l6Ke8qZ03EYuEQcPuVQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_tagging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-tagging/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_tagging/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-tagging/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-treebeard/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django-treebeard/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix index 4e36523e0c..c3df9cf4ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.3"; + version = "4.2.4"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-RadH4cWz1t8bFBsUgeGTsDP9H9vaP/Umd9yBr9qsuu0="; + hash = "sha256-fkIl7AZeDzVMz3NJoi0gneCcwcB0gyvp64TFHBeZxDI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index d45b600c80..d5b388f5f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Camel case JSON support for Django REST framework"; homepage = "https://github.com/vbabiy/djangorestframework-camel-case"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index dc97ddb295..04ea80c1a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = " Dataclasses serializer for Django REST framework"; homepage = "https://github.com/oxan/djangorestframework-dataclasses"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix index 9aec9ff0c7..fdc6b3184d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Django-guardian support for Django REST Framework"; homepage = "https://github.com/rpkilby/django-rest-framework-guardian"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix index b6029ad993..d4a96d6795 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = " Recursive Serialization for Django REST framework "; homepage = "https://github.com/heywbj/django-rest-framework-recursive"; license = licenses.isc; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index 912c484b0a..ced22d5480 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web APIs for Django, made easy"; homepage = "https://www.django-rest-framework.org/"; - maintainers = with maintainers; [ desiderius SuperSandro2000 ]; + maintainers = with maintainers; [ desiderius ]; license = licenses.bsd2; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix index 8cf15e9fda..88a568ed25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dockerfile-parse"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-If59UQZC8rYamZ1Fw9l0X5UOEf5rokl1Vbj2N4K3jkU="; + hash = "sha256-MYTM3FEyIZg+UDrADhqlBKKqj4Tl3mc8RrC27umex7w="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix index cae32e4a2b..bd8af6391a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Dockerspawner: A custom spawner for Jupyterhub"; homepage = "https://jupyter.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix index 37785f1e29..78bbba8a79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python package for docstring repetition"; homepage = "https://github.com/Chilipp/docrep"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ costrouc ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dokuwiki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dokuwiki/default.nix new file mode 100644 index 0000000000..0d221c3b73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dokuwiki/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "dokuwiki"; + version = "1.3.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gtTyO6jmjQT0ZwmxvH+RAe1v5aruNStfP1qz1+AqYXs="; + }; + + pythonImportsCheck = [ + "dokuwiki" + ]; + + meta = with lib; { + homepage = "https://github.com/fmenabe/python-dokuwiki"; + description = "A python module that aims to manage DokuWiki wikis by using the provided XML-RPC API"; + license = licenses.mit; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index 0789e76dab..1413cd3248 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Serve self-contained distribution builds of Swagger UI and Redoc with Django"; homepage = "https://github.com/tfranzel/drf-spectacular-sidecar"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix index d21e9f5b9d..e9c3a752b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { homepage = "https://github.com/tfranzel/drf-spectacular"; changelog = "https://github.com/tfranzel/drf-spectacular/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix index 696c85d9fb..739cf1bf50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix index 21e24275c4..4f63c677e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.2.4"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-R/4k6yZS96yAkjhO/Ay9MJ2KUlq9TFQvsUoqpjvZcKI="; + hash = "sha256-nPhXJgky9/CgqBnyqbF2+BASHRSpwKd0ePIRFMq29Vc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix index 107c9d23f1..80831ea0eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dtlssocket/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.15"; + version = "0.1.16"; format = "pyproject"; src = fetchPypi { pname = "DTLSSocket"; inherit version; - hash = "sha256-RWscUxJsmLkI2GPjnpS1oJVPsJ+xbqPAKk4Q1G7ISu4="; + hash = "sha256-MLEIrkX84cAz4+9sLd1+dBgGKuN0Io46f6lpslQ2ajk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index 1c2560faac..f582ae9c3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Python binding for DuckDB"; homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc cpcloud ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duct-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duct-py/default.nix new file mode 100644 index 0000000000..6a79305e90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/duct-py/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "duct-py"; + version = "0.6.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "oconnor663"; + repo = "duct.py"; + rev = version; + hash = "sha256-4ja/SQ9R/SbKlf3NqKxLi+Fl/4JI0Fl/zG9EmTZjWZc="; + }; + + pythonImportsCheck = [ "duct" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # This test completely empties the environment then tries to run a Python command. + # The test then fails because it can't find the `python` executable. It's unclear + # how this test even passes _outside_ of Nix. + "test_full_env" + ]; + + meta = with lib; { + description = "A Python library for running child processes"; + homepage = "https://github.com/oconnor663/duct.py"; + license = licenses.mit; + maintainers = with maintainers; [ zmitchell ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix index 17ee62c931..088e9dc844 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/duosecurity/duo_client_python"; changelog = "https://github.com/duosecurity/duo_client_python/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 6fadd43441..9dd9a154a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.5.0"; + version = "2.9.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K4quPZZnHqZkuR8moJ8TwmfHQ3BennoByZ5XW5X5rDA="; + hash = "sha256-NJAemtzqpqgWRmsXfcw9gj7T10jARemUMehIxTI7+fQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index a26bab92d7..a4c3fb5838 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.23.0"; + version = "0.24.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fWe/nnI8ugKGOvuwvH8ufvfkhQr3y1PldyYzsvJ5yLw="; + hash = "sha256-DpRnbvGF6HOCAcQ7HRf9x1bzrHHnL95Fz/TzpCosRZo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index 1082529bcc..cbd787a7c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "2.12.1"; + version = "2.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0J3XLBfH8kpIAyAnMhbS6d4vW3vtlbhCKIuaNsLZACg="; + hash = "sha256-5tvwIa2kx5MlMZV6J+NqN9v/TjOeZC6wftO102/QbCk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix index ebd6a66210..4796ab9962 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "EditorConfig File Locator and Interpreter for Python"; homepage = "https://github.com/editorconfig/editorconfig-core-py"; license = licenses.psfl; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix index d3349549bc..70b11a9f23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.15.3"; + version = "0.15.4"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-PWjevYUts0dQMBmABpU8neuTqDlglTCCQmuvnVndfto="; + hash = "sha256-jGZa1qfI/OybwgG2L4N1hICHpWZTufgElpl31EhU+O4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edlib/default.nix index 30c3f8fb3b..357db8d2b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/edlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/edlib/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { disabled = pythonOlder "3.6"; - sourceRoot = "source/bindings/python"; + sourceRoot = "${edlib.src.name}/bindings/python"; preBuild = '' ln -s ${edlib.src}/edlib . diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index 0ffe64f62c..c50b5042a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.17.0"; + version = "6.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Tyot/JswIiwxugjxyHcENDAGF9uxwaptTIZwU/GnjAU="; + hash = "sha256-s4aM2HuagqcF2sLHHRh2kj1tglf+JZ7hXT4PcAeFStQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index 827ee3421b..b9efe30422 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.1.4"; + version = "4.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-cU22JdrCTvg8cF1LK9dYfOTztp3qoXV9VK6aMpbKFHc="; + hash = "sha256-5K2xcnTo3/A6/pCxQn5qZqni7C64p/yNAWWJlhQeKe4="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enochecker-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enochecker-core/default.nix new file mode 100644 index 0000000000..806bd4a14e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/enochecker-core/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "enochecker-core"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version; + pname = "enochecker_core"; + hash = "sha256-N41p2XRCp55rcPXLpA4rPIARsva/dQzK8qafjzXtavI="; + }; + + + pythonImportsCheck = [ + "enochecker_core" + ]; + + # no tests upstream + doCheck = false; + + meta = with lib; { + description = "Base library for enochecker libs"; + homepage = "https://github.com/enowars/enochecker_core"; + changelog = "https://github.com/enowars/enochecker_core/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fwc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix index d823f3c4c8..abaa47ec07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Enrich adds few missing features to the wonderful rich library"; homepage = "https://github.com/pycontribs/enrich"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index ec35a06c20..332d4866e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.35"; + version = "0.5.36"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-gHHLKviU1ZHrlBp4R3WqAwEGWiM7VuB7lOYiUIJ1J7A="; + hash = "sha256-5eA9fqL748VigNgy1G7bZtMstV7EI9LLPhv6xZnCEFA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix index 03c5cc6312..3a7d12b410 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { description = "Ethereum ABI utilities"; homepage = "https://github.com/ethereum/eth-abi"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix index fc4062f01c..319db87011 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Account abstraction library for web3.py"; homepage = "https://github.com/ethereum/eth-account"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix index ab5d023f51..c26914f360 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "The Ethereum hashing function keccak256"; homepage = "https://github.com/ethereum/eth-hash"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix index f50da1d17d..e4320e8e03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Tools for handling the encrypted keyfile format used to store private keys"; homepage = "https://github.com/ethereum/eth-keyfile"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix index 601013b20f..e9d3cc28cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "Common API for Ethereum key operations"; homepage = "https://github.com/ethereum/eth-keys"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix index 8747d15f55..0b2e9468c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "RLP definitions for common Ethereum objects"; homepage = "https://github.com/ethereum/eth-rlp"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix index 8ed085ad0e..434fc6d8c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-typing"; changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix index 08648ab32e..73a287b49a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix index e6f40fa90e..61eef0a05a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.1.0"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = version; - hash = "sha256-XQcYYz4MOxWj9QlgM6KuwBaCHjYzGRkQw3cN5WBSnAo="; + hash = "sha256-19taP6adzmO4zH2As1OTXeYNFj6KwjhxBr09X+SrZRk="; }; nativeBuildInputs = [ @@ -33,12 +33,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = if (pythonAtLeast "3.11") then [ - # regression in 3.11.4 - # https://github.com/agronholm/exceptiongroup/issues/64 - "test_catch_handler_raises" - ] else null; - pythonImportsCheck = [ "exceptiongroup" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix index 15979b0f22..937e90250a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Extract code blocks from markdown"; homepage = "https://github.com/nschloe/exdown"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix index 895253d5a4..89a0bd110d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; - sourceRoot = "source/builtins/extractcode_7z-linux"; + sourceRoot = "${src.name}/builtins/extractcode_7z-linux"; propagatedBuildInputs = [ plugincode diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix index f1dd6f1295..0031c7a279 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; - sourceRoot = "source/builtins/extractcode_libarchive-linux"; + sourceRoot = "${src.name}/builtins/extractcode_libarchive-linux"; preBuild = '' pushd src/extractcode_libarchive/lib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fabric/default.nix index 8dfd102539..80a4bd6674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fabric/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pythonic remote execution"; homepage = "https://www.fabfile.org/"; license = licenses.bsd2; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix index e9300edab0..6ab228baf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/facebook-sdk/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; homepage = "https://github.com/pythonforfacebook/facebook-sdk"; license = licenses.asl20 ; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fairscale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fairscale/default.nix index eff005bc5c..42a7da74f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fairscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fairscale/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools # build inputs , torch , numpy @@ -19,7 +20,7 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.10"; @@ -30,10 +31,16 @@ buildPythonPackage { hash = "sha256-L2Rl/qL6l0OLAofygzJBGQdp/2ZrgDFarwZRjyAR3dw="; }; - nativeBuildInputs = [ ninja ]; - dontUseNinjaBuild = true; - dontUseNinjaInstall = true; - dontUseNinjaCheck = true; + # setup.py depends on ninja python dependency, but we have the binary in nixpkgs + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup_requires=["ninja"]' 'setup_requires=[]' + ''; + + nativeBuildInputs = [ + ninja + setuptools + ]; propagatedBuildInputs = [ torch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index 91be38ab54..af8bc72fa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.16.0"; + version = "2.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-gJcgATH9ASbD4Uq/uZpTwmqCJ8UXOS/4t8Uq89V61GA="; + hash = "sha256-nDxuXDWnTt/ljd/M4pElo4U8jn91l+J9fPAfYpS0mOc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index cadde12caf..7e7624020d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-XWuWg8PzXdLIuUTZ5dnpFmFmqEhOReqIEmBbCpzdzrg="; + hash = "sha256-yWDZPa9+DZh2Bj9IIeIVFpAt9nhQOk2tTZh02difsCs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix index 6cc980db09..85b9eecb57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.7.4"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oAOqViIBtIVYO0AN/Ug7I97QExhFaeFoNJ/7tpN/49w="; + hash = "sha256-UPnWVYiZJdP6r7Bm1H9DMXpLi26c9tpXeEkLXVJxWdM="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix index bc8eaa3588..a2b4b9c76b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { description = "A fast native implementation of diff algorithm with a pure Python fallback"; homepage = "https://github.com/syrusakbary/fastdiff"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; # resulting compiled object panics at import broken = stdenv.is32bit; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix index 86529151e9..563c4b7e4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.6.0"; + version = "0.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "guillaumekln"; repo = "faster-whisper"; rev = "v${version}"; - hash = "sha256-tBajxrAhV7R9VnAzUr7ONAYH9h8Uh/UUeu2YZAAotBo="; + hash = "sha256-NTk0S+dMChygnC7Wix62AFO4NNSPJuKXyqoEyWiQhII="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix index 86ea56f333..7d45d7f979 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix @@ -36,6 +36,6 @@ buildPythonPackage { homepage = "https://github.com/rlabbe/filterpy"; description = "Kalman filtering and optimal estimation library"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix index a4537280e4..68fb70cda5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.3.0"; + version = "0.3.1"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-5sbWxIznz9aVnM3OEtYSHVds/zlfST/UZmfn1amqJHQ="; + hash = "sha256-diH4qcGZpw0hmDHN2uuEyn6D4guDWBcr/0eHGhil7aQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 409394e5fb..edbd9433fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -19,17 +19,16 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.9.1"; + version = "1.9.4.post1"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-2CGLkgnpCAh9G+ILol5tmRj9S6/XeKk8eLzGEODiyP8="; + hash = "sha256-CeGdWAmWteVtL0BoBQ1sB/+1AWkmxogtK99bL5Fpdbw="; }; nativeBuildInputs = [ @@ -49,7 +48,6 @@ buildPythonPackage rec { cligj click-plugins munch - setuptools ]; passthru.optional-dependencies = { @@ -66,12 +64,27 @@ buildPythonPackage rec { rm -r fiona # prevent importing local fiona ''; - disabledTests = [ - # Some tests access network, others test packaging - "http" "https" "wheel" + pytestFlagsArray = [ + # Tests with gdal marker do not test the functionality of Fiona, + # but they are used to check GDAL driver capabilities. + "-m 'not gdal'" ]; - pythonImportsCheck = [ "fiona" ]; + disabledTests = [ + # Some tests access network, others test packaging + "http" + "https" + "wheel" + + # see: https://github.com/Toblerity/Fiona/issues/1273 + "test_append_memoryfile_drivers" + ]; + + pythonImportsCheck = [ + "fiona" + ]; + + doInstallCheck = true; meta = with lib; { changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix index ea2d7f3cd3..d8f7c808a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { description = "A Finite Volume PDE Solver Using Python"; changelog = "https://github.com/usnistgov/fipy/blob/${version}/CHANGELOG.rst"; license = licenses.free; - maintainers = with maintainers; [ costrouc wd15 ]; + maintainers = with maintainers; [ wd15 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix index d56d42abf2..860f449fd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -45,5 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/pycqa/flake8"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "flake8"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix index b524a941f4..c77fc912cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix @@ -108,6 +108,6 @@ buildPythonPackage rec { homepage = "https://github.com/flask-admin/flask-admin/"; changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index b4f5c63d64..eaf132e943 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { homepage = "https://github.com/dpgaspar/flask-appbuilder/"; changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940 broken = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix index 5a6aca4978..7d3679e8f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Adds i18n/l10n support to Flask applications"; homepage = "https://github.com/mrjoes/flask-babelex"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix index a4bd3af49a..856c7f010b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Brcrypt hashing for Flask"; homepage = "https://github.com/maxcountryman/flask-bcrypt"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix index 9adecc5968..32a275177c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/mongoengine/flask-mongoengine"; changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix index 4ae75839dc..c8d2123689 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "OpenID support for Flask"; homepage = "https://pythonhosted.org/Flask-OpenID/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-themes2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-themes2/default.nix new file mode 100644 index 0000000000..56c03ca39e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-themes2/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }: + +buildPythonPackage rec { + pname = "flask-themes2"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "Flask-Themes2"; + inherit version; + hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ flask ]; + + meta = with lib; { + description = "Easily theme your Flask app"; + homepage = "https://github.com/sysr-q/flask-themes2"; + license = licenses.mit; + maintainers = with maintainers; [ ruby0b ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix index 4bcb028806..b7914ad377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { Python web application frameworks. ''; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix index f477a1446a..ae5c7e309c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { inherit (flatbuffers) pname version src; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # flatbuffers needs VERSION environment variable for setting the correct # version, otherwise it uses the current date. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flit-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flit-core/default.nix index d0b83d30ea..c81a8567de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flit-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flit-core/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Distribution-building parts of Flit. See flit package for more information"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh SuperSandro2000 ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix index 58e10e22a4..43d8d8e90e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "A simple packaging tool for simple packages"; homepage = "https://github.com/pypa/flit"; license = licenses.bsd3; - maintainers = with maintainers; [ fridh SuperSandro2000 ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index 2e5502966f..cdb7fd1ea9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.37"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-3SlgYENtyv0JdUwGFpT3lWUDOciAKThYGz/RV8z+tac="; + hash = "sha256-+eklvdmlWrwvdI6IwNyAIEI0kDlzIYh7bzNY94dzA+E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix index b6fdb148ed..2be3f227ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; rev = "v${version}"; - hash = "sha256-yApMUTO6Kq2YESGMpkU4/FlN57+hX0uQr2fGH7QIdUE="; + hash = "sha256-4JhzrRnpb9+FYXd0S2XcBelaHuRksm8RC29rxZqtlpw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix new file mode 100644 index 0000000000..2b001fecaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontawesomefree/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "fontawesomefree"; + version = "6.4.0"; + format = "wheel"; + + # they only provide a wheel + src = fetchPypi { + inherit pname version format; + dist = "py3"; + python = "py3"; + hash = "sha256-4S7a1xts9pk/x8aupjZ+Ex8vJHtkNfrKmbEjKbrNKyc="; + }; + + pythonImportsCheck = [ + "fontawesomefree" + ]; + + meta = with lib; { + homepage = "https://github.com/FortAwesome/Font-Awesome"; + description = "Icon library and toolkit"; + license = with licenses; [ ofl cc-by-40 ]; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index bdc0826ac8..1f359dfdf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.12.0"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1giXmmyuy+qrY6xV3yZn4kcDd6w6l8uCL4ozcZE4N00="; + hash = "sha256-e+w3ce6KdvbYzH48XPEQTiBgtjbKWNdQj8ie4yw0rzE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index 970f04be62..e158692e9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -155,6 +155,6 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix index f8b0f78299..61204104a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads"; homepage = "https://github.com/kata198/func_timeout"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix index f0e07e6e29..4012144710 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-yvF57ErcaknKcK6UgINt65uASNZpEtXk+LOizYDH1Bo="; + hash = "sha256-4eYDaQwjnYCTnobXRtFrToRyxxH2N2n9sh8z7oPC2Wc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package that extends NumPy arrays to operate over finite fields"; homepage = "https://github.com/mhostetter/galois"; + changelog = "https://github.com/mhostetter/galois/releases/tag/v${version}"; downloadPage = "https://github.com/mhostetter/galois/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ chrispattison ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix index 472b3e592c..3adaf2d70b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Bluetooth (Generic Attribute Profile) GATT SDK for Python"; homepage = "https://github.com/getsenic/gatt-python/"; license = licenses.mit; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix index 930aafc5eb..46c98cfc78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; }; - sourceRoot = "source"; + sourceRoot = src.name; nativeBuildInputs = [ setuptools-rust diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix index 0c1aa9fbf2..81a8e36782 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.13"; + version = "0.5.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gkHAIrsk6LKNjieTiSU0ZH6WI2+wJB68edNqJ7n86tY="; + hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix index 3de2bad0f4..7bb7458b0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/genpy/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "C/C++ source generation from an AST"; homepage = "https://github.com/inducer/genpy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix index 2e2380361c..37a9d75bee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "An async GitHub API library"; homepage = "https://github.com/brettcannon/gidgethub"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix index 3446f653d4..7003443f17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gitignore-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-kc1Y3kHcVVao9zqQMbUeMi/9s+W2aUAapCx3h8VyWRQ="; + hash = "sha256-Z2x09XwFDMf6sUoKXJ240abp7zctbVCN4dsoQmWVSn8="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix index 29028e6d32..83d6aa13cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glob2/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Version of the glob module that can capture patterns and supports recursive wildcards"; homepage = "https://github.com/miracle2k/python-glob2/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix index 7774b3c538..4ff23443e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/quintusdias/glymur"; changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 8af6dbc643..1aae1c347e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.2.3"; + version = "6.2.5"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-AL8dkN3qTriiyGp/359uKy5aOMr9XPSSBw388VvUXYI="; + hash = "sha256-El2hRY+ELzdW/Bv34JURsisRr74MEv19sFt9tWFHIes="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix new file mode 100644 index 0000000000..d2c6aebe22 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, six +, pytestCheckHook +, responses +, nose +}: + +buildPythonPackage rec { + pname = "gocardless-pro"; + version = "1.45.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gocardless"; + repo = "gocardless-pro-python"; + rev = "v${version}"; + hash = "sha256-mzIEHm8roiVtrh84Oc+J87anMpr4zMp5yLFCmuljg8k="; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + pythonImportsCheck = [ "gocardless_pro" ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + nose + ]; + + meta = with lib; { + description = "A client library for the GoCardless Pro API"; + homepage = "https://github.com/gocardless/gocardless-pro-python"; + changelog = "https://github.com/gocardless/gocardless-pro-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index c3839dc667..c4cf9b2e07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -87,6 +87,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-api-core"; changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix index 40af6ed4a0..e185a88858 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; changelog = "https://github.com/googleapis/google-auth-library-python-httplib2/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 134fb80d41..5d5c56188c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 terlar ]; + maintainers = with maintainers; [ terlar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index 1190265918..13f0ea961f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -105,6 +105,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-auth-library-python"; changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index d96874aeeb..1e37e3a955 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-access-context-manager"; changelog = "https://github.com/googleapis/python-access-context-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix new file mode 100644 index 0000000000..f88c5e2cef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, fetchPypi +, google-api-core +, grpc-google-iam-v1 +, lib +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-artifact-registry"; + version = "1.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FuuxwOMV7IB1drn5hzX7p4BwJYQCUsgnZNVR+E6XKhM="; + }; + + propagatedBuildInputs = [ + google-api-core + grpc-google-iam-v1 + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "google.cloud.artifactregistry" + "google.cloud.artifactregistry_v1" + "google.cloud.artifactregistry_v1beta2" + ]; + + meta = with lib; { + description = "Google Cloud Artifact Registry API client library"; + homepage = "https://github.com/googleapis/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index fdff2da58e..f38a83a2c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-asset"; changelog = "https://github.com/googleapis/python-asset/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 643098f1de..60515a9c65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-audit-log"; changelog = "https://github.com/googleapis/python-audit-log/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index fb2a2fb510..fcbddee2fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -79,6 +79,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-automl"; changelog = "https://github.com/googleapis/python-automl/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index c29272d0f2..5136c19576 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; changelog = "https://github.com/googleapis/python-bigquery-datatransfer/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 2ef048af1a..ce91fa6c6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery-storage"; changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 7b237bb1a2..69a32d87a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.11.3"; + version = "3.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1Fhb6edsmE7IPvKQ6+/xdWLSyfL0+E0wFdm3sntJmp0="; + hash = "sha256-aX3xFyQaIoO8u5OyHhC63BTlHJqQgA0qfho+HH2EKXQ="; }; propagatedBuildInputs = [ @@ -131,6 +131,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery"; changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index b8d6bee573..773eea02e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.19.0"; + version = "2.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EebMccj9DmrPj+/GCECLkqplq3bSmRkNqlI3gYq0qzo="; + hash = "sha256-PUeEqed0crzfHLAHDDu4GgktMaNt11nuovfMIkz5iwk="; }; propagatedBuildInputs = [ @@ -65,6 +65,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigtable"; changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 6739b356fc..db7ab280b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.26.0"; + version = "2.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fUqX5n/tQ7BgtIo3/1jyOGvkIUiVltbfLpzwIZ0YJ0M="; + hash = "sha256-yML87bCWsuiV+jcznu6QDaLwKxSCb4Nd2BUm5f+wtRE="; }; propagatedBuildInputs = [ @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-container"; changelog = "https://github.com/googleapis/python-container/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index 9e45b46c5f..091729e95f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-cloud-core"; changelog = "https://github.com/googleapis/python-cloud-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 1fb272724c..8787eed87a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-datacatalog"; changelog = "https://github.com/googleapis/python-datacatalog/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 4bdd783af8..513f6c6167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-dataproc"; changelog = "https://github.com/googleapis/python-dataproc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index a86274ea5f..501afabbc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-datastore"; changelog = "https://github.com/googleapis/python-datastore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index 8f602f974d..c7e75a8e8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-dlp"; changelog = "https://github.com/googleapis/python-dlp/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index b61f1b7317..ec554d61d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-dns"; changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 4b3ecdcab5..4f28791963 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-error-reporting"; changelog = "https://github.com/googleapis/python-error-reporting/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 70570bfdce..19b8c25f37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-firestore"; changelog = "https://github.com/googleapis/python-firestore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index 1afb505c42..ec412c732d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-iam"; changelog = "https://github.com/googleapis/python-iam/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index b64354fc7d..3cd2f397a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-iot"; changelog = "https://github.com/googleapis/python-iot/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 0cd8a9d28d..9fa399d56f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-kms"; changelog = "https://github.com/googleapis/python-kms/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index 4a2e027792..762ebe98fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-language"; changelog = "https://github.com/googleapis/python-language/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index 6902231d87..3de689ac17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -80,6 +80,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-logging"; changelog = "https://github.com/googleapis/python-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 5c2494e5b6..7f2b2f46d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-monitoring"; changelog = "https://github.com/googleapis/python-monitoring/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index b90e3263e7..2aa7834ace 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-org-policy"; changelog = "https://github.com/googleapis/python-org-policy/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index a2185b7a42..a25ef3587d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-os-config"; changelog = "https://github.com/googleapis/python-os-config/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 6472f1fc32..fc713b8f8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-pubsub"; changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 860a65207e..e935fc37e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-redis"; changelog = "https://github.com/googleapis/python-redis/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 930c5805e6..aef2d27942 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-resource-manager"; changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index a9eb5f2ba7..67d050c2e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-runtimeconfig"; changelog = "https://github.com/googleapis/python-runtimeconfig/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 5c9997225f..c29c1e692f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-secret-manager"; changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ siriobalmelli SuperSandro2000 ]; + maintainers = with maintainers; [ siriobalmelli ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 90d692094f..4063ad21ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.23.1"; + version = "1.23.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GlFoeifExNS7pd+vDnYWsGWPNDkQ4SmnFFnTnsjTN6Q="; + hash = "sha256-3QdHomKKN8bSUtyFCZJliw/FxNixVj9pdkzMwJWT880="; }; propagatedBuildInputs = [ @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-securitycenter"; changelog = "https://github.com/googleapis/python-securitycenter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 157e670309..c9f568fd81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.36.0"; + version = "3.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zBKYxYvmUIAnC1StrhfzOSdkB4zhHlkds/6H5l1ZjG0="; + hash = "sha256-+JprkY2HU6RjkarQ74IemkD8lC3CW53x0kDwhrX/jRk="; }; propagatedBuildInputs = [ @@ -80,6 +80,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-spanner"; changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 462bcba9df..53b865bd75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-speech"; changelog = "https://github.com/googleapis/python-speech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index 490dc10677..ebcb32bf2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -89,6 +89,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-storage"; changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index ad654c6e2a..4d2a57a2d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-tasks"; changelog = "https://github.com/googleapis/python-tasks/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index 390abd0a58..55577e6fef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-test-utils"; changelog ="https://github.com/googleapis/python-test-utils/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 3b67f04f67..a1d430c022 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-texttospeech"; changelog = "https://github.com/googleapis/python-texttospeech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index d8f8b1a284..d7c11e3cad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-trace"; changelog = "https://github.com/googleapis/python-trace/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index 3b29befab9..0c487e19cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.11.2"; + version = "3.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CZluS7DfpcICMYWvhxkvHSwANmj4yfT6xDJCMQskQj4="; + hash = "sha256-LnjfcMGAMfF4ceLZdeeZjj3vyiL4JsjBsLiMlvXKVps="; }; propagatedBuildInputs = [ @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-translate"; changelog = "https://github.com/googleapis/python-translate/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 14f12cff1a..b0c883a56b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-videointelligence"; changelog = "https://github.com/googleapis/python-videointelligence/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index 21760337af..91d97e68b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-vision"; changelog = "https://github.com/googleapis/python-vision/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 702ba0d210..1ad657a827 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-websecurityscanner"; changelog = "https://github.com/googleapis/python-websecurityscanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix index da7f93da90..b1dc31da87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-crc32c"; description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ freezeboy SuperSandro2000 ]; + maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix index 124a725c56..3cc5c3d436 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/mirumee/google-i18n-address"; changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index a93cc2441f..455a04d2cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; changelog = "https://github.com/googleapis/google-resumable-media-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix index 3b08b4619c..dbf098fae7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Common protobufs used in Google APIs"; homepage = "https://github.com/googleapis/python-api-common-protos"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix new file mode 100644 index 0000000000..9fd2c80c3c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cachetools +, numpy +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "gptcache"; + version = "0.1.37"; + format = "setuptools"; + + disabled = pythonOlder "3.8.1"; + + src = fetchFromGitHub { + owner = "zilliztech"; + repo = "GPTCache"; + rev = "refs/tags/${version}"; + hash = "sha256-eQu3O6jPL1BRObA99XA2EOznn9NaArVRouqD1Ypz/4w="; + }; + + propagatedBuildInputs = [ + cachetools + numpy + requests + ]; + + # many tests require network access and complicated dependencies + doCheck = false; + + pythonImportsCheck = [ "gptcache" ]; + + meta = with lib; { + description = "Semantic cache for LLMs and fully integrated with LangChain and llama_index"; + homepage = "https://github.com/zilliztech/GPTCache"; + changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix index bdfa8c0e49..8636a71ecd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grad-cam/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.4.6"; + version = "1.4.8"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sL4+UUfC60JWAgJPvXeVGUHAskuoceVYwYDrYlibUOE="; + hash = "sha256-BNcwDaEEmRsEoJ4nvvGfjZ9LdG0eRqZCFuY5/Gmp5N4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix index 1ce628cc21..e87dc33355 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "graphene"; - version = "3.2.2"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = "graphene"; rev = "refs/tags/v${version}"; - hash = "sha256-kwF6oXp06w7r1PbPoJTCQ9teTExYMoqvIZDhtv5QNn8="; + hash = "sha256-DGxicCXZp9kW/OFkr0lAWaQ+GaECx+HD8+X4aW63vgQ="; }; propagatedBuildInputs = [ @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphene"; changelog = "https://github.com/graphql-python/graphene/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index f20e251fad..d80ed27297 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -4,7 +4,7 @@ , python , cairocffi , django -, django_tagging +, django-tagging , fetchFromGitHub , fetchpatch , gunicorn @@ -49,7 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cairocffi django - django_tagging + django-tagging gunicorn pyparsing python-memcached diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix index 401214bc1c..c751ba560b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "A library to help construct a graphql-py server supporting react-relay"; homepage = "https://github.com/graphql-python/graphql-relay-py/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix index 2d84cd87e0..de5e03d613 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { hash = "sha256-SQ+LcHeHDB1Hd5wXGDJBZmBG4KEZ3NsV4+4X9WgPb9E="; }; - sourceRoot = "source/gremlin-python/src/main/python"; + sourceRoot = "${src.name}/gremlin-python/src/main/python"; postPatch = '' sed -i '/pytest-runner/d' setup.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 105813f0d7..bff3045e5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.32.0"; + version = "0.32.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mGvoB05GJCoqkGJRpc85eAChU7LDW1w2FTHa6oIbz5k="; + hash = "sha256-rPh4FtcigZzscm3y/BJ/0Q0wURlumowlHY15MiQw2B8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 303d67c58e..f5a25339de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "GRPC library for the google-iam-v1 service"; homepage = "https://github.com/googleapis/googleapis"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix new file mode 100644 index 0000000000..cee3a2e159 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonRelaxDepsHook +, fetchPypi +, grpcio +, protobuf +}: + +buildPythonPackage rec { + pname = "grpcio-channelz"; + version = "1.56.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PlPGrD16Iy5vCsuVsFQ3FHd+wu0FJCFbo7isvYtVAQU="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "grpcio" + ]; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + pythonImportsCheck = [ "grpc_channelz" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Channel Level Live Debug Information Service for gRPC"; + homepage = "https://pypi.org/project/grpcio-channelz"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix index 656e147ac5..c45423ed95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "gRPC extensions for Google Cloud Platform"; homepage = "https://grpc.io"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix new file mode 100644 index 0000000000..c202a1f7c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonRelaxDepsHook +, fetchPypi +, grpcio +, protobuf +}: + +buildPythonPackage rec { + pname = "grpcio-health-checking"; + version = "1.56.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-XNodihNovizaBPkoSotzzuCf8+J37sjd2avPL+92s3I="; + }; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "grpcio" + ]; + + pythonImportsCheck = [ "grpc_health" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Standard Health Checking Service for gRPC"; + homepage = "https://pypi.org/project/grpcio-health-checking/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix new file mode 100644 index 0000000000..886df4537e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, grpcio +, protobuf +}: + +buildPythonPackage rec { + pname = "grpcio-reflection"; + version = "1.56.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dKgXZq9jmrjxt/WVMdyBRkD0obzwEtwGzmviBbUKOUw="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "grpcio" + ]; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + pythonImportsCheck = [ "grpc_reflection" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Standard Protobuf Reflection Service for gRPC"; + homepage = "https://pypi.org/project/grpcio-reflection"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index a8dade04a3..e8ea37c904 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "HTTP/2-based RPC framework"; license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix index 8c02015957..69ac2d4a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/glotzerlab/gsd"; changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index 9b41e272b9..30619532a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"' ''; + env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) { + GSSAPI_SUPPORT_DETECT = "false"; + }; + nativeBuildInputs = [ cython krb5 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix new file mode 100644 index 0000000000..7cd557d394 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/guidance/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, aiohttp +, diskcache +, gptcache +, msal +, nest-asyncio +, numpy +, openai +, platformdirs +, pygtrie +, pyparsing +, requests +, tiktoken +, torch +}: + +buildPythonPackage rec { + pname = "guidance"; + version = "0.0.64"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "guidance"; + rev = "refs/tags/${version}"; + hash = "sha256-tQpDJprxctKI88F+CZ9aSJbVo7tjmI4+VrI+WO4QlxE="; + }; + + propagatedBuildInputs = [ + aiohttp + diskcache + gptcache + msal + nest-asyncio + numpy + openai + platformdirs + pygtrie + pyparsing + requests + tiktoken + ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + disabledTests = [ + # require network access + "test_each_parallel_with_gen_openai" + ]; + + disabledTestPaths = [ + # require network access + "tests/library/test_gen.py" + "tests/library/test_include.py" + "tests/library/test_select.py" + "tests/llms/test_openai.py" + "tests/llms/test_transformers.py" + "tests/test_program.py" + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + pythonImportsCheck = [ "guidance" ]; + + meta = with lib; { + description = "A guidance language for controlling large language models"; + homepage = "https://github.com/microsoft/guidance"; + changelog = "https://github.com/microsoft/guidance/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix index 7bd347d750..8c543bce85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/benoitc/gunicorn"; description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix index 67f0ad0945..9926b3cfe9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "gymnasium"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = pname; - rev = "v${version}"; - hash = "sha256-7rRF21H3IxbgmqxvtC370kr0exLgfg3e2tA3J49xuao="; + rev = "refs/tags/v${version}"; + hash = "sha256-4YaEFEWSOTEdGgO1kSOleZQp7OrcOf+WAT/E0BWeoKI="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix index 50682ec31a..872ef1ab43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; homepage = "https://github.com/python-hyper/h11"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix index 8c6dde1803..bb37c4d160 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "https://github.com/python-hyper/h2"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index 05699dd07e..c40d1633ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , base36 , chacha20poly1305-reuseable @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.7.0"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,10 +26,11 @@ buildPythonPackage rec { owner = "ikalchev"; repo = "HAP-python"; rev = "refs/tags/${version}"; - hash = "sha256-/UBJh1m+WscN9I85/kvlNQnowNybEDyGVuQk4HBDWLE="; + hash = "sha256-M/STfco+Bx+KxBT1lUIrYyGSjBcPw2UVX02gNOROke4="; }; propagatedBuildInputs = [ + async-timeout chacha20poly1305-reuseable cryptography h11 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix index 1b80c9a498..6059ce3cb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix @@ -13,7 +13,7 @@ let pname = "hassil"; - version = "1.0.6"; + version = "1.2.5"; in buildPythonPackage { inherit pname version; @@ -21,7 +21,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-rCSVKFIkfPg2aYFwuYVLMxMO8S11dV8f4eckpFbNB3k="; + hash = "sha256-udOkZILoba2+eR8oSFThsB846COaIXawwRYhn261mCA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 35c7e2d651..9a1ecc4294 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.25.0"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xKoyRwMeyU+qQ0wXsVCTXdQatxQCc5re2Iv6KGjusuA="; + hash = "sha256-siyPuSLqzH30bdY1y+VaBBCjOU1YLtBgPpTvZCJtcXc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix index cc953aa696..59ca3e5b61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/daleroberts/hdmedians"; description = "High-dimensional medians"; license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix index dbde2de90b..9bfb9918bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/hexbytes"; changelog = "https://github.com/ethereum/hexbytes/blob/v${version}/docs/release_notes.rst"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix index 9b8487ffa8..c00d7d5b46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hexdump/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { }; # the source zip has no prefix, so everything gets unpacked to /build otherwise - sourceRoot = "source"; unpackPhase = '' runHook preUnpack mkdir source @@ -21,6 +20,8 @@ buildPythonPackage rec { runHook postUnpack ''; + sourceRoot = "source"; + pythonImportsCheck = [ "hexdump" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix new file mode 100644 index 0000000000..b865c4c84d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hfst/default.nix @@ -0,0 +1,45 @@ +{ lib +, pkgs +, stdenv +, buildPythonPackage +, foma +, icu +, swig +}: + +buildPythonPackage rec { + pname = "hfst"; + inherit (pkgs.hfst) version src; + + sourceRoot = "${src.name}/python"; + + postPatch = '' + # omorfi-python looks for 'hfst' Python package + sed -i 's/libhfst_swig/hfst/' setup.py; + ''; + + nativeBuildInputs = [ + swig + ]; + + buildInputs = [ + icu + pkgs.hfst + ]; + + setupPyBuildFlags = [ + "--inplace" + ]; + + # Find foma in Darwin tests + preCheck = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="${foma}/lib" + ''; + + meta = with lib; { + description = "Python bindings for HFST"; + homepage = "https://github.com/hfst/hfst"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hid-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hid-parser/default.nix new file mode 100644 index 0000000000..56aeb503b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hid-parser/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytestCheckHook +, hypothesis +}: + +buildPythonPackage rec { + pname = "hid-parser"; + version = "0.0.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zbm+h+ieDmd1K0uH+9B8EWtYScxqYJXVpY9bXdBivA4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ "hid_parser" ]; + + meta = with lib; { + description = "Typed pure Python library to parse HID report descriptors"; + homepage = "https://github.com/usb-tools/python-hid-parser"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hist/default.nix index df7f447a04..07f8035fb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hist/default.nix @@ -8,16 +8,19 @@ , numpy , pytestCheckHook , pytest-mpl +, pythonOlder }: buildPythonPackage rec { pname = "hist"; - version = "2.6.3"; + version = "2.7.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "dede097733d50b273af9f67386e6dcccaab77e900ae702e1a9408a856e217ce9"; + hash = "sha256-/74xTCvQPDQrnxaNznFa2PNigesjFyoAlwiCqTRP6Yg="; }; buildInputs = [ @@ -38,7 +41,8 @@ buildPythonPackage rec { meta = with lib; { description = "Histogramming for analysis powered by boost-histogram"; - homepage = "https://hist.readthedocs.io/en/latest/"; + homepage = "https://hist.readthedocs.io/"; + changelog = "https://github.com/scikit-hep/hist/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hnswlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hnswlib/default.nix new file mode 100644 index 0000000000..c3dab17f53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hnswlib/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, hnswlib +, numpy +, pybind11 +, setuptools +, unittestCheckHook +}: + +buildPythonPackage { + pname = "hnswlib"; + inherit (hnswlib) version src meta; + format = "pyproject"; + + nativeBuildInputs = [ + numpy + setuptools + pybind11 + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ + "tests/python" + "--pattern 'bindings_test*.py'" + ]; + + pythonImportsCheck = [ + "hnswlib" + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 61e47ab064..0f3f8ae660 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.28"; + version = "0.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v.${version}"; - hash = "sha256-JHj7fSE8p3TLViDSegl6gm35u53D9NvN7Oa2TBjN9t4="; + hash = "sha256-ijhqu0LzQzpjDSe9ZjNhgdjq/DJuD7oVbRTLX97nGHM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hologram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hologram/default.nix new file mode 100644 index 0000000000..0964bbf89c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hologram/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pytestCheckHook +, python-dateutil +, setuptools +}: + +buildPythonPackage rec { + pname = "hologram"; + version = "0.0.16"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-DboVCvByI8bTThamGBwSiQADGxIaEnTMmwmVI+4ARgc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + jsonschema + python-dateutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hologram" + ]; + + meta = with lib; { + description = "A library for automatically generating Draft 7 JSON Schemas from Python dataclasses"; + homepage = "https://github.com/dbt-labs/hologram"; + license = licenses.mit; + maintainers = with maintainers; [ mausch tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 66fce7bfd2..538a6b489c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Python data analysis and visualization seamless and simple"; homepage = "https://www.holoviews.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 85a6b7b5a0..bae4dc5a71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.0"; + version = "1.10.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g8vdg7YU3rkXW85U4w9Hvb6u9uvoDphbkIlVXchCRxQ="; + hash = "sha256-zNhqiWYZ3tv6lwYgmi6Yue+mFcgk7Y1dDMbzWlsvVJM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix index f726340b7c..421ef73275 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "HOOMD-blue is a general-purpose particle simulation toolkit"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix index 775ff1a50f..ae09ccfdf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Implementation of HopcroftKarp's algorithm"; homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; license = licenses.gpl3Only; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index 9a08dafca9..4a910af1b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { description = "Instant coding answers via the command line"; homepage = "https://github.com/gleitz/howdoi"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix index 41b2a5522e..ba819ba388 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Pure-Python HPACK header compression"; homepage = "https://github.com/python-hyper/hpack"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index eacca2b851..68508b655e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Chromium HSTS Preload list as a Python package and updated daily"; homepage = "https://github.com/sethmlarson/hstspreload"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix index 1b34c07187..308a2dd08f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "A collection of framework independent HTTP protocol utils"; homepage = "https://github.com/MagicStack/httptools"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 90b11bbc59..ffbea1b67c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -125,6 +125,6 @@ buildPythonPackage rec { description = "The next generation HTTP client"; homepage = "https://github.com/encode/httpx"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc fab ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix index 13ed586c37..9854e428a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , freezegun , gettext -, importlib-metadata , pytestCheckHook , pythonOlder , hatch-vcs @@ -12,16 +11,16 @@ buildPythonPackage rec { pname = "humanize"; - version = "4.6.0"; + version = "4.7.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-humanize"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sI773uzh+yMiyu1ebsk6zutfyt+tfx/zT/X2AdH5Fyg="; + hash = "sha256-ofRdrFVxIxAtv8WopJDX8Te8yaaJTnDbRM56V7pm/NM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,10 +31,6 @@ buildPythonPackage rec { gettext ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - postBuild = '' scripts/generate-translation-binaries.sh ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix index 9407927529..39e7f58359 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://hvplot.pyviz.org"; changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix index 5bf37b4539..5cade60d0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix @@ -4,6 +4,7 @@ , antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub +, fetchpatch , importlib-resources , jre_headless , omegaconf @@ -32,6 +33,12 @@ buildPythonPackage rec { src = ./antlr4.patch; antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) + # https://github.com/facebookresearch/hydra/pull/2731 + (fetchpatch { + name = "setuptools-67.5.0-test-compatibility.patch"; + url = "https://github.com/facebookresearch/hydra/commit/25873841ed8159ab25a0c652781c75cc4a9d6e08.patch"; + hash = "sha256-oUfHlJP653o3RDtknfb8HaaF4fpebdR/OcbKHzJFK/Q="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix index 3673b50bb8..d4d45fa2e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "HTTP/2 framing layer for Python"; homepage = "https://github.com/python-hyper/hyperframe/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index fab840a74e..a5692c6315 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -108,6 +108,6 @@ buildPythonPackage rec { homepage = "https://github.com/HypothesisWorks/hypothesis"; changelog = "https://hypothesis.readthedocs.io/en/latest/changes.html#v${lib.replaceStrings [ "." ] [ "-" ] version}"; license = licenses.mpl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix index a9c3af6c32..61aae4e4f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { description = "Hypothesis strategies for generating Python programs, something like CSmith"; homepage = "https://github.com/Zac-HD/hypothesmith"; license = licenses.mpl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix index 10e3838da1..8ac76ae26d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix @@ -210,6 +210,6 @@ buildPythonPackage rec { homepage = "https://github.com/ibis-project/ibis"; changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc cpcloud ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix index 8bb64ba4e1..e012ca20e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Lightweight template engine"; homepage = "https://github.com/dmulholland/ibis"; license = licenses.publicDomain; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix index 74f4444858..2f539c8752 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , freezegun , tzdata -, py , pyparsing , pydantic , pytest-asyncio @@ -19,16 +18,16 @@ buildPythonPackage rec { pname = "ical"; - version = "4.5.4"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UcuJ23yzpRHDUFlwov692UyLXP/9Qb4F+IJIszo12/M="; + hash = "sha256-6xDbr/y9ZNT9thWMLHPi9/EXVXrUdMCVJdQAcd3G2vo="; }; nativeBuildInputs = [ @@ -49,7 +48,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - py pytest-asyncio pytest-benchmark pytest-golden diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index d7637d6503..2bc949f040 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.24"; + version = "2.5.26"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; - rev = "v${version}"; - hash = "sha256-L73M+lWonuT7sSk+piBkZZJtxxeBvZ1XUXUypvS65G0="; + rev = "refs/tags/v${version}"; + hash = "sha256-gpvfj9XwhErMPXWygZb5QMHDwCK7ZhGw6L86ttRoP/Y="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix index abe6836b59..77f6283e4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://github.com/pydron/ifaddr"; description = "Enumerates all IP addresses on all network adapters of the system"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix index b8f02166f3..6f7f5d2562 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.10.4"; + version = "0.10.6"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY="; + hash = "sha256-xdzk/gcHL/kFpZabdP7Cq4lUv0aEwpevgLJYqfb2KGY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix index a3a37c0acc..99184c0467 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "3.2.2"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - hash = "sha256-uYg8hxYAHXpcgYWQUgjkCnfu+bKnPbzk0YnOsJKqk70="; + hash = "sha256-EClOm/ictxPaBbxHkL3/YWYQQy21YZZIJwdImOF0+Rc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index e302731825..b7d2811fbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook }: buildPythonPackage rec { pname = "imap-tools"; - version = "1.0.0"; + version = "1.2.0"; - disabled = isPy27; + disabled = pythonOlder "3.5"; format = "setuptools"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-JAMEJv0Vc5iunuKusyD+rxLiubEIDgHsr7FrMZgLy9Q="; + hash = "sha256-FC4uvBqQ9Lqpvj94ByM7LYiqqjAQQljYduBxwum49lI="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix index 8f8bed046c..555fa80acd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.5"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; - rev = "v${version}"; - hash = "sha256-7b/iSFQ4817XmDA40cQ/iqEuUegeg8Cypl85ntux6CI="; + rev = "refs/tags/v${version}"; + hash = "sha256-DsvKtiy9sawGKpQu3f5OMUtE2Emq3Br8FupopUcLVew="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/impacket/default.nix index cc957ac156..3e5db5b396 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/impacket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/impacket/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/SecureAuthCorp/impacket"; # Modified Apache Software License, Version 1.1 license = licenses.free; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index bb9a899086..b4c20163cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "6.0.0"; + version = "6.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-41S+3rYO+mr/3MiuEhtzVEp6p0FW0EcxGUj21xHNN40="; + hash = "sha256-26zniS2MDErBrQlmYiMvgx1OZPTEVFvVMBaj6dRlR0M="; }; nativeBuildInputs = [ @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Read metadata from Python packages"; homepage = "https://importlib-metadata.readthedocs.io/"; license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab AndersonTorres ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix index 53294680df..74336bf5d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix index 8fabae484d..3498b4935c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix @@ -39,6 +39,6 @@ let incremental = buildPythonPackage rec { homepage = "https://github.com/twisted/incremental"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in incremental diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix index a36a11ac60..e62e7f17e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/weblyzard/inscriptis"; changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix new file mode 100644 index 0000000000..6d5c4a6623 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix @@ -0,0 +1,77 @@ +{ lib +, albumentations +, buildPythonPackage +, cython +, easydict +, fetchPypi +, insightface +, matplotlib +, mxnet +, numpy +, onnx +, onnxruntime +, opencv4 +, prettytable +, pythonOlder +, scikit-image +, scikit-learn +, tensorboard +, testers +, tqdm +}: + +buildPythonPackage rec { + pname = "insightface"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + easydict + matplotlib + mxnet + numpy + onnx + onnxruntime + opencv4 + scikit-learn + scikit-image + tensorboard + tqdm + albumentations + prettytable + ]; + + pythonImportsCheck = [ + "insightface" + "insightface.app" + "insightface.data" + ]; + + passthru.tests.version = testers.testVersion { + package = insightface; + command = "insightface-cli --help"; + # Doesn't support --version but we still want to make sure the cli is executable + # and returns the help output + version = "help"; + }; + + doCheck = false; # Upstream has no tests + + meta = with lib; { + description = "State-of-the-art 2D and 3D Face Analysis Project"; + homepage = "https://github.com/deepinsight/insightface"; + license = licenses.mit; + maintainers = with maintainers; [ oddlama ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix index 2dd71b515a..98450dd31e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -121,6 +121,6 @@ buildPythonPackage rec { homepage = "https://github.com/ContinuumIO/intake"; changelog = "https://github.com/intake/intake/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iocextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iocextract/default.nix index 9a2f5a2ec4..5831ab80e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iocextract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iocextract/default.nix @@ -4,11 +4,12 @@ , pytestCheckHook , pythonOlder , regex +, requests }: buildPythonPackage rec { pname = "iocextract"; - version = "1.15.2"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,11 +18,12 @@ buildPythonPackage rec { owner = "InQuest"; repo = "python-iocextract"; rev = "refs/tags/v${version}"; - hash = "sha256-l0TGi3Y3/Dcwyp80eRWYYlDaDDJdpc31fcxdYEVvQas="; + hash = "sha256-jwMu4G146FpH6aFCiZK9tI/3CKnZYC2RCtO9QXXaquQ="; }; propagatedBuildInputs = [ regex + requests ]; nativeCheckInputs = [ @@ -36,6 +38,11 @@ buildPythonPackage rec { "tests.py" ]; + disabledTests = [ + # AssertionError: 'http://exampledotcom/test' != 'http://example.com/test' + "test_refang_data" + ]; + meta = with lib; { description = "Module to extract Indicator of Compromises (IOC)"; homepage = "https://github.com/InQuest/python-iocextract"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index 7bd161a5ae..4aec189907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { homepage = "https://github.com/gotcha/ipdb"; description = "IPython-enabled pdb"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix index 9788fd8a54..c4e9e17988 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master"; description = "Nose plugin to use iPdb instead of Pdb when tests fail"; license = licenses.lgpl2; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix index da55df0ac3..a126030d0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ipyniivue"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vFbEV/ZMXvKZeQUR536OZQ/5uIkt4tOWcCGRPMdc34I"; + hash = "sha256-kym7949VI6C+62p3IOQ2QIzWnuSBcrmySb83oqUwhjI="; }; nativeBuildInputs = [ hatchling hatch-jupyter-builder ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix index 99525060c5..e252987e3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools-scm, jaraco_collections, importlib-metadata +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, six +, jaraco-logging +, jaraco-text +, jaraco-stream +, pytz +, jaraco-itertools +, setuptools-scm +, jaraco-collections +, importlib-metadata }: buildPythonPackage rec { @@ -20,12 +30,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six importlib-metadata - jaraco_logging - jaraco_text - jaraco_stream + jaraco-logging + jaraco-text + jaraco-stream pytz - jaraco_itertools - jaraco_collections + jaraco-itertools + jaraco-collections ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix index e0667bb5b7..149aa4c9c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2023.1"; + version = "2023.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QLkpCBF95OBOzPrBXmlzyhFMfq1bs2+S/8Z5n4oMekg="; + sha256 = "sha256-NsNI1N9ZuNYWr1i3dl7hSaTP3jdsTYsIpoF98vrZG9Y="; }; postConfigure = '' @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Python wrapper around isl, an integer set library"; homepage = "https://github.com/inducer/islpy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix index 417fca817f..860b237c3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Python package for conversion and transliteration of unicode into ascii or iso-8859-1"; homepage = "https://github.com/redvasily/isounidecode"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix index eda1bd94c6..cbd739d5a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix @@ -5,9 +5,9 @@ , fetchFromGitHub , fetchPypi , importlib-resources -, jaraco_classes -, jaraco_collections -, jaraco_itertools +, jaraco-classes +, jaraco-collections +, jaraco-itertools , jaraco-context , jaraco-net , keyring @@ -55,15 +55,15 @@ buildPythonPackage rec { colorlog keyring requests-toolbelt - jaraco_collections + jaraco-collections jaraco-context - jaraco_classes + jaraco-classes jaraco-net more-itertools importlib-resources bx-py-utils platformdirs - jaraco_itertools + jaraco-itertools ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix index 5fd16f1f50..8c9b32fb11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - pname = "jaraco.classes"; + pname = "jaraco-classes"; version = "3.1.1"; disabled = isPy27; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix index 32b2a974d3..1d8f9a8f22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix @@ -3,17 +3,18 @@ , fetchPypi , setuptools , setuptools-scm -, jaraco_classes -, jaraco_text +, jaraco-classes +, jaraco-text }: buildPythonPackage rec { - pname = "jaraco.collections"; + pname = "jaraco-collections"; version = "4.3.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "jaraco.collections"; + inherit version; hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; }; @@ -30,8 +31,8 @@ buildPythonPackage rec { env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ - jaraco_classes - jaraco_text + jaraco-classes + jaraco-text ]; pythonNamespaces = [ "jaraco" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix index 6e036379b5..b23d9504de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix @@ -6,8 +6,8 @@ , fetchpatch , setuptools , setuptools-scm -, jaraco_text -, jaraco_collections +, jaraco-text +, jaraco-collections , keyring , pytestCheckHook }: @@ -48,8 +48,8 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ - jaraco_text - jaraco_collections + jaraco-text + jaraco-collections keyring ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix index c0a373c8b6..9cd5e9988f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix @@ -6,12 +6,13 @@ }: buildPythonPackage rec { - pname = "jaraco.functools"; + pname = "jaraco-functools"; version = "3.6.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "jaraco.functools"; + inherit version; hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix index fa652a5355..906733508c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix @@ -3,12 +3,13 @@ }: buildPythonPackage rec { - pname = "jaraco.itertools"; + pname = "jaraco-itertools"; version = "6.2.1"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "jaraco.itertools"; + inherit version; hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix index b56f5e9ac3..565395d840 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix @@ -11,11 +11,11 @@ , keyring , requests , feedparser -, jaraco_text -, jaraco_logging +, jaraco-text +, jaraco-logging , jaraco-email -, jaraco_functools -, jaraco_collections +, jaraco-functools +, jaraco-collections , path , python-dateutil , pathvalidate @@ -58,11 +58,11 @@ buildPythonPackage rec { keyring requests feedparser - jaraco_text - jaraco_logging + jaraco-text + jaraco-logging jaraco-email - jaraco_functools - jaraco_collections + jaraco-functools + jaraco-collections path python-dateutil pathvalidate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-stream/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaraco-stream/default.nix index 48a5085f79..b7befef927 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-stream/default.nix @@ -1,11 +1,12 @@ { buildPythonPackage, fetchPypi, setuptools-scm, six }: buildPythonPackage rec { - pname = "jaraco.stream"; + pname = "jaraco-stream"; version = "3.0.3"; src = fetchPypi { - inherit pname version; + pname = "jaraco.stream"; + inherit version; sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix index fa4efeb53a..cba2f375af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix @@ -5,10 +5,10 @@ , setuptools , setuptools-scm , toml -, jaraco_functools +, jaraco-functools , jaraco-context , more-itertools -, jaraco_collections +, jaraco-collections , pytestCheckHook }: @@ -32,10 +32,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ toml - jaraco_functools + jaraco-functools jaraco-context more-itertools - jaraco_collections + jaraco-collections ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix index 38febd83f4..eacbf2cbfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix @@ -4,7 +4,7 @@ , pythonOlder , autocommand , importlib-resources -, jaraco_functools +, jaraco-functools , jaraco-context , inflect , pathlib2 @@ -13,14 +13,15 @@ }: buildPythonPackage rec { - pname = "jaraco.text"; + pname = "jaraco-text"; version = "3.11.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "jaraco.text"; + inherit version; hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA="; }; @@ -35,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ autocommand jaraco-context - jaraco_functools + jaraco-functools inflect ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index c7e84e4c11..b3d3138ab4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -27,7 +27,7 @@ , scipy , stdenv # Options: -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index 2bcf5e9c17..bf93bf1a5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -40,8 +40,9 @@ , snappy , zlib +, config # CUDA flags: -, cudaSupport ? false +, cudaSupport ? config.cudaSupport , cudaPackages ? {} # MKL: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index 036f13ad36..f597b7d549 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.23.3"; + version = "1.23.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-feD/8GLkewfVwtGRZs8YaWnb96bFICpcH6nkJmCmPgs="; + hash = "sha256-d0KONiYS/5JXrl5izFSTYeABEhCW+W9cKpMgk9o9LB4="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix index 2a2389cf82..7317ee8fc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Lightweight pipelining: using Python functions as pipeline jobs"; homepage = "https://joblib.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index 94d67e131c..4cd2a2886d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jsbeautifier"; - version = "1.14.8"; + version = "1.14.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1MTiY6Qt1hlK+52+VHEL48VgRJLL7D6JyS3ZhRP5i58="; + hash = "sha256-xzjrw2tHvZTkym3RepAEw8x07a1YLKHWDg5dWUWmPLk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix index 1846bfc596..582248ca32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-merge-patch/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "JSON Merge Patch library"; homepage = "https://github.com/open-contracting/json-merge-patch"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonable/default.nix new file mode 100644 index 0000000000..705087674a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonable/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jsonable"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "halfak"; + repo = "python-jsonable"; + rev = "refs/tags/${version}"; + hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA="; + }; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "jsonable" ]; + + meta = with lib; { + description = "Provides an abstract base class and utilities for defining trivially JSONable python objects"; + homepage = "https://github.com/halfak/python-jsonable"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix index 6dfa6914f4..83275f54a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix @@ -7,22 +7,19 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.9.0"; + version = "1.9.2"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; + hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM="; }; propagatedBuildInputs = [ jsonschema ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # Fails with "Unresolvable JSON pointer" - "test_local_reference_in_meta" - ]; - meta = with lib; { description = "Merge a series of JSON documents"; homepage = "https://github.com/avian2/jsonmerge"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix index 0cc232bd70..a6fe574a9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-c-kernel/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Minimalistic C kernel for Jupyter"; homepage = "https://github.com/brendanrius/jupyter-c-kernel/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-core/default.nix new file mode 100644 index 0000000000..0f9c573e30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-core/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jupyter-core +, notebook +}: + +buildPythonPackage rec { + pname = "jupyter-contrib-core"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "jupyter-contrib"; + repo = "jupyter_contrib_core"; + rev = "refs/tags/${version}"; + hash = "sha256-UTtK+aKxBFkqKuHrt1ox8vdHyFz/9HiKFl7U4UQcG88="; + }; + + propagatedBuildInputs = [ + jupyter-core + notebook + ]; + + pythonImportsCheck = [ "jupyter_contrib_core" ]; + + meta = with lib; { + description = "Common utilities for jupyter-contrib projects"; + homepage = "https://github.com/jupyter-contrib/jupyter_contrib_core"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix new file mode 100644 index 0000000000..f95493513e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jupyter-contrib-core +, jupyter-highlight-selected-word +, jupyter-nbextensions-configurator +, lxml +}: + +buildPythonPackage rec { + pname = "jupyter-contrib-nbextensions"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "ipython-contrib"; + repo = "jupyter_contrib_nbextensions"; + rev = "refs/tags/${version}"; + hash = "sha256-1o8tBfRw6jNcKfNE7xXrQaEhx+KOv7mLOruvuMDtJ1Q="; + }; + + propagatedBuildInputs = [ + jupyter-contrib-core + jupyter-highlight-selected-word + jupyter-nbextensions-configurator + lxml + ]; + + pythonImportsCheck = [ "jupyter_contrib_nbextensions" ]; + + meta = with lib; { + description = "A collection of various notebook extensions for Jupyter"; + homepage = "https://github.com/ipython-contrib/jupyter_contrib_nbextensions"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix new file mode 100644 index 0000000000..a069ecf948 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "jupyter-highlight-selected-word"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "jcb91"; + repo = "jupyter_highlight_selected_word"; + rev = "refs/tags/${version}"; + hash = "sha256-KgM//SIfES46uZySwNR4ZOcolnJORltvThsmEvxXoIs="; + }; + + pythonImportsCheck = [ "jupyter_highlight_selected_word" ]; + + meta = with lib; { + description = "Jupyter notebook extension that enables highlighting every instance of the current word in the notebook"; + homepage = "https://github.com/jcb91/jupyter_highlight_selected_word"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix new file mode 100644 index 0000000000..ef0ff17526 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jupyter-contrib-core +}: + +buildPythonPackage rec { + pname = "jupyter-nbextensions-configurator"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "jupyter-contrib"; + repo = "jupyter_nbextensions_configurator"; + rev = "refs/tags/${version}"; + hash = "sha256-ovKYHATRAC5a5qTMv32ohU2gJd15/fRKXa5HI0zGp/0="; + }; + + propagatedBuildInputs = [ jupyter-contrib-core ]; + + pythonImportsCheck = [ "jupyter_nbextensions_configurator" ]; + + meta = with lib; { + description = "A jupyter notebook serverextension providing config interfaces for nbextensions"; + homepage = "https://github.com/jupyter-contrib/jupyter_nbextensions_configurator"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index b889b7bf62..0d39b868c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Turn code repositories into Jupyter enabled Docker Images"; homepage = "https://repo2docker.readthedocs.io/"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index b8ecde78ed..317b42d8a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -16,7 +16,6 @@ , tornado , pyzmq , ipykernel -, ipython_genutils , traitlets , jupyter-core , jupyter-client @@ -30,7 +29,6 @@ , anyio , websocket-client , requests -, requests-unixsocket }: buildPythonPackage rec { @@ -55,7 +53,6 @@ buildPythonPackage rec { jinja2 tornado pyzmq - ipython_genutils traitlets jupyter-core jupyter-client @@ -68,7 +65,6 @@ buildPythonPackage rec { prometheus-client anyio websocket-client - requests-unixsocket ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 7aeaa6cdb2..9907122b11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "JupyterHub Spawner using systemd for resource isolation"; homepage = "https://github.com/jupyterhub/systemdspawner"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 0e7a283b5d..2418b8db4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Jupyter Widgets JupyterLab Extension"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = licenses.bsd3; - maintainers = with maintainers; [ jonringer SuperSandro2000 ]; + maintainers = with maintainers; [ jonringer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index e15858ec37..433031d730 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { description = "Jupyter lab environment notebook server extension"; license = with licenses; [ bsd3 ]; homepage = "https://jupyter.org/"; - maintainers = with maintainers; [ zimbatm costrouc ]; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index 1c1ea206e4..b766f6d42e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -77,6 +77,6 @@ buildPythonPackage rec { homepage = "https://jupyterlab-server.readthedocs.io/"; changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix index 0d6361499d..2061f788c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/latchset/jwcrypto"; changelog = "https://github.com/latchset/jwcrypto/releases/tag/v${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index 43d65c4f0f..8805636080 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -2,6 +2,7 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, orjson , unittestCheckHook , pythonOlder , redis @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,11 +19,12 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-IhxMei6KkPsDnUkV4+zxSMI7rgZgOvbHQFqJAC1b5iw="; + hash = "sha256-1Bv0e218cvLuv/go0L13C39fFAeo0FJeCoU+XFUBhzk="; }; propagatedBuildInputs = [ boto3 + orjson redis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix index f85c756b81..2c6dc57d99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; + hash = "sha256-URGW8FyJZ3ktrwolls5ElSWn8FD6vWCA+Eu0aGtPh6U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix index a761c97859..a9b15b4390 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-VAm/jHeG/LfLpouHc3mSX8Kr8u/keHY552dLzoGaPrQ="; + hash = "sha256-w0LdGPVsxTi7jlfS/HSBEZdjL9ZKclucnBVViwrVC6Y="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast kasa crypt"; homepage = "https://github.com/bdraco/kasa-crypt"; - changelog = "https://github.com/bdraco/kasa-crypt/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/kasa-crypt/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix index f0989d493d..c729e1da53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -6,7 +6,7 @@ , setuptools-scm , importlib-metadata , dbus-python -, jaraco_classes +, jaraco-classes , jeepney , secretstorage , pytestCheckHook @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_classes + jaraco-classes ] ++ lib.optionals stdenv.isLinux [ jeepney secretstorage diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix index 64ad208b38..86d9f2b5f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "Python implementation of Mapper algorithm for Topological Data Analysis"; homepage = "https://kepler-mapper.scikit-tda.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 5b18605852..8e97d083cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { description = "Kubernetes Python client"; homepage = "https://github.com/kubernetes-client/python"; license = licenses.asl20; - maintainers = with maintainers; [ lsix SuperSandro2000 ]; + maintainers = with maintainers; [ lsix ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix index 707ce63ff3..8b537122e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix @@ -62,7 +62,7 @@ , chardet , requests-toolbelt , neo4j -, langchainplus-sdk +, langsmith # test dependencies , pytest-vcr , pytest-asyncio @@ -80,7 +80,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.229"; + version = "0.0.240"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -89,9 +89,11 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-9hPF+0bEcFGH2oop3e513kBp6UeUEBlPXD+2pZ4dCi0="; + hash = "sha256-7UwAdOzEgu3K/Gfq8D/GHNGxD6KhSx0xGMxtmpdnYxQ="; }; + sourceRoot = "source/libs/langchain"; + postPatch = '' substituteInPlace langchain/utilities/bash.py \ --replace '"env", ["-i", "bash", ' '"${lib.getExe bash}", [' @@ -227,7 +229,7 @@ buildPythonPackage rec { # azure-ai-formrecognizer # azure-ai-vision # azure-cognitiveservices-speech - langchainplus-sdk + langsmith ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix new file mode 100644 index 0000000000..af1a1c1afe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, requests +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage { + pname = "langsmith"; + version = "0.0.14"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchainplus-sdk"; + # there are no correct tags + # https://github.com/langchain-ai/langchainplus-sdk/issues/105 + rev = "092f67222e4beabca0f51ba03f1ee028f916da63"; + hash = "sha256-U8fs16Uq80EB7Ey5YuQhUKKI9DOXJWlabM5JdoDnWP0="; + }; + + sourceRoot = "source/python"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pydantic + requests + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # these tests require network access + "integration_tests" + ]; + + pythonImportsCheck = [ "langsmith" ]; + + meta = with lib; { + description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; + homepage = "https://github.com/langchain-ai/langchainplus-sdk"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix index a7e8a5de4a..5f8941047b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/dirkjanm/ldapdomaindump/"; changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix index edbcc2c110..e100690e6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "A Pure-Python Twisted library for LDAP"; homepage = "https://github.com/twisted/ldaptor"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix index 1a3ad1b7f2..b483a05caa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix @@ -2,11 +2,13 @@ , babel , buildPythonPackage , click -, deprecated , exifread , fetchFromGitHub +, fetchNpmDeps , filetype , flask +, hatch-vcs +, hatchling , importlib-metadata , inifile , jinja2 @@ -14,8 +16,10 @@ , marshmallow , marshmallow-dataclass , mistune +, nodejs +, npmHooks +, pillow , pip -, pyopenssl , pytest-click , pytest-mock , pytest-pylint @@ -25,15 +29,13 @@ , python-slugify , pytz , requests -, setuptools -, typing-inspect -, watchdog +, watchfiles , werkzeug }: buildPythonPackage rec { pname = "lektor"; - version = "3.4.0b4"; + version = "3.4.0b8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,13 +44,28 @@ buildPythonPackage rec { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk="; + hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U="; }; + npmDeps = fetchNpmDeps { + src = "${src}/frontend"; + hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M="; + }; + + npmRoot = "frontend"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + nodejs + npmHooks.npmConfigHook + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ babel click - deprecated exifread filetype flask @@ -58,17 +75,16 @@ buildPythonPackage rec { marshmallow marshmallow-dataclass mistune + pillow pip - pyopenssl python-slugify - pytz requests - setuptools - typing-inspect - watchdog + watchfiles werkzeug ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata + ] ++ lib.optionals (pythonOlder "3.9") [ + pytz ]; nativeCheckInputs = [ @@ -86,8 +102,11 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test requires network access + # Tests require network access "test_path_installed_plugin_is_none" + "test_VirtualEnv_run_pip_install" + # expects FHS paths + "test_VirtualEnv_executable" ]; meta = with lib; { @@ -95,6 +114,6 @@ buildPythonPackage rec { homepage = "https://www.getlektor.com/"; changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md"; license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index 6f3f2d3def..991a51203d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -19,31 +19,31 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.4.9"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "instagram"; - repo = pname; + repo = "libcst"; rev = "refs/tags/v${version}"; - hash = "sha256-ikddvKsvXMNHMfA9jUhvyiDXII0tTs/rE97IGI/azgA="; + hash = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/${cargoRoot}"; + sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-FWQGv3E5X+VEnTYD0uKN6W4USth8EQlEGbYgUAWZ5EQ="; + hash = "sha256-rPB3bAMdvjgsT3jkEDoWatW8LPwgIaFSbFPqiqANtBY="; }; cargoRoot = "native"; postPatch = '' - # test try to format files, which isn't necessary when consuming releases - sed -i libcst/codegen/generate.py \ - -e '/ufmt/c\ pass' + # avoid infinite recursion by not formatting the release files + substituteInPlace libcst/codegen/generate.py \ + --replace '"ufmt"' '"true"' ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -70,8 +70,12 @@ buildPythonPackage rec { ]; preCheck = '' + # otherwise import libcst.native fails + cp build/lib.*/libcst/native.* libcst/ + ${python.interpreter} -m libcst.codegen.generate visitors ${python.interpreter} -m libcst.codegen.generate return_types + # Can't run all tests due to circular dependency on hypothesmith -> libcst rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests} ''; @@ -89,6 +93,6 @@ buildPythonPackage rec { description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; license = with licenses; [ mit asl20 psfl ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix index 6b141af3c9..699bbabdfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix @@ -9,7 +9,9 @@ , six , nose , mako -, cudaSupport ? false, cudaPackages +, config +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } , openclSupport ? true, ocl-icd, clblas }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librespot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librespot/default.nix new file mode 100644 index 0000000000..21a25729fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/librespot/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, defusedxml +, protobuf +, pythonRelaxDepsHook +, websocket-client +, pyogg +, zeroconf +, requests +, pycryptodomex +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "librespot"; + version = "0.0.9"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kokarare1212"; + repo = "librespot-python"; + rev = "v${version}"; + hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + defusedxml + protobuf + pycryptodomex + pyogg + requests + websocket-client + zeroconf + ]; + + pythonRelaxDeps = [ + "protobuf" + "pyogg" + "requests" + "zeroconf" + ]; + + # Doesn't include any tests + doCheck = false; + + pythonImportsCheck = [ + "librespot" + ]; + + meta = with lib; { + description = "Open Source Spotify Client"; + homepage = "https://github.com/kokarare1212/librespot-python"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix index 3410664525..8a6bc51066 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Python binding for libsass to compile Sass/SCSS"; homepage = "https://sass.github.io/libsass-python/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/life360/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/life360/default.nix index cb61561eac..e3fd2a8ecb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/life360/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "5.5.0"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-F/j3qIdz63pEQ+nj1poP3lBFWSpSq4nLseYg+N2tykU="; + hash = "sha256-GRQPH7fp8YkkCEpXtvgFxJO6VLFQK/PBaRe0Tfg3KdU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index a313aa2233..38ec2aaa5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { homepage = "https://github.com/Microsoft/LightGBM"; changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ teh costrouc ]; + maintainers = with lib.maintainers; [ teh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix index bed095186e..d96eb4d4c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lmfit/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.2.1"; + version = "1.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-AM71vRRb+BtzYwt4kmrySyTxgFQh5iEcpYVYiqfMQVs="; + hash = "sha256-BEoFKhGmHaBXYnRQTBfrfigDtBEo4lgh6WYyIH8jyIw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix index 75d250ad03..8bdde865df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loopy/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "A code generator for array-based code on CPUs and GPUs"; homepage = "https://github.com/inducer/loopy"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/looseversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/looseversion/default.nix index 84c64a3d54..19b5d10ca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/looseversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/looseversion/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "looseversion"; - version = "1.2.0"; + version = "1.3.0"; format = "flit"; src = fetchPypi { inherit version pname; - sha256 = "sha256-xk5xwLKQMGg7Tqda7kMdstJcTm5TNZDlISnx2eUd4gQ="; + sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 1b97989636..7f0231c7d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.17.5"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-P3MpnVWjeB2OwqRcm4Wj6GixBDguMOFN227iM+e5Fi8="; + hash = "sha256-wl8L+ZQQgzWb7QUHWHSOT3meCn1baE7Prs1nWAOvnKo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix index e172cf2f97..ed06dca7c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-lz4/python-lz4"; changelog = "https://github.com/python-lz4/python-lz4/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix index 5ef3111d86..942699156a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres SuperSandro2000 ]; + maintainers = with maintainers; [ AndersonTorres ]; # https://github.com/miyakogi/m2r/issues/66 broken = versionAtLeast mistune.version "2"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/macaddress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/macaddress/default.nix new file mode 100644 index 0000000000..2849506671 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/macaddress/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, hypothesis +, reprshed +}: + +buildPythonPackage rec { + pname = "macaddress"; + version = "2.0.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mentalisttraceur"; + repo = "python-macaddress"; + rev = "v${version}"; + hash = "sha256-2eD5Ui8kUduKLJ0mSiwaz7TQSeF1+2ASirp70V/8+EA="; + }; + + pythonImportsCheck = [ + "macaddress" + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + reprshed + ]; + + pytestFlagsArray = [ + "$src/test.py" + ]; + + meta = with lib; { + homepage = "https://github.com/mentalisttraceur/python-macaddress"; + description = "A module for handling hardware identifiers like MAC addresses"; + license = licenses.bsd0; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix index 9345573e9a..d7b122396e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { homepage = "https://github.com/lihaoyi/macropy"; description = "Macros in Python: quasiquotes, case classes, LINQ and more"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; broken = pythonAtLeast "3.8"; # see https://github.com/lihaoyi/macropy/issues/103 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 1d7e6eb922..3e871a9056 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -27,16 +27,16 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.7.3"; + version = "1.8.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-HOM7BlrKpqm16plTMLFpC6VScEoMlxCJFhZ0mcIFIcE="; + hash = "sha256-YYbdd0GLVKE7+Oi0mpQjqhFdjdlquk/XnIg5WrtKcfI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix new file mode 100644 index 0000000000..8a3a0fff57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, hatchling +}: + +buildPythonPackage rec { + pname = "magic-filter"; + version = "1.0.10"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiogram"; + repo = "magic-filter"; + rev = "v${version}"; + hash = "sha256-mHqq/ci8uMACNutwmxKX1nrl3nTSnSyU2x1VxzWxqzM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "magic_filter" ]; + + meta = with lib; { + description = "Magic filter based on dynamic attribute getter"; + homepage = "https://github.com/aiogram/magic-filter"; + changelog = "https://github.com/aiogram/magic-filter/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 0a9e26771c..e47f27d806 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index a47322fdc6..76eaca6be6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index 0773277489..f462793266 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; license = licenses.mit; - maintainers = with maintainers; [ asymmetric SuperSandro2000 ]; + maintainers = with maintainers; [ asymmetric ]; mainProgram = "wormhole"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix index b2559c6c3e..1d108b3686 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Enum field for Marshmallow"; homepage = "https://github.com/justanr/marshmallow_enum"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix index cd11d89c7d..57e7728b1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "A library for pattern matching on symbolic expressions"; homepage = "https://github.com/HPAC/matchpy"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index b97730fbd4..4b83afc5d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -15,22 +15,21 @@ , pytestCheckHook , pytest-asyncio , aiosqlite -, sqlalchemy , asyncpg }: buildPythonPackage rec { pname = "mautrix"; - version = "0.19.16"; + version = "0.20.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-aZlc4+J5Q+N9qEzGUMhsYguPdUy+E5I06wrjVyqvVDk="; + hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; }; propagatedBuildInputs = [ @@ -57,17 +56,9 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio aiosqlite - sqlalchemy asyncpg ] ++ passthru.optional-dependencies.encryption; - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - - disabledTestPaths = [ - # sqlalchemy 2 unsupported - "mautrix/client/state_store/tests/store_test.py" - ]; - pythonImportsCheck = [ "mautrix" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index 90acdef2d3..b5f7fb9d5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -31,6 +31,10 @@ buildPythonPackage rec { "maxminddb" ]; + # The multiprocessing tests fail on Darwin because multiprocessing uses spawn instead of fork, + # resulting in an exception when it can’t pickle the `lookup` local function. + disabledTests = lib.optionals stdenv.isDarwin [ "multiprocessing" ]; + meta = with lib; { description = "Reader for the MaxMind DB format"; homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 9b9eef88ea..9643dc0140 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -4,16 +4,16 @@ , click , dnspython , fetchFromGitHub -, mock , poetry-core , pytest-asyncio +, pytest-rerunfailures , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "mcstatus"; - version = "10.0.3"; + version = "11.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +22,15 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LHcLqP9IGqi0YmjgFoTwojyS+IZmBOBujYWMPuqNc6w="; + hash = "sha256-+r6WL59T9rNAKl3r4Hef75uJoD7DRYA23uS/OlzRyRk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov=mcstatus --cov-append --cov-branch --cov-report=term-missing -vvv --no-cov-on-fail" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -36,19 +42,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytest-asyncio + pytest-rerunfailures pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace " --cov=mcstatus --cov-append --cov-branch --cov-report=term-missing -vvv --no-cov-on-fail" "" \ - --replace 'asyncio-dgram = "2.1.2"' 'asyncio-dgram = ">=2.1.2"' \ - --replace 'dnspython = "2.2.1"' 'dnspython = ">=2.2.0"' - ''; - pythonImportsCheck = [ "mcstatus" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix index a338309ec6..88ca28f489 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.28.1"; + version = "0.28.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-iaho3a6Agk5Utl7px+E3afUJfoWbhoYSCe2WqYzDF1w="; + hash = "sha256-S1ZBSkWqCU6EpFqLpxCN1ZNswJroF86+26WeyYPD0S0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 9a146402da..ff223339b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.1.10"; + version = "2.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-pa3hSrulnTfoOmNkaWvsqdd7ow+qENPJlBHFoFooZhw="; + hash = "sha256-nYbnOlD3yC3aoSSY4jwSgTv/m56I+ral2GwmoyQij1M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix index 2c0ba17567..58ddc57bfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mesonpep517/default.nix @@ -5,6 +5,7 @@ , ninja , setuptools , toml +, wheel }: # TODO: offer meson as a Python package so we have dist-info folder. @@ -19,19 +20,21 @@ buildPythonPackage rec { hash = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; }; + # Applies the following merge request, which doesn't apply cleanly: + # https://gitlab.com/thiblahute/mesonpep517/-/merge_requests/25 + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'backend-path = "."' 'backend-path = ["."]' + ''; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ toml ]; - # postPatch = '' - # # Meson tries to detect ninja as well, so we should patch meson as well. - # substituteInPlace mesonpep517/buildapi.py \ - # --replace "'meson'" "'${meson}/bin/meson'" \ - # --replace "'ninja'" "'${ninja}/bin/ninja'" - # ''; - propagatedNativeBuildInputs = [ meson ninja ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix index d9e537b057..9eda32b4e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , chardet , django -, django_contrib_comments +, django-contrib-comments , fetchPypi , filebrowser_safe , future @@ -42,7 +42,7 @@ buildPythonPackage rec { bleach chardet django - django_contrib_comments + django-contrib-comments filebrowser_safe future grappelli_safe diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix new file mode 100644 index 0000000000..a15f81014c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/minimal-snowplow-tracker/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, six +}: + +buildPythonPackage rec { + pname = "minimal-snowplow-tracker"; + version = "0.0.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rKv3Vy2w5/XL9pg9SV7vVAgfcb45IzDrOq25zLOdqqQ="; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "snowplow_tracker" + ]; + + meta = with lib; { + description = "Minimal snowplow event tracker"; + homepage = "https://github.com/dbt-labs/snowplow-python-tracker"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix new file mode 100644 index 0000000000..cd40bb14b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, mkdocs +}: + +buildPythonPackage rec { + pname = "mkdocs-git-authors-plugin"; + version = "0.7.2"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "timvink"; + repo = "mkdocs-git-authors-plugin"; + rev = "v${version}"; + hash = "sha256-jhYwi9HO6kxOS1QmEKb1YnXGSJ4Eyo4Sm07jI4lxXnA="; + }; + + propagatedBuildInputs = [ mkdocs ]; + + pythonImportsCheck = [ "mkdocs_git_authors_plugin" ]; + + meta = with lib; { + description = "Lightweight MkDocs plugin to display git authors of a markdown page"; + homepage = "https://github.com/timvink/mkdocs-git-authors-plugin"; + license = licenses.mit; + maintainers = with maintainers; [ totoroot ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-linkcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-linkcheck/default.nix new file mode 100644 index 0000000000..540640e14b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-linkcheck/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pythonPackages +}: + +buildPythonPackage rec { + pname = "mkdocs-linkcheck"; + version = "unstable-2021-08-24"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "byrnereese"; + repo = "linkchecker-mkdocs"; + rev = "a75d765b0ec564e5ed0218880ed0b5ab4b973917" ; + hash = "sha256-z59F7zUKZKIQSiTlE6wGbGDecPMeruNgltWUYfDf8jY="; + }; + + propagatedBuildInputs = with pythonPackages; [ + aiohttp + requests + ]; + + pythonImportsCheck = [ "mkdocs_linkcheck" ]; + + meta = with lib; { + description = "Validate links in Markdown files for static site generators like MkDocs, Hugo or Jekyll"; + longDescription = '' + This is not a MkDocs plugin, but a companion tool that is useful to validate links in Markdown files for + static site generators like MkDocs, Hugo or Jekyll. It can be used with any text files containing links. + ''; + homepage = "https://github.com/byrnereese/mkdocs-linkcheck"; + license = licenses.mit; + maintainers = with maintainers; [ totoroot ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix index 9a428f158e..878117c6b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mkdocs-redirects"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mkdocs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+Ti+Z5gL5vVlQDt+KRw9nNHHKhRtEfguQe1K001DK9E="; + hash = "sha256-zv/tCsC2wrD0iH7Kvlq4nXJMPMGQ7+l68Y/q/x66LBg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index 656bde232a..dcd7a15fa7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.10.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; - rev = version; - hash = "sha256-VGPlOHQNtXrfmcne93xDIxN20KDGlTQrjeAKhX/L6K0="; + rev = "refs/tags/${version}"; + hash = "sha256-65c63K8u3aWJFeMIi0jOeRA7RXc1OWumys0LUOvgBEU="; }; nativeBuildInputs = [ @@ -37,11 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'license = "ISC"' 'license = {text = "ISC"}' \ - ''; - pythonImportsCheck = [ "mkdocstrings_handlers" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix index b9f0174bb5..f9b94a0506 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Universal data modeling for Python"; homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix index 36294fab76..e2d498bc42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , isPy3k @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - pname = "moderngl_window"; - version = "2.4.2"; + pname = "moderngl-window"; + version = "2.4.4"; src = fetchFromGitHub { owner = "moderngl"; - repo = pname; + repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; + hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; @@ -28,11 +29,14 @@ buildPythonPackage rec { # Tests need a display to run. doCheck = false; + pythonImportsCheck = [ "moderngl_window" ]; + meta = with lib; { homepage = "https://github.com/moderngl/moderngl_window"; description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; license = licenses.mit; - platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. + broken = stdenv.isDarwin; # darwin build breaks + platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ c0deaddict ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix index a0d8cf600d..cb0be3e5ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB"; homepage = "http://mongoengine.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mqtt2influxdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mqtt2influxdb/default.nix new file mode 100644 index 0000000000..a2d7fa25fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mqtt2influxdb/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, influxdb +, jsonpath-ng +, paho-mqtt +, py-expression-eval +, pyaml +, pycron +, schema +}: +buildPythonPackage rec { + pname = "mqtt2influxdb"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "hardwario"; + repo = "bch-mqtt2influxdb"; + rev = "v${version}"; + sha256 = "YDgMoxnH4vCCa7b857U6iVBhYLxk8ZjytGziryn24bg="; + }; + + propagatedBuildInputs = [ + influxdb + jsonpath-ng + paho-mqtt + py-expression-eval + pyaml + pycron + schema + ]; + + pythonImportsCheck = [ "mqtt2influxdb" ]; + + meta = with lib; { + homepage = "https://github.com/hardwario/bch-mqtt2influxdb"; + description = "Flexible MQTT to InfluxDB Bridge"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix index 6bacec60da..18287c6419 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/msgpack/msgpack-python"; changelog = "https://github.com/msgpack/msgpack-python/blob/v${version}/ChangeLog.rst"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 47a65bf0cf..3f3cc47351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.0.1"; + version = "5.1.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nolze"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OrGgY+CEhAHGOOIPYK8OijRdoh0PRelnsKB++ksUIXY="; + hash = "sha256-A1TeTE4TMHAb+KtFxTi+b4yTfuEFya8iyzy92dzQ0Z4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix index a64a3e928c..6d9a28e564 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "An implementation of a multiset"; homepage = "https://github.com/wheerd/multiset"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/music-tag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/music-tag/default.nix new file mode 100644 index 0000000000..f997ca4725 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/music-tag/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mutagen +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "music-tag"; + version = "0.4.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Cqtubu2o3w9TFuwtIZC9dFYbfgNWKrCRzo1Wh828//Y="; + }; + + propagatedBuildInputs = [ + mutagen + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test" ]; + + # Tests fail: ModuleNotFoundError: No module named '_test_common' + doCheck = false; + + pythonImportsCheck = [ + "music_tag" + ]; + + meta = with lib; { + description = "Simple interface to edit audio file metadata"; + homepage = "https://github.com/KristoforMaynard/music-tag"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwcli/default.nix new file mode 100644 index 0000000000..cc58e46d20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwcli/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonRelaxDepsHook +, docopt +, para +}: + +buildPythonPackage rec { + pname = "mwcli"; + version = "0.0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ADMb0P8WtXIcnGJ02R4l/TVfRewHc8ig45JurAWHGaA="; + }; + + # Prevent circular dependency + pythonRemoveDeps = [ + "mwxml" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + docopt + para + ]; + + # Tests require mwxml which itself depends on this package (circular dependency) + doCheck = false; + + meta = with lib; { + description = "A set of helper functions and classes for mediawiki-utilities command-line utilities"; + homepage = "https://github.com/mediawiki-utilities/python-mwcli"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix index 738e36dfe3..28e7f8c89f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mwdblib"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WwSKWfnSDJT8kIAk4e8caeL2UztFaIpNCDy1j46IbzM="; + hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwtypes/default.nix new file mode 100644 index 0000000000..89e693dda8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwtypes/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonable +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mwtypes"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3BF2xZZWKcEj6FmzGa5hUdTjhVMemngWBMDUyjQ045k="; + }; + + propagatedBuildInputs = [ jsonable ]; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + disabledTests = [ + "test_normalize_path_bad_extension" + "test_open_file" + ]; + + pythonImportsCheck = [ "mwtypes" ]; + + meta = with lib; { + description = "A set of classes for working with MediaWiki data types."; + homepage = "https://github.com/mediawiki-utilities/python-mwtypes"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwxml/default.nix new file mode 100644 index 0000000000..792b52f01a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwxml/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonschema +, mwcli +, mwtypes +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mwxml"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-CEjfDPLik3GPVUMRrPRxW9Z59jn05Sy+R9ggZYnbHTE="; + }; + + propagatedBuildInputs = [ + jsonschema + mwcli + mwtypes + ]; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + disabledTests = [ + "test_page_with_discussion" + ]; + + pythonImportsCheck = [ "mwxml" ]; + + meta = with lib; { + description = "A set of utilities for processing MediaWiki XML dump data"; + homepage = "https://github.com/mediawiki-utilities/python-mwxml"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix index a9e778bdd8..8b386a425a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix @@ -20,6 +20,9 @@ buildPythonPackage { doCheck = !isPy3k; postPatch = '' + # Required to support numpy >=1.24 where np.bool is removed in favor of just bool + substituteInPlace python/mxnet/numpy/utils.py \ + --replace "bool = onp.bool" "bool = bool" substituteInPlace python/setup.py \ --replace "graphviz<0.9.0," "graphviz" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index f7c6a7e24a..239dccb7e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.14.6"; + version = "7.17.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-7GAF583sr8ackeqalcd3rZsrSqeknlTZ82jsP2XJL7I="; + hash = "sha256-YuHq3pfx3dNgi9M4dGSmIOC3iZaLe9lqrRL0q3ggCTs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index cb83489343..62b26ff2d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-ebs"; - version = "1.27.0"; + version = "1.28.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hBFD5BNZ0OaHwL4iMLPNA916dLUBHTBl2f18/iOPsTs="; + hash = "sha256-GhOEPhx4zD5jXyTMH75DOq0UL4LgOMkJn0U5nKciNMI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 78f7f1acfd..2dadaefe38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,18 +8,19 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.28.3"; + version = "1.28.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wrRUQTEmB5pkNKPgWnXLTK2UfHYk5TujhGy4KaIjDEs="; + hash = "sha256-TlX9rXKbbm9FIR41S9Ggp0WlZf6dHkYnN/d1wohJz7U="; }; propagatedBuildInputs = [ boto3 + ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; @@ -33,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations for boto3.s3"; homepage = "https://github.com/youtype/mypy_boto3_builder"; + changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 47a7ad7916..141caaad19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -114,6 +114,6 @@ buildPythonPackage rec { description = "Optional static typing for Python"; homepage = "https://www.mypy-lang.org"; license = licenses.mit; - maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; + maintainers = with maintainers; [ martingms lnl7 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix index 40b23f9ae9..bdd6c63da6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Experimental type system extensions for programs checked with the mypy typechecker"; homepage = "https://www.mypy-lang.org"; license = licenses.mit; - maintainers = with maintainers; [ martingms lnl7 SuperSandro2000 ]; + maintainers = with maintainers; [ martingms lnl7 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index a5694987ab..6ede481fba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , flit-core , importlib-metadata , ipython @@ -30,6 +31,27 @@ buildPythonPackage rec { hash = "sha256-D2E4ZRX6sHxzZGrcqX//L2n0HpDTE6JgIXxbvkGdhYs="; }; + patches = [ + # Fix compatiblity with myst-parser 1.0. Remove with the next release. + (fetchpatch { + url = "https://github.com/executablebooks/MyST-NB/commit/48c45c6a8c4501005766c2d821b5e9ddfbedd5fa.patch"; + hash = "sha256-jGL2MjZArvPtbiaR/rRGCIi0QwYO0iTIK26GLuTrBM8="; + excludes = [ + "myst_nb/__init__.py" + "docs/authoring/custom-formats.Rmd" + "docs/authoring/jupyter-notebooks.md" + "docs/index.md" + "pyproject.toml" + "tests/nb_fixtures/reporter_warnings.txt" + ]; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "myst-parser~=0.18.0" "myst-parser" + ''; + nativeBuildInputs = [ flit-core pythonRelaxDepsHook @@ -53,7 +75,10 @@ buildPythonPackage rec { "myst-parser" ]; - pythonImportsCheck = [ "myst_nb" ]; + pythonImportsCheck = [ + "myst_nb" + "myst_nb.sphinx_ext" + ]; meta = with lib; { description = "A Jupyter Notebook Sphinx reader built on top of the MyST markdown parser"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix index 2de84cf20e..c986085a61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix @@ -16,14 +16,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Valassis-Digital-Media"; repo = "nbconflux"; - rev = version; - sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh"; + rev = "refs/tags/${version}"; + hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw="; }; propagatedBuildInputs = [ nbconvert requests ]; nativeCheckInputs = [ pytestCheckHook responses ]; + patches = [ + # The original setup.py file is missing commas in the install_requires list + ./setup-py.patch + ]; + JUPYTER_PATH="${nbconvert}/share/jupyter"; disabledTests = [ "test_post_to_confluence" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/setup-py.patch b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/setup-py.patch new file mode 100644 index 0000000000..1e92e2dd11 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/setup-py.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index 26f882d..b7ccf67 100644 +--- a/setup.py ++++ b/setup.py +@@ -27,8 +27,8 @@ setup( + ] + }, + install_requires=[ +- 'nbconvert>=5.3' +- 'requests' +- 'traitlets' ++ 'nbconvert>=5.3', ++ 'requests', ++ 'traitlets', + ], + ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix index 7d1d827cc2..58b02546f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Basic notebook checks and linting"; homepage = "https://github.com/pyviz/nbsmoke"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 5b19602f92..74018b75e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://nbsphinx.readthedocs.io/"; changelog = "https://github.com/spatialaudio/nbsphinx/blob/${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix index 8fa86e50d1..9eaa2c60de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "A py.test plugin to validate Jupyter notebooks"; homepage = "https://github.com/computationalmodelling/nbval"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix index 244f49a48e..e6db538859 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nclib"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg="; + hash = "sha256-26KjYMxJMj5ANb2ej9hVl689sAcGHp89QUkH2xiLhZk="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 22f817b7eb..1447ceb9bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.10.0"; + version = "5.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-UD7y/OVoYyEL+68CW+kc8m8poATqRRSwoP6XQyUbGC0="; + hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix index 43253eecdc..fcd74efe92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Patch asyncio to allow nested event loops"; homepage = "https://github.com/erdewit/nest_asyncio"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix index b804251ebc..c5a5a2d006 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , orjson , fetchFromGitHub +, pytest-asyncio , pytestCheckHook , pythonOlder , requests @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VBK+h5K/irI0T0eUaYC1iouzMUo/lJshLTe0h5CtnAQ="; + hash = "sha256-1uCmlFkha5oaNm5N0/8402ulBr7fNRUbDDASECfN9r8="; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses requests-mock + pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ninja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ninja/default.nix new file mode 100644 index 0000000000..d3ab12c29a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ninja/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchurl +, cmake +, setuptools-scm +, scikit-build +, pytestCheckHook +, pytest-virtualenv +}: +let + # these must match NinjaUrls.cmake + ninja_src_url = "https://github.com/Kitware/ninja/archive/v1.11.1.g95dee.kitware.jobserver-1.tar.gz"; + ninja_src_sha256 = "7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db"; + ninja_src = fetchurl { + url = ninja_src_url; + sha256 = ninja_src_sha256; + }; +in +buildPythonPackage rec { + pname = "ninja"; + version = "1.11.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "scikit-build"; + repo = "ninja-python-distributions"; + rev = version; + hash = "sha256-scCYsSEyN+u3qZhNhWYqHpJCl+JVJJbKz+T34gOXGJM="; + }; + patches = [ + # make sure cmake doesn't try to download the ninja sources + ./no-download.patch + ]; + + inherit ninja_src; + postUnpack = '' + # assume that if the hash matches, the source should be fine + if ! grep "${ninja_src_sha256}" $sourceRoot/NinjaUrls.cmake; then + echo "ninja_src_sha256 doesn't match the hash in NinjaUrls.cmake!" + exit 1 + fi + mkdir -p "$sourceRoot/Ninja-src" + pushd "$sourceRoot/Ninja-src" + tar -xavf ${ninja_src} --strip-components 1 + popd + ''; + + postPatch = '' + sed -i '/cov/d' setup.cfg + ''; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + scikit-build + cmake + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-virtualenv + ]; + + meta = with lib; { + description = "A small build system with a focus on speed"; + homepage = "https://github.com/scikit-build/ninja-python-distributions"; + license = licenses.asl20; + maintainers = with maintainers; [ _999eagle ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ninja/no-download.patch b/third_party/nixpkgs/pkgs/development/python-modules/ninja/no-download.patch new file mode 100644 index 0000000000..0937a5fde1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ninja/no-download.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,6 +64,7 @@ + # Download selected source archive + ExternalProject_add(download_ninja_source + SOURCE_DIR ${Ninja_SOURCE_DIR} ++ DOWNLOAD_COMMAND "" + URL ${${src_archive}_url} + URL_HASH SHA256=${${src_archive}_sha256} + DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix index 5758e60fa3..8ec80af073 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Simple jupyter kernel for nix-repl"; homepage = "https://github.com/GTrunSec/nix-kernel"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix index 7746444fd3..ec967493d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "6.0.1"; + version = "7.0.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "tvoDSqg4g517c1w0VcsVm3r4mBFG3RHaOTAJAv1ooc4="; + hash = "sha256-oIR2iEiOBQ1VKouJTLqEiWWNzrMSJcnxK+m/j9Ia/m8="; }; nativeCheckInputs = [ unittestCheckHook git which ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 401c481411..e0af4c4969 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Tools for removing the tedious nature of creating nixpkgs derivations"; homepage = "https://github.com/nix-community/nixpkgs-pytools"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix index b1135eba7d..596468f83c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Noise Protocol Framework"; homepage = "https://github.com/plizonczyk/noiseprotocol/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix index da294bf882..786820b1ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Nose plugin to randomly order tests and control random.seed"; homepage = "https://github.com/adamchainz/nose-randomly"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix index b41cc4344c..2f2eceb788 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notifications-python-client"; - version = "8.0.0"; + version = "8.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "alphagov"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-feATZS7PG9IKY6ooPztA49WykQ/Bt67frSe3PpbiCLc="; + hash = "sha256-ZDqUJljCZnGmm0TRclv23I+I9egFdF25P0wIYAQkOVI="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'" "" + --replace "pytest-runner" "" ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix index 70c422b08b..af288e2a13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix @@ -1,6 +1,5 @@ { stdenv , lib - , buildPythonPackage , notmuch , python @@ -13,7 +12,12 @@ buildPythonPackage { sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi"; - buildInputs = [ python notmuch cffi ]; + nativeBuildInputs = [ + cffi + ]; + buildInputs = [ + python notmuch cffi + ]; # since notmuch 0.35, this package expects _notmuch_config.py that is # generated by notmuch's configure script diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index fae84969a6..d503307ce6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,14 @@ , runCommand , fetchpatch +, config + # CUDA-only dependencies: , addOpenGLRunpath ? null , cudaPackages ? {} # CUDA flags: -, cudaSupport ? false +, cudaSupport ? config.cudaSupport }: let diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix index bb524cc30b..d5722053c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/zarr-developers/numcodecs"; license = licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix index 8e2f630fdb..64d6d29163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "http://pypi.python.org/pypi/numericalunits"; description = "A package that lets you define quantities with unit"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix index d96d2c1351..65a077392f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -1,5 +1,7 @@ { lib +, stdenv , fetchPypi +, fetchpatch , python , buildPythonPackage , gfortran @@ -18,7 +20,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); let cfg = writeTextFile { name = "site.cfg"; - text = (lib.generators.toINI {} { + text = lib.generators.toINI {} { ${blas.implementation} = { include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; @@ -35,9 +37,9 @@ let library_dirs = "${blas}/lib"; runtime_library_dirs = "${blas}/lib"; }; - }); + }; }; -in buildPythonPackage rec { +in buildPythonPackage (rec { pname = "numpy"; version = "1.24.2"; format = "setuptools"; @@ -54,8 +56,38 @@ in buildPythonPackage rec { # Patching of numpy.distutils is needed to prevent it from undoing the # patch to distutils. ./numpy-distutils-C++.patch + ] + ++ lib.optionals stdenv.cc.isClang [ + # f2py.f90mod_rules generates code with invalid function pointer conversions, which are + # clang 16 makes an error by default. + (fetchpatch { + url = "https://github.com/numpy/numpy/commit/609fee4324f3521d81a3454f5fcc33abb0d3761e.patch"; + hash = "sha256-6Dbmf/RWvQJPTIjvchVaywHGcKCsgap/0wAp5WswuCo="; + }) + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Backport from 1.25. `platform.machine` returns `arm64` on aarch64-darwin, which causes + # differing results between `_selected_real_kind_func` and Fortran’s `selected_real_kind`. + (fetchpatch { + url = "https://github.com/numpy/numpy/commit/afcedf4b63f4a94187e6995c2adea0da3bb18e83.patch"; + hash = "sha256-cxBoimX5a9wC2qUIGAo5o/M2E9+eV63bV2/wLmfDYKg="; + }) + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` + # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and + # 80-bit long double complex numbers. + ./disable-failing-long-double-test-Rosetta-2.patch ]; + postPatch = '' + # fails with multiple errors because we are not using the pinned setuptools version + # see https://github.com/numpy/numpy/blob/v1.25.0/pyproject.toml#L7 + # error: option --single-version-externally-managed not recognized + # TypeError: dist must be a Distribution instance + rm numpy/core/tests/test_cython.py + ''; + nativeBuildInputs = [ gfortran cython ]; buildInputs = [ blas lapack ]; @@ -83,7 +115,7 @@ in buildPythonPackage rec { checkPhase = '' runHook preCheck pushd "$out" - ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' + ${python.interpreter} -c 'import numpy, sys; sys.exit(numpy.test("fast", verbose=10) is False)' popd runHook postCheck ''; @@ -105,4 +137,7 @@ in buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} +} // lib.optionalAttrs stdenv.cc.isClang { + # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. + hardeningDisable = [ "strictoverflow" ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/disable-failing-long-double-test-Rosetta-2.patch b/third_party/nixpkgs/pkgs/development/python-modules/numpy/disable-failing-long-double-test-Rosetta-2.patch new file mode 100644 index 0000000000..3e446745f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/disable-failing-long-double-test-Rosetta-2.patch @@ -0,0 +1,23 @@ +diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py +index 6951d41e4..eefe86ad4 100644 +--- a/numpy/core/tests/test_umath.py ++++ b/numpy/core/tests/test_umath.py +@@ -4180,7 +4180,17 @@ def test_against_cmath(self): + ) + @pytest.mark.xfail(IS_MUSL, reason="gh23049") + @pytest.mark.xfail(IS_WASM, reason="doesn't work") +- @pytest.mark.parametrize('dtype', [np.complex64, np.complex_, np.longcomplex]) ++ @pytest.mark.parametrize('dtype', [ ++ np.complex64, ++ np.complex_, ++ pytest.param( ++ np.longcomplex, ++ marks=pytest.mark.skipif( ++ sys.platform == "darwin" and platform.machine() == "x86_64", ++ reason="doesn’t work under Rosetta 2", ++ ), ++ ), ++ ]) + def test_loss_of_precision(self, dtype): + """Check loss of precision in complex arc* functions""" + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index f4c085d02c..8894de41d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "11.525.131"; + version = "12.535.77"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-K39NrSXEv0mrnQqaPW4lq9FouRtd6OK23uRwN1bBuuU="; + hash = "sha256-jYHl7Zk8hABkVBAq+ExL/99yulxRIStsASHGVoiYPhQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix index d9b7e5ce14..611d89b434 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.106.0"; + version = "2.107.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-46+/uxCwAO9E1YBE337lsD3h2jkcBCYM7o3Vzh42tmI="; + hash = "sha256-GeZCA5Bg3qSL3VRWh3Dvh9+4+3RgwuRVXR8LM/eKed4="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix index d874935cf5..130b45d631 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ome-zarr/default.nix @@ -6,47 +6,38 @@ , pytestCheckHook , aiohttp , dask +, distributed , fsspec , numpy , requests , scikit-image -, s3fs , toolz , zarr }: buildPythonPackage rec { pname = "ome-zarr"; - version = "0.6.1"; + version = "0.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ome"; repo = "ome-zarr-py"; rev = "refs/tags/v${version}"; - hash = "sha256-dpweOuqruh7mAqmSaNbehLCr8OCLe1IZNWV4bpHpTl0="; + hash = "sha256-DMBTrDyUmNsrjOsFKrqukJNZ1f/mAjz4aunNUcwVMKg="; }; - patches = [ - # remove after next release: - (fetchpatch { - name = "fix-writer-bug"; - url = "https://github.com/ome/ome-zarr-py/commit/c1302e05998dfe2faf94b0f958c92888681f5ffa.patch"; - hash = "sha256-1WANObABUXkjqeGdnmg0qJ48RcZcuAwgitZyMwiRYUw="; - }) - ]; - propagatedBuildInputs = [ numpy dask + distributed zarr fsspec aiohttp requests - s3fs scikit-image toolz - ]; + ] ++ fsspec.passthru.optional-dependencies.s3; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix new file mode 100644 index 0000000000..6bbe964de7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/omorfi/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, pkgs +, lib +, stdenv +, hfst +}: + +buildPythonPackage rec { + pname = "omorfi"; + inherit (pkgs.omorfi) src version; + + sourceRoot = "${src.name}/src/python"; + + propagatedBuildInputs = [ + hfst + ]; + + # Fixes some improper import paths + patches = [ ./importfix.patch ]; + + # Apply patch relative to source/src + patchFlags = [ "-p3" ]; + + meta = with lib; { + description = "Python interface for Omorfi"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Ofborg build error (hfst not found?) + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omorfi/importfix.patch b/third_party/nixpkgs/pkgs/development/python-modules/omorfi/importfix.patch new file mode 100644 index 0000000000..67a54363c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/omorfi/importfix.patch @@ -0,0 +1,76 @@ +diff --git a/src/python/omorfi/entryguessing/gradation.py b/src/python/omorfi/entryguessing/gradation.py +index 7d3ed8cb..825d7ead 100755 +--- a/src/python/omorfi/entryguessing/gradation.py ++++ b/src/python/omorfi/entryguessing/gradation.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-from .omorfi.error_logging import fail_guess_because +-from .omorfi.string_mangling import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def gradation_make_morphophonemes(wordmap): +diff --git a/src/python/omorfi/entryguessing/guess_new_class.py b/src/python/omorfi/entryguessing/guess_new_class.py +index 1884716b..3a781bfc 100755 +--- a/src/python/omorfi/entryguessing/guess_new_class.py ++++ b/src/python/omorfi/entryguessing/guess_new_class.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-from .error_logging import fail_guess_because +-from .string_manglers import three_syllable ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import three_syllable + + + def guess_new_class(wordmap): +diff --git a/src/python/omorfi/entryguessing/plurale_tantum.py b/src/python/omorfi/entryguessing/plurale_tantum.py +index a8af81fb..95fc4b7b 100755 +--- a/src/python/omorfi/entryguessing/plurale_tantum.py ++++ b/src/python/omorfi/entryguessing/plurale_tantum.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-from .error_logging import fail_guess_because +-from .omorfi.string_manglers import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def plurale_tantum_get_singular_stem(wordmap): +diff --git a/src/python/omorfi/formats/experimental_xml_formatter.py b/src/python/omorfi/formats/experimental_xml_formatter.py +index abccbff5..11b0f518 100755 +--- a/src/python/omorfi/formats/experimental_xml_formatter.py ++++ b/src/python/omorfi/formats/experimental_xml_formatter.py +@@ -19,9 +19,9 @@ + + from xml.sax.saxutils import escape as xml_escape + +-from ftb3_formatter import Ftb3Formatter ++from .ftb3_formatter import Ftb3Formatter + +-from .settings import version_id_easter_egg ++from omorfi.settings import version_id_easter_egg + + + def make_xmlid(s): +diff --git a/src/python/omorfi/formats/lexc_formatter.py b/src/python/omorfi/formats/lexc_formatter.py +index 4ec616b7..b146129f 100755 +--- a/src/python/omorfi/formats/lexc_formatter.py ++++ b/src/python/omorfi/formats/lexc_formatter.py +@@ -19,8 +19,8 @@ + + # functions for formatting the database data to lexc + +-from .settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary +-from .string_manglers import lexc_escape ++from omorfi.settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary ++from omorfi.string_manglers import lexc_escape + + + def format_copyright_lexc(): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxmltools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxmltools/default.nix new file mode 100644 index 0000000000..97eaf68254 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxmltools/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, onnx +, skl2onnx +# native check inputs +, pytestCheckHook +, pandas +, xgboost +, onnxruntime +, scikit-learn +, pyspark +, lightgbm +}: + +buildPythonPackage rec { + pname = "onnxmltools"; + version = "1.11.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "onnx"; + repo = "onnxmltools"; + rev = "v${version}"; + hash = "sha256-uLFAGtCDLdMd0SMoonMXFE0kGHuDpwp6IrIbD0t8l4M="; + }; + + propagatedBuildInputs = [ + numpy + onnx + skl2onnx + ]; + + pythonImportsCheck = [ "onnxmltools" ]; + + # there are still some dependencies that need to be packaged for the tests to run + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pandas + xgboost + onnxruntime + scikit-learn + pyspark + lightgbm + # coremltools + # libsvm + # h20 + ]; + + meta = with lib; { + description = "ONNXMLTools enables conversion of models to ONNX"; + homepage = "https://github.com/onnx/onnxmltools"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix index af369b0d82..8fea2e6d91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxruntime/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , autoPatchelfHook , pythonRelaxDepsHook @@ -7,6 +8,7 @@ , numpy , packaging , oneDNN +, re2 }: @@ -34,8 +36,9 @@ buildPythonPackage { ''; nativeBuildInputs = [ - autoPatchelfHook pythonRelaxDepsHook + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ]; # This project requires fairly large dependencies such as sympy which we really don't always need. @@ -48,6 +51,7 @@ buildPythonPackage { # Libraries are not linked correctly. buildInputs = [ oneDNN + re2 onnxruntime.protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix index 257fb589ba..13e7a870b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/pylib.nix @@ -12,7 +12,7 @@ in buildPythonPackage (common // { pname = "openrazer"; - sourceRoot = "source/pylib"; + sourceRoot = "${common.src.name}/pylib"; propagatedBuildInputs = [ dbus-python diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix index 72578e1825..9950b6af16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "openshift"; repo = "openshift-restclient-python"; - rev = "v${version}"; - hash = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; + rev = "refs/tags/v${version}"; + hash = "sha256-uLfewj7M8KNs3oL1AM18sR/WhAR2mvBfqadyhR73FP0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix index c38fb19faf..2a4de0a92c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -8,6 +8,7 @@ , opentelemetry-test-utils , setuptools , pytestCheckHook +, pythonRelaxDepsHook }: let @@ -16,18 +17,21 @@ let version = "1.18.0"; disabled = pythonOlder "3.7"; + # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${self.version}"; - hash = "sha256-h6XDzM29wYiC51S7OpBXvWFCfZ7DmIyGMG2pFjJV7pI="; - sparseCheckout = [ "/${self.pname}" ]; - } + "/${self.pname}"; + hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; + }; + + sourceRoot = "source/opentelemetry-api"; format = "pyproject"; nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -36,6 +40,10 @@ let setuptools ]; + pythonRelaxDeps = [ + "importlib-metadata" + ]; + nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook @@ -49,10 +57,11 @@ let passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; meta = with lib; { - homepage = "https://opentelemetry.io"; + homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; description = "OpenTelemetry Python API"; + changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${self.src.rev}"; license = licenses.asl20; - maintainers = teams.deshaw.members; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; }; in self diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 2cfd38f2d1..a786318a58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -1,26 +1,20 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , opentelemetry-proto , opentelemetry-sdk , opentelemetry-test-utils , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-common"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-HNlkbDyYnr0/lDeY1xt0pRxqk+977ljgPdfJzAxL3AQ="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-common"; format = "pyproject"; @@ -40,10 +34,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.common" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common"; description = "OpenTelemetry Protobuf encoding"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 1b12b8f265..d4f2f4c430 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,29 +1,23 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , googleapis-common-protos , grpcio , hatchling +, opentelemetry-api , opentelemetry-test-utils , opentelemetry-exporter-otlp-proto-common , pytest-grpc , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-grpc"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-feAmPL/G3ABIY5tBODlMJIBzxqg6Bl7imJB2EYtEp2o="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-grpc"; format = "pyproject"; @@ -49,10 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc"; description = "OpenTelemetry Collector Protobuf over gRPC Exporter"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index ccf4cc7a21..6d7bf23daf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , googleapis-common-protos , hatchling +, opentelemetry-api , opentelemetry-exporter-otlp-proto-common , opentelemetry-test-utils , requests @@ -12,18 +12,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp-proto-http"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-r4jvIhRM9E4CuZyS/XvvYO+F9cPxip8ab57CUfip47Q="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-http"; format = "pyproject"; @@ -46,10 +40,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.http" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-http"; description = "OpenTelemetry Collector Protobuf over HTTP Exporter"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 278298be12..a360614888 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,26 +1,20 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , backoff , hatchling +, opentelemetry-api , opentelemetry-exporter-otlp-proto-grpc , opentelemetry-exporter-otlp-proto-http , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-otlp"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-ph9ahT6M8UBvuUJjk6nug68Ou/D7XuuXkfnKHEdD8x8="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-otlp"; format = "pyproject"; @@ -39,10 +33,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.otlp" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp"; description = "OpenTelemetry Collector Exporters"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index 003241d74c..1e74b3fd50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-sdk @@ -10,18 +9,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-exporter-prometheus"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-vWVLUt3Ett04kqUyoTOBNvRj51/M35X83saBBxeOTZI="; - sparseCheckout = [ "/exporter/${pname}" ]; - } + "/exporter/${pname}"; + sourceRoot = "source/exporter/opentelemetry-exporter-prometheus"; format = "pyproject"; @@ -42,10 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.exporter.prometheus" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus"; description = "Prometheus Metric Exporter for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix new file mode 100644 index 0000000000..de0823c0aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, pythonOlder +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, wrapt +, pytestCheckHook +, aiohttp +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-aiohttp-client"; + disabled = pythonOlder "3.7"; + + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + + format = "pyproject"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + opentelemetry-util-http + wrapt + aiohttp + ]; + + # missing https://github.com/ezequielramos/http-server-mock + # which looks unmaintained + doCheck = false; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.aiohttp_client" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-aiohttp-client"; + description = "OpenTelemetry Instrumentation for aiohttp-client"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 3fb18175ab..5777498873 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , asgiref , hatchling , opentelemetry-api @@ -12,18 +11,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-asgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-BfNrbOQwyApdcKOVGF0LqzWOxzLkHZYiYdYVVPkGmdQ="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-asgi"; format = "pyproject"; @@ -46,10 +39,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi"; description = "ASGI instrumentation for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 2d8536a903..ec19eacf0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , django , hatchling , opentelemetry-api @@ -14,18 +13,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-django"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-5tyLFQTYuJBFAFZirqsaHXCw72Q3TigDctZZFi/2zdI="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-django"; format = "pyproject"; @@ -50,10 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-django"; description = "OpenTelemetry Instrumentation for Django"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix new file mode 100644 index 0000000000..8313faa8d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, pythonOlder +, hatchling +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-sdk +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, wrapt +, pytestCheckHook +, grpcio +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-grpc"; + disabled = pythonOlder "3.7"; + + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-grpc"; + + format = "pyproject"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-sdk + opentelemetry-semantic-conventions + wrapt + ]; + + passthru.optional-dependencies = { + instruments = [ grpcio ]; + }; + + nativeCheckInputs = [ + opentelemetry-test-utils + grpcio + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; + description = "OpenTelemetry Instrumentation for grpc"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index b50674ea1b..408cfb6923 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -11,18 +10,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-wsgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-DBZGXY8Y208YC/guk0qUB04UA/JFAtiv3kjsikskTRs="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-wsgi"; format = "pyproject"; @@ -44,10 +37,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.wsgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-wsgi"; description = "WSGI Middleware for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 140ca38655..8716ef4efe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -16,13 +16,15 @@ buildPythonPackage rec { version = "0.39b0"; disabled = pythonOlder "3.7"; + # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-+zk76A640nyd1L0I55JrMMs7EnQ+SPQdYGAFIyQFc6E="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; + }; + + sourceRoot = "source/opentelemetry-instrumentation"; format = "pyproject"; @@ -47,7 +49,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; + changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; license = licenses.asl20; - maintainers = teams.deshaw.members; + maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix index b3df8b8939..c673dee398 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -1,24 +1,18 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , protobuf , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-proto"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-6iB+QlBUqRvIJ9p38NYgP4icW2rYs1P3bNCxI95cOvs="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + sourceRoot = "source/opentelemetry-proto"; format = "pyproject"; @@ -36,10 +30,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.proto" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-proto"; description = "OpenTelemetry Python Proto"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 6ac7b8037f..1b4683137d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , flaky , hatchling , opentelemetry-api @@ -14,17 +13,11 @@ let self = buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-sdk"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${self.version}"; - hash = "sha256-YMFSmzuvm/VA9Fpe7pbF9mnGQHOQpobWMb1iGRt+d3w="; - sparseCheckout = [ "/${self.pname}" ]; - } + "/${self.pname}"; + sourceRoot = "source/opentelemetry-sdk"; format = "pyproject"; @@ -56,11 +49,9 @@ let # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; - meta = with lib; { - homepage = "https://opentelemetry.io"; - description = "OpenTelemetry Python API and SDK"; - license = licenses.asl20; - maintainers = teams.deshaw.members; + meta = opentelemetry-api.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-sdk"; + description = "OpenTelemetry Python SDK"; }; }; in self diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix index d9743975bf..0ae9fb34d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix @@ -1,23 +1,17 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling +, opentelemetry-api , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-semantic-conventions"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-82L/tDoWgu0r+Li3CS3hjVR99DQQmA5yt3y85+37imI="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + sourceRoot = "source/opentelemetry-semantic-conventions"; format = "pyproject"; @@ -31,10 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.semconv" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-semantic-conventions"; description = "OpenTelemetry Semantic Conventions"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index 0f78e511a8..71e87b0737 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -2,25 +2,18 @@ , callPackage , buildPythonPackage , pythonOlder -, fetchFromGitHub , asgiref , hatchling , opentelemetry-api , opentelemetry-sdk }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-api) version src; pname = "opentelemetry-test-utils"; - version = "1.18.0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-WRcKTE3eVqOSQUi5gZ3du+RGw8CrMazXHrctdrjgzHo="; - sparseCheckout = [ "/tests/${pname}" ]; - } + "/tests/${pname}"; + sourceRoot = "source/tests/opentelemetry-test-utils"; format = "pyproject"; @@ -36,10 +29,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.test" ]; - meta = with lib; { + meta = opentelemetry-api.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/tests/opentelemetry-test-utils"; description = "Test utilities for OpenTelemetry unit tests"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ddd25dccb7..49ec52a380 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-instrumentation , opentelemetry-sdk @@ -10,18 +9,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-util-http"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-C20/M5wimQec/8tTKx7+jkIYgfgNPtU9lkPKliIM3Uk="; - sparseCheckout = [ "/util/${pname}" ]; - } + "/util/${pname}"; + sourceRoot = "source/util/opentelemetry-util-http"; format = "pyproject"; @@ -42,10 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.util.http" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http"; description = "Web util for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix index 26342ab42d..299de61808 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.14"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-eTlFb/v88jaEzx5H8ofHMNkqPunDvXcXGvg5ThripeA="; + hash = "sha256-hb+TVnCAAnsoKPk9N1bDXj463CErp7nn2cteOumKhLs="; }; pythonRemoveDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix index cd30ec1815..b693afc477 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "optax"; - version = "0.1.5"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vhPpynKq0dboSt+fQ4lvVv9ytDXnZKRrc7lF03Mm39g="; + hash = "sha256-zSMJxagPe2rkhrawJ+TWXUzk6V58IY6MhWmEqLVtOoA="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix index deea9fecbf..e9e60f8c9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix @@ -88,6 +88,6 @@ buildPythonPackage rec { description = "A hyperparameter optimization framework"; homepage = "https://optuna.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix index dc081c385d..bdcd705268 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.8.11"; + version = "3.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TFoagWUtd/nJceNaptgPp4aTR/tBCmxpiZIVJwOlia4="; + hash = "sha256-uEwlrWPQbctCMiIz4fdXe2GDr2SSHaMzmYzzrECerxg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/x+0/I3WFxPwVu2LliTgr42SuJX7VjOLe/SGai5OgAw="; + hash = "sha256-U/WenkO7ecZQOGEppBlLtlXGtbpbS7e+Ic1hg/AnKSk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix index a1d738890b..1b3ed28502 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "An async ORM"; homepage = "https://github.com/encode/orm"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix index 408a3ba0c3..e77c715e45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix @@ -40,7 +40,7 @@ let description = "Core utilities for Python packages"; homepage = "https://github.com/pypa/packaging"; license = with licenses; [ bsd2 asl20 ]; - maintainers = with maintainers; [ bennofs SuperSandro2000 ]; + maintainers = with maintainers; [ bennofs ]; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddle-bfloat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddle-bfloat/default.nix new file mode 100644 index 0000000000..a1d6c591fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/paddle-bfloat/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pythonAtLeast +, numpy +}: +let + pname = "paddle-bfloat"; + version = "0.1.7"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + pname = "paddle_bfloat"; + inherit version; + hash = "sha256-mrjQCtLsXOvqeHHMjuMx65FvMfZ2+wTh1ao9ZJE+9xw="; + }; + + postPatch = '' + sed '1i#include ' -i bfloat16.cc # gcc12 + # replace deprecated function for python3.11 + substituteInPlace bfloat16.cc \ + --replace "Py_TYPE(&NPyBfloat16_Descr) = &PyArrayDescr_Type" "Py_SET_TYPE(&NPyBfloat16_Descr, &PyArrayDescr_Type)" + ''; + + disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "paddle_bfloat" ]; + +# upstream has no tests + doCheck = false; + + meta = with lib; { + description = "Paddle numpy bfloat16 package"; + homepage = "https://pypi.org/project/paddle-bfloat"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/binary-hashes.nix deleted file mode 100644 index 602f1759bc..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/binary-hashes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - cp39 = { - hash = "sha256-qD94RBvzlCDf0mXSszmZw0ilN8p4/5gDpDbBRgEMHZs="; - }; - cp310 = { - hash = "sha256-vjUVESLiqPY+r7K5eUlYPX3hK3QtQ8/H1LIz5lZtrMg="; - }; - cp311 = { - hash = "sha256-6IVD8DjTMHqD+yZPXP16Do9QQzJbOPxSEbHXVAJbQp8="; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/default.nix deleted file mode 100644 index 263485187a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/paddle_bfloat/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pythonAtLeast -, python -}: -let - pname = "paddle_bfloat"; - version = "0.1.7"; - format = "wheel"; - pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; - binary-hash = (import ./binary-hashes.nix)."${pyShortVersion}" or {}; - src = fetchPypi ({ - inherit pname version format; - dist = pyShortVersion; - python = pyShortVersion; - abi = pyShortVersion; - platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; - } // binary-hash); -in -buildPythonPackage { - inherit pname version format src; - - disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; - - propagatedBuildInputs = [ - ]; - - meta = with lib; { - description = "Paddle numpy bfloat16 package"; - homepage = "https://pypi.org/project/paddle-bfloat"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix index e2cd47fa47..0af1060b5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/holoviz/panel"; changelog = "https://github.com/holoviz/panel/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix index f1c26beaa6..d5c2f3018d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -84,6 +84,6 @@ buildPythonPackage rec { description = "Parametrize and run Jupyter and interact with notebooks"; homepage = "https://github.com/nteract/papermill"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/para/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/para/default.nix new file mode 100644 index 0000000000..e1f3f82812 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/para/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "para"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc="; + }; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "para" ]; + + meta = with lib; { + description = "A set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks"; + homepage = "https://pypi.org/project/para"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix index a24e6aec8e..a37cf7c7f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://param.holoviz.org/"; changelog = "https://github.com/holoviz/param/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index a578566019..278556fe48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix index 74d6d186bc..c30dc40891 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "A HTTP and FTP parallel file downloader"; homepage = "https://parfive.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix index 925fa6febf..d69a9a54e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Allows parsing and manipulation of PEP 440 version numbers"; homepage = "https://github.com/RazerM/parver"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix index 95bbc785db..9083f197aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Multi-purpose brute-forcer"; homepage = "https://github.com/lanjelot/patator"; license = licenses.gpl2Only; - maintainers = with maintainers; [ y0no SuperSandro2000 ]; + maintainers = with maintainers; [ y0no ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix index 4ec9da43a5..6bf24b8f15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Object-oriented filesystem paths"; homepage = "https://pathlib.readthedocs.org/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix index 43eff770c1..b844a1528b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; homepage = "https://pypi.org/project/pathlib2/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index d969b0bd6b..eebea069de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "18.1.11"; + version = "19.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SdnPF2J9AorzSjObkjObIqvejZYSQbjStkKEbiTAOIo="; + hash = "sha256-Ju+vKKNmRCRLYSOXNmCdBR8Ce1Xw3BA7IMMCRBSFhKQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix index c0954ec3ca..1de099579d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -3,34 +3,35 @@ , buildPythonPackage , logutils , mako +, webob , webtest , pythonOlder , pytestCheckHook , genshi , gunicorn , jinja2 -, six , sqlalchemy , virtualenv +, setuptools }: buildPythonPackage rec { pname = "pecan"; - version = "1.4.2"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SbJV5wHD8UYWBfWw6PVPDCGSLXhF1BTCTdZAn+aV1VA="; + hash = "sha256-YGMnLV+GB3P7tLSyrhsJ2oyVQGLvhxFQwGz9sjkdk1U="; }; propagatedBuildInputs = [ logutils mako - webtest - six + webob + setuptools ]; nativeCheckInputs = [ @@ -40,20 +41,11 @@ buildPythonPackage rec { jinja2 sqlalchemy virtualenv + webtest ]; pytestFlagsArray = [ "--pyargs pecan" - # tests fail with sqlalchemy 2.0 - ] ++ lib.optionals (lib.versionAtLeast sqlalchemy.version "2.0") [ - # The 'sqlalchemy.orm.mapper()' function is removed as of SQLAlchemy - # 2.0. Use the 'sqlalchemy.orm.registry.map_imperatively()` method - # of the ``sqlalchemy.orm.registry`` class to perform classical - # mapping. - # https://github.com/pecan/pecan/issues/143 - "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_result_proxy" - "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_row_proxy" - "--deselect=pecan/tests/test_jsonify.py::TestJsonifySQLAlchemyGenericEncoder::test_sa_object" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix index 54b93e69f1..8bd8b1a924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytestCheckHook , setuptools , numpy , packaging @@ -15,16 +14,16 @@ buildPythonPackage rec { pname = "peft"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7j//SDuld2ANxEcG4R0rK5vEaTX7gQwWRH56PO2KqAY="; + hash = "sha256-riOCe43/2xUpE6TTCEpMndeFTbaBN4JFDlv90tqVO4Y="; }; nativeBuildInputs = [ setuptools ]; @@ -39,7 +38,7 @@ buildPythonPackage rec { accelerate ]; - doCheck = false; # tried to download pretrained model + doCheck = false; # tries to download pretrained models pythonImportsCheck = [ "peft" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix index db8b4cd572..1dfc78ffca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/nschloe/perfplot"; changelog = "https://github.com/nschloe/perfplot/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix index 7cf199eee0..09feb66549 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { homepage = "https://persim.scikit-tda.org"; changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix index 9713669f15..89f3974d40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.1.8"; + version = "0.2.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+0daPPZGVkqfZw0gOZwIl+knL/zZki9fs5kA3dYqPpE="; + hash = "sha256-VcV/WyDY1UN2TcuvNRQRIh5YIlewGQXf6fcTZihvftQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix index 8975be61f1..0e14d34151 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Factory and registry pattern for Python classes"; homepage = "https://class-registry.readthedocs.io/en/latest/"; license = licenses.mit; - maintainers = with maintainers; [ kevincox SuperSandro2000 ]; + maintainers = with maintainers; [ kevincox ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix index 4b60c649fe..fa6c633786 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.15.0"; + version = "0.16.1"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-8VxkrzADp3yCeb02BxtT6oSP1FCX8GW4oc6OECK2hJw="; + hash = "sha256-4VOJ7l6tBhMBZ2x+T5Bl5WdnMg4JEBkwaGDA/9XUmc8="; }; propagatedBuildInputs = [ @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Clean and modern Sphinx theme"; homepage = "https://piccolo-theme.readthedocs.io"; - license = licenses.mit; + license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ loicreynier ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix new file mode 100644 index 0000000000..a04479cfb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, setuptools-scm +, absl-py +, lxml +, skia-pathops +, pytestCheckHook +}: +buildPythonPackage rec { + pname = "picosvg"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "v${version}"; + hash = "sha256-J06ijF1c3ZKPqKiQha6yqfj8EjFZoZzA6i6UCCrexi8="; + }; + + patches = [ + # see https://github.com/googlefonts/picosvg/issues/299 + # this patch fixed a failing test case after the update to skia-pathops 0.8 + # as soon as skia-pathops in nixpkgs is updated to 0.8, this patch should be removed + (fetchpatch { + url = "https://github.com/googlefonts/picosvg/commit/4e971ed6cd9afb412b2845d29296a0c24f086562.patch"; + hash = "sha256-OZEipNPCSuuqcy4XggBiuGv4HN604dI4N9wlznyAwF0="; + revert = true; + }) + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + absl-py + lxml + skia-pathops + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # a few tests are failing on aarch64 + doCheck = !stdenv.isAarch64; + + meta = with lib; { + description = "Tool to simplify SVGs"; + homepage = "https://github.com/googlefonts/picosvg"; + license = licenses.asl20; + maintainers = with maintainers; [ _999eagle ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index 746496ff28..4573e25a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -32,6 +32,6 @@ import ../pillow/generic.nix (rec { Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } // args ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix index 6dc894c0a4..b3ff63b1fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook @@ -12,7 +13,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,9 +21,17 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-ocLXeARI65P7zDeJvzkWqlcg2ULjeUX0BWaAMX8c0j4="; + hash = "sha256-v1SEedM2cm16Ds6252fhefveN4M65CeUYCYxoHDWMPE="; }; + patches = [ + (fetchpatch { + # Fixed type handling for include and lib directories; Remove with 10.0.0 + url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.patch"; + hash = "sha256-m5R5fLflnbJXbRxFlTjT2X3nKdC05tippMoJUDsJmy0="; + }) + ]; + passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; @@ -37,6 +46,6 @@ import ./generic.nix (rec { processing and graphics capabilities. ''; license = licenses.hpnd; - maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; + maintainers = with maintainers; [ goibhniu prikhi ]; }; } // args ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix index 307ed7bc1c..5de3ec424f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/pims"; changelog = "https://github.com/soft-matter/pims/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix index dccde0b418..84f3798df8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-CHjcruRHxGyNGz1xyFRonap+VI5QCaFxeAkHx9TnR4k="; + hash = "sha256-OR/kE3VO/U4O8AFUtEJx1jxM3Uvt8IjSMRGlcl2GMhA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index 8873b27d5e..2259ecf655 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; - maintainers = with maintainers; [ costrouc doronbehar ]; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix index 4d241e87e1..172401620a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "pip update helpers"; homepage = "https://github.com/nschloe/pipdate"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index 9053b553c5..43d99563a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.9.5"; + version = "2.12.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-Fy9wDPYY1FRRRcu6ucOccFYU6PjfX6SggXIIGEhSFMM="; + hash = "sha256-4qRMET04JLVuDRfQtv/uQquf76iU00rnsWNaUXj1Gfw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -54,6 +54,11 @@ buildPythonPackage rec { "pipdeptree" ]; + disabledTests = [ + # Don't run console tests + "test_console" + ]; + meta = with lib; { description = "Command line utility to show dependency tree of packages"; homepage = "https://github.com/tox-dev/pipdeptree"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piper-phonemize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piper-phonemize/default.nix new file mode 100644 index 0000000000..cd09567a61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/piper-phonemize/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, onnxruntime-native +, piper-phonemize-native +, pybind11 +, setuptools +}: + +buildPythonPackage { + inherit (piper-phonemize-native) pname version src; + format = "pyproject"; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + buildInputs = [ + onnxruntime-native + piper-phonemize-native + piper-phonemize-native.espeak-ng + ]; + + pythonImportsCheck = [ + "piper_phonemize" + ]; + + # no tests + doCheck = false; + + meta = { + description = "Phonemization libary used by Piper text to speech system"; + inherit (piper-phonemize-native.meta) homepage license maintainers; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix index d5b5815c3b..b5fc0c4499 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Interface Python with pkg-config"; homepage = "https://github.com/matze/pkgconfig"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index ccb47700bc..648d04ddf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "15.0.0"; + version = "15.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-vNOIMZce2PwH108KKaUIp1tadNH7HIKjzbm7rxZqLO8="; + hash = "sha256-NJCU82Q19X1fApYcbP+ZAxf76uwAnSnhch4aBer9Nm4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix index bdd7846c76..1c64471778 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/playwright/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.34.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - hash = "sha256-GIxMVuSSJsRDsHDOPnJsDsTcghGYtIFpRS5u7HJd+zY="; + hash = "sha256-/umpMkD+WEpBmw2cRb71PtOMd1sRNfwmURKdaRy4Qsc="; }; patches = [ @@ -94,7 +94,7 @@ buildPythonPackage rec { description = "Python version of the Playwright testing and automation library"; homepage = "https://github.com/microsoft/playwright-python"; license = licenses.asl20; - maintainers = with maintainers; [ techknowlogick yrd SuperSandro2000 ]; + maintainers = with maintainers; [ techknowlogick yrd ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index c186c93332..7c7d36167f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.31.6"; + version = "0.31.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-mHZuhB0on9uOpsR8R/cMlJMoTNW7ZIPGGd2S/lbT54A="; + hash = "sha256-IRetWNKVzWsrHOphdgV5xmdiubwDx8KOUA7x+BmTt9A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix index fe42888d61..7dd625b83c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.1.20230703"; + version = "1.5.1.20230725"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wn/ctnvn7SxB79Jlg+Eqsk3y8bHYKMi4+NE4Rr0E4N4="; + hash = "sha256-N0yQSVgSYx2D5wpixBMrxPq8ddKcGr/vfnsGn+Smrac="; }; # Tests are not shipped and there are no GitHub tags diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix index 424ceac408..bc61bfb739 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.7.6"; + version = "23.7.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4fA/zzipv5CBPYkDtefATSmk3Q7b9Qjz4lJOy4y/wDM="; + hash = "sha256-qaeVQQmgEfuQ46us2l74W2yWZnUzePyT8+f5JQR0RdM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/posthog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/posthog/default.nix index 25f1d90a86..d6136cf717 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/posthog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/posthog/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub # build inputs @@ -9,12 +8,9 @@ , backoff , python-dateutil # check inputs +, pytestCheckHook , mock , freezegun -, pylint -, flake8 -, coverage -, pytest }: let pname = "posthog"; @@ -40,18 +36,22 @@ buildPythonPackage { ]; nativeCheckInputs = [ + pytestCheckHook mock freezegun - pylint - flake8 - coverage - pytest ]; pythonImportsCheck = [ "posthog" ]; + disabledTests = [ + "test_load_feature_flags_wrong_key" + # Tests require network access + "test_request" + "test_upload" + ]; + meta = with lib; { description = "Official PostHog python library"; homepage = "https://github.com/PostHog/posthog-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix index 87c374fd53..4cad316d2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.3.6"; + version = "0.3.7"; pname = "potentials"; format = "setuptools"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-VEPGa3Wp+B3KterfA5XGjaDf6sIAkSST0GWdeqaJcE0="; + hash = "sha256-vkrNVRf9ntYSpf8nXmAmGjc+sQ4iFllisYHd9s+uQv0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix index 1dce18366b..3a868d78d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.6"; + version = "1.7.6.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE="; + hash = "sha256-qzRDaBTi8YI481aI/YabJkGy0tjcoiuNJG9nAd/JVMg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix index 37cd041424..320c264aca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pq/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "PQ is a transactional queue for PostgreSQL"; homepage = "https://github.com/malthe/pq/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix index 25ceb1259c..572e1efceb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix index 320764a88e..d70808d972 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Rison encoder/decoder"; homepage = "https://github.com/betodealmeida/python-rison"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix index 801beaa447..192841994e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/verigak/progress/"; description = "Easy to use progress bars"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index 3d3469e3f7..d6ef622698 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Beautiful, idiomatic protocol buffers in Python"; homepage = "https://github.com/googleapis/proto-plus-python"; license = licenses.asl20; - maintainers = with maintainers; [ ruuda SuperSandro2000 ]; + maintainers = with maintainers; [ ruuda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 1aaeca9c64..f2615499f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -1,10 +1,12 @@ { buildPackages -, lib , buildPythonPackage -, protobuf -, isPyPy , fetchpatch +, isPyPy +, lib +, protobuf +, pytestCheckHook , pythonAtLeast +, tzdata }: let @@ -21,9 +23,7 @@ buildPythonPackage { then "${toString (lib.toInt versionMajor + 1)}.${versionMinor}.${versionPatch}" else protobuf.version; - disabled = isPyPy; - - sourceRoot = "source/python"; + sourceRoot = "${protobuf.src.name}/python"; patches = lib.optionals (pythonAtLeast "3.11") [ (fetchpatch { @@ -41,6 +41,8 @@ buildPythonPackage { fi ''; + nativeBuildInputs = lib.optional isPyPy tzdata; + buildInputs = [ protobuf ]; propagatedNativeBuildInputs = [ @@ -50,6 +52,20 @@ buildPythonPackage { setupPyGlobalFlags = [ "--cpp_implementation" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals isPyPy [ + # error message differs + "testInvalidTimestamp" + # requires tracemalloc which pypy does not implement + # https://foss.heptapod.net/pypy/pypy/-/issues/3048 + "testUnknownFieldsNoMemoryLeak" + # assertion is not raised for some reason + "testStrictUtf8Check" + ]; + pythonImportsCheck = [ "google.protobuf" "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked diff --git a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix index 71f231f982..915c1d98ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix @@ -27,6 +27,6 @@ buildPythonPackage { description = "Get a public suffix for a domain name using the Public Suffix List"; homepage = "https://github.com/nexB/python-publicsuffix2"; license = licenses.mpl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 12a0326fb4..3a46c99691 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230711"; + version = "0.10.0.20230804"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yFShirput7wpYLQoDauxW5xxc6o2ptWFAYSAEqDmzBA="; + hash = "sha256-J8yeq9CuzXGlqPjGf8hnV0IeI+Wg0Q5GS69/8z+FLp8="; }; passthru.optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index d5d34898b9..a1cedcaa5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/pulumi/pulumi-aws"; changelog = "https://github.com/pulumi/pulumi-aws/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix index 3c8b1f1e1c..68301c0e49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/workhorsy/py-cpuinfo"; changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix index 226b22a45d..9a7d1c3720 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "ECC pairing and bn_128 and bls12_381 curve operations"; homepage = "https://github.com/ethereum/py_ecc"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 162b2d1570..8ede11e359 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { description = "Collection of functions to generate hashes for signing on Ethereum"; homepage = "https://github.com/rmeissner/py-eth-sig-utils"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more. broken = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-expression-eval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-expression-eval/default.nix new file mode 100644 index 0000000000..6aee63effb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-expression-eval/default.nix @@ -0,0 +1,24 @@ +{ lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage rec { + pname = "py-expression-eval"; + version = "0.3.14"; + + src = fetchFromGitHub { + owner = "axiacore"; + repo = "py-expression-eval"; + rev = "v${version}"; + sha256 = "YxhZd8V6ofphcNdcbBbrT5mc37O9c6W1mfhsvFVC+KM="; + }; + + meta = with lib; { + homepage = "https://github.com/AxiaCore/py-expression-eval/"; + description = "Python Mathematical Expression Evaluator"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix index 08630928f2..d2057d2cf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-lru-cache/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { description = "An in-memory LRU cache for python"; homepage = "https://github.com/stucchio/Python-LRU-cache"; license = licenses.gpl3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix index e85e4116ba..eb71f167b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-7FYIRlr75L0y1d9jgbPpq/G7VC4YMD7IUQVNhfHdCh8="; + hash = "sha256-CVpXw5yAYBeRgTlNzgourQlDqfNmKLdzV7mQSd7PoJg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix new file mode 100644 index 0000000000..f76f12708f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-radix-sr"; + version = "1.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "SEKOIA-IO"; + repo = "py-radix"; + rev = "v${version}"; + hash = "sha256-aHV+NvPR4Gyk6bEpCftgBylis9rU7BWLpBMatjP4QmE="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "name='py-radix'" "name='py-radix-sr'" + ''; + + pythonImportsCheck = [ "radix" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python radix tree for IPv4 and IPv6 prefix matching"; + homepage = "https://github.com/SEKOIA-IO/py-radix"; + license = with licenses; [ isc bsdOriginal ]; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix new file mode 100644 index 0000000000..5748b8c169 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py65/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "py65"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mnaberez"; + repo = "py65"; + rev = "refs/tags/${version}"; + hash = "sha256-WLs3TAZovuphWZIvMvM3CZnqg1aZfMF4Yrqw46k+bLA="; + }; + + postPatch = '' + substituteInPlace py65/tests/test_monitor.py \ + --replace "test_argv_rom" "dont_test_argv_rom" \ + --replace "test_argv_combination_rom_mpu" "dont_test_argv_combination_rom_mpu" + ''; + + meta = { + homepage = "https://py65.readthedocs.io/"; + description = "Emulate 6502-based microcomputer systems in Python"; + longDescription = '' + Py65 includes a program called Py65Mon that functions as a machine + language monitor. This kind of program is sometimes also called a + debugger. Py65Mon provides a command line with many convenient commands + for interacting with the simulated 6502-based system. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres tomasajt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix index f441e21039..4180edaebd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyamg/pyamg"; changelog = "https://github.com/pyamg/pyamg/blob/v${version}/changelog.md"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix index 7dbb595efe..053844d71f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Auto-generate PEP-484 annotations"; homepage = "https://github.com/dropbox/pyannotate"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix index ccdff83be1..3888f66d77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://pyasn1.readthedocs.io"; changelog = "https://github.com/etingof/pyasn1/blob/master/CHANGES.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 4c13743739..5cddd154aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -19,12 +19,13 @@ , pythonOlder , requests , srptools +, stdenv , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.13.2"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7jXxnZLruwNzYVOn3c+YlF2olwezwjpwXInDem44/vE="; + hash = "sha256-lg7gsCB8zn+q+ZTkIoGkIls10xS7bp8Svd749a10bWA="; }; postPatch = '' @@ -87,6 +88,11 @@ buildPythonPackage rec { "--asyncio-mode=legacy" ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False + "test_stream_retransmission" + ]; + disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix index 77ce5686a9..99aef4c985 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = "https://github.com/appknox/pyaxmlparser"; # Files from Androguard are licensed ASL 2.0 license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix index 3a00c78198..1aed69b85f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyviz/pyct"; changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index f9dd03be57..45e5d8f13a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -82,6 +82,6 @@ buildPythonPackage rec { homepage = "http://pycurl.io/"; description = "Python Interface To The cURL library"; license = with licenses; [ lgpl2Only mit ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix index 61b39e5427..f24f2e7847 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydata-google-auth/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pydata-google-auth"; - version = "1.8.0"; + version = "1.8.2"; format = "setuptools"; src = fetchFromGitHub { repo = pname; owner = "pydata"; rev = "refs/tags/${version}"; - hash = "sha256-PMQj+ySdin02MUBIumyW/PvCGqUhmloDCnBFJggd4I8="; + hash = "sha256-Wo+tXbzOuz/cW8GuWoSxLA/Lr2S9NMdePa8tIV39mbY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index c86c7b376c..faa85f6f4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.12"; + version = "1.12.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-upqlLEGxetkFiwHuwwf7c2wbqrXQcRSamRszYUTsyNk="; + hash = "sha256-n4FmMqpCqxPmGJokfaxnruG9d5oodv6Yfg80Y1EIr34="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix index caa013f226..c7ee5359be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Python tool kit for multi-body dynamics"; homepage = "http://pydy.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyemd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyemd/default.nix index c7b277a609..bb178a5724 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyemd/default.nix @@ -1,16 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, cython }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, cython +, packaging +, setuptools +, numpy +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyemd"; - version = "0.5.1"; + version = "1.0.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70"; + hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4="; }; - propagatedBuildInputs = [ numpy ]; - buildInputs = [ cython ]; + nativeBuildInputs = [ + cython + packaging + setuptools + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix index 2a99f637f8..0b5d016a42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fgFbwMqlQcF83k345kztw/SN5j447/TuJUPYmFPKiFY="; + hash = "sha256-dAC+jW+Ky+uPsgBXpp81+bxytWYeZbd+zWzEXkmM198="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix index 5c73cc84c2..e0934dc34b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Fused multiply-add for Python"; homepage = "https://github.com/nschloe/pyfma"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index b276e80e6b..e48513b55c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Asynchronous FTP server library"; homepage = "https://github.com/giampaolo/pyftpdlib/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix index 8e11960026..45dbd1a43a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyfuse3"; - version = "3.2.2"; + version = "3.2.3"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "libfuse"; repo = "pyfuse3"; rev = "refs/tags/${version}"; - hash = "sha256-Y9Haz3MMhTXkvYFOGNWJnoGNnvoK6wiQ+s3AwJhBD8Q="; + hash = "sha256-2YrVapCojcFRaljqNeWPMWz3hEgSutKPy2u8FXp0fME="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix new file mode 100644 index 0000000000..b98fee9d38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: +buildPythonPackage rec { + pname = "PyGLM"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "Zuzu-Typ"; + repo = "PyGLM"; + rev = "${version}"; + hash = "sha256-+On4gqfB9hxuINQdcGcrZyOsphfylUNq7tB2uvjsCkE="; + fetchSubmodules = true; + }; + + meta = with lib; { + homepage = "https://github.com/Zuzu-Typ/PyGLM"; + description = "An OpenGL Mathematics (GLM) library for Python written in C++"; + license = licenses.zlib; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix index f3bcafff79..a7b2acd55c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix @@ -46,7 +46,7 @@ let pygments = buildPythonPackage description = "A generic syntax highlighter"; mainProgram = "pygmentize"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index 15fe2d6747..147198087f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -58,6 +58,6 @@ toPythonModule (stdenv.mkDerivation rec { description = "Parallel optimisation for Python"; homepage = "https://github.com/esa/pygmo2"; license = licenses.gpl3Plus; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix index 584e6a2aca..312faf202b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Pure Python gNMI client to manage network functions and collect telemetry"; homepage = "https://github.com/akarneliuk/pygnmi"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix index 0d7e82be63..cc92086747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdl/default.nix @@ -4,7 +4,7 @@ toPythonModule (stdenv.mkDerivation { pname = "pykdl"; inherit (orocos-kdl) version src; - sourceRoot = "source/python_orocos_kdl"; + sourceRoot = "${orocos-kdl.src.name}/python_orocos_kdl"; # Fix hardcoded installation path postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 39207c063f..7ce1674312 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -115,6 +115,6 @@ buildPythonPackage rec { - epylint: Emacs and Flymake compatible Pylint ''; license = licenses.gpl1Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index 0734c006f5..4f70a25afa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.4.2"; + version = "2023.4.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zB/LJGEPJ3uZEoVQiLQUCWqLo9YLXN6vge3RhIwA5D4="; + hash = "sha256-pUtOLQ4ftG0tYPued12CqKGt3LKyfmLPxIYKvkYg1nI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix index 63f9122acd..509df2efaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Spyder extensions for the python-language-server"; homepage = "https://github.com/spyder-ide/pyls-spyder"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix index 2528885e19..a3e651e177 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "A Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs "; homepage = "https://github.com/geekpradd/PyLyrics"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch b/third_party/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch new file mode 100644 index 0000000000..2193b260ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatting/01-kdtree-signature.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_kdtree.py b/tests/test_kdtree.py +index 0110083..049fa07 100644 +--- a/tests/test_kdtree.py ++++ b/tests/test_kdtree.py +@@ -23,7 +23,7 @@ def run_kdtree(): + + tree = cKDTree(data_points) + +- distances2, indices2 = tree.query(query_points, k=k, n_jobs=-1) ++ distances2, indices2 = tree.query(query_points, k=k) + + t2 = time.perf_counter() + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatting/default.nix new file mode 100644 index 0000000000..0d10efd616 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatting/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numba +, numpy +, pillow +, scipy +, pytestCheckHook +, +}: +buildPythonPackage rec { + pname = "pymatting"; + version = "1.1.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pymatting"; + repo = "pymatting"; + rev = "v${version}"; + hash = "sha256-9eRpsWwXAkp6aw1ZWJsUFf0BMIN0UBFc2rW1lltL2cw="; + }; + + patches = [ ./01-kdtree-signature.patch ]; + + propagatedBuildInputs = [ + numba + numpy + pillow + scipy + ]; + + pythonImportsCheck = [ "pymatting" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # no access to input data set + # see: https://github.com/pymatting/pymatting/blob/master/tests/download_images.py + "test_alpha" + "test_laplacians" + "test_preconditioners" + "test_lkm" + ]; + + meta = with lib; { + description = "A Python library for alpha matting"; + homepage = "https://github.com/pymatting/pymatting"; + changelog = "https://github.com/pymatting/pymatting/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix index 37c5bb86e1..f5b07c5a4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.9"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-S5mM15DcEBwczsLk6VJDzgMo80NjsCeehz66SALYeV4="; + hash = "sha256-b7YRg5g9ltYJhjMVcq9uZaSqzizJZM4pE4WYW2u9AwY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix index a58d565922..de9b8e9ae1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "A package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix index 983cc7566d..ba22546099 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.2.8"; + version = "2.2.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "milvus-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oqwa/2UT9jyGaEEzjr/phZZStLOZ6JRj+4ck0tmP0W0="; + hash = "sha256-NTzdbmI2vNvNBFhN+xyZewH4b6l1BbKkDDE7rLNJ4IE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix index 1a981fa185..a167f8cf1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - hash = "sha256-5+Mg3dPjMxEL2pgEeuR1TwiicIMHN6RO6G0SgbZm/eM="; + hash = "sha256-HyOk3W95dEl+p8YGh3xP29HcvbncqxsUaWSQUiKgTWM="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API wrapper to retrieve warnings from the german NINA app"; homepage = "https://gitlab.com/DeerMaximum/pynina"; + changelog = "https://gitlab.com/DeerMaximum/pynina/-/releases/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynisher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynisher/default.nix index 2014c70b61..3d1c3a8422 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynisher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynisher/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pynisher"; - version = "1.0.5"; + version = "1.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-usSowgCwGTATiX1dbPpScO9/FI+E567dvGZxAC+zS14="; + hash = "sha256-BTH34zv7OAaVKc20VASfv3QaxAt/Y14Dkd/PBo/V6vo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix index 0d738ef469..c0900b6644 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { homepage = "http://pyomo.org"; changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix index df5416ad99..db77f854db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix @@ -95,6 +95,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pyopenssl"; changelog = "https://github.com/pyca/pyopenssl/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix index 28eac119f9..e6ae36f0cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Python module to generate and modify perf"; homepage = "https://pyperf.readthedocs.io/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix index e1bb5cd068..74ddf37e23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypiserver/pypiserver"; description = "Minimal PyPI server for use with pip/easy_install"; license = with licenses; [ mit zlib ]; - maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; + maintainers = with maintainers; [ austinbutler ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix index 90c42306a1..816afc262f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pypitoken"; - version = "6.0.3"; + version = "7.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ewjoachim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1kPIVcxpFjqlAnPh71iS07n9M0qcFrwMRV8k38YxHBc="; + hash = "sha256-CjSENkk1VlzrCngwFoJuq31Iai60qTJXBGMoV5QkSsE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix index 3edf1adf02..22f2048ba1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.5.1"; + version = "6.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4WagVownvMjbACcaUEOTYiZpC2pKdM4KXK60CAQKl8M="; + hash = "sha256-FIfuc1D5/7ZtYKtBdlGSUsKzcXYsvo+DQP2VH2OAEoA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix index 96f5d66cf6..0f88c0afb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrabbit2/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "A Pythonic interface to the RabbitMQ Management HTTP API"; homepage = "https://github.com/deslum/pyrabbit2"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix index a913923b2c..67a57b8c20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-G/mmM2lEQWJV+7uZHKECj1jnhTYbcOw9yCi4/9nRDuk="; + hash = "sha256-Qi0NfLayypi/wKJZB9IOzoeaZsb3oq2JahXWdkwSjeo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index 426459a67f..a5dbfd521d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , webtest -, zope_component +, zope-component , hupper , pastedeploy , plaster @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeCheckInputs = [ webtest - zope_component + zope-component ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix index f4031db0d9..69862bdfe5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Chameleon template compiler for pyramid"; homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix index c387bdef4b..7ee23f34e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Formulate and solve resource-constrained scheduling problems"; homepage = "https://github.com/timnon/pyschedule"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix index 80920c5c91..abc30c72ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.6.0"; + version = "2023.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-ogYVk0Kvv595IlIa/qdV1lqlnW45IG29PX5EEaMaphw="; + hash = "sha256-PH8ClpuYwTu+34hSPPwI1KMFut6UaxWVrbf38LYb9EQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix index 1daeb94087..f04b85a9d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "python screenshot"; homepage = "https://github.com/ponty/pyscreenshot"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix index 2ebfa8238f..75672f3466 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.28"; + version = "1.0.32"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7mYYsJCiJZedbmO9fv/Zr+QZOaSE6d6ld94yWUhUmUQ="; + hash = "sha256-5A98g2SyJa+aGFewPLUgL73XpkccQTYec1mCZvIOa9w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index e9848a3ad8..52649fed67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "23.2.1"; + version = "23.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { repo = "pyslurm"; owner = "PySlurm"; rev = "refs/tags/v${version}"; - hash = "sha256-EYXVkQGe5A+fmzcBdhMnALzX8k7hxaCYsL1Ehrikme4="; + hash = "sha256-M8seh5pkw2OTiDU4O96D0Lg3+FrlB2w4ehy53kSxyoU="; }; buildInputs = [ cython slurm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix index e8a6727ae6..9cebc9d7bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysnooper"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "PySnooper"; - hash = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; + hash = "sha256-gQZp4WKiUKBm2GYuVzrbxa93DpN8W1V48ou3NV0chZs="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix index 5aff4d2ccd..8ac514d7fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -4,6 +4,7 @@ , asynccmd , buildPythonPackage , fetchFromGitHub +, poetry-core , pytest-asyncio , pytestCheckHook , pythonOlder @@ -11,18 +12,22 @@ buildPythonPackage rec { pname = "pyspcwebgw"; - version = "0.6.0"; - format = "setuptools"; + version = "0.7.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mbrrg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Pjv8AxXuwi48Z8U+LSZZ+OhXrE3KlX7jlmnXTBLxXOs="; + hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ asynccmd aiohttp @@ -43,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the SPC Web Gateway REST API"; homepage = "https://github.com/mbrrg/pyspcwebgw"; + changelog = "https://github.com/pyspcwebgw/pyspcwebgw/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix index 76db9500ab..7441689895 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Python 3 bindings for SQLCipher"; homepage = "https://github.com/rigglemania/pysqlcipher3/"; license = licenses.zlib; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix index 4c3b66698a..d00c430e3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Srim Automation of Tasks via Python"; homepage = "https://gitlab.com/costrouc/pysrim"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix index c431ba0ed7..2c70cbd320 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Generate PyAnnotate annotations from your pytest tests"; homepage = "https://github.com/kensho-technologies/pytest-annotate"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 110db96aba..a9934fbdcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , ansible-core @@ -55,6 +56,17 @@ buildPythonPackage rec { # [Errno -3] Temporary failure in name resolution "test_connection_failure_v2" "test_connection_failure_extra_inventory_v2" + ] ++ lib.optionals stdenv.isDarwin [ + # These tests fail in the Darwin sandbox + "test_ansible_facts" + "test_func" + "test_param_override_with_marker" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # These tests fail in the Darwin sandbox + "tests/test_adhoc.py" + "tests/test_adhoc_result.py" ]; pythonImportsCheck = [ @@ -66,6 +78,6 @@ buildPythonPackage rec { homepage = "https://github.com/jlaska/pytest-ansible"; changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix index 95e22510d8..7984a390a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Pytest plugin to help with comparing array output from tests"; homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix index aa88d42813..43f2edfc30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Plugin to add diagnostic information to the header of the test output"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix index a111c8953d..5e1f922301 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Meta-package containing dependencies for testing"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix index debbe626ff..ffc13ca9eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/Stranger6667/pytest-click"; changelog = "https://github.com/Stranger6667/pytest-click/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index 4f520f3e8b..b3f445cad4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix index bb0d410618..89b035e74d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-muQ8lb00tdhAvaLaNupuHh6YqbDEvkaGFbnb4tR2Wes="; + hash = "sha256-iabj6WuS6+65O4ztagT1/H+U8/SKySQ9bQiOfvln1AQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix index 26cf78d0f7..63b64f2331 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Pytest plugin to help with testing figures output from Matplotlib"; homepage = "https://github.com/matplotlib/pytest-mpl"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix index 5e869b9a06..8514fbb720 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Mypy static type checker plugin for Pytest"; homepage = "https://github.com/dbader/pytest-mypy"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix index f076417fbb..ac7936c014 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Pytest plugin for detecting inadvertent open file handles"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix index ed076fa847..5bb9224ac4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Pytest plugin to check source code with pylint"; homepage = "https://github.com/carsongee/pytest-pylint"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix index 3d7a5a86fb..96f7519354 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "pytest support for PyQt and PySide applications"; homepage = "https://github.com/pytest-dev/pytest-qt"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix index 7962198ca8..84f7edb2b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Relaxed test discovery/organization for pytest"; changelog = "https://github.com/bitprophet/pytest-relaxed/blob/${version}/docs/changelog.rst"; license = licenses.bsd0; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix index 1529796bab..544a2e3400 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/pytest-remotedata"; changelog = "https://github.com/astropy/pytest-remotedata/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix index 61d7d22b29..9bd2ee22ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Pytest plugin for repeating tests"; homepage = "https://github.com/pytest-dev/pytest-repeat"; license = licenses.mpl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix index 72936dff17..7047eef03e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "A plugin to enable snapshot testing with pytest"; homepage = "https://github.com/joseph-roitman/pytest-snapshot/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix index 89395ad803..67ee191b85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pytest Plugin to disable socket calls during tests"; homepage = "https://github.com/miketheman/pytest-socket"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix index c744a2926b..e916e0e005 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Frozenball/pytest-sugar"; changelog = "https://github.com/Teemu/pytest-sugar/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix index c4fbeb466b..fe663c3f26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , setuptools-scm , ansible-core , paramiko @@ -51,6 +52,9 @@ buildPythonPackage rec { "test_user_connection" "test_sudo" "test_docker_encoding" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # broken because salt package only built for python 3.10 + "test_backend_importables" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix index 77c8c0cf22..9064b4283b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix @@ -4,7 +4,6 @@ , pytest , pytestCheckHook , pexpect -, pytest-cov }: buildPythonPackage rec { @@ -24,7 +23,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pexpect - pytest-cov ]; disabledTests = [ @@ -46,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-timeout/"; changelog = "https://github.com/pytest-dev/pytest-timeout/#changelog"; license = licenses.mit; - maintainers = with maintainers; [ makefu costrouc ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix index aef430a8e6..0b555274c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/The-Compiler/pytest-xvfb"; changelog = "https://github.com/The-Compiler/pytest-xvfb/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix index 0912daa20f..e9224b543b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix @@ -9,6 +9,7 @@ , mock , requests , requests-toolbelt +, setuptools }: let @@ -38,6 +39,7 @@ buildPythonPackage rec { requests requests-toolbelt pyjwt + setuptools ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 503723aa96..e2daf959ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.31.0"; + version = "0.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fFxFpVKA6CdKwYRQCZb7iDrhLVmzaCr009Cv7CvMDyo="; + hash = "sha256-4fBV7sInw/jrKt7CmG7riMTmpLyrsyvWZGRY6s3YbHw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix index 66c1939c7e..1044fe0a27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-csxcad/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ cython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix index 156d2270d8..03290d2e99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-cHWOOH/A4MS628s5T2GsvmizSXCo/tfg98iUaf4XkSo="; + hash = "sha256-VnS61Ok4dsCw0xl+MU1/lC05AYvzHiuDP2eIpoE8P7g="; }; postPatch = '' @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "API for the GNU Privacy Guard (GnuPG)"; homepage = "https://github.com/vsajip/python-gnupg"; + changelog = "https://github.com/vsajip/python-gnupg/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ copumpkin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index c327257e0a..bfb53c92df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-s3FNRpMZC/MG3s+ZDHgdsIT2AhvBDmGvJfutUPzY4wE="; + hash = "sha256-XTSnIL/hBL1Rsyv/tBce/WCvA3n7mZern0v3i6gTOeA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index acbb9383e1..78f97117f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -1,5 +1,6 @@ { lib , anyio +, async-timeout , asyncclick , buildPythonPackage , fetchFromGitHub @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.2"; + version = "0.5.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+ezs8mj3TRmeIhKPxyov9BPdNkhj0ri4FgoZdW7O8tA="; + hash = "sha256-7GJnkT7FOYzytQyOCP8zU5hUk4SbeC7gc1qkhl5eXGo="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ anyio + async-timeout asyncclick pydantic ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix index 62b8cd6202..a4adbf787a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Provides access to the Keycloak API"; homepage = "https://github.com/marcospereirampj/python-keycloak"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix index f90591a7fb..056b466216 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index c609630a2d..c04beb032f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.6.3"; + version = "3.7.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-xtxbZS8CPCkgyFX08THn7hGurFj8dQV+KIZ6VvTY7hA="; + hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix index edf3db11d5..9078f41aea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "A streaming multipart parser for Python"; homepage = "https://github.com/andrew-d/python-multipart"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix index 39cd201c96..e255a9b891 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-olm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { disabled = !isPy3k; - sourceRoot = "source/python"; + sourceRoot = "${olm.src.name}/python"; buildInputs = [ olm ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix index 348f10b3ae..7a186276df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-openems/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ cython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix index 74a0d8deb0..389e8a5df9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jozMYrmXHSykv5npboyySuVDs1Lamlee15ZPYI4zmO4="; + hash = "sha256-oLqgjTuC5rpAzXTJO+KFn+uQ0TV7rNPWHOAJtRI4otk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index 9cb3baf066..104e446fa4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -56,6 +56,6 @@ in buildPythonPackage rec { homepage = "https://github.com/python-rapidjson/python-rapidjson"; description = "Python wrapper around rapidjson"; license = licenses.mit; - maintainers = with maintainers; [ costrouc dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index 6a34b756b1..ade8f0cfd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.30.0"; + version = "0.32.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-ut7iaVR/2vGJ4L6/3dl9EmMVly3gvkhHqnBFAeTOQ1Y="; + hash = "sha256-DojIfAmYW/asvpAkcBj/pN1rdCPFD4nwkEqpGVBkMoE="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index 48528adf2b..05fcdda421 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Python library for the snappy compression library from Google"; homepage = "https://github.com/andrix/python-snappy"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix new file mode 100644 index 0000000000..f9a0841fdc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, dataclasses-json +, isodate +, requests +, requests-oauthlib +, pytestCheckHook +, responses +}: +buildPythonPackage rec { + pname = "python-youtube"; + version = "0.9.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "sns-sdks"; + repo = "python-youtube"; + rev = "v${version}"; + hash = "sha256-PbPdvUv7I9NKW6w4OJbiUoRNVJ1SoXychSXBH/y5nzY="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=pyyoutube" "" \ + --replace "--cov-report xml" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dataclasses-json + isodate + requests + requests-oauthlib + ]; + + pythonImportsCheck = [ "pyyoutube" ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + meta = with lib; { + description = "A simple Python wrapper around for YouTube Data API"; + homepage = "https://github.com/sns-sdks/python-youtube"; + changelog = "https://github.com/sns-sdks/python-youtube/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix index 7a6ab30127..1b5bd96110 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytomorrowio"; - version = "0.3.5"; + version = "0.3.6"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-LFIQJJPqKlqLzEoX9ShfoASigPC5R+OWiW81VmjONe8="; + hash = "sha256-ZCA+GYuZuRgc4Pi9Bcg4zthOnkmQ+/IddFMkR0WYfKk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index 8e5b66171a..d4067edd33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-sjRJzov7P8B0kg7+T+JKCpx6TsaOr1N3TYIeKayI0+8="; + hash = "sha256-/RfHryuIFhLn9SCg6YVn0Ley8ajcIlsDtuKNuhUFm8M="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix index 9384ff0e0b..3da9eb457f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.7.0"; + version = "1.7.2"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - hash = "sha256-9c7lfeM6PXF6CR3JtLi1NPmTwEbrv9Kh1kvdDQbskuI="; + hash = "sha256-ChFD05ZK0TCVvM+uqGzma2x5qqyD94uBvFpSnWuyL2c="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix index 24f3b89a86..29b1e5f8d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.24.0"; + version = "0.24.1"; src = fetchPypi { inherit pname version; - hash = "sha256-sqOv4cmep1H4KWZSVX6sVZh02iobHsBiUXhwbsWjRfM="; + hash = "sha256-deVNNyGPWsRbDaHw/ZzF5SajysPvHPrUEM96sziwFHE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index e2c02fcc55..e9ec506d6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.10.5"; + version = "4.10.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BrdffDuPTn/uFKT9F0pF1+0/MraIPRwsN64DdseQdQA="; + hash = "sha256-vO60QMr+J3tE7ZIU7fZP27jMuPeCJH56Hbhjek5ZfXI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix index 43295e0c90..a8af2db236 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "PyUtilib: A collection of Python utilities"; homepage = "https://github.com/PyUtilib/pyutilib"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix index 287b41d3ee..b3672b20b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.1.7"; + version = "2.1.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aU9NfAYMTfMlTjiSnv5vhUBUzrOD+UDQvktpLoGr8N8="; + hash = "sha256-RrFCza6y5IdeDokSAGOYs20OMIm4UGCRy/0YO/uYtNo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index bc3a0b9af3..b6d3593b94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.59"; + version = "9.2.62"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-V4YZFua3SrmUz96dWgMWUZulK6f1+VqlRAf6GWHul0Y="; + hash = "sha256-eBmmXdtYeG6O8Wdt0Gye78/6dt+XZznXyEzlv9WFwcI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index 000418a340..e63038b54c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.40.1"; + version = "0.41.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-nGLguMbenfKONcY1W5S+BZ6zHmnW/Sivs2/NpDqrEck="; + hash = "sha256-vFxEMKEkiFOBrkvmaJPwoo+lOe6V9AmPxl32Tocy9p8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix index 30901bb689..4b36784949 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Launch jobs, organize the output, and dissect the results"; homepage = "https://pyviz.org/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix index 2fd5a96fa9..802ad73a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvoro/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/joe-jordan/pyvoro"; description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix index 2a681c4f49..f35c6a028d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.15"; + version = "0.4.16"; src = fetchPypi { inherit pname version; - hash = "sha256-vz7Sjd8KT7UgOBI5AN5q6CS7jl+WL87w91cgm0bXRGw="; + hash = "sha256-qqcMhwsKs2UhX45xUF9zaDxO0VsfNjhDOx3HNE/ltd0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index a37d3a7d1b..6a64397971 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "1.1.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OROS5mLMDXxygzWvURZtt5MD+gey5GxfsvpkbshOzR0="; + hash = "sha256-6aigzwHP9iAQF4GKKQfnZl9sAbwZfOAG/xPf6ay7rGs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix index cc09a5e0f1..3442d5f984 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyxbe"; - version = "1.0.2"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mborgerson"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sm8/Lcsk3aL8/MB0cVrKNb8MoQPxGCGpHkEPWv+mPdo="; + hash = "sha256-iLzGGgizUbaEG1xrNq4WDaWrGtcaLwAYgn4NGYiSDBo="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix index 19063414a4..1242697aba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; homepage = "https://github.com/gvanrossum/pyxl3"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix index 16ba6b4de9..e8956dba34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix @@ -1,21 +1,27 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder -, nose +, pytestCheckHook , lxml +, matplotlib +, networkx +, pandas , requests , six }: buildPythonPackage rec { pname = "pyxnat"; - version = "1.5"; - disabled = pythonOlder "3.7"; + version = "1.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Y8mj6OfZXyE1q3C8HyVzGySuZB6rLSsL/CV/7axxaec="; + # PyPI dist missing test configuration files: + src = fetchFromGitHub { + owner = "pyxnat"; + repo = "pyxnat"; + rev = "refs/tags/${version}"; + hash = "sha256-QejYisvQFN7CsDOx9wAgTHmRZcSEqgIr8twG4XucfZ4="; }; propagatedBuildInputs = [ @@ -30,17 +36,37 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "pathlib>=1.0" "" \ --replace "future>=0.16" "" + sed -i '/--cov/d' setup.cfg ''; - nativeCheckInputs = [ nose ]; - checkPhase = "nosetests pyxnat/tests"; - doCheck = false; # requires a docker container running an XNAT server + nativeCheckInputs = [ + pytestCheckHook + matplotlib + networkx + pandas + ]; + preCheck = '' + export PYXNAT_SKIP_NETWORK_TESTS=1 + ''; + pytestFlagsArray = [ "pyxnat" ]; + disabledTestPaths = [ + # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: + "pyxnat/tests/pipelines_test.py" + "pyxnat/tests/search_test.py" + "pyxnat/tests/user_and_project_management_test.py" + ]; + disabledTests = [ + # try to access network even though PYXNAT_SKIP_NETWORK_TESTS is set: + "test_ashs_volumes" + "test_inspector_structure" + ]; pythonImportsCheck = [ "pyxnat" ]; meta = with lib; { homepage = "https://pyxnat.github.io/pyxnat"; description = "Python API to XNAT"; + changelog = "https://github.com/pyxnat/pyxnat/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix index 8de6ba9e6d..e140c949b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.5"; + version = "0.21.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-lw6jswIaqDFExz/hjIrpZf4BC757l83MeCfOyZaTbfg="; + hash = "sha256-1vXqwir3lAM+m/HGHWuXl20muAOasEWo1H0RjUCShTM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qudida/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qudida/default.nix new file mode 100644 index 0000000000..48d83c4d14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qudida/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, opencv4 +, pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, typing-extensions +}: + +buildPythonPackage rec { + pname = "qudida"; + version = "0.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "opencv-python" + ]; + + propagatedBuildInputs = [ + numpy + opencv4 + scikit-learn + typing-extensions + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "qudida" ]; + + meta = with lib; { + description = "QUick and DIrty Domain Adaptation"; + homepage = "https://github.com/arsenyinfo/qudida"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rauth/default.nix new file mode 100644 index 0000000000..059dfa9a2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rauth/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, requests +, pytestCheckHook +, mock +, nose +, pycrypto +}: + +buildPythonPackage rec { + pname = "rauth"; + version = "0.7.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "litl"; + repo = "rauth"; + rev = version; + hash = "sha256-wRKZbxZCEfihOaJM8sk8438LE++KJWxdOGImpL1gHa4="; + }; + + patches = [ + (fetchpatch { + # https://github.com/litl/rauth/pull/211 + name = "fix-pycrypdodome-replacement-for-pycrypto.patch"; + url = "https://github.com/litl/rauth/commit/7fb3b7bf1a1869a52cf59ee3eb607d318e97265c.patch"; + hash = "sha256-jiAIw+VQ2d/bkm2brqfY1RUrNGf+lsMPnoI91gGUS6o="; + }) + ]; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ "rauth" ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + nose + pycrypto + ]; + + meta = with lib; { + description = "A Python library for OAuth 1.0/a, 2.0, and Ofly"; + homepage = "https://github.com/litl/rauth"; + changelog = "https://github.com/litl/rauth/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix index cf3c7f6e8d..6a43bcdc3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { description = "Readme is a library for rendering readme descriptions for Warehouse"; homepage = "https://github.com/pypa/readme"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recline/default.nix index 9bafa54880..074e1da033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recline/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "This library helps you quickly implement an interactive command-based application"; homepage = "https://github.com/NetApp/recline"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix index 12c4898e78..f6ccd201df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "referencing"; - version = "0.29.1"; + version = "0.30.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-Mdbzv0xNMnU8b9ynqX7kXUkTasx4pCymWXs5RcwRmSc="; + hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix index 0fc894e9f0..ccbfb1cb87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Simple manipualtion and display of spatial regions"; homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index b18c432aed..ee631bf221 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -1,17 +1,16 @@ { lib , aiohttp -, aiounittest , buildPythonPackage , fetchFromGitHub , ffmpeg-python -, pytestCheckHook +, orjson , pythonOlder , requests }: buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.3"; + version = "0.7.6"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-QCs0tb0yS5el6kYIoWm71x14e0rsp3lOUntgrj0hvBo="; + hash = "sha256-muxM9+3D8WL2muw5yxbYKmbkVc5lTcj9XQOr67hb/pU="; }; postPatch = '' @@ -28,34 +27,16 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "ffmpeg" "ffmpeg-python" ''; + propagatedBuildInputs = [ aiohttp ffmpeg-python + orjson requests ]; - doCheck = false; # all testse require a network device - - nativeCheckInputs = [ - aiounittest - pytestCheckHook - ]; - - pytestFlagsArray = [ - "tests/test.py" - ]; - - disabledTests = [ - # Tests require network access - "test1_settings" - "test2_states" - "test3_images" - "test4_properties" - "test_succes" - "test_wrong_host" - "test_wrong_password" - "test_wrong_user" - ]; + # All tests require a network device + doCheck = false; pythonImportsCheck = [ "reolink_aio" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix index 4d68f52be9..f87d5cdc78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix @@ -3,13 +3,12 @@ , fetchPypi , pythonOlder , setuptools-scm -, six , pytestCheckHook }: buildPythonPackage rec { pname = "repeated-test"; - version = "2.3.1"; + version = "2.3.3"; format = "pyproject"; disabled = pythonOlder "3.5"; @@ -17,17 +16,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "repeated_test"; inherit version; - hash = "sha256-TbVyQA7EjCSwo6qfDksbE8IU1ElkSCABEUBWy5j1KJc="; + hash = "sha256-3YPU8SL9rud5s0pnwwH5TJk1MXsDhdkDnZp/Oj6sgXs="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - six - ]; - nativeCheckInputs = [ pytestCheckHook ]; @@ -39,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unittest-compatible framework for repeating a test function over many fixtures"; homepage = "https://github.com/epsy/repeated_test"; + changelog = "https://github.com/epsy/repeated_test/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ tjni ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reprshed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reprshed/default.nix new file mode 100644 index 0000000000..1aa9469aab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/reprshed/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "python-reprshed"; + version = "1.0.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mentalisttraceur"; + repo = "python-reprshed"; + rev = "v${version}"; + hash = "sha256-XfmiewI74eDLKTAU6Ed76QXfJYMRb+idRACl6CW07ME="; + }; + + pythonImportsCheck = [ + "reprshed" + ]; + + meta = with lib; { + homepage = "https://github.com/mentalisttraceur/python-reprshed"; + description = "A toolshed for writing great __repr__ methods quickly and easily"; + license = licenses.bsd0; + maintainers = with maintainers; [ netali ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix index 031bf93faa..4e72ce6736 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix @@ -1,33 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, python -, mock +{ lib +, buildPythonPackage +, fetchPypi +, fixtures , purl +, pytestCheckHook +, python , requests +, requests-futures , six -, testrepository , testtools -, pytest }: buildPythonPackage rec { pname = "requests-mock"; - version = "1.10.0"; + version = "1.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WcnDJBmp+xroPsJC2Y6InEW9fXpl1IN1zCQ+wIRBZYs="; + hash = "sha256-7xC1crSJpfKOCbcIaXIIxKOyuJ74Cp8BWENA6jV+w8Q="; }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - propagatedBuildInputs = [ requests six ]; - nativeCheckInputs = [ mock purl testrepository testtools pytest ]; + nativeCheckInputs = [ + fixtures + purl + pytestCheckHook + requests-futures + testtools + ]; meta = with lib; { description = "Mock out responses from the requests package"; homepage = "https://requests-mock.readthedocs.io"; + changelog = "https://github.com/jamielennox/requests-mock/releases/tag/${version}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix index 55d37ab874..d2b4bf57a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Validating URI References per RFC 3986"; homepage = "https://rfc3986.readthedocs.org"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix index a82d4107ce..0b65e8c1c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://ripser.scikit-tda.org"; changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix index 13aca2c0d7..651c27be67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscv-isac/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "riscv-isac"; - version = "0.17.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-I0RsvSCrSlNGVj8z+WUQx6vbdNkKCRyMFvNx+0mTBAE="; + hash = "sha256-7CWUyYwzynFq/Qk5SzQB+ljsVVI98kPPDT63Emhqihw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix index f03ba7019a..b0e7d123e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "RLP serialization library"; homepage = "https://github.com/ethereum/pyrlp"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index fd5655bcd1..43da9125f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.1.2"; + version = "4.2.0"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "PythonLibCore"; - rev = "v${version}"; - hash = "sha256-uS0NwyFqidhrMG7thHM0qau22B/kI16c8aXEUuNdioQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-RJTn1zSVJYgbh93Idr77uHl02u0wpj6p6llSJfQVTQk="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix index 9b224775f6..3dcf1606c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Python Tools for Robot Framework and Test Libraries"; homepage = "https://github.com/userzimmermann/robotframework-tools"; license = licenses.gpl3Plus; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix index 7eb6d7906c..8b6eb61e72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , cargo , fetchPypi @@ -6,11 +7,12 @@ , pythonOlder , rustc , rustPlatform +, libiconv }: buildPythonPackage rec { pname = "rpds-py"; - version = "0.8.10"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,13 +20,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-E+ZDzorVAqAmM5c2L7iHWUtJz4S/UY1gOMFvI18rzqQ="; + hash = "sha256-jXDo8UkA8mV8JJ6k3vljvthqKbgfgfW3a1qSFWgN6UU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-D4pbEipVn1r5rrX+wDXi97nDZJyBlkdqhmbJSgQGTLU="; + hash = "sha256-2LiQ+beFj9+kykObPNtqcg+F+8wBDzvWcauwDLHa7Yo="; }; nativeBuildInputs = [ @@ -34,6 +36,10 @@ buildPythonPackage rec { rustc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix index 7bb8ac8545..6d6a484255 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "rst2pdf"; - version = "0.100"; + version = "0.101"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zkw8FubT3qJ06ECkNurE26bLUKtq8xYvydVxa+PLe0I="; + sha256 = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg="; }; outputs = [ "out" "man" ]; @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert reStructured Text to PDF via ReportLab"; homepage = "https://rst2pdf.org/"; + changelog = "https://github.com/rst2pdf/rst2pdf/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix index 2db8a335e8..26b94d0fd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Common routines for ruamel packages"; homepage = "https://sourceforge.net/projects/ruamel-base/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index a8f93d53f6..7975629b4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix index 13885e03ab..d938fb1f21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix index 4d30e553c9..06a2c3966a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix @@ -30,11 +30,11 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; hash = "sha256-tC0XawmKWNGCaByHQfJEfmHM3m/qgTuIpcRaEFJC6dM"; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ setuptools-rust diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 6bee251ff3..c45a729164 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -1,65 +1,84 @@ { lib , buildPythonPackage -, fetchPypi +, pythonOlder +, fetchFromGitHub , pythonRelaxDepsHook , attrs , boto3 +, cloudpickle , google-pasta -, importlib-metadata , numpy , protobuf -, protobuf3-to-dict , smdebug-rulesconfig +, importlib-metadata +, packaging , pandas , pathos -, packaging -, pythonOlder +, schema +, pyyaml +, jsonschema +, platformdirs +, tblib +, urllib3 +, docker +, scipy }: buildPythonPackage rec { pname = "sagemaker"; - version = "2.135.0"; + version = "2.173.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ypdcqEYLxHbfnq1ycq3hVLThhIIs3pq29Fv33Ly2hbE="; + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-python-sdk"; + rev = "refs/tags/v${version}"; + hash = "sha256-Fzkw37bRBbCD7VBIsN4Qkk6dI0Qh4Gvt5TJbnoUuPCs="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ - # FIXME: Remove when >= 2.111.0 "attrs" - "protobuf" + "boto3" ]; propagatedBuildInputs = [ attrs boto3 + cloudpickle google-pasta - importlib-metadata numpy - packaging - pathos protobuf - protobuf3-to-dict smdebug-rulesconfig + importlib-metadata + packaging pandas + pathos + schema + pyyaml + jsonschema + platformdirs + tblib ]; - postFixup = '' - [ "$($out/bin/sagemaker-upgrade-v2 --help 2>&1 | grep -cim1 'pandas failed to import')" -eq "0" ] - ''; - - doCheck = false; + doCheck = false; # many test dependencies are not available in nixpkgs pythonImportsCheck = [ "sagemaker" "sagemaker.lineage.visualizer" ]; + passthru.optional-dependencies = { + local = [ urllib3 docker pyyaml ]; + scipy = [ scipy ]; + # feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs + }; + meta = with lib; { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 52b04f4ccc..eaa1424019 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -130,6 +130,6 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic/"; changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc AluisioASG ]; + maintainers = with maintainers; [ AluisioASG ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index bc25094c3d..9c82820f84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -23,7 +23,7 @@ , html5lib , importlib-metadata , intbitset -, jaraco_functools +, jaraco-functools , javaproperties , jinja2 , jsonstreams @@ -94,7 +94,7 @@ buildPythonPackage rec { html5lib importlib-metadata intbitset - jaraco_functools + jaraco-functools javaproperties jinja2 jsonstreams diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index 18e49239d0..2c4920cf4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Data structures, algorithms and educational resources for bioinformatics"; license = licenses.bsd3; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix index 2915e68767..553afcd8a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "A Python extension module which implements the fast marching method"; homepage = "https://github.com/scikit-fmm/scikit-fmm"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix index 9288ea3f55..09c9547fd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { description = "Sequential model-based optimization toolbox"; homepage = "https://scikit-optimize.github.io/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; broken = true; # It will fix by https://github.com/scikit-optimize/scikit-optimize/pull/1123 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix index 784dc84a08..e2b6fae9aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Topological Data Analysis for humans"; homepage = "https://github.com/scikit-tda/scikit-tda"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix index f1bf381691..c429c6f647 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.0.4"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vsNuTwxxKyWwFPxMCQkSyQDnMLUYMLJ28AUnVrh3ksE="; + hash = "sha256-ggqSS5SWJvKxYzCz4Q9LkA0hXmj/3iGhMKeNb/UQVXg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix index 2611ae5c3a..297a6514ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://www.github.com/SethMichaelLarson/selectors2"; description = "Back-ported, durable, and portable selectors"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 598bbc41de..053b42d90e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Bindings for Selenium WebDriver"; homepage = "https://selenium.dev/"; license = licenses.asl20; - maintainers = with maintainers; [ jraygauthier SuperSandro2000 ]; + maintainers = with maintainers; [ jraygauthier ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix index 5a41b89f41..7316256cd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.16.1"; + version = "2.17.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-J3QX4utnr64xNMt81kwGX6VJlDz6qe5oz+sjH5JATZQ="; + hash = "sha256-zfgkTBdE8UWwk+G3bLBThVjgU+m2QoPf1fzORyznEgs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix index c1ad64b3f5..dc7335b351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentencepiece/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ sentencepiece.dev ]; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # sentencepiece installs 'bin' output. meta = builtins.removeAttrs sentencepiece.meta [ "outputsToInstall" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index f5ec7a21b5..94cb5ab003 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.28.1"; + version = "1.29.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-toyZAOtAZl38UfLs8+DbAb/EqX+sl/ndKGb7/pFI10Q="; + hash = "sha256-etn7vkKgCN7a8Dxv4gDSVaG6mvCltVh6rTOLaKEyNRA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index 5a1a2e2107..906d6355e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/PyO3/setuptools-rust"; changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix index dc338bd411..36373efda5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix index 069afeca9b..20e4d95928 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -3,10 +3,6 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, python -, lsof -, glibcLocales -, coreutils , pytestCheckHook }: @@ -47,6 +43,9 @@ buildPythonPackage rec { "test_unicode_path" # fails to import itself after modifying the environment "test_environment" + # timing sensitive through usage of sleep(1) and signal handling + # https://github.com/amoffat/sh/issues/684 + "test_general_signal" ] ++ lib.optionals stdenv.isDarwin [ # Disable tests that fail on Darwin sandbox "test_background_exception" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix index 9284d64521..a93cca6232 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , writeText @@ -30,7 +29,7 @@ buildPythonPackage rec { pname = "shap"; - version = "0.42.0"; + version = "0.42.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -39,17 +38,9 @@ buildPythonPackage rec { owner = "slundberg"; repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-VGlswr9ywHk4oKSmmAzEC7+E0V2XEFlg19zXVktUdhc="; + hash = "sha256-Ezq6WS6QnoM5uEfo2DgDAEo1HkQ1KjmfgIyVWh3RM94="; }; - patches = [ - (fetchpatch { - name = "fix-circular-import-error.patch"; - url = "https://github.com/slundberg/shap/commit/ce118526b19b4a206cf8b496c2cd2b215ef7a91b.patch"; - hash = "sha256-n2yFjFgc2VSFKb4ZJx775HblULWfnQSEnqjfPa8AOt0="; - }) - ]; - nativeBuildInputs = [ setuptools ]; @@ -152,6 +143,6 @@ buildPythonPackage rec { homepage = "https://github.com/slundberg/shap"; changelog = "https://github.com/slundberg/shap/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ evax ]; + maintainers = with maintainers; [ evax natsukium ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix index 10638620b0..bb74352b1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "simple and sensible display of images"; homepage = "https://github.com/freeman-lab/showit"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix index 4f939eed4f..f27d2c1f25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.6.2"; + version = "1.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qhWkUprDEFRvb9/0dGWBjyIFQY08sAqFSl5jYGtN6Z8="; + hash = "sha256-9XXAVwno8rO5Uw7S5FWsyEUSqUE46QRehpAr5wIlYgc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index f417ac3268..8598f04918 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { homepage = "https://github.com/simple-salesforce/simple-salesforce"; changelog = "https://github.com/simple-salesforce/simple-salesforce/blob/v${version}/CHANGES"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix index cc138695e3..aa8a970364 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { format = "pyproject"; disabled = pythonOlder "3.8"; - sourceRoot = "source/Wrapping/Python"; + sourceRoot = "${src.name}/Wrapping/Python"; preBuild = '' make ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix new file mode 100644 index 0000000000..30cf185c1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix @@ -0,0 +1,88 @@ +{ buildPythonPackage +, chalice +, cherrypy +, django +, falcon +, fastapi +, fetchFromGitHub +, flask +, flask-sockets +, lib +, moto +, numpy +, pyramid +, pytest-asyncio +, pytestCheckHook +, sanic +, sanic-testing +, slack-sdk +, starlette +, tornado +}: + +buildPythonPackage rec { + pname = "slack-bolt"; + version = "1.18.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "slackapi"; + repo = "bolt-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-s9djd/MDNnyNkjkeApY6Fb1mhI6iop8RghaSJdi4eAs="; + }; + + # The packaged pytest-runner version is too new as of 2023-07-27. It's not really needed anyway. Unfortunately, + # pythonRelaxDepsHook doesn't work on setup_requires packages. + postPatch = '' + substituteInPlace setup.py --replace "pytest-runner==5.2" "" + ''; + + propagatedBuildInputs = [ slack-sdk ]; + + nativeCheckInputs = [ + chalice + cherrypy + django + falcon + fastapi + flask + flask-sockets + moto + pyramid + pytest-asyncio + pytestCheckHook + sanic + sanic-testing + starlette + tornado + ]; + + # Work around "Read-only file system: '/homeless-shelter'" errors + preCheck = '' + export HOME="$(mktemp -d)" + ''; + + disabledTestPaths = [ + # boddle is not packaged as of 2023-07-15 + "tests/adapter_tests/bottle/" + ]; + + disabledTests = [ + # Require network access + "test_events" + "test_interactions" + "test_lazy_listener_calls" + "test_lazy_listeners" + "test_failure" + ]; + + pythonImportsCheck = [ "slack_bolt" ]; + + meta = with lib; { + description = "A framework to build Slack apps using Python"; + homepage = "https://github.com/slackapi/bolt-python"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index 6d805c35f0..433f9ad62a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -5,7 +5,6 @@ , boto3 , buildPythonPackage , codecov -, databases , fetchFromGitHub , flake8 , flask-sockets @@ -21,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.20.2"; + version = "3.21.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-2MPXV+rVXZYMTZe11T8x8GKQmHZwUlkwarCkheVkERo="; + hash = "sha256-begpT/DaDqOi8HZE10FCuIIv18KSU/i5G/Z5DXKUT7Y="; }; propagatedBuildInputs = [ @@ -44,7 +43,6 @@ buildPythonPackage rec { nativeCheckInputs = [ codecov - databases flake8 flask-sockets moto @@ -67,6 +65,7 @@ buildPythonPackage rec { "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" "test_org_installation" "test_interactions" + "test_issue_690_oauth_access" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix index 47e3f58f58..f74447750c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Library to access sliced imaging data"; homepage = "https://github.com/spacetx/slicedimage"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicerator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicerator/default.nix index a1240f47c4..a8a4a7d3b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slicerator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slicerator/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "A lazy-loading, fancy-sliceable iterable"; homepage = "https://github.com/soft-matter/slicerator"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index ef2a897de2..be0e061bdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -9,12 +9,13 @@ , pythonOlder , setuptools , solc +, web3 , withSolc ? false }: buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.9.2"; + version = "0.9.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-Co3BFdLmSIMqlZVEPJHYH/Cf7oKYSZ+Ktbnd5RZGmfE="; + hash = "sha256-c6H7t+aPPWn1i/30G9DLOmwHhdHHHbcP3FRVVjk1XR4="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { packaging prettytable setuptools + web3 ]; postFixup = lib.optionalString withSolc '' @@ -55,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/trailofbits/slither"; changelog = "https://github.com/crytic/slither/releases/tag/${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ arturcygan fab ]; + maintainers = with maintainers; [ arturcygan fab hellwolf ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix index 7152980629..a1ba8f67f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "An improved PLY implementation of lex and yacc for Python 3"; homepage = "https://github.com/dabeaz/sly"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix index d7d5686023..bd0d181a3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.5.1"; + version = "0.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "grahamwetzler"; repo = "smart-meter-texas"; - rev = "v${version}"; - hash = "sha256-rjMRV5MekwRkipes2nWos/1zi3sD+Ls8LyD3+t5FOZc="; + rev = "refs/tags/v${version}"; + hash = "sha256-8htd5fLrtkaVlSEm+RB7tWA5YZkcAOjAXVNzZiMwP7k="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snakebite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakebite/default.nix index 62e233aec3..a5b8a99311 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snakebite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snakebite/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Pure Python HDFS client"; homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix index 6f6a1df05b..a36c8e48d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Snapshot testing for pytest, unittest, Django, and Nose"; homepage = "https://github.com/syrusakbary/snapshottest"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 4a89534c63..fbf000d21e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -7,6 +7,7 @@ , fetchPypi , filelock , idna +, keyring , oscrypto , pycryptodomex , pyjwt @@ -53,6 +54,10 @@ buildPythonPackage rec { typing-extensions ]; + passthru.optional-dependencies = { + secure-local-storage = [ keyring ]; + }; + # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix index 19c41c35ac..509505b270 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socid-extractor"; - version = "0.0.24"; + version = "0.0.25"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "soxoj"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-INewgfm+E2t4QfE+SRAm5a74AKsifNtnwC0WPBqPUns="; + hash = "sha256-3aqtuaecqtUcKLp+LRUct5aZb9mP0cE9xH91xWqtb1Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix index bd7efca27e..93b942811c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -27,6 +27,13 @@ buildPythonPackage rec { hash = "sha256-IJ+ovLQv6/UU1oepmUQjzaWBG3Rdd3xvui7FjK85Urs="; }; + patches = [ + # https://github.com/sopel-irc/sopel/issues/2401 + # https://github.com/sopel-irc/sopel/commit/596adc44330939519784389cbb927435305ef758.patch + # rewrite the patch because there are too many patches needed to apply the above patch. + ./python311-support.patch + ]; + propagatedBuildInputs = [ dnspython geoip2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/python311-support.patch b/third_party/nixpkgs/pkgs/development/python-modules/sopel/python311-support.patch new file mode 100644 index 0000000000..dfa0283409 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/python311-support.patch @@ -0,0 +1,96 @@ +diff --git a/sopel/plugins/handlers.py b/sopel/plugins/handlers.py +index 76902aa0..05f0279d 100644 +--- a/sopel/plugins/handlers.py ++++ b/sopel/plugins/handlers.py +@@ -46,20 +46,15 @@ from __future__ import absolute_import, division, print_function, unicode_litera + + import imp + import importlib ++import importlib.util + import inspect + import itertools + import os ++import sys + + from sopel import loader + from . import exceptions + +-try: +- reload = importlib.reload +-except AttributeError: +- # py2: no reload function +- # TODO: imp is deprecated, to be removed when py2 support is dropped +- reload = imp.reload +- + + class AbstractPluginHandler(object): + """Base class for plugin handlers. +@@ -301,7 +296,7 @@ class PyModulePlugin(AbstractPluginHandler): + + This method assumes the plugin is already loaded. + """ +- self._module = reload(self._module) ++ self._module = importlib.reload(self._module) + + def is_loaded(self): + return self._module is not None +@@ -402,45 +397,31 @@ class PyFilePlugin(PyModulePlugin): + + if good_file: + name = os.path.basename(filename)[:-3] +- module_type = imp.PY_SOURCE ++ spec = importlib.util.spec_from_file_location( ++ name, ++ filename, ++ ) + elif good_dir: + name = os.path.basename(filename) +- module_type = imp.PKG_DIRECTORY ++ spec = importlib.util.spec_from_file_location( ++ name, ++ os.path.join(filename, '__init__.py'), ++ submodule_search_locations=filename, ++ ) + else: + raise exceptions.PluginError('Invalid Sopel plugin: %s' % filename) + + self.filename = filename + self.path = filename +- self.module_type = module_type ++ self.module_spec = spec + + super(PyFilePlugin, self).__init__(name) + + def _load(self): +- # The current implementation uses `imp.load_module` to perform the +- # load action, which also reloads the module. However, `imp` is +- # deprecated in Python 3, so that might need to be changed when the +- # support for Python 2 is dropped. +- # +- # However, the solution for Python 3 is non-trivial, since the +- # `importlib` built-in module does not have a similar function, +- # therefore requires to dive into its public internals +- # (``importlib.machinery`` and ``importlib.util``). +- # +- # All of that is doable, but represents a lot of work. As long as +- # Python 2 is supported, we can keep it for now. +- # +- # TODO: switch to ``importlib`` when Python2 support is dropped. +- if self.module_type == imp.PY_SOURCE: +- with open(self.path) as mod: +- description = ('.py', 'U', self.module_type) +- mod = imp.load_module(self.name, mod, self.path, description) +- elif self.module_type == imp.PKG_DIRECTORY: +- description = ('', '', self.module_type) +- mod = imp.load_module(self.name, None, self.path, description) +- else: +- raise TypeError('Unsupported module type') +- +- return mod ++ module = importlib.util.module_from_spec(self.module_spec) ++ sys.modules[self.name] = module ++ self.module_spec.loader.exec_module(module) ++ return module + + def get_meta_description(self): + """Retrieve a meta description for the plugin. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix index 7158c6deca..3b60be8c48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix @@ -32,7 +32,7 @@ let description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; homepage = "https://grantjenks.com/docs/sortedcontainers/"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix index cd5a0cd194..e26a04192f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix @@ -3,7 +3,6 @@ , fetchPypi , hatchling , isPy3k -, backports_functools_lru_cache }: buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix new file mode 100644 index 0000000000..72403d67c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, spacy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "spacy-lookups-data"; + version = "1.0.3"; + format = "setuptools"; + + src = fetchPypi { + pname = "spacy_lookups_data"; + inherit version; + hash = "sha256-q2hlVI+4ZtR5CQ4xEIp+Je0ZKhH8sJiW5xFjKM3FK+E="; + }; + + nativeCheckInputs = [ + spacy + pytestCheckHook + ]; + + pythonImportsCheck = [ "spacy_lookups_data" ]; + + meta = with lib; { + description = "Additional lookup tables and data resources for spaCy"; + homepage = "https://pypi.org/project/spacy-lookups-data"; + license = licenses.mit; + maintainers = with maintainers; [ jboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix index 047689b5c2..9904e594e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { changelog = "https://sparse.pydata.org/en/stable/changelog.html"; downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix index f92c9e237f..69a34dd2c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinx-basic-ng"; - version = "1.0.0.beta1"; + version = "1.0.0.beta2"; disable = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-basic-ng"; rev = version; - hash = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk="; + hash = "sha256-MHBGIKOKhGklrx3O075LRud8NhY2hzlTWh+jalrFpko="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix index 002b71b474..4e58535368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "sphinx-design"; - version = "0.4.1"; + version = "0.5.0"; format = "flit"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "sphinx_design"; - hash = "sha256-W2QYukotw9g1kuoP9hpSqJH+chlaTDoYsvocdmjORwg="; + hash = "sha256-6OUTrOpvktFcbeOzTpVEWPJFuOdhtFtjlQ9lNzNSqwA="; }; nativeBuildInputs = [ flit-core ]; @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A sphinx extension for designing beautiful, view size responsive web components"; homepage = "https://github.com/executablebooks/sphinx-design"; + changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index d38d0df973..4a0dcda238 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 8421e1669a..17f2d5dcbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Sphinx extension to include program output"; homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; license = licenses.bsd2; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 7a7ed5868f..62e7df21ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "TikZ extension for Sphinx"; homepage = "https://bitbucket.org/philexander/tikz"; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix index 9ec70d67f8..9bf6386476 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "A sqlalchemy plugin that allows postgres use of CITEXT"; homepage = "https://github.com/mahmoudimus/sqlalchemy-citext"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index e978defcbf..fa0d3ad6ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -4,7 +4,6 @@ , flask , flask-login , flask-sqlalchemy -, flexmock , psycopg2 , pymysql , pytestCheckHook @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "sqlalchemy-continuum"; - version = "1.3.14"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLAlchemy-Continuum"; inherit version; - hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; + hash = "sha256-Rk+aWxBjUrXuRPE5MSyzWMWS0l7qrjU3wOrHLC+vteU="; }; propagatedBuildInputs = [ @@ -42,9 +41,6 @@ buildPythonPackage rec { flask-sqlalchemy = [ flask-sqlalchemy ]; - flexmock = [ - flexmock - ]; i18n = [ sqlalchemy-i18n ]; @@ -57,12 +53,7 @@ buildPythonPackage rec { ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Indicate tests that we don't have a database server at hand - DB = "sqlite"; - - disabledTestPaths = [ - # Test doesn't support latest SQLAlchemy - "tests/plugins/test_flask.py" - ]; + env.DB = "sqlite"; pythonImportsCheck = [ "sqlalchemy_continuum" @@ -74,8 +65,5 @@ buildPythonPackage rec { changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - - # https://github.com/kvesteri/sqlalchemy-continuum/issues/326 - broken = versionAtLeast sqlalchemy.version "2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index 0feeaa5d32..edb6ab2ed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sqlalchemy-mixins"; - version = "2.0.3"; + version = "2.0.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "absent1706"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DOQlG86VJEV1Eqqo+KLwmRo2tNePq+Na05s1eDhBjcQ="; + hash = "sha256-soashrkokHveEI9YXAAPBPHydhoToJhCHx+g7bunhLE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index 9b15ae3ddf..5ef2756061 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,7 +1,6 @@ { lib , isPyPy , pythonOlder -, fetchPypi , fetchFromGitHub , buildPythonPackage @@ -41,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.17"; + version = "2.0.18"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -50,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-thwPqyxhojyHZpo7LK6nl69Z1B1Z6+WR1dAdlVrgiaY="; + hash = "sha256-juZIFlmgwGFFhv+3DsMx6k1QRcGLQyTOwR5Hii8A68c="; }; nativeBuildInputs =[ @@ -143,6 +142,7 @@ buildPythonPackage rec { disabledTestPaths = [ # typing correctness, not interesting "test/ext/mypy" + "test/typing" # slow and high memory usage, not interesting "test/aaa_profiling" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 6fb27b1566..c3ad45ec13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -8,20 +8,23 @@ , python-dateutil , sqlite-fts4 , tabulate +, pluggy , pytestCheckHook , hypothesis +, testers +, sqlite-utils }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.33"; + version = "3.34"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vneZNtrbnezvURpG8oC9lGg9OFYl9pplcw+24A5fJlY="; + hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM="; }; postPatch = '' @@ -35,6 +38,7 @@ buildPythonPackage rec { python-dateutil sqlite-fts4 tabulate + pluggy ]; nativeCheckInputs = [ @@ -46,6 +50,10 @@ buildPythonPackage rec { "sqlite_utils" ]; + passthru.tests.version = testers.testVersion { + package = sqlite-utils; + }; + meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix index b0a3fac3f3..bc1be1222b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix @@ -1,5 +1,4 @@ { lib -, backports_unittest-mock , buildPythonPackage , fetchPypi , pytestCheckHook @@ -26,7 +25,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - backports_unittest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix index 4653189fbf..653b30f14d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2023.4.1"; + version = "2023.7.0"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qoOqKXtmavKgfbg6bBEeZb+n1RVyZSxqhKIQsToxDUU="; + hash = "sha256-XKBpB3ackquVKsdF8b/45Kaz5Y2ussOl0o0HkD+k9tM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statistics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statistics/default.nix index 283954c838..40a51373c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statistics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statistics/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "A Python 2.* port of 3.4 Statistics Module"; homepage = "https://github.com/digitalemagine/py-statistics"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ costrouc ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix index f43ba68f57..035329a978 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.11"; + version = "2.17.18"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Jy7ORAMnrBSeDZob3KcAnqhLBI1az/g6s30BYPA0bTE="; + hash = "sha256-1pWSP+s1jjtuRWWoPD5CcYZzt9JSiGHPNxxkLXP+pkc="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index 23a4f01ddc..d41dcda8ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix index b1c013790b..ff12abf47a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix index d4c3d8623b..95814c1c06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/striprtf/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.25"; + version = "0.0.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5soxa3sCeBeYeNsxr4Y96ztTVdeSHgSH/6z8WWUvGQI="; + hash = "sha256-/bK7p6xEAHLRxB6rUNjXSuiPYKi2V1xuLHgF3EYgk6o="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix index 8f0f9164dd..7f13c29172 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Library that can be used for a variety of time series data mining tasks"; homepage = "https://github.com/TDAmeritrade/stumpy"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index a73ad1bc1c..d08fe36473 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.6-1"; + version = "0.7.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/VaGiOnPyTHSwkxlQtwyIZohD3QK897kapmM3S8bHtM="; + hash = "sha256-SrOFKXh/wG2+HKaLvyNP6/Le9R3Ri7+/xsUBAazo7js="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 5d07c631fc..e813657674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -158,7 +158,7 @@ buildPythonPackage rec { description = "Python for Solar Physics"; homepage = "https://sunpy.org"; license = licenses.bsd2; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix index 3252011450..991c881020 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix @@ -5,30 +5,20 @@ , six , mock , isPyPy -, pythonOlder -, fetchpatch }: buildPythonPackage rec { pname = "sure"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "34ae88c846046742ef074036bf311dc90ab152b7bc09c342b281cebf676727a2"; + sha256 = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; }; - patches = [ - # https://github.com/gabrielfalcao/sure/issues/169 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/055baa81cd987e566de62a5657513937521a90d4/trunk/python310.diff"; - hash = "sha256-BKylV8xpTOuO/X4hzZKpoIcAQcdAK0kXYENRad7AGPc="; - }) - ]; - propagatedBuildInputs = [ six mock @@ -38,8 +28,6 @@ buildPythonPackage rec { rednose ]; - doCheck = pythonOlder "3.11"; - pythonImportsCheck = [ "sure" ]; @@ -47,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility belt for automated testing"; homepage = "https://sure.readthedocs.io/"; - changelog = "https://github.com/gabrielfalcao/sure/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix index f03ad50701..2ce5a49b8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/survey/default.nix @@ -2,22 +2,23 @@ , buildPythonPackage , pythonOlder , fetchPypi -, wrapio +, setuptools-scm }: buildPythonPackage rec { pname = "survey"; - version = "3.4.3"; + version = "4.5.4"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I="; + hash = "sha256-wjpO1+9AXi75uPXOTE5/owEiZgtffkkMAaZ+gDO0t5I="; }; - propagatedBuildInputs = [ - wrapio + nativeBuildInputs = [ + setuptools-scm ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix index d850d28bb5..60ae595848 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { description = "Python library providing wrappers to SymEngine"; homepage = "https://github.com/symengine/symengine.py"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix index 0dea848dfc..ed8eb472dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systemd/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://www.freedesktop.org/software/systemd/python-systemd/"; changelog = "https://github.com/systemd/python-systemd/blob/v${version}/NEWS"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix index 4862e3208d..437c1b2183 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/tableau/document-api-python"; changelog = "https://github.com/tableau/document-api-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix index a5dbed7133..7eab0e9cda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Great data sets for Topological Data Analysis"; homepage = "https://tadasets.scikit-tda.org"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix index bcc5cbbef9..4fa46defe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix @@ -1,37 +1,76 @@ -{ lib +{ stdenv +, lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , attrs , pendulum +, poetry-core , pprintpp +, pytestCheckHook +, pythonRelaxDepsHook , wrapt }: buildPythonPackage rec { pname = "tbm-utils"; version = "2.6.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "1v7pb3yirkhzbv1z5i1qp74vl880f56zvzfj68p08b5jxv64hmr3"; + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-AEKawsAxDSDNkIaXEFFgdEBOY2PpASDrhlDrsnM5eyA="; }; - propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; - - # this versioning was done to prevent normal pip users from encountering - # issues with package failing to build from source, but nixpkgs is better postPatch = '' - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" + substituteInPlace pyproject.toml \ + --replace 'poetry>=1.0.0' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' ''; - # No tests in archive. - doCheck = false; + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + attrs + pendulum + pprintpp + wrapt + ]; + + pythonRelaxDeps = [ + "attrs" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + # Skip on macOS because /etc/localtime is accessed through the pendulum + # library, which is not allowed in a sandboxed build. + "test_create_parser_filter_dates" + "test_parse_args" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # Skip on macOS because /etc/localtime is accessed through the pendulum + # library, which is not allowed in a sandboxed build. + "tests/test_datetime.py" + "tests/test_misc.py" + ]; + + pythonImportsCheck = [ + "tbm_utils" + ]; meta = { description = "A commonly-used set of utilities"; homepage = "https://github.com/thebigmunch/tbm-utils"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md"; + license = [ lib.licenses.mit ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix index 1a63403f6a..128af5bc06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -8,7 +8,7 @@ # runtime , pytz -, jaraco_functools +, jaraco-functools # tests , freezegun @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jaraco_functools + jaraco-functools pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix index 962a39abab..1d60c09c6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -1,4 +1,5 @@ { apache-beam +, array-record , attrs , beautifulsoup4 , buildPythonPackage @@ -19,6 +20,7 @@ , lxml , matplotlib , mwparserfromhell +, mwxml , networkx , nltk , numpy @@ -46,13 +48,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.8.2"; + version = "4.9.2"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - hash = "sha256-FYFk53WKNQTSrnGGiA6cn9LffbMJkZtjlGuOF52Og7c="; + hash = "sha256-FKquhuk5hVBH9Im2RrIwgmosgqkoJHj0ESR2BmAOlbI="; }; patches = [ @@ -61,6 +63,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + array-record attrs dill dm-tree @@ -95,6 +98,7 @@ buildPythonPackage rec { lxml matplotlib mwparserfromhell + mwxml networkx nltk opencv4 @@ -120,6 +124,7 @@ buildPythonPackage rec { "tensorflow_datasets/core/registered_test.py" "tensorflow_datasets/core/utils/gcs_utils_test.py" "tensorflow_datasets/import_without_tf_test.py" + "tensorflow_datasets/proto/build_tf_proto_test.py" "tensorflow_datasets/scripts/cli/build_test.py" # Requires `pretty_midi` which is not packaged in `nixpkgs`. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index a988a39c38..0fc684b83c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,10 +18,10 @@ , wheel , jax , opt-einsum -, backports_weakref , tensorflow-estimator-bin , tensorboard -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? {} , zlib , python @@ -53,7 +53,7 @@ in buildPythonPackage { disabled = pythonAtLeast "3.11"; src = let - pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; + pyVerNoDot = lib.strings.stringAsChars (x: lib.optionalString (x != ".") x) python.pythonVersion; platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; key = "${platform}_py_${pyVerNoDot}_${unit}"; @@ -82,8 +82,7 @@ in buildPythonPackage { keras-applications keras-preprocessing h5py - ] ++ lib.optional (!isPy3k) mock - ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; + ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ wheel ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index ba7c36c950..8d16f6921d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -17,7 +17,8 @@ # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? { } , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , mklSupport ? false, mkl @@ -447,7 +448,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - broken = !(xlaSupport -> cudaSupport); + broken = !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11"; } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index d005791642..5ce4c59490 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.0"; + version = "3.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6H8miS0tKB99ZkiBvqJ77NIsswJ+ivYt1VZOLwTQr24="; + hash = "sha256-K68UhtPtgTZoAl9NG5ZHOwzsvDl028coXS4ZpmJ0ULs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tess/default.nix index 883d541f81..be8e8ff45e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tess/default.nix @@ -25,6 +25,6 @@ buildPythonPackage { description = "A module for calculating and analyzing Voronoi tessellations"; homepage = "https://tess.readthedocs.org"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix index ce272b9d7a..268ee99785 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d0MNJytT2s073Ur11WP9wkrlG4b9vJzy6BRvKceryaQ="; + sha256 = "sha256-pz82cutgQ9ifMS6+40mcBiOsXIqeEquYdBWT+npZNPY="; }; # https://github.com/sirfz/tesserocr/issues/314 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index af81532975..4ccc1251a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -7,7 +7,7 @@ , pythonOlder , sybil , twisted -, zope_component +, zope-component }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook sybil twisted - zope_component + zope-component ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix index 2a3fa04268..2ba2ea4944 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Textwrap from Python 3.6 backport plus a few tweaks"; homepage = "https://github.com/jonathaneunice/textwrap3"; license = licenses.psfl; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix new file mode 100644 index 0000000000..b1fe7abfae --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix @@ -0,0 +1,86 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, pytest-runner +# runtime dependencies +, numpy +, onnx +, requests +, six +, flatbuffers +, protobuf +, tensorflow +# check dependencies +, pytestCheckHook +, graphviz +, parameterized +, pytest-cov +, pyyaml +, timeout-decorator +, onnxruntime +, keras +}: + +buildPythonPackage rec { + pname = "tf2onnx"; + version = "1.14.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "onnx"; + repo = "tensorflow-onnx"; + rev = "v${version}"; + hash = "sha256-JpXwf+GLjn0krsb5KnEhVuemWa0V2+wF10neDsdtOfI="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + pytest-runner + ]; + + pythonRelaxDeps = [ + "flatbuffers" + ]; + + propagatedBuildInputs = [ + numpy + onnx + requests + six + flatbuffers + protobuf + tensorflow + onnxruntime + ]; + + pythonImportsCheck = [ "tf2onnx" ]; + + nativeCheckInputs = [ + pytestCheckHook + graphviz + parameterized + pytest-cov + pyyaml + timeout-decorator + keras + ]; + + # TODO investigate the failures + disabledTestPaths = [ + "tests/test_backend.py" + "tests/test_einsum_helper.py" + "tests/test_einsum_optimizers.py" + ]; + + disabledTests = [ + "test_profile_conversion_time" + ]; + + meta = with lib; { + description = "Convert TensorFlow, Keras, Tensorflow.js and Tflite models to ONNX"; + homepage = "https://github.com/onnx/tensorflow-onnx"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/theano/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/theano/default.nix index 1bcbda650a..428bf4310d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/theano/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/theano/default.nix @@ -11,8 +11,9 @@ , setuptools , six , libgpuarray -, cudaSupport ? false, cudaPackages ? {} -, cudnnSupport ? false +, config +, cudaSupport ? config.cudaSupport, cudaPackages ? { } +, cudnnSupport ? cudaSupport }: let diff --git a/third_party/nixpkgs/pkgs/development/python-modules/three-merge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/three-merge/default.nix index dab312c884..2bb1891cd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/three-merge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/three-merge/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Simple library for merging two strings with respect to a base one"; homepage = "https://github.com/spyder-ide/three-merge"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix index 7d9ac9a604..87e84a43b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix @@ -3,19 +3,24 @@ , buildPythonPackage , fetchPypi , python-dateutil +, poetry-core , requests }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.1"; - format = "setuptools"; + version = "0.7.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ttOjw6VXR36QL/GUQXjpPWrE617Bmdt0piUsA4O5W/g="; + hash = "sha256-CyyvzhuDB9XgroeP+WPTJIufT3VU9fD6Pg2Q1prB0Mo="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ requests python-dateutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix index 108c989b7d..aa537c6a61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://tinycss.readthedocs.io"; changelog = "https://github.com/Kozea/tinycss/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index a94a1205e1..fd6153b940 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { lockFile = ./Cargo.lock; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix index 8f96a82ad6..b2de1c0dfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; homepage = "https://github.com/hukkin/tomli"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch SuperSandro2000 ]; + maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index 5e0c568000..912628bf94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildPythonPackage, python, - cudaSupport ? false, cudaPackages, magma, + config, cudaSupport ? config.cudaSupport, cudaPackages, magma, useSystemNccl ? true, MPISupport ? false, mpi, buildDocs ? false, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index bc33961c09..e1ec536711 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -28,13 +28,14 @@ in buildPythonPackage { disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12"); - buildInputs = with cudaPackages; [ + # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. + buildInputs = with cudaPackages; lib.optionals stdenv.isLinux [ # $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships # libcudart.$hash.so.11.0 cuda_cudart ]; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook addOpenGLRunpath ]; @@ -49,7 +50,7 @@ in buildPythonPackage { pythonImportsCheck = [ "torchvision" ]; - preInstall = '' + preInstall = lib.optionalString stdenv.isLinux '' addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; @@ -62,7 +63,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix index 478b0c936f..e255e603b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "A web framework and asynchronous networking library"; homepage = "https://www.tornadoweb.org/"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index fe7df9d9ef..b732988db3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , asn1crypto , cffi , cryptography -, ibm-sw-tpm2 , pkgconfig # see nativeBuildInputs , pkg-config # see nativeBuildInputs , pycparser @@ -14,6 +14,8 @@ , pyyaml , setuptools-scm , tpm2-tss +, tpm2-tools +, swtpm }: buildPythonPackage rec { @@ -28,6 +30,33 @@ buildPythonPackage rec { hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc="; }; + patches = [ + # This patches the call to the C preprocessor not to include types + # pycparser does not handle. + # `hardeningDisable = [ "fortify" ]` would have the same effect but + # would also disable hardening from generated FFI objects. + # + # backport of https://github.com/tpm2-software/tpm2-pytss/pull/523 + (fetchpatch { + url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch"; + sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o="; + }) + + # Lookup tcti via getinfo not system's ld_library_path + # https://github.com/tpm2-software/tpm2-pytss/pull/525 + (fetchpatch { + url = "https://github.com/tpm2-software/tpm2-pytss/commit/97289a08ddf44f7bdccdd122d6055c69e12dc584.patch"; + sha256 = "sha256-VFq3Hv4I8U8ifP/aSjyu0BiW/4jfPlRDKqRcqUGw6UQ="; + }) + + # Fix hardcoded `fapi-config.json` configuration path + ./fapi-config.patch + ]; + + postPatch = '' + sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py + ''; + nativeBuildInputs = [ cffi pkgconfig # this is the Python module @@ -46,12 +75,12 @@ buildPythonPackage rec { pyyaml ]; - # https://github.com/tpm2-software/tpm2-pytss/issues/341 - doCheck = false; + doCheck = true; nativeCheckInputs = [ - ibm-sw-tpm2 pytestCheckHook + tpm2-tools + swtpm ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch new file mode 100644 index 0000000000..f6245ef304 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/fapi-config.patch @@ -0,0 +1,12 @@ +diff --git a/src/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py +index 916eda6..1afba3f 100644 +--- a/src/tpm2_pytss/FAPI.py ++++ b/src/tpm2_pytss/FAPI.py +@@ -23,6 +23,7 @@ logger = logging.getLogger(__name__) + + FAPI_CONFIG_ENV = "TSS2_FAPICONF" + FAPI_CONFIG_PATHS = [ ++ "@TPM2_TSS@/etc/tpm2-tss/fapi-config.json", + "/etc/tpm2-tss/fapi-config.json", + "/usr/local/etc/tpm2-tss/fapi-config.json", + ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix index 2981542337..0123ce0cbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/trackpy"; changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix index ea4f0e265d..43f147a6a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ let pname = "trainer"; - version = "0.0.27"; + version = "0.0.29"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-2uITlcaGcRujhSZPK746d13X8ZrgaGbfMZruLmTpQIs="; + hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 8855637016..cd5af01e0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -18,6 +18,7 @@ , scikit-learn , tensorflow , onnxconverter-common +, tf2onnx , torch , accelerate , faiss @@ -50,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.30.2"; + version = "4.31.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -59,14 +60,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-S1jQsBObKGZY9tlbcNcgchwUs/eeaohYxOtbN1cPa2Q="; + hash = "sha256-YbLI/CkRto8G4bV7ijUkB/0cc7LkfNBQxL1iNv8aWW4="; }; propagatedBuildInputs = [ filelock huggingface-hub numpy - protobuf packaging pyyaml regex @@ -90,8 +90,11 @@ buildPythonPackage rec { ja = [ # fugashi # ipadic - # unidic_lite + # rhoknp + # sudachidict_core + # sudachipy # unidic + # unidic_lite ]; sklearn = [ scikit-learn @@ -99,7 +102,7 @@ buildPythonPackage rec { tf = [ tensorflow onnxconverter-common - # tf2onnx + tf2onnx # tensorflow-text # keras-nlp ]; @@ -119,8 +122,9 @@ buildPythonPackage rec { ]; onnx = [ onnxconverter-common - # tf2onnx + tf2onnx onnxruntime + onnxruntime-tools ]; modelcreation = [ cookiecutter diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix index d72d46e9d7..540e52f079 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/treq"; description = "Requests-like API built on top of twisted.web's Agent"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 9d0bc808a9..6a60b75cc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,18 +2,21 @@ , buildPythonPackage , fetchPypi , setuptools +, pythonOlder , numpy , lxml }: buildPythonPackage rec { pname = "trimesh"; - version = "3.22.3"; + version = "3.22.5"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-PrXqBYOEFCXIZsihhImh1swbGFRCoyTGl82dkfBE7aU="; + hash = "sha256-Lk30HShbVSBeiclfxJUkd7W2HfvLsZiUdYqebLI7otw="; }; nativeBuildInputs = [ setuptools ]; @@ -33,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for loading and using triangular meshes"; homepage = "https://trimsh.org/"; + changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix index 45f4b195a8..98fdcfae0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "WebSocket client and server implementation for Python Trio"; homepage = "https://github.com/HyperionGray/trio-websocket"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttstokenizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttstokenizer/default.nix new file mode 100644 index 0000000000..554e0341fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttstokenizer/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, anyascii +, inflect +, nltk +, numpy +}: + +buildPythonPackage rec { + pname = "ttstokenizer"; + version = "1.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HtDXDKlZ3jpwIgb5DvaqurEkRe8TRJ2xqKl2IKElnKU="; + }; + + propagatedBuildInputs = [ + anyascii + inflect + nltk + numpy + ]; + + pythonImportsCheck = [ "ttstokenizer" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Tokenizer for Text to Speech (TTS) models"; + homepage = "https://pypi.org/project/ttstokenizer"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix index a61e0f33e9..af9e8f6770 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tubeup"; - version = "2023.5.29"; + version = "2023.7.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5tvRaIXVzZcNy40uOEPwwN4EKPvvZPiR3qIdmiZSXWw="; + sha256 = "sha256-lI+Ws1uVC8cnRERmfY7j5vPjQGEAH6zef7nBnd/hC+I="; }; nativeBuildInputs = [ @@ -33,7 +33,6 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "internetarchive" "urllib3" "docopt" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix index 9a327f344f..1fe1d30385 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "turnt"; - version = "1.10.0"; + version = "1.11.0"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-pwUNmUvyUYxke39orGkziL3DVRWoJY5AQLz/pTyf3M8="; + hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix index 0731822c3b..7b12ef05fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -202,6 +202,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/twisted"; description = "Asynchronous networking framework written in Python"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix b/third_party/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix index 5110e5e2a5..1c9144226b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typecode/libmagic.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; }; - sourceRoot = "source/builtins/typecode_libmagic-linux"; + sourceRoot = "${src.name}/builtins/typecode_libmagic-linux"; propagatedBuildInputs = [ plugincode diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix index 8487b7ff9e..48ce811b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Python AST modules with type comment support"; homepage = "https://github.com/python/typed_ast"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix index 1b2789dd8e..d724378fee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.11"; + version = "0.4.15.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qUIesk2c/FhIgNwdM7f9QGoUInwfmfUMWrkmXgTQdjg="; + hash = "sha256-+9/F2dJNhcM70FT74zrcbOxE7tsZz7ur+7tX3CV65Lg="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix index 6061645453..c2e71f2245 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.3"; + version = "5.1.8.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI="; + hash = "sha256-qMOQJGNOmYNL7xRs7C42xYX0eISt303GXW0Lex9idRc="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix index cc1102c035..ee4ede8620 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-deprecated/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.9.2"; + version = "1.2.9.3"; format = "setuptools"; src = fetchPypi { pname = "types-Deprecated"; inherit version; - hash = "sha256-kWFv1nRfi/LUV/u779FM3kODjp8AoEtaDq5Pwfe7xpc="; + hash = "sha256-74cyet8+PEpMfY4G5Y9kdnENNGbs+1PEnvsICASnDvM="; }; # Modules has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix index fa0b37055c..c3c6359262 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "9.5.0.4"; + version = "10.0.0.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-8bavR6vRUYR+4lkR/+unhImbx9x/nrqMpqWqxSKwEu8="; + hash = "sha256-/gk4CrItQSztmJoGfp7kr3Gfo6R7obU7IytGUUqHEEI="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index 319082c8a6..8a169a2d9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.23.0.1"; + version = "4.23.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e9XqEioFexGoK3hdneRkkyoekXX+l3pBKK3vEdfzVUc="; + hash = "sha256-EGawadTw4Jveu2TKTzXMa4rM9S+Ag2gEbM7JZ0SvA3U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix index 655e96f2e3..76691b13b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.2.0.1"; + version = "23.2.0.2"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-vutdInBMYloeS23HVjVcW0rwuYATi3AqnZ+TKs8CCQM="; + hash = "sha256-agENrJ7NQrWC190sw+nkBIa3mztkuy//uhR0/5avkG0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix index 1f03d20e90..2d00bae5a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.13"; + version = "2.8.19.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-CaAnX5XuMc5oGWcQ7Sw9G53ELgthzEOsw2mkLLk5E08="; + hash = "sha256-H08QrJi7ixat6dvuNRjZrOAXgh2UsFekJbBp+DRzf0s="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index 314175c704..e191d56d69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.2"; + version = "4.6.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-0O/NlvZf0gNkN8KdjBJWbP3FSTRdc+3aywSIuBr/n54="; + hash = "sha256-797zfcDAS/V4YZVlH9aU+L/daT6sCexK9G2Q9yZSVY8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 6b8d972e46..14481ff78d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.1"; + version = "2.31.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PeZnz/oSPOaYWR3grX2wNKUxdFellusLSUTlqdno0aw="; + hash = "sha256-aqP3+vDqUtcouxjAoNFSLZv9jHLSb/b2G/w9BqQRz0A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix index 489f024e24..ecef01714f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-retry"; - version = "0.9.9.3"; + version = "0.9.9.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-G3oKBK3xLyEjfnaDNXSpqPdV+IiJwiatmdbjv6W248g="; + hash = "sha256-5HMdxoS1a4ddl0ZFmtZl07woGla1MKzfHJdzAWd5mUE="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix index 2be7a11428..123aaa3461 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.9.0.2"; + version = "0.9.0.3"; src = fetchPypi { inherit pname version; - hash = "sha256-HdQyKjoUbpBzFpx0J4uPFKWOuZBcqdsNJYjfQI8nysk="; + hash = "sha256-GXZR+dZGcZPNFm2FABFqbTom8qTrLbCTvJU17hwL5V4="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix index d033d40274..ad4207769a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Typing stubs for typed-ast"; homepage = "https://github.com/python/typeshed"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 veehaitch ]; + maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix index 911f9e3119..d02174d772 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.13"; + version = "1.26.25.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MwBTjJ3BHa0y6uSCesMT9dmGuLIUlIAfG/l6GsbAOuU="; + hash = "sha256-Ipt/V3yVG4wbksG8Ky/bC0mEe9KvbRzCouPdNA872o8="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix index 18834d9c38..96f351ccaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "A type system library for Python"; homepage = "https://github.com/encode/typesystem"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix index 7059c9cae1..8790249579 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Provider of IANA time zone data"; homepage = "https://github.com/python/tzdata"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix index f1b3c49646..31f55ebdea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Universal array library"; homepage = "https://github.com/Quansight-Labs/uarray"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix new file mode 100644 index 0000000000..f9d1cf6c1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyparsing +, six +}: + +buildPythonPackage rec { + pname = "ucsmsdk"; + version = "0.9.14"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "CiscoUcs"; + repo = "ucsmsdk"; + rev = "v${version}"; + hash = "sha256-lSkURvKRgW+qV1A8OT4WYsMGlxxIqaFnxQ3Rnlixdw0="; + }; + + propagatedBuildInputs = [ + pyparsing + six + ]; + + # most tests are broken + doCheck = false; + + pythonImportsCheck = [ "ucsmsdk" ]; + + meta = with lib; { + description = "Python SDK for Cisco UCS"; + homepage = "https://github.com/CiscoUcs/ucsmsdk"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix index 8893d00434..0237602326 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Ultra fast JSON encoder and decoder"; homepage = "https://github.com/ultrajson/ultrajson"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix index e229857538..d6ec6611b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.7.2"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AQeCgos/6BCvITTSnBYxefvAMWHHbJBsmbVMACl6L3o="; + hash = "sha256-UOAeIVjn3Z5zC4jZP0y+XH1HjYesxjGmFYpEknu8cag="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index 7097ee33a1..04d3bd6fd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -96,6 +96,6 @@ buildPythonPackage rec { description = "Uniform Manifold Approximation and Projection"; homepage = "https://github.com/lmcinnes/umap"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix index d88c8c391c..cf9e95e41b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cgWDKwhwBdG3RpA6U1yn0NtTgcH2Id3AApBSTVav0hc="; + hash = "sha256-hF9LVzOHTOO0JyEm3kluq+AKSa1nj90E1ILR533u1CU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix index 74780c7e03..c1f17ce880 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicorn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = unicorn-emu.src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/units/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/units/default.nix index 13ae42823f..8e9742d2f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/units/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/units/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "Python support for quantities with units"; homepage = "https://bitbucket.org/adonohue/units/"; license = licenses.psfl; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 8497d17a5f..be25e21a43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/xmlrunner/unittest-xml-reporting"; description = "unittest-based test runner with Ant/JUnit like XML reporting"; license = licenses.bsd2; - maintainers = with maintainers; [ rprospero SuperSandro2000 ]; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix index 2a23c01dd8..0d60a6b50c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage -, fetchFromGitHub -, flit-core +, fetchPypi +, setuptools +, setuptools-scm , fsspec }: buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.0.23"; + version = "0.1.0"; format = "pyproject"; - src = fetchFromGitHub { - owner = "fsspec"; - repo = "universal_pathlib"; - rev = "v${version}"; - hash = "sha256-UT4S7sqRn0/YFzFL1KzByK44u8G7pwWHERzJEm7xmiw="; + src = fetchPypi { + pname = "universal_pathlib"; + inherit version; + hash = "sha256-LqzljIZUZh8zHvcyBqFHBbunpJVYFpk6mfuesVGyojg="; }; nativeBuildInputs = [ - flit-core + setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -30,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pathlib api extended to use fsspec backends"; homepage = "https://github.com/fsspec/universal_pathlib"; - changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/${src.rev}"; + changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix new file mode 100644 index 0000000000..7b3b5c8983 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -0,0 +1,93 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# propagated build inputs +, click +, fastapi +, jinja2 +, mypy +, nbconvert +, python-multipart +, pandas +, types-requests +, types-ujson +, uvicorn +, autoflake +# native check inputs +, pytestCheckHook +, black +, coverage +, flake8 +, httpx +, ipython +, pytest-cov +, requests +, requests-toolbelt +, nbdev +, pytest-mock +}: +let + version = "0.10.10"; +in +buildPythonPackage { + pname = "unstructured-api-tools"; + inherit version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured-api-tools"; + rev = version; + hash = "sha256-CJ5bsII24hw03JN4+8VywYRYCsnMlYHjmaIIn0zttIs="; + }; + + propagatedBuildInputs = [ + click + fastapi + jinja2 + mypy + nbconvert + python-multipart + pandas + types-requests + types-ujson + uvicorn + autoflake + ] ++ uvicorn.optional-dependencies.standard; + + pythonImportsCheck = [ "unstructured_api_tools" ]; + + # test require file generation but it complains about a missing file mypy + doCheck = false; + # preCheck = '' + # substituteInPlace Makefile \ + # --replace "PYTHONPATH=." "" \ + # --replace "mypy" "${mypy}/bin/mypy" + # make generate-test-api + # ''; + + nativeCheckInputs = [ + pytestCheckHook + black + coverage + flake8 + httpx + ipython + pytest-cov + requests + requests-toolbelt + nbdev + pytest-mock + ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/Unstructured-IO/unstructured-api-tools"; + changelog = "https://github.com/Unstructured-IO/unstructured-api-tools/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix new file mode 100644 index 0000000000..e03d2a6f45 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix @@ -0,0 +1,99 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# runtime dependencies +, layoutparser +, python-multipart +, huggingface-hub +, opencv +, onnxruntime +, transformers +, detectron2 +# check inputs +, pytestCheckHook +, coverage +, click +, httpx +, mypy +, pytest-cov +, pdf2image +}: + +buildPythonPackage rec { + pname = "unstructured-inference"; + version = "0.5.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured-inference"; + rev = "refs/tags/${version}"; + hash = "sha256-xlsihi1ZTNgdnSk3H8rMBRi4AAxPKNFqygcIMtM/jE0="; + }; + + postPatch = '' + substituteInPlace requirements/base.in \ + --replace "opencv-python" "opencv" + ''; + + propagatedBuildInputs = [ + layoutparser + python-multipart + huggingface-hub + opencv + onnxruntime + transformers + detectron2 + # paddleocr + # yolox + ] + ++ layoutparser.optional-dependencies.layoutmodels + ++ layoutparser.optional-dependencies.tesseract; + + nativeCheckInputs = [ + pytestCheckHook + coverage + click + httpx + mypy + pytest-cov + pdf2image + huggingface-hub + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # not sure why this fails + "test_get_path_oob_move_deeply_nested" + "test_get_path_oob_move_nested[False]" + # requires yolox + "test_yolox" + # requires paddleocr + "test_table_prediction" + ]; + + disabledTestPaths = [ + # network access + "test_unstructured_inference/inference/test_layout.py" + "test_unstructured_inference/models/test_chippermodel.py" + "test_unstructured_inference/models/test_detectron2.py" + "test_unstructured_inference/models/test_detectron2onnx.py" + # unclear failure + "test_unstructured_inference/models/test_donut.py" + "test_unstructured_inference/models/test_model.py" + "test_unstructured_inference/models/test_tables.py" + ]; + + pythonImportsCheck = [ "unstructured_inference" ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/Unstructured-IO/unstructured-inference"; + changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix new file mode 100644 index 0000000000..542e6f0adc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -0,0 +1,143 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# propagated build inputs +, chardet +, filetype +, lxml +, msg-parser +, nltk +, openpyxl +, pandas +, pdf2image +, pdfminer-six +, pillow +, pypandoc +, python-docx +, python-pptx +, python-magic +, markdown +, requests +, tabulate +, xlrd +# optional-dependencies +, langdetect +, sacremoses +, sentencepiece +, torch +, transformers +, unstructured-inference +, s3fs +, fsspec +, adlfs +# , discord-py +, pygithub +, python-gitlab +, praw +, slack-sdk +, wikipedia +, google-api-python-client +# , gcsfs +, elasticsearch8 +, jq +# , dropboxdrivefs +, atlassian-python-api +# test dependencies +, pytestCheckHook +, black +, coverage +, click +, freezegun +# , label-studio-sdk +, mypy +, pytest-cov +, pytest-mock +, vcrpy +, grpcio +}: +let + version = "0.8.1"; + optional-dependencies = { + huggingflace = [ + langdetect + sacremoses + sentencepiece + torch + transformers + ]; + local-inference = [ unstructured-inference ]; + s3 = [ s3fs fsspec ]; + azure = [ adlfs fsspec ]; + discord = [ ]; # discord-py + github = [ pygithub ]; + gitlab = [ python-gitlab ]; + reddit = [ praw ]; + slack = [ slack-sdk ]; + wikipedia = [ wikipedia ]; + google-drive = [ google-api-python-client ]; + gcs = []; # gcsfs fsspec + elasticsearch = [ elasticsearch8 jq ]; + dropbox = []; # dropboxdrivefs fsspec + confluence = [ atlassian-python-api ]; + }; +in +buildPythonPackage { + pname = "unstructured"; + inherit version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured"; + rev = version; + hash = "sha256-I9pRycg3uGn7Xfd4YGxic16SXi8+gslsIVarzDT8X2w="; + }; + + propagatedBuildInputs = [ + chardet + filetype + lxml + msg-parser + nltk + openpyxl + pandas + pdf2image + pdfminer-six + pillow + pypandoc + python-docx + python-pptx + python-magic + markdown + requests + tabulate + xlrd + ]; + + pythonImportsCheck = [ "unstructured" ]; + + # test try to download punkt from nltk + # figure out how to make it available to enable the tests + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + black + coverage + click + freezegun + mypy + pytest-cov + pytest-mock + vcrpy + grpcio + ]; + + meta = with lib; { + description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; + homepage = "https://github.com/Unstructured-IO/unstructured"; + changelog = "https://github.com/Unstructured-IO/unstructured/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix index 7e135e2aa7..014382b215 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "A full-featured console (xterm et al.) user interface library"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix index 46fc9ab925..edf92f5711 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/userpath/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BCM9L8/lz/kRweT7cYl1VkDhUk/4ekuCq51rh1/uV4c="; + hash = "sha256-heMnRUMXRHfGLVcB7UOj7xBRgkqd13aWitxBHlhkDdE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index fc5023b5fc..38283c71ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -115,6 +115,6 @@ buildPythonPackage rec { description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix index 1a7b850342..2f562a02ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Python Data Validation for Humans™"; homepage = "https://github.com/kvesteri/validators"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix new file mode 100644 index 0000000000..d984e7c106 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcard/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, fetchFromGitLab +, lib +, pytestCheckHook +, python-dateutil +, pythonAtLeast +, pythonOlder +}: +buildPythonPackage rec { + pname = "vcard"; + version = "0.15.4"; + + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + + src = fetchFromGitLab { + owner = "engmark"; + repo = "vcard"; + rev = "refs/tags/v${version}"; + hash = "sha256-7GNq6PoWZgwhhpxhWOkUEpqckeSfzocex1ZGN9CTJyo="; + }; + + propagatedBuildInputs = [ python-dateutil ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vcard" ]; + + meta = { + homepage = "https://gitlab.com/engmark/vcard"; + description = "vCard validator, class and utility functions"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.l0b0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix index b4a16c44a0..dbddbe6be0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vidstab/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/AdamSpannbauer/python_video_stab"; description = "Video Stabilization using OpenCV"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix index b204c6c79b..583a17c070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.2"; + version = "2.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8AqxLIrsFtAazH+ZqhXbkYNhlAhQ5XL/tNFRAGLh2kk="; + hash = "sha256-d9t/zO1ROCndS+5kiFVyDbs+96z7GMHaH6T82b8hl40="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix index 2bbff0485b..c01464f27c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix @@ -7,7 +7,7 @@ , django-filter , django-modelcluster , django-taggit -, django_treebeard +, django-treebeard , djangorestframework , draftjs-exporter , fetchPypi @@ -43,7 +43,7 @@ buildPythonPackage rec { anyascii beautifulsoup4 django - django_treebeard + django-treebeard django-filter django-modelcluster django-taggit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix index 9ccb68067b..fa57b00728 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -1,7 +1,10 @@ { lib , stdenv , appdirs +, azure-containerregistry , azure-core +, azure-identity +, azure-storage-blob , bokeh , boto3 , buildPythonPackage @@ -11,6 +14,7 @@ , flask , git , gitpython +, google-cloud-artifact-registry , google-cloud-compute , google-cloud-storage , hypothesis @@ -51,7 +55,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.15.3"; + version = "0.15.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -60,7 +64,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i1Lo6xbkCgRTJwRjk2bXkZ5a/JRUCzFzmEuPQlPvZf4="; + hash = "sha256-etS1NkkskA5Lg/38QIdzCVWgqZpjpT2LwaWF1k7WVXs="; }; patches = [ @@ -94,10 +98,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + azure-containerregistry azure-core + azure-identity + azure-storage-blob bokeh boto3 flask + google-cloud-artifact-registry google-cloud-compute google-cloud-storage hypothesis @@ -213,17 +221,17 @@ buildPythonPackage rec { "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py" - "tests/pytest_tests/system_tests/tests_launch/test_github_reference.py" - "tests/pytest_tests/system_tests/tests_launch/test_job.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_add.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_cli.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_kubernetes.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_local_container.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_run.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_sweep_cli.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch_sweep.py" - "tests/pytest_tests/system_tests/tests_launch/test_launch.py" - "tests/pytest_tests/system_tests/tests_launch/test_wandb_reference.py" + "tests/pytest_tests/system_tests/test_launch/test_github_reference.py" + "tests/pytest_tests/system_tests/test_launch/test_job.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_add.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_cli.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_kubernetes.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_local_container.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_run.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_sweep_cli.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_sweep.py" + "tests/pytest_tests/system_tests/test_launch/test_launch.py" + "tests/pytest_tests/system_tests/test_launch/test_wandb_reference.py" # Tries to access /homeless-shelter "tests/pytest_tests/unit_tests/test_tables.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index 3cf2ad0e73..9feee98f78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -73,7 +73,7 @@ let homepage = "https://github.com/wasmerio/wasmer-python"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index b3ed1b0b1e..1a906934a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Library for computing contrast ratios, as required by WCAG 2.0"; homepage = "https://github.com/gsnedders/wcag-contrast-ratio"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix index dc8aae05f4..689c27a470 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Wilcard File Name matching library"; homepage = "https://github.com/facelessuser/wcmatch"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix index 21f3a7b440..1d23225c2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix @@ -1,6 +1,4 @@ { lib, fetchPypi, buildPythonPackage, pytestCheckHook -, isPy3k -, backports_functools_lru_cache , setuptools }: @@ -15,9 +13,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ setuptools ] ++ lib.optionals (!isPy3k) [ - backports_functools_lru_cache - ]; + propagatedBuildInputs = [ setuptools ]; # To prevent infinite recursion with pytest doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix index 35d89947c7..33017b3a46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; homepage = "https://webpy.org/"; license = licenses.publicDomain; - maintainers = with maintainers; [ layus SuperSandro2000 ]; + maintainers = with maintainers; [ layus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix index b69ff310a2..91d62cf849 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.2.0"; + version = "8.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-mdaJQMRS4HcmSFoV/vQ/EviubAxbORvLp2Bl1FJ/uF0="; + hash = "sha256-yrIHlBsGhsTQhsgjYy3c1DQxUWRDQaMvz1C46qceMcc="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index 6d39ed74dd..39795ac6ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/duo-labs/py_webauthn"; changelog = "https://github.com/duo-labs/py_webauthn/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 0bd4bec4d5..0111a43b06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.42.3"; + version = "0.45.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-TEB2UtXH73CCJhbuQjnABcG3XLHB6VybDwjhixnpt0w="; + hash = "sha256-lZa8HIGLSDd/avNuoYSUHJ0b3rSx8uHLuUz8lABQHO4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index f5ee7e13b4..a70e833da9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.55.0"; + version = "0.57.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+ISWPrpY/urpZZZrn6+Ii8gbrwkQMLL6gXhydXd8HqI="; + hash = "sha256-EqKjDPSjhI03ZwkHyNG4ZbIdrzn7wrjpGfze1Qkk0lk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index fdce818b4d..e5b6a93eae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { utility libraries. ''; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 36ba90d6d7..5985b96d6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.3"; + version = "0.18.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GvebWPO+jKDJk7yuMgEctlvKLXeo95GlJUSuI+FMCRU="; + hash = "sha256-9dwkylr+aCTGw/VIY90nxq8IkqBASeEfdr5JGz7pZrc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix index 83e9136cc7..6e943a0b34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix index fc78d23fea..2c06d187c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Pure Python, pure state-machine WebSocket implementation"; homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix index 35be8ba260..326a56461a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "WTForms integration for peewee models"; homepage = "https://github.com/coleifer/wtf-peewee/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wyoming/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wyoming/default.nix index 984e3a285d..feb7106c51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wyoming/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wyoming/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "wyoming"; - version = "0.0.1"; + version = "1.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-EIUbKL8DNFNNGmLRcu12mlw4H+gAHmCUw09eLG0s8+M="; + hash = "sha256-I5GgDu9HRj6fIX66q3RuDeB13h6dpwxrSBxKhzE+Fus="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index 2005879e51..45edddf408 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,8 +1,10 @@ { lib +, bleak , bleak-retry-connector , bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage +, cryptography , fetchFromGitHub , home-assistant-bluetooth , poetry-core @@ -14,7 +16,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.17.2"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,17 +25,25 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2zS34feelJNVarfe8GEZxBNL45IK+Owl6TlBDOTVvSs="; + hash = "sha256-5AzqsCWDgGhJ1EgJrbA8QHjP/Y14cIdSA0GKwZMrxX0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" \ + --replace 'pycryptodomex = ">=3.18.0"' 'pycryptodomex = ">=3.17.0"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + bleak bleak-retry-connector bluetooth-data-tools bluetooth-sensor-state-data + cryptography home-assistant-bluetooth pycryptodomex sensor-state-data @@ -43,11 +53,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "xiaomi_ble" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index ba03f1bf04..0761518060 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.11.1"; + version = "2.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9H5LQX6uXWr9pQ/WosNl1LrcbR+MAwVtZv8Cdb+WFvg="; + hash = "sha256-rKvHb0wkWVuZO8M8uIQdOiY1N6DmGSpqUgz4YYbUfSM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix index 38185102a0..bd4e2cbb0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix index c83b61bafe..bc8146a914 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yabadaba"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = pname; rev = "v${version}"; - hash = "sha256-PXmkRbCFag2WAtodwgb3kX+hRDZdCKKi/YwAMSQePxQ="; + hash = "sha256-D3dzO+vhf1utBMmX2RUgvxuaPneFnXDseqfz6CMDmv4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index 2431a9101a..727306bea2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -1,4 +1,5 @@ { lib +, async-interrupt , async-timeout , bleak , bleak-retry-connector @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.2.0"; + version = "2.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ei/+QfDjuzbKFZ8Nl+KnCJB6xu7xZh0m6LnzHUEg790="; + hash = "sha256-Z8pPN9cO/8jv66yrG2EKRDXNjKPbYarOOB5t9ObMzek="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-interrupt async-timeout bleak bleak-retry-connector diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix index f5cba78a20..6e40262724 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix @@ -3,25 +3,34 @@ , fetchPypi , isPyPy , nose +, importlib-metadata +, platformdirs +, tomli }: buildPythonPackage rec { pname = "yapf"; - version = "0.32.0"; + version = "0.40.1"; src = fetchPypi { inherit pname version; - hash = "sha256-o/UIXTfvfj4ATEup+bPkDFT/GQHNER8FFFrjE6fGfRs="; + hash = "sha256-lYWH61yOxshgEZqcJdAq3fMKRPdaoVKkIg0w5WqYA3w="; }; # nose is unavailable on pypy doCheck = !isPyPy; + propagatedBuildInputs = [ + importlib-metadata + platformdirs + tomli + ]; + nativeCheckInputs = [ nose ]; - meta = with lib; { + meta = { homepage = "https://github.com/google/yapf"; description = "Yet Another Python Formatter"; longDescription = '' @@ -44,7 +53,7 @@ buildPythonPackage rec { that a programmer would write if they were following the style guide. It takes away some of the drudgery of maintaining your code. ''; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres siddharthist ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ AndersonTorres siddharthist ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix index b17b845f33..c4d8dac999 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.8.2"; + version = "1.9.2"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-SdQ0AsbjATrQl4YCv2v1MoU1xI0ZIwS5G5ejxnkLFWI="; + hash = "sha256-BKudS59YfAbYAcKr/pMXt3zfmWxlqQ1ehOzEUBCCNXE="; }; patches = [ @@ -51,10 +51,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.11") [ - "test_not_a_scheme2" - ]; - postCheck = '' popd ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix index 5a19645b6b..05ca35fa75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitLab , flit-core @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.11"; + version = "0.7.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "stavros"; repo = "python-yeelight"; rev = "refs/tags/v${version}"; - hash = "sha256-NKW8f0Xi8kACot+qunJp+tz3ioSa5UGoeLmbPfjBaXg="; + hash = "sha256-oTlfrx3YN6mPxu7+xzTmYG2L7KulFDlB3+oOhVOFSA8="; }; nativeBuildInputs = [ flit-core ]; @@ -27,6 +28,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ifaddr + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix index 766cfbe6b0..a2ac657c9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yolink-api/default.nix @@ -1,8 +1,8 @@ { lib , aiohttp +, aiomqtt , buildPythonPackage , fetchFromGitHub -, asyncio-mqtt , pydantic , pythonOlder , setuptools @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.2.9"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DbdoGNwz7HtscnDv+rOI2zcs4i4Dl1DpRZNH/DOcJHc="; + hash = "sha256-t/e3DSpmrH48I6ZAmDljL5YblsY2/UWgPCcodi2A7Ro="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - asyncio-mqtt + aiomqtt pydantic tenacity ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix index 08b137402b..b954451924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix index 11b0b3b007..796118abc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix @@ -9,12 +9,13 @@ , pytest-asyncio , pytestCheckHook , pythonRelaxDepsHook +, uvicorn , websockets }: buildPythonPackage rec { pname = "ypy-websocket"; - version = "0.9.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "y-crdt"; repo = "ypy-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-dHcXJavzR1BDAM9Xjm144gfNMSDEkenumI3POBfCjvQ="; + hash = "sha256-JsSOh7CSHUnGJmNAP87fMMsRgdj6nNna1XVe15MYqoA="; }; pythonRelaxDeps = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + uvicorn websockets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix index 43ccf906ad..552a1333e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/zarr-developers/zarr"; changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix index dc37c5315a..ab5f7b8147 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -3,10 +3,8 @@ , aioresponses , attrs , buildPythonPackage -, cached-property , defusedxml , fetchFromGitHub -, fetchpatch , freezegun , httpx , isodate @@ -29,6 +27,7 @@ buildPythonPackage rec { pname = "zeep"; version = "4.2.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -41,9 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - cached-property defusedxml - httpx isodate lxml platformdirs @@ -51,7 +48,19 @@ buildPythonPackage rec { requests requests-file requests-toolbelt - xmlsec + ]; + + passthru.optional-dependencies = { + async_require = [ + httpx + ]; + xmlsec_require = [ + xmlsec + ]; + }; + + pythonImportsCheck = [ + "zeep" ]; nativeCheckInputs = [ @@ -64,26 +73,15 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ]; + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' - export HOME=$(mktemp -d); + export HOME=$TMPDIR ''; - disabledTests = [ - # lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64 - "test_mime_content_serialize_text_xml" - # Tests are outdated - "test_load" - "test_load_cache" - "test_post" - ]; - - pythonImportsCheck = [ - "zeep" - ]; - meta = with lib; { + changelog = "https://github.com/mvantellingen/python-zeep/releases/tag/${version}"; description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 19e4abdccc..6cd8253cfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.70.0"; + version = "0.74.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-AXzPx6T82TYQhoHFkOeNDawD6xnsIBDk35Jlp+Jt5ZQ="; + hash = "sha256-0QmAq1+dRfRkomZgh4Q0YF20omQBDUTgGt8cP1L6cx0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index bf5f6386ac..29ffbdeb37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.101"; + version = "0.0.102"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-YZGsDSrxPpxluxyRkOPyvJLQ9YADuZ8NYcznIGZ0BYg="; + hash = "sha256-TsL6JRxYf8KqmLqfN0nosxaTbzezlP4Q0Fb876WeTHI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index 8faa6bafe2..6b5c0fd41a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.3"; + version = "0.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3pK6H926awUuQGmwyqirFKPnnz+XCGg2/ChuwvaHoDY="; + hash = "sha256-wt7ZsMXOh+CbhJCUMS7RhzozYlyINRs0xOF7ecwkNCU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index e852746d7b..fb08f30623 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.56.2"; + version = "0.56.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-VUnt2rk1nQZqmoS8ytBCX2q3E4zxSz2A0Hg7AUXmtJo="; + hash = "sha256-PxvTg/z7WmJaH/iwHoJu2bQDLR4G5nkMS5fSP46C3mQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix index e2a9add8af..b16248fb9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , func-timeout -, jaraco_itertools +, jaraco-itertools , pythonOlder , setuptools-scm }: @@ -28,7 +28,7 @@ let zipp = buildPythonPackage rec { nativeCheckInputs = [ func-timeout - jaraco_itertools + jaraco-itertools ]; pythonImportsCheck = [ @@ -43,6 +43,6 @@ let zipp = buildPythonPackage rec { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }; in zipp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_component/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-component/default.nix similarity index 54% rename from third_party/nixpkgs/pkgs/development/python-modules/zope_component/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/zope-component/default.nix index c59aa01b58..93373d8a31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_component/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-component/default.nix @@ -1,35 +1,47 @@ { lib , buildPythonPackage , fetchPypi +, zope_configuration , zope-deferredimport , zope_deprecation , zope_event , zope-hookable -, zope_interface -, zope_configuration , zope_i18nmessageid +, zope_interface }: buildPythonPackage rec { - pname = "zope.component"; - version = "5.1.0"; + pname = "zope-component"; + version = "6.0"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-pQj5/vG29ShkYtM0DNif+rXHiZ3KBAEzcjnLa6fGuwo="; + pname = "zope.component"; + inherit version; + hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY="; }; propagatedBuildInputs = [ - zope-deferredimport zope_deprecation zope_event zope-hookable zope_interface - zope_configuration zope_i18nmessageid + zope_configuration + zope-deferredimport + zope_deprecation + zope_event + zope-hookable + zope_i18nmessageid + zope_interface ]; # ignore tests because of a circular dependency on zope_security doCheck = false; + pythonImportsCheck = [ + "zope.component" + ]; + meta = with lib; { homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; + changelog = "https://github.com/zopefoundation/zope.component/blob/${version}/CHANGES.rst"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix deleted file mode 100644 index a3583654e6..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_broken/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope_interface -}: - -buildPythonPackage rec { - pname = "zope.broken"; - version = "3.6.0"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999"; - }; - - buildInputs = [ zope_interface ]; - - meta = with lib; { - homepage = "http://pypi.python.org/pypi/zope.broken"; - description = "Zope Broken Object Interfaces"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 1d230c732b..807deb097f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , zope_event -, zope_component +, zope-component }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; }; - propagatedBuildInputs = [ zope_event zope_component ]; + propagatedBuildInputs = [ zope_event zope-component ]; # namespace colides with local directory doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix index 9c43844888..2427e12569 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zxing_cpp"; inherit (zxing-cpp) src version; - sourceRoot = "source/wrappers/python"; + sourceRoot = "${src.name}/wrappers/python"; patches = [ ./use-nixpkgs-pybind11.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix index 4cf6f16fed..6b5aafcd3c 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix index b18248c7d6..86c885b52d 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix @@ -70,11 +70,12 @@ let assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/") #*/ ); - maybeCopyAll = pkgname: if pkgname == null then "" else - let - mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found"); - in - copyIfBundledByPath mainGem; + maybeCopyAll = pkgname: lib.optionalString (pkgname != null) ( + let + mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found"); + in + copyIfBundledByPath mainGem + ); # We have to normalize the Gemfile.lock, otherwise bundler tries to be # helpful by doing so at run time, causing executables to immediately bail diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index bcfd2ff6c4..da157c30a1 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.16"; - source.sha256 = "sha256-FjRuBn1YnZUgCoDzPFEbMLii6JASiFJbLTKS4hdenWk="; + version = "2.4.17"; + source.sha256 = "sha256-2EV6XnbJ0VPUuw/R/9Kj9Y+/CQyzRIub16Ah0T8ORK0="; dontPatchShebangs = true; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix index b33758486e..7ae9168975 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix @@ -233,7 +233,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { pushd $out/${ruby.gemPath} find doc/ -iname created.rid -delete -print find gems/*/ext/ extensions/ \( -iname Makefile -o -iname mkmf.log -o -iname gem_make.out \) -delete -print - ${if keepGemCache then "" else "rm -fvr cache"} + ${lib.optionalString (!keepGemCache) "rm -fvr cache"} popd # write out metadata and binstubs diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile index b6cfd674cf..30cd0f6b72 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile @@ -128,6 +128,7 @@ gem 'rspec' gem 'rubocop' gem 'rubocop-performance' gem 'ruby-libvirt' +gem 'ruby-lsp' gem 'ruby-lxc' gem 'ruby-progressbar' gem 'ruby-terminfo' diff --git a/third_party/nixpkgs/pkgs/development/tools/aapt/default.nix b/third_party/nixpkgs/pkgs/development/tools/aapt/default.nix new file mode 100644 index 0000000000..0d59f3ae6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/aapt/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchzip +, autoPatchelfHook +, libcxx +}: + +stdenvNoCC.mkDerivation rec { + pname = "aapt"; + version = "8.0.2-9289358"; + + src = + let + urlAndHash = + if stdenvNoCC.isLinux then { + url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-linux.jar"; + hash = "sha256-P8eVIS6zaZGPh4Z7SXUiLtZaX1YIsSmGOdvF6Xb1WHI="; + } else if stdenvNoCC.isDarwin then { + url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-osx.jar"; + hash = "sha256-hDfEPk3IJt+8FbRVEiHQbn24vsuOe6m36UcQsT6tGsQ="; + } else throw "Unsupport platform: ${stdenvNoCC.system}"; + in + fetchzip (urlAndHash // { + extension = "zip"; + stripRoot = false; + }); + + nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenvNoCC.isLinux [ libcxx ]; + + installPhase = '' + runHook preInstall + + install -D aapt2 $out/bin/aapt2 + + runHook postInstall + ''; + + meta = { + description = "A build tool that compiles and packages Android app's resources"; + homepage = "https://developer.android.com/tools/aapt2"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ linsui ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix b/third_party/nixpkgs/pkgs/development/tools/allure/default.nix index a0ede8a0b9..511f8a7383 100644 --- a/third_party/nixpkgs/pkgs/development/tools/allure/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.23.0"; + version = "2.23.1"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-RBe9S6eHnKhtar/rLoLs6gl2TJtCNfoGrYLDbE6CpRI="; + sha256 = "sha256-B06QKq6X9epmRt1wbGORzh8fLUXRAHo1Tv2hWUXJ9Ds="; }; dontConfigure = true; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 3e005d86b4..3825f81bcf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.13.5"; + version = "2.14.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-/carrJ87XvnD5Pd+MJAqNdXxA5vyJl0mX1hEbykhSUk="; + sha256 = "sha256-6gq70bF954CNUS1t38o+1YqWZORGgxM1CWcbUnRyhOU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index c6aeeebc8d..47ee7bc3fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.212.0"; + version = "0.213.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-0ratY4ZR+OD7lbf0fKJXrGFKzXgp+GRDS+WsJeb7gIU="; + sha256 = "sha256-6w09lo1+gBiFU481a6wYGQmJ61yVwQhMOll7QUeXy0U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index 6652ee134f..e1a6b8c341 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -4,15 +4,6 @@ , gdk-pixbuf, wrapGAppsHook }: -let why3_1_5 = why3.overrideAttrs (o: rec { - version = "1.5.1"; - src = fetchurl { - url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz"; - hash = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; - }; - }); in -let why3 = why3_1_5; in - let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; runtimeDeps = with ocamlPackages; [ @@ -45,33 +36,25 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "26.1"; - slang = "Iron"; + version = "27.1"; + slang = "Cobalt"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - hash = "sha256-UT7ajIyu8e5vzrz2oBKDDrtZqUacgUP/TRi0/kz9Qkg="; + hash = "sha256-WxNXShaliXHCeQm+6Urn83sX2JeFK0DHaKPU4uCeOdI="; }; - patches = [ - (fetchpatch { - name = "fixes-yojson-2_1-support.patch"; - url = "https://git.frama-c.com/pub/frama-c/-/commit/647eace02ed8dac46e75452898c3470f82576818.patch"; - hash = "sha256-XfLi4kW1Y2MCLjHHQZAD8DvXvfZuDH3OKd9hlTV0XCw="; - }) - ]; - postConfigure = "patchShebangs src/plugins/eva/gen-api.sh"; strictDeps = true; - nativeBuildInputs = [ wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib dune_3 ]); + nativeBuildInputs = [ wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib dune_3 menhir ]); buildInputs = with ocamlPackages; [ dune-site dune-configurator ltl2ba ocamlgraph yojson menhirLib camlzip lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen - ppx_deriving ppx_import ppx_deriving_yojson + ppx_deriving ppx_import ppx_deriving_yaml ppx_deriving_yojson gdk-pixbuf ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix index a1eec36204..65d5f0e91b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/ikos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, tbb +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, boost, tbb , gmp, llvm, clang, sqlite, python3 , ocamlPackages, mpfr, ppl, doxygen, graphviz }: @@ -11,13 +11,18 @@ in stdenv.mkDerivation rec { pname = "ikos"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; repo = "ikos"; rev = "v${version}"; - sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; + hash = "sha256-scaFkUhCkIi41iR6CGPbEndzXkgqTKMb3PDNvhgVbCE="; + }; + + patches = fetchpatch { + url = "https://github.com/NASA-SW-VnV/ikos/commit/2e647432427b3f0dbb639e0371d976ab6406f290.patch"; + hash = "sha256-ffzjlqEp4qp76Kwl5zpyQlg/xUMt8aLDSSP4XA4ndS8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix index 6cf84434cd..6c0f359fff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bison ]; - sourceRoot = "source/Src"; + sourceRoot = "${src.name}/Src"; preBuild = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/development/tools/api-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/api-linter/default.nix new file mode 100644 index 0000000000..e58d5f093a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/api-linter/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "api-linter"; + version = "1.55.0"; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "api-linter"; + rev = "v${version}"; + hash = "sha256-aywqb//fhygphjX3suVfqNIG0saPPnhgLPA/DBpSVQY="; + }; + + vendorHash = "sha256-oK1d9aQ43Zj+Xt4tMhn+Lz1Q09psqqdTUqbgEdkuBvg="; + + subPackages = [ "cmd/api-linter" ]; + + ldflags = [ + "-s" + "-w" + ]; + + # reference: https://github.com/googleapis/api-linter/blob/v1.55.0/.github/workflows/release.yaml#L76 + preBuild = '' + cat > cmd/api-linter/version.go </dev/null 2>&1; then - checkTarget=check + checkTarget="check" elif bmake -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi if [ -z "${checkTarget:-}" ]; then echo "no test target found in bmake, doing nothing" else - # shellcheck disable=SC2086 local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" # Old bash empty array hack $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} @@ -56,17 +50,11 @@ bmakeCheckPhase() { echoCmd 'check flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - - unset flagsArray fi runHook postCheck } -if [ -z "${dontUseBmakeCheck-}" -a -z "${checkPhase-}" ]; then - checkPhase=bmakeCheckPhase -fi - bmakeInstallPhase() { runHook preInstall @@ -74,10 +62,9 @@ bmakeInstallPhase() { mkdir -p "$prefix" fi - # shellcheck disable=SC2086 local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} - SHELL=$SHELL + SHELL="$SHELL" # Old bash empty array hack $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} @@ -86,15 +73,10 @@ bmakeInstallPhase() { echoCmd 'install flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" - unset flagsArray runHook postInstall } -if [ -z "${dontUseBmakeInstall-}" -a -z "${installPhase-}" ]; then - installPhase=bmakeInstallPhase -fi - bmakeDistPhase() { runHook preDist @@ -103,7 +85,6 @@ bmakeDistPhase() { fi # Old bash empty array hack - # shellcheck disable=SC2086 local flagsArray=( $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} ) @@ -116,13 +97,26 @@ bmakeDistPhase() { # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. - # shellcheck disable=SC2086 cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs" fi runHook postDist } -if [ -z "${dontUseBmakeDist-}" -a -z "${distPhase-}" ]; then +preConfigureHooks+=(addMakeFlags) + +if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=bmakeBuildPhase +fi + +if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=bmakeCheckPhase +fi + +if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=bmakeInstallPhase +fi + +if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then distPhase=bmakeDistPhase fi diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix index 97eaf76ee4..bb4e224f6e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix @@ -1,5 +1,4 @@ { fetchurl, lib, stdenv, zstd -, autoPatchelfHook, gcc-unwrapped , testers, buck2 # for passthru.tests }: @@ -27,15 +26,11 @@ let suffix = { x86_64-darwin = "x86_64-apple-darwin"; aarch64-darwin = "aarch64-apple-darwin"; - # TODO (aseipp): there's an aarch64-linux musl build of buck2, but not a - # x86_64-linux musl build. keep things consistent for now and use glibc - # builds for both; but we should fix this in the future to be less fragile; - # we can then remove autoPatchelfHook. - x86_64-linux = "x86_64-unknown-linux-gnu"; - aarch64-linux = "aarch64-unknown-linux-gnu"; + x86_64-linux = "x86_64-unknown-linux-musl"; + aarch64-linux = "aarch64-unknown-linux-musl"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - buck2-version = "2023-07-11"; + buck2-version = "2023-08-01"; src = let hashes = builtins.fromJSON (builtins.readFile ./hashes.json); @@ -48,24 +43,20 @@ stdenv.mkDerivation { version = "unstable-${buck2-version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made inherit src; - buildInputs = lib.optionals stdenv.isLinux [ gcc-unwrapped ]; # need libgcc_s.so.1 for patchelf - nativeBuildInputs = [ zstd ] - # TODO (aseipp): move to musl build and nuke this? - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ zstd ]; + doCheck = true; dontConfigure = true; + dontStrip = true; + unpackPhase = "unzstd ${src} -o ./buck2"; buildPhase = "chmod +x ./buck2"; + checkPhase = "./buck2 --version"; installPhase = '' mkdir -p $out/bin install -D buck2 $out/bin/buck2 ''; - # NOTE (aseipp): use installCheckPhase instead of checkPhase so that - # autoPatchelfHook kicks in first. - doInstallCheck = true; - installCheckPhase = "$out/bin/buck2 --version"; - passthru = { updateScript = ./update.sh; tests = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json index 6c6a8b5a63..69a7a0f72f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,5 +1,6 @@ -{ "x86_64-linux": "sha256-dVOshrjpsFomstnJsZMPBDfakXOkU+ORbv//fq8Oxss=" -, "x86_64-darwin": "sha256-BuzA8irlqLWnv5fGUdIHu0grz9smTBdOs5yTUBZLUKg=" -, "aarch64-linux": "sha256-Thr9RsI7AkumBeraq08KoxDAXYKv63bZUTrTYN0GAss=" -, "aarch64-darwin": "sha256-vRu0ra6YN7+o1AId6+v0ZLQucO84KwS3Ila6Ksmp1J0=" +{ "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" +, "x86_64-linux": "sha256-wZULK2FPZ4GtQ5MMQmgfmtbMHJ7sPbue2RdVY0dmRuE=" +, "x86_64-darwin": "sha256-FmayArw2gswKjAEv0AzpFZNiXNx3GmJnPwH9g+Y/BGU=" +, "aarch64-linux": "sha256-3M1dRIFU0CwoVCbmq3oghhz51wW37melzt9hdIHqzzY=" +, "aarch64-darwin": "sha256-UAe73UNDSLL8OHqzAd+NOwwtW4bpVBz/aL4wdy3VuYg=" } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/update.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/update.sh index 34fa4f4d6d..c10774c15e 100755 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/update.sh @@ -4,16 +4,17 @@ set -euo pipefail VERSION=$(curl -s https://api.github.com/repos/facebook/buck2/releases \ - | jq -r '. | - sort_by(.created_at) | .[] | - select ((.prerelease == true) and (.name != "latest")) | - .name') + | jq -r 'sort_by(.created_at) | reverse | + (map + (select ((.prerelease == true) and (.name != "latest"))) | + first + ) | .name') echo "Latest buck2 prerelease: $VERSION" ARCHS=( - "x86_64-linux:x86_64-unknown-linux-gnu" + "x86_64-linux:x86_64-unknown-linux-musl" "x86_64-darwin:x86_64-apple-darwin" - "aarch64-linux:aarch64-unknown-linux-gnu" + "aarch64-linux:aarch64-unknown-linux-musl" "aarch64-darwin:aarch64-apple-darwin" ) @@ -21,16 +22,13 @@ NFILE=pkgs/development/tools/build-managers/buck2/default.nix HFILE=pkgs/development/tools/build-managers/buck2/hashes.json rm -f "$HFILE" && touch "$HFILE" -marker="{" +printf "{ \"_comment\": \"@generated by pkgs/development/tools/build-managers/buck2/update.sh\"\n" >> "$HFILE" for arch in "${ARCHS[@]}"; do IFS=: read -r arch_name arch_target <<< "$arch" sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/buck2-${arch_target}.zst")" srihash="$(nix hash to-sri --type sha256 "$sha256hash")" - - echo "${marker} \"$arch_name\": \"$srihash\"" >> "$HFILE" - marker="," + echo ", \"$arch_name\": \"$srihash\"" >> "$HFILE" done - echo "}" >> "$HFILE" sed -i \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix index cb0bcd7034..b244d92d3a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -1,5 +1,6 @@ { lib, stdenv , build2 +, fetchpatch , fetchurl , git , libbpkg @@ -22,6 +23,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-3F4Pv8YX++cNa6aKhPM67mrt/5oE1IeoZUSmljHqBfI="; }; + patches = [ + # Patch git tests for git v2.38+ + # Remove when bumping to v0.16.0 or greater + (fetchpatch { + url = "https://github.com/build2/bpkg/commit/a97b12a027546b37f66d3e08064f92f5539cf79.patch"; + sha256 = "sha256-x5iJQXt84XyjZYdAmYO4FymSV2vi7nfIoeMOxFm/2eQ="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ build2 diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 5c81ba4b42..648158a9b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -127,16 +127,16 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.0.1"; + version = "8.2.1"; nativeVersion = "0.22-milestone-24"; - sha256 = "02g9i1mrpdydj8d6395cv6a4ny9fw3z7sjzr7n6l6a9zx65masqv"; + sha256 = "1lasx96qgh1pjmjjk8a5a772ppgqmp33mp6axyfsjalg71nigv03"; defaultJava = jdk17; }; gradle_7 = gen { - version = "7.6.1"; + version = "7.6.2"; nativeVersion = "0.22-milestone-24"; - sha256 = "11qz1xjfihnlvsblqqnd49kmvjq86pzqcylj6k1zdvxl4dd60iv1"; + sha256 = "1b7riri2ysr1bvfskmmb8phfx8c2b719kqhf189fvrszw63na6x0"; defaultJava = jdk17; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/knit/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/knit/default.nix new file mode 100644 index 0000000000..df2898239b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/knit/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "knit"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "zyedidia"; + repo = "knit"; + rev = "v${version}"; + hash = "sha256-zxwEJnQZpOEJhV7jx2ClS3XmMfGBiq8AHR26TOIBJVw="; + }; + + vendorHash = "sha256-+IZFydwchHIMIvYmIgZ0uJKjW4aVBFuj3SQk58I0z/g="; + + subPackages = [ + "cmd/knit" + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/zyedidia/knit/info.Version=${version}" + ]; + + meta = with lib; { + description = "A simple and flexible build tool using Lua, similar to make/mk"; + homepage = "https://github.com/zyedidia/knit"; + changelog = "https://github.com/zyedidia/knit/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ DrSensor ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix index 2e487efef6..34de18d471 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-QwU7gzQUS+w2kSIhvTxTksJrNiVjaQ4M1CCfyc+3V7A="; + hash = "sha256-JLCxG4iWm+yJ9WUqQxOeBnOLAugeTrM3bl79zKYBs6w="; }; - cargoHash = "sha256-pVwarRhS+PGOeIV1jjWjOdXUc8fuEGRocd/hT0Y1yKQ="; + cargoHash = "sha256-4PHc0BkK/QXrafOoeUS0XicKb/JDdJkLhbDAziYgZh4="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 3ae839b7b9..8791fbb37b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "d88419f21872d18ed2c34a6a612d133b1ebccea2"; - version = "2023-07-11"; + rev = "474915ff832c29944399fe1823d755dfcd587a5e"; + version = "2023-07-25"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "uP8TJ/LsicrVqFXbn8kJNDHRUB/D/y6VxAkVtldwP5U="; + sha256 = "+hrS2Hyh1mLEQBxZHpf6+uIb5cTYhq8odgvmVms2+G8="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index a2b9f297ab..f2065d4106 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-XdQ69GFnoboN9jhZv65uNS++1SXnZiLY69yJFCIlMrI="; + hash = "sha256-nM+UTsyzPGaDDvn/nUbDQCdBzcbYgyUQRSYdsz50joI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json index 031d71a7ba..c6fc0bf691 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.0.1", + "version": "1.0.2", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0n6jlxbfw21ck1qg2xzkrp0p4hlvr21cxfp3p27svp01104n6ig8" + "sha256": "0a1gsrzavflyp6vk7qghb7az9ki1mq4vkncsbjwq0b5hrmy4mxry" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "05rmxi7nwxkvx6as6sbfvrsyll2lp06iq77z22glkkv8y1dd6334" + "sha256": "0six9qcrihshn4sbiyzkbxdnkflqq5az166fdi5wz4rq0l4jj02z" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1vsjp3sdnclx5w4bv1kzkk23q848374phlx3ix0qln04ih821q0l" + "sha256": "1c6dsidgcjscqzknvn1sl66kjvjbg400dxxb9lp134zm2sn8r3r2" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1904f2z3hvkl2rmj0czk5qkw9327zqf5m8i4ad0bzyrri5q7q4ki" + "sha256": "1a35xhkvri5nlk65ms0rwlcgsbl8264j6c60665ds2h9dwph06n7" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix index d5b880ebb9..93b8b38ec9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-sV5X3+evRDS6Ryi0UKLlPlzmzRE0NXERoVlQ8S5o/4I="; + hash = "sha256-Fee/XuxtNP9+T8kRd3yeEhFvpfaIgMkqfSaZCpaYEdM="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/capnproto-rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/capnproto-rust/default.nix index f3015427ad..e63cca6a5e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/capnproto-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/capnproto-rust/default.nix @@ -6,15 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "capnproto-rust"; - version = "0.17.1"; + version = "0.17.2"; src = fetchCrate { crateName = "capnpc"; inherit version; - sha256 = "sha256-7RfJUYV3X9w0FALP3pbhmeIqrWLqlgr4oNvPnBc+RY8="; + hash = "sha256-WVjXVLVoTCAtA8a6+zaX4itAaPCWb2c0trtSsxBopO4="; }; - cargoHash = "sha256-wmoXdukXWagW61jbFBODnIjlBrV6Q+wgvuFG/TqkvVk="; + cargoHash = "sha256-h9YArxHnY14T8eQCS4JVItjaCjv+2dorcOVBir7r6SY="; + + postInstall = '' + mkdir -p $out/include/capnp + cp rust.capnp $out/include/capnp + ''; nativeCheckInputs = [ capnproto @@ -24,6 +29,6 @@ rustPlatform.buildRustPackage rec { description = "Cap'n Proto codegen plugin for Rust"; homepage = "https://github.com/capnproto/capnproto-rust"; license = licenses.mit; - maintainers = with maintainers; [ mikroskeem ]; + maintainers = with maintainers; [ mikroskeem solson ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 41e63d8667..0a1c0f838e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.05.26"; + version = "2023.07.13"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-YnieYpRTBTnV3/jjcy1m469qH4m8uTeAVt3SG55r2/0="; + sha256 = "sha256-QldjFSUDZAafIzJCQGm9EKq8sVDGiyDsWpGVTYtWNTk="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/codespelunker/default.nix b/third_party/nixpkgs/pkgs/development/tools/codespelunker/default.nix index 2515fc7931..107b4e3b09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/codespelunker/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/codespelunker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "codespelunker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "boyter"; repo = "cs"; rev = "v${version}"; - hash = "sha256-kWKDr8KKD3M5MyRuEMMZXvTqflDidkMsu2fN9N0s50w="; + hash = "sha256-9Od2SOUYf4ij+UWOX/1kWS+qUZRje1wjzSAzBc5qk8s="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix index 8d5e312cc2..43752d828b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -13,6 +13,10 @@ let inherit version; hash = "sha256-RKZgUGCAzJdeHfpXdv5fYxXdxiane1C/Du4YsDieomU="; }; + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; }); moto = super.moto.overridePythonAttrs (oldAttrs: rec { # a lot of tests -> very slow, we already build them when building python packages diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 709c95fc99..1e8ad72399 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.101.1"; + version = "0.101.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jTQUBcS8JYyXmdYo4sxuGrtuOfkKCZa0OXjGu3wvQBw="; + sha256 = "sha256-vPfdv1EtI5FAK2tIaHc+5hd1kiQvDk1Gwwqv5ug5Lco="; }; vendorHash = "sha256-qYt3NRjlImRE/G2CUYTukOCP37slseYxiJGLFtZCiDk="; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix index a38f6329b5..8ebc464cb3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-9Mv+We4VtsnnZJJF5P3+1EhrX6QrcV7hEzYaLqai5IU="; + hash = "sha256-ms736KXQjqWnIU7WHQ4k1r6qwCp07N6tufCx9s9biVc="; }; - vendorHash = "sha256-ptfrcsE3YQBqChxbOjkO3xia6ZTI0fGJNXA+q32m9wY="; + vendorHash = "sha256-zssmvu1s7O2DdvjxUYkR13CKOe4EYn50RFRRIPBJ9qg="; proxyVendor = true; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index f710681880..974cd8f464 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; + mainProgram = "drone-runner-docker"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix index 373c618372..c40d94645d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { # https://polyformproject.org/licenses/small-business/1.0.0/ license = licenses.unfree; maintainers = with maintainers; [ mic92 ]; + mainProgram = "drone-runner-exec"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix index 1d15cdc604..92a015f8e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/drone-runners/drone-runner-ssh"; license = licenses.unfreeRedistributable; maintainers = teams.c3d2.members; + mainProgram = "drone-runner-ssh"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix new file mode 100644 index 0000000000..1a048de134 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromGitea +, testers +, forgejo-actions-runner +}: + +buildGoModule rec { + pname = "forgejo-actions-runner"; + version = "2.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "forgejo"; + repo = "runner"; + rev = "v${version}"; + hash = "sha256-ZIhUlTGeNuJSrBVXYjAz/YHYmkR3wg1LAe0uUabEQRQ="; + }; + + vendorHash = "sha256-OauNDA0mkarSWrZBfJE/SYspa3CTEYKpLRMvbPdIoRo="; + + ldflags = [ + "-s" + "-w" + "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=${src.rev}" + ]; + + doCheck = false; # Test try to lookuyp code.forgejo.org. + + passthru.tests.version = testers.testVersion { + package = forgejo-actions-runner; + version = src.rev; + }; + + meta = with lib; { + description = "A runner for Forgejo based on act"; + homepage = "https://code.forgejo.org/forgejo/runner"; + changelog = "https://gitea.com/gitea/act_runner/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + mainProgram = "act_runner"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix index f445f00ea2..69d23f7f33 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -1,28 +1,35 @@ { lib , fetchFromGitea , buildGoModule +, testers +, gitea-actions-runner }: buildGoModule rec { pname = "gitea-actions-runner"; - version = "0.1.8"; + version = "0.2.3"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${version}"; - hash = "sha256-J67g0jy/5Dfmvu3bSPqH+r9+MuLyl2lZyEZrOovfNJI="; + hash = "sha256-RNH/12XV07nWhGnmR4FKJSSK/KnLA76+pKFHTPG8AAk="; }; - vendorHash = "sha256-Ik4n1oB6MWE2djcM5CdDhJKx4IJsZu7eJr5St+T67B4="; + vendorHash = "sha256-VS1CIxV0e01h5L1UA4p8R1Z28yLOEZTMxS+gbEaJwKs="; ldflags = [ "-s" "-w" - "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=${version}" + "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=v${version}" ]; + passthru.tests.version = testers.testVersion { + package = gitea-actions-runner; + version = "v${version}"; + }; + meta = with lib; { mainProgram = "act_runner"; maintainers = with maintainers; [ techknowlogick ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index bf45ca1eec..6ccc923ec3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -17,13 +17,13 @@ }: buildDotnetModule rec { pname = "github-runner"; - version = "2.306.0"; + version = "2.307.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-wffHekmyMIGTpUHBPgcxAOPRoTDuuWJZh9pJly3I2eQ="; + hash = "sha256-h/JcOw7p/loBD6aj7NeZyqK3GtapNkjWTYw0G6OCmVQ="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e29d6032b4..df3fbbf4c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.1.0"; + version = "16.2.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-tlTmKq1a5hX8G0+7RC1QbWA7YVnoBS5R9QqXljJ4bVg="; + vendorHash = "sha256-sP9lboy1M4+AB1Z0VsX5eNxZ9ckuJBgEPxavAbOSk8g="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-1obA2f/YtOBkgYLJqcHQWbaCezEw7lUXs4OxFiONCm8="; + sha256 = "sha256-gTjGf/WuMoGNvsiWWj3Y7l2MvSzBM12RY/Odolm4fNw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 174f2e0eae..18ae7591a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.401.2"; + version = "2.401.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-hr2OCytRB1yZsA1DYDwoWEQL8BHs0Imlx5HQyWTUBoI="; + hash = "sha256-p5igxUgaj/sDINkSH2z0ncV1w2kCjarhek3TmLaeAA0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix new file mode 100644 index 0000000000..d1b3ea7bd6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, woodpecker-plugin-git +}: + +buildGoModule rec { + pname = "woodpecker-plugin-git"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "woodpecker-ci"; + repo = "plugin-git"; + rev = "refs/tags/${version}"; + hash = "sha256-k9w87zt021F6c4GD8kIpqC2ZjpPBiyvJO80z81TKtnE="; + }; + + vendorHash = "sha256-63Ly/9yIJu2K/DwOfGs9pYU3fokbs2senZkl3MJ1UIY="; + + CGO_ENABLED = "0"; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + # Checks fail because they require network access. + doCheck = false; + + passthru.tests.version = testers.testVersion { package = woodpecker-plugin-git; }; + + meta = with lib; { + description = "Woodpecker plugin for cloning Git repositories."; + homepage = "https://woodpecker-ci.org/"; + changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}"; + license = licenses.asl20; + mainProgram = "plugin-git"; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/agent.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/agent.nix index 2865711d50..5bbc4cf99c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/agent.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/agent.nix @@ -1,11 +1,10 @@ -{ lib, buildGoModule, callPackage, fetchFromGitHub }: +{ buildGoModule, callPackage }: let common = callPackage ./common.nix { }; in buildGoModule { pname = "woodpecker-agent"; - inherit (common) version src ldflags postBuild; - vendorSha256 = null; + inherit (common) version src ldflags postInstall vendorHash; subPackages = "cmd/agent"; @@ -13,5 +12,6 @@ buildGoModule { meta = common.meta // { description = "Woodpecker Continuous Integration agent"; + mainProgram = "woodpecker-agent"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index b5eda9efb9..d1f1da8816 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -1,11 +1,10 @@ -{ lib, buildGoModule, callPackage, fetchFromGitHub }: +{ buildGoModule, callPackage }: let common = callPackage ./common.nix { }; in buildGoModule { pname = "woodpecker-cli"; - inherit (common) version src ldflags postBuild; - vendorSha256 = null; + inherit (common) version src ldflags postInstall vendorHash; subPackages = "cmd/cli"; @@ -13,5 +12,6 @@ buildGoModule { meta = common.meta // { description = "Command line client for the Woodpecker Continuous Integration server"; + mainProgram = "woodpecker-cli"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 7e1f63b790..5cf27e5cc3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,21 +1,22 @@ { lib, fetchFromGitHub }: let - version = "0.15.8"; - srcSha256 = "sha256-7CTRx7I47VEKfPvkWhmpyHV3hkeLyHymFMrkyYQ1wl8="; - yarnSha256 = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc="; + version = "1.0.0"; + srcHash = "sha256-1HSSHR3myn1x75kO/70w1p21a7dHwFiC7iAH/KRoYsE="; + vendorHash = "sha256-UFTK3EK8eYB3/iKxycCIkSHdLsKGnDkYCpoFJSajm5M="; + yarnHash = "sha256-QNeQwWU36A05zaARWmqEOhfyZRW68OgF4wTonQLYQfs="; in { - inherit version yarnSha256; + inherit version yarnHash vendorHash; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "woodpecker"; rev = "v${version}"; - sha256 = srcSha256; + hash = srcHash; }; - postBuild = '' - cd $GOPATH/bin + postInstall = '' + cd $out/bin for f in *; do mv -- "$f" "woodpecker-$f" done diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix index 267fdc1398..01767d6fe0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix @@ -1,6 +1,19 @@ -{ lib, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }: +{ lib, buildPackages, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }: let common = callPackage ./common.nix { }; + + esbuild_0_17_19 = buildPackages.esbuild.overrideAttrs (_: rec { + version = "0.17.19"; + + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU="; + }; + + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); in mkYarnPackage { pname = "woodpecker-frontend"; @@ -9,15 +22,19 @@ mkYarnPackage { src = "${common.src}/web"; packageJSON = ./woodpecker-package.json; + yarnLock = ./yarn.lock; + offlineCache = fetchYarnDeps { - yarnLock = "${common.src}/web/yarn.lock"; - sha256 = common.yarnSha256; + yarnLock = ./yarn.lock; + hash = common.yarnHash; }; + ESBUILD_BINARY_PATH = lib.getExe esbuild_0_17_19; + buildPhase = '' runHook preBuild - yarn build + yarn --offline build runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/server.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/server.nix index d97412649b..874949dff2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/server.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/server.nix @@ -1,11 +1,10 @@ -{ lib, buildGoModule, callPackage, fetchFromGitHub, woodpecker-frontend }: +{ buildGoModule, callPackage, woodpecker-frontend }: let common = callPackage ./common.nix { }; in buildGoModule { pname = "woodpecker-server"; - inherit (common) version src ldflags postBuild; - vendorSha256 = null; + inherit (common) version src ldflags postInstall vendorHash; postPatch = '' cp -r ${woodpecker-frontend} web/dist @@ -23,5 +22,6 @@ buildGoModule { meta = common.meta // { description = "Woodpecker Continuous Integration server"; + mainProgram = "woodpecker-server"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/update.sh index 3530ea6c46..bfe948e8f5 100755 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq +#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq nix-prefetch pnpm-lock-export # shellcheck shell=bash @@ -28,23 +28,26 @@ fi version="${version#v}" # Woodpecker repository -src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .sha256) +src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .hash) + +# Go modules +vendorHash=$(nix-prefetch '{ sha256 }: (callPackage (import ./cli.nix) { }).goModules.overrideAttrs (_: { modHash = sha256; })') # Front-end dependencies woodpecker_src="https://raw.githubusercontent.com/woodpecker-ci/woodpecker/v$version" wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/package.json" -O woodpecker-package.json -web_tmpdir=$(mktemp -d) -trap 'rm -rf "$web_tmpdir"' EXIT -pushd "$web_tmpdir" -wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/yarn.lock" +trap 'rm -rf pnpm-lock.yaml' EXIT +wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/pnpm-lock.yaml" +pnpm-lock-export --schema yarn.lock@v1 yarn_hash=$(prefetch-yarn-deps yarn.lock) -popd # Use friendlier hashes src_hash=$(nix hash to-sri --type sha256 "$src_hash") +vendorHash=$(nix hash to-sri --type sha256 "$vendorHash") yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix -sed -i -E -e "s#srcSha256 = \".*\"#srcSha256 = \"$src_hash\"#" common.nix -sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix +sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix +sed -i -E -e "s#vendorHash = \".*\"#vendorHash = \"$vendorHash\"#" common.nix +sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json index 3caa2f3cbf..f7aada656a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json @@ -17,46 +17,60 @@ "test": "echo 'No tests configured' && exit 0" }, "dependencies": { - "@kyvg/vue3-notification": "2.3.4", - "ansi-to-html": "0.7.2", - "dayjs": "1.10.7", - "floating-vue": "2.0.0-beta.5", - "fuse.js": "6.4.6", - "humanize-duration": "3.27.0", - "javascript-time-ago": "2.3.10", - "node-emoji": "1.11.0", - "pinia": "2.0.0", - "vue": "v3.2.20", - "vue-router": "4.0.10" + "@intlify/unplugin-vue-i18n": "^0.10.1", + "@kyvg/vue3-notification": "^2.9.1", + "@vueuse/core": "^9.13.0", + "ansi_up": "^5.2.1", + "dayjs": "^1.11.9", + "floating-vue": "^2.0.0-beta.24", + "fuse.js": "^6.6.2", + "humanize-duration": "^3.28.0", + "javascript-time-ago": "^2.5.9", + "lodash": "^4.17.21", + "node-emoji": "^1.11.0", + "pinia": "^2.1.4", + "prismjs": "^1.29.0", + "vue": "^3.3.4", + "vue-i18n": "^9.2.2", + "vue-router": "^4.2.2" }, "devDependencies": { - "@iconify/json": "1.1.421", - "@types/humanize-duration": "3.27.0", - "@types/javascript-time-ago": "2.0.3", - "@types/node": "16.11.6", - "@types/node-emoji": "1.8.1", - "@typescript-eslint/eslint-plugin": "5.6.0", - "@typescript-eslint/parser": "5.6.0", - "@vitejs/plugin-vue": "1.9.4", - "@vue/compiler-sfc": "3.2.20", - "eslint": "7.32.0", - "eslint-config-airbnb-base": "15.0.0", - "eslint-config-airbnb-typescript": "16.1.0", - "eslint-config-prettier": "8.3.0", - "eslint-plugin-import": "2.25.3", - "eslint-plugin-prettier": "4.0.0", - "eslint-plugin-promise": "5.1.1", - "eslint-plugin-simple-import-sort": "7.0.0", - "eslint-plugin-vue": "7.18.0", - "eslint-plugin-vue-scoped-css": "1.3.0", - "prettier": "2.4.1", - "typescript": "4.4.4", - "unplugin-icons": "0.12.17", - "unplugin-vue-components": "0.17.0", - "vite": "2.9.13", - "vite-plugin-windicss": "1.4.12", - "vite-svg-loader": "3.0.0", - "vue-tsc": "0.28.10", - "windicss": "3.2.0" + "@iconify/json": "^2.2.85", + "@types/humanize-duration": "^3.27.1", + "@types/javascript-time-ago": "^2.0.3", + "@types/lodash": "^4.14.195", + "@types/node": "^18.16.19", + "@types/node-emoji": "^1.8.2", + "@types/prismjs": "^1.26.0", + "@typescript-eslint/eslint-plugin": "^5.60.1", + "@typescript-eslint/parser": "^5.60.1", + "@vitejs/plugin-vue": "^4.2.3", + "@vue/compiler-sfc": "^3.3.4", + "eslint": "^8.44.0", + "eslint-config-airbnb-base": "^15.0.0", + "eslint-config-airbnb-typescript": "^17.0.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-simple-import-sort": "^10.0.0", + "eslint-plugin-vue": "^9.15.1", + "eslint-plugin-vue-scoped-css": "^2.5.0", + "prettier": "^2.8.8", + "typescript": "5.0.3", + "unplugin-icons": "^0.16.3", + "unplugin-vue-components": "^0.24.1", + "vite": "^4.3.9", + "vite-plugin-prismjs": "^0.0.8", + "vite-plugin-windicss": "^1.9.0", + "vite-svg-loader": "^4.0.0", + "vue-eslint-parser": "^9.3.1", + "vue-tsc": "^1.8.3", + "windicss": "^3.5.6" + }, + "pnpm": { + "overrides": { + "semver@<7.5.2": ">=7.5.2" + } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock new file mode 100644 index 0000000000..22790763a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock @@ -0,0 +1,3219 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@aashutoshrathi/word-wrap@1.2.6": + version "1.2.6" + resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz" + integrity "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" + +"@ampproject/remapping@2.2.1": + version "2.2.1" + resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz" + integrity "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==" + dependencies: + "@jridgewell/gen-mapping" "0.3.3" + "@jridgewell/trace-mapping" "0.3.18" + +"@antfu/install-pkg@0.1.1": + version "0.1.1" + resolved "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-0.1.1.tgz" + integrity "sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==" + dependencies: + "execa" "5.1.1" + "find-up" "5.0.0" + +"@antfu/utils@0.7.4": + version "0.7.4" + resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.4.tgz" + integrity "sha512-qe8Nmh9rYI/HIspLSTwtbMFPj6dISG6+dJnOguTlPNXtCvS2uezdxscVBb7/3DrmNbQK49TDqpkSQ1chbRGdpQ==" + +"@babel/code-frame@7.22.5": + 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==" + dependencies: + "@babel/highlight" "7.22.5" + +"@babel/compat-data@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz" + integrity "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==" + +"@babel/core@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz" + integrity "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==" + dependencies: + "@ampproject/remapping" "2.2.1" + "@babel/code-frame" "7.22.5" + "@babel/generator" "7.22.5" + "@babel/helper-compilation-targets" "7.22.5" + "@babel/helper-module-transforms" "7.22.5" + "@babel/helpers" "7.22.5" + "@babel/parser" "7.22.5" + "@babel/template" "7.22.5" + "@babel/traverse" "7.22.5" + "@babel/types" "7.22.5" + "convert-source-map" "1.9.0" + "debug" "4.3.4" + "gensync" "1.0.0-beta.2" + "json5" "2.2.3" + "semver" "7.5.3" + +"@babel/generator@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz" + integrity "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==" + dependencies: + "@babel/types" "7.22.5" + "@jridgewell/gen-mapping" "0.3.3" + "@jridgewell/trace-mapping" "0.3.18" + "jsesc" "2.5.2" + +"@babel/helper-compilation-targets@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz" + integrity "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==" + dependencies: + "@babel/compat-data" "7.22.5" + "@babel/core" "7.22.5" + "@babel/helper-validator-option" "7.22.5" + "browserslist" "4.21.9" + "lru-cache" "5.1.1" + "semver" "7.5.3" + +"@babel/helper-environment-visitor@7.22.5": + 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==" + +"@babel/helper-function-name@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz" + integrity "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==" + dependencies: + "@babel/template" "7.22.5" + "@babel/types" "7.22.5" + +"@babel/helper-hoist-variables@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz" + integrity "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==" + dependencies: + "@babel/types" "7.22.5" + +"@babel/helper-module-imports@7.22.5": + 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==" + dependencies: + "@babel/types" "7.22.5" + +"@babel/helper-module-transforms@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz" + integrity "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==" + 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.5" + "@babel/helper-validator-identifier" "7.22.5" + "@babel/template" "7.22.5" + "@babel/traverse" "7.22.5" + "@babel/types" "7.22.5" + +"@babel/helper-simple-access@7.22.5": + 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==" + dependencies: + "@babel/types" "7.22.5" + +"@babel/helper-split-export-declaration@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz" + integrity "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==" + dependencies: + "@babel/types" "7.22.5" + +"@babel/helper-string-parser@7.22.5": + 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==" + +"@babel/helper-validator-identifier@7.22.5": + 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==" + +"@babel/helper-validator-option@7.22.5": + 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==" + +"@babel/helpers@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz" + integrity "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==" + dependencies: + "@babel/template" "7.22.5" + "@babel/traverse" "7.22.5" + "@babel/types" "7.22.5" + +"@babel/highlight@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz" + integrity "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==" + dependencies: + "@babel/helper-validator-identifier" "7.22.5" + "chalk" "2.4.2" + "js-tokens" "4.0.0" + +"@babel/parser@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz" + integrity "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==" + dependencies: + "@babel/types" "7.22.5" + +"@babel/template@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz" + integrity "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==" + dependencies: + "@babel/code-frame" "7.22.5" + "@babel/parser" "7.22.5" + "@babel/types" "7.22.5" + +"@babel/traverse@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz" + integrity "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==" + dependencies: + "@babel/code-frame" "7.22.5" + "@babel/generator" "7.22.5" + "@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.5" + "@babel/parser" "7.22.5" + "@babel/types" "7.22.5" + "debug" "4.3.4" + "globals" "11.12.0" + +"@babel/types@7.22.5": + version "7.22.5" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz" + integrity "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==" + dependencies: + "@babel/helper-string-parser" "7.22.5" + "@babel/helper-validator-identifier" "7.22.5" + "to-fast-properties" "2.0.0" + +"@esbuild/android-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz" + integrity "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==" + +"@esbuild/android-arm@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz" + integrity "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==" + +"@esbuild/android-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz" + integrity "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==" + +"@esbuild/darwin-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz" + integrity "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==" + +"@esbuild/darwin-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz" + integrity "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==" + +"@esbuild/freebsd-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz" + integrity "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==" + +"@esbuild/freebsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz" + integrity "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==" + +"@esbuild/linux-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz" + integrity "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==" + +"@esbuild/linux-arm@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz" + integrity "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==" + +"@esbuild/linux-ia32@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz" + integrity "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==" + +"@esbuild/linux-loong64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz" + integrity "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==" + +"@esbuild/linux-mips64el@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz" + integrity "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==" + +"@esbuild/linux-ppc64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz" + integrity "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==" + +"@esbuild/linux-riscv64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz" + integrity "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==" + +"@esbuild/linux-s390x@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz" + integrity "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==" + +"@esbuild/linux-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz" + integrity "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==" + +"@esbuild/netbsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz" + integrity "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==" + +"@esbuild/openbsd-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz" + integrity "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==" + +"@esbuild/sunos-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz" + integrity "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==" + +"@esbuild/win32-arm64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz" + integrity "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==" + +"@esbuild/win32-ia32@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz" + integrity "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==" + +"@esbuild/win32-x64@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz" + integrity "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==" + +"@eslint-community/eslint-utils@4.4.0": + version "4.4.0" + resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz" + integrity "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==" + dependencies: + "eslint" "8.44.0" + "eslint-visitor-keys" "3.4.1" + +"@eslint-community/regexpp@4.5.1": + version "4.5.1" + resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz" + integrity "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==" + +"@eslint/eslintrc@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz" + integrity "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==" + dependencies: + "ajv" "6.12.6" + "debug" "4.3.4" + "espree" "9.6.0" + "globals" "13.20.0" + "ignore" "5.2.4" + "import-fresh" "3.3.0" + "js-yaml" "4.1.0" + "minimatch" "3.1.2" + "strip-json-comments" "3.1.1" + +"@eslint/js@8.44.0": + version "8.44.0" + resolved "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz" + integrity "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==" + +"@floating-ui/core@1.3.1": + version "1.3.1" + resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.3.1.tgz" + integrity "sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==" + +"@floating-ui/dom@1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.1.tgz" + integrity "sha512-TpIO93+DIujg3g7SykEAGZMDtbJRrmnYRCNYSjJlvIbGhBjRSNTLVbNeDQBrzy9qDgUbiWdc7KA0uZHZ2tJmiw==" + dependencies: + "@floating-ui/core" "1.3.1" + +"@humanwhocodes/config-array@0.11.10": + version "0.11.10" + resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz" + integrity "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==" + dependencies: + "@humanwhocodes/object-schema" "1.2.1" + "debug" "4.3.4" + "minimatch" "3.1.2" + +"@humanwhocodes/module-importer@1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz" + integrity "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" + +"@humanwhocodes/object-schema@1.2.1": + version "1.2.1" + resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz" + integrity "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==" + +"@iconify/json@^2.2.85", "@iconify/json@2.2.85": + version "2.2.85" + resolved "https://registry.npmjs.org/@iconify/json/-/json-2.2.85.tgz" + integrity "sha512-T72zjZlpP311ftbdzpOFbRCictazlrX1xR8lLu3swVvFo22b/SZNBN4r0cv+e+eVNZvMxhF/cFww2fkaZ3m7Pg==" + dependencies: + "@iconify/types" "2.0.0" + "pathe" "1.1.1" + +"@iconify/types@2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz" + integrity "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==" + +"@iconify/utils@2.1.7": + version "2.1.7" + resolved "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.7.tgz" + integrity "sha512-P8S3z/L1LcV4Qem9AoCfVAaTFGySEMzFEY4CHZLkfRj0Fv9LiR+AwjDgrDrzyI93U2L2mg9JHsbTJ52mF8suNw==" + dependencies: + "@antfu/install-pkg" "0.1.1" + "@antfu/utils" "0.7.4" + "@iconify/types" "2.0.0" + "debug" "4.3.4" + "kolorist" "1.8.0" + "local-pkg" "0.4.3" + +"@intlify/bundle-utils@5.5.0": + version "5.5.0" + resolved "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-5.5.0.tgz" + integrity "sha512-k5xe8oAoPXiH6unXvyyyCRbq+LtLn1tSi/6r5f6mF+MsX7mcOMtgYbyAQINsjFrf7EDu5Pg4BY00VWSt8bI9XQ==" + dependencies: + "@intlify/message-compiler" "9.3.0-beta.17" + "@intlify/shared" "9.3.0-beta.17" + "acorn" "8.9.0" + "escodegen" "2.1.0" + "estree-walker" "2.0.2" + "jsonc-eslint-parser" "1.4.1" + "magic-string" "0.30.0" + "source-map" "0.6.1" + "vue-i18n" "9.2.2" + "yaml-eslint-parser" "0.3.2" + +"@intlify/core-base@9.2.2": + version "9.2.2" + resolved "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz" + integrity "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==" + dependencies: + "@intlify/devtools-if" "9.2.2" + "@intlify/message-compiler" "9.2.2" + "@intlify/shared" "9.2.2" + "@intlify/vue-devtools" "9.2.2" + +"@intlify/devtools-if@9.2.2": + version "9.2.2" + resolved "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz" + integrity "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==" + dependencies: + "@intlify/shared" "9.2.2" + +"@intlify/message-compiler@9.2.2": + version "9.2.2" + resolved "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz" + integrity "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==" + dependencies: + "@intlify/shared" "9.2.2" + "source-map" "0.6.1" + +"@intlify/message-compiler@9.3.0-beta.17": + version "9.3.0-beta.17" + resolved "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.3.0-beta.17.tgz" + integrity "sha512-i7hvVIRk1Ax2uKa9xLRJCT57to08OhFMhFXXjWN07rmx5pWQYQ23MfX1xgggv9drnWTNhqEiD+u4EJeHoS5+Ww==" + dependencies: + "@intlify/shared" "9.3.0-beta.17" + "source-map" "0.6.1" + +"@intlify/shared@9.2.2": + version "9.2.2" + resolved "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz" + integrity "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==" + +"@intlify/shared@9.3.0-beta.17": + version "9.3.0-beta.17" + resolved "https://registry.npmjs.org/@intlify/shared/-/shared-9.3.0-beta.17.tgz" + integrity "sha512-mscf7RQsUTOil35jTij4KGW1RC9SWQjYScwLxP53Ns6g24iEd5HN7ksbt9O6FvTmlQuX77u+MXpBdfJsGqizLQ==" + +"@intlify/unplugin-vue-i18n@^0.10.1", "@intlify/unplugin-vue-i18n@0.10.1": + version "0.10.1" + resolved "https://registry.npmjs.org/@intlify/unplugin-vue-i18n/-/unplugin-vue-i18n-0.10.1.tgz" + integrity "sha512-9ZzE0ddlDO06Xzg25JPiNbx6PJPDho5k/Np+uL9fJRZEKq2TxT3c+ZK+Pec6j0ybhhVXeda8/yE3tPUf4SOXZQ==" + dependencies: + "@intlify/bundle-utils" "5.5.0" + "@intlify/shared" "9.3.0-beta.17" + "@rollup/pluginutils" "5.0.2" + "@vue/compiler-sfc" "3.3.4" + "debug" "4.3.4" + "fast-glob" "3.3.0" + "js-yaml" "4.1.0" + "json5" "2.2.3" + "pathe" "1.1.1" + "picocolors" "1.0.0" + "source-map" "0.6.1" + "unplugin" "1.3.1" + "vue-i18n" "9.2.2" + +"@intlify/vue-devtools@9.2.2": + version "9.2.2" + resolved "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz" + integrity "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==" + dependencies: + "@intlify/core-base" "9.2.2" + "@intlify/shared" "9.2.2" + +"@jridgewell/gen-mapping@0.3.3": + version "0.3.3" + resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz" + integrity "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==" + dependencies: + "@jridgewell/set-array" "1.1.2" + "@jridgewell/sourcemap-codec" "1.4.15" + "@jridgewell/trace-mapping" "0.3.18" + +"@jridgewell/resolve-uri@3.1.0": + version "3.1.0" + resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz" + integrity "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" + +"@jridgewell/set-array@1.1.2": + version "1.1.2" + resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz" + integrity "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" + +"@jridgewell/sourcemap-codec@1.4.14": + version "1.4.14" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" + integrity "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" + +"@jridgewell/sourcemap-codec@1.4.15": + version "1.4.15" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz" + integrity "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + +"@jridgewell/trace-mapping@0.3.18": + version "0.3.18" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz" + integrity "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==" + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + +"@kyvg/vue3-notification@^2.9.1", "@kyvg/vue3-notification@2.9.1": + version "2.9.1" + resolved "https://registry.npmjs.org/@kyvg/vue3-notification/-/vue3-notification-2.9.1.tgz" + integrity "sha512-FsY8g25tQetr3etnarxHtCeNFKssH8sheFu13LyL2JJmOOel437QqKV5n4RBDDDTIo55iKgIVYXeojliXYdEhw==" + dependencies: + "vue" "3.3.4" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" + integrity "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==" + dependencies: + "@nodelib/fs.stat" "2.0.5" + "run-parallel" "1.2.0" + +"@nodelib/fs.stat@2.0.5": + version "2.0.5" + resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" + integrity "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" + +"@nodelib/fs.walk@1.2.8": + version "1.2.8" + resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz" + integrity "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==" + dependencies: + "@nodelib/fs.scandir" "2.1.5" + "fastq" "1.15.0" + +"@rollup/pluginutils@5.0.2": + version "5.0.2" + resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz" + integrity "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==" + dependencies: + "@types/estree" "1.0.1" + "estree-walker" "2.0.2" + "picomatch" "2.3.1" + +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz" + integrity "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==" + +"@types/estree@1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz" + integrity "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==" + +"@types/humanize-duration@^3.27.1", "@types/humanize-duration@3.27.1": + version "3.27.1" + resolved "https://registry.npmjs.org/@types/humanize-duration/-/humanize-duration-3.27.1.tgz" + integrity "sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w==" + +"@types/javascript-time-ago@^2.0.3", "@types/javascript-time-ago@2.0.3": + version "2.0.3" + resolved "https://registry.npmjs.org/@types/javascript-time-ago/-/javascript-time-ago-2.0.3.tgz" + integrity "sha512-G6SdYh6gHxgCTU0s4cMIRHwRO4p3f7jQSZbDPfUOZpUAG1od3rTjT0e8rxGThUiTTWQHwpBRws8eHO8D2QqfkA==" + +"@types/json-schema@7.0.12": + version "7.0.12" + resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz" + integrity "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==" + +"@types/json5@0.0.29": + version "0.0.29" + resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" + integrity "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" + +"@types/lodash@^4.14.195", "@types/lodash@4.14.195": + version "4.14.195" + resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz" + integrity "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==" + +"@types/node-emoji@^1.8.2", "@types/node-emoji@1.8.2": + version "1.8.2" + resolved "https://registry.npmjs.org/@types/node-emoji/-/node-emoji-1.8.2.tgz" + integrity "sha512-PfF1qL/9veo8BSHLV84C9ORNr3lHSlnWJ6yU8OdNufoftajeWHTLVbGHvp2B7e7DPDS9gMs6cfeSsqo5rqSitg==" + +"@types/node@^18.16.19", "@types/node@18.16.19": + version "18.16.19" + resolved "https://registry.npmjs.org/@types/node/-/node-18.16.19.tgz" + integrity "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==" + +"@types/prismjs@^1.26.0", "@types/prismjs@1.26.0": + version "1.26.0" + resolved "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.0.tgz" + integrity "sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==" + +"@types/semver@7.5.0": + version "7.5.0" + resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz" + integrity "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==" + +"@types/web-bluetooth@0.0.16": + version "0.0.16" + resolved "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz" + integrity "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==" + +"@typescript-eslint/eslint-plugin@^5.60.1", "@typescript-eslint/eslint-plugin@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.1.tgz" + integrity "sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==" + dependencies: + "@eslint-community/regexpp" "4.5.1" + "@typescript-eslint/parser" "5.60.1" + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/type-utils" "5.60.1" + "@typescript-eslint/utils" "5.60.1" + "debug" "4.3.4" + "eslint" "8.44.0" + "grapheme-splitter" "1.0.4" + "ignore" "5.2.4" + "natural-compare-lite" "1.4.0" + "semver" "7.5.3" + "tsutils" "3.21.0" + "typescript" "5.0.3" + +"@typescript-eslint/parser@^5.60.1", "@typescript-eslint/parser@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.60.1.tgz" + integrity "sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q==" + dependencies: + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/typescript-estree" "5.60.1" + "debug" "4.3.4" + "eslint" "8.44.0" + "typescript" "5.0.3" + +"@typescript-eslint/scope-manager@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz" + integrity "sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==" + dependencies: + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/visitor-keys" "5.60.1" + +"@typescript-eslint/type-utils@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz" + integrity "sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==" + dependencies: + "@typescript-eslint/typescript-estree" "5.60.1" + "@typescript-eslint/utils" "5.60.1" + "debug" "4.3.4" + "eslint" "8.44.0" + "tsutils" "3.21.0" + "typescript" "5.0.3" + +"@typescript-eslint/types@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.1.tgz" + integrity "sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==" + +"@typescript-eslint/typescript-estree@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz" + integrity "sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==" + dependencies: + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/visitor-keys" "5.60.1" + "debug" "4.3.4" + "globby" "11.1.0" + "is-glob" "4.0.3" + "semver" "7.5.3" + "tsutils" "3.21.0" + "typescript" "5.0.3" + +"@typescript-eslint/utils@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz" + integrity "sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==" + dependencies: + "@eslint-community/eslint-utils" "4.4.0" + "@types/json-schema" "7.0.12" + "@types/semver" "7.5.0" + "@typescript-eslint/scope-manager" "5.60.1" + "@typescript-eslint/types" "5.60.1" + "@typescript-eslint/typescript-estree" "5.60.1" + "eslint" "8.44.0" + "eslint-scope" "5.1.1" + "semver" "7.5.3" + +"@typescript-eslint/visitor-keys@5.60.1": + version "5.60.1" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz" + integrity "sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==" + dependencies: + "@typescript-eslint/types" "5.60.1" + "eslint-visitor-keys" "3.4.1" + +"@vitejs/plugin-vue@^4.2.3", "@vitejs/plugin-vue@4.2.3": + version "4.2.3" + resolved "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.2.3.tgz" + integrity "sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==" + dependencies: + "vite" "4.3.9" + "vue" "3.3.4" + +"@volar/language-core@1.7.10": + version "1.7.10" + resolved "https://registry.npmjs.org/@volar/language-core/-/language-core-1.7.10.tgz" + integrity "sha512-18Gmth5M0UI3hDDqhZngjMnb6WCslcfglkOdepRIhGxRYe7xR7DRRzciisYDMZsvOQxDYme+uaohg0dKUxLV2Q==" + dependencies: + "@volar/source-map" "1.7.10" + +"@volar/source-map@1.7.10": + version "1.7.10" + resolved "https://registry.npmjs.org/@volar/source-map/-/source-map-1.7.10.tgz" + integrity "sha512-FBpLEOKJpRxeh2nYbw1mTI5sZOPXYU8LlsCz6xuBY3yNtAizDTTIZtBHe1V8BaMpoSMgRysZe4gVxMEi3rDGVA==" + dependencies: + "muggle-string" "0.3.1" + +"@volar/typescript@1.7.10": + version "1.7.10" + resolved "https://registry.npmjs.org/@volar/typescript/-/typescript-1.7.10.tgz" + integrity "sha512-yqIov4wndLU3GE1iE25bU5W6T+P+exPePcE1dFPPBKzQIBki1KvmdQN5jBlJp3Wo+wp7UIxa/RsdNkXT+iFBjg==" + dependencies: + "@volar/language-core" "1.7.10" + +"@vue/compiler-core@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz" + integrity "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==" + dependencies: + "@babel/parser" "7.22.5" + "@vue/shared" "3.3.4" + "estree-walker" "2.0.2" + "source-map-js" "1.0.2" + +"@vue/compiler-dom@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz" + integrity "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==" + dependencies: + "@vue/compiler-core" "3.3.4" + "@vue/shared" "3.3.4" + +"@vue/compiler-sfc@^3.3.4", "@vue/compiler-sfc@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz" + integrity "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==" + dependencies: + "@babel/parser" "7.22.5" + "@vue/compiler-core" "3.3.4" + "@vue/compiler-dom" "3.3.4" + "@vue/compiler-ssr" "3.3.4" + "@vue/reactivity-transform" "3.3.4" + "@vue/shared" "3.3.4" + "estree-walker" "2.0.2" + "magic-string" "0.30.0" + "postcss" "8.4.24" + "source-map-js" "1.0.2" + +"@vue/compiler-ssr@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz" + integrity "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==" + dependencies: + "@vue/compiler-dom" "3.3.4" + "@vue/shared" "3.3.4" + +"@vue/devtools-api@6.5.0": + version "6.5.0" + resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz" + integrity "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" + +"@vue/language-core@1.8.3": + version "1.8.3" + resolved "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.3.tgz" + integrity "sha512-AzhvMYoQkK/tg8CpAAttO19kx1zjS3+weYIr2AhlH/M5HebVzfftQoq4jZNFifjq+hyLKi8j9FiDMS8oqA89+A==" + dependencies: + "@volar/language-core" "1.7.10" + "@volar/source-map" "1.7.10" + "@vue/compiler-dom" "3.3.4" + "@vue/reactivity" "3.3.4" + "@vue/shared" "3.3.4" + "minimatch" "9.0.2" + "muggle-string" "0.3.1" + "typescript" "5.0.3" + "vue-template-compiler" "2.7.14" + +"@vue/reactivity-transform@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz" + integrity "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==" + dependencies: + "@babel/parser" "7.22.5" + "@vue/compiler-core" "3.3.4" + "@vue/shared" "3.3.4" + "estree-walker" "2.0.2" + "magic-string" "0.30.0" + +"@vue/reactivity@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz" + integrity "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==" + dependencies: + "@vue/shared" "3.3.4" + +"@vue/runtime-core@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz" + integrity "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==" + dependencies: + "@vue/reactivity" "3.3.4" + "@vue/shared" "3.3.4" + +"@vue/runtime-dom@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz" + integrity "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==" + dependencies: + "@vue/runtime-core" "3.3.4" + "@vue/shared" "3.3.4" + "csstype" "3.1.2" + +"@vue/server-renderer@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz" + integrity "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==" + dependencies: + "@vue/compiler-ssr" "3.3.4" + "@vue/shared" "3.3.4" + "vue" "3.3.4" + +"@vue/shared@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz" + integrity "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==" + +"@vue/typescript@1.8.3": + version "1.8.3" + resolved "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.3.tgz" + integrity "sha512-6bdgSnIFpRYHlt70pHmnmNksPU00bfXgqAISeaNz3W6d2cH0OTfH8h/IhligQ82sJIhsuyfftQJ5518ZuKIhtA==" + dependencies: + "@volar/typescript" "1.7.10" + "@vue/language-core" "1.8.3" + +"@vueuse/core@^9.13.0", "@vueuse/core@9.13.0": + version "9.13.0" + resolved "https://registry.npmjs.org/@vueuse/core/-/core-9.13.0.tgz" + integrity "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==" + dependencies: + "@types/web-bluetooth" "0.0.16" + "@vueuse/metadata" "9.13.0" + "@vueuse/shared" "9.13.0" + "vue-demi" "0.14.5" + +"@vueuse/metadata@9.13.0": + version "9.13.0" + resolved "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.13.0.tgz" + integrity "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==" + +"@vueuse/shared@9.13.0": + version "9.13.0" + resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-9.13.0.tgz" + integrity "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==" + dependencies: + "vue-demi" "0.14.5" + +"@windicss/config@1.9.0": + version "1.9.0" + resolved "https://registry.npmjs.org/@windicss/config/-/config-1.9.0.tgz" + integrity "sha512-QO4+udbmDIgZwAi89tqUt5nGwBq3IgyELjLn83twZXiIqzOw+77ecCuM0oPSbzWmIbCqXq3wRQHd6Z1u5E/5zQ==" + dependencies: + "debug" "4.3.4" + "jiti" "1.18.2" + "windicss" "3.5.6" + +"@windicss/plugin-utils@1.9.0": + version "1.9.0" + resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-1.9.0.tgz" + integrity "sha512-omAacM5ExIr9XBUI2z47CyCXJBke4imJZqXW41YgHhRLbahTngbScFk5yxa6dXivDXUpUKqasOPXBJgA4bhHCg==" + dependencies: + "@antfu/utils" "0.7.4" + "@windicss/config" "1.9.0" + "debug" "4.3.4" + "fast-glob" "3.3.0" + "magic-string" "0.30.0" + "micromatch" "4.0.5" + "windicss" "3.5.6" + +"acorn-jsx@5.3.2": + version "5.3.2" + resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" + integrity "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" + dependencies: + "acorn" "8.9.0" + +"acorn@7.4.1": + version "7.4.1" + resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" + integrity "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" + +"acorn@8.9.0": + version "8.9.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz" + integrity "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==" + +"ajv@6.12.6": + 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.3" + "fast-json-stable-stringify" "2.1.0" + "json-schema-traverse" "0.4.1" + "uri-js" "4.4.1" + +"ansi-regex@5.0.1": + version "5.0.1" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" + integrity "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + +"ansi-styles@3.2.1": + 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==" + dependencies: + "color-convert" "1.9.3" + +"ansi-styles@4.3.0": + version "4.3.0" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" + integrity "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" + dependencies: + "color-convert" "2.0.1" + +"ansi_up@^5.2.1", "ansi_up@5.2.1": + version "5.2.1" + resolved "https://registry.npmjs.org/ansi_up/-/ansi_up-5.2.1.tgz" + integrity "sha512-5bz5T/7FRmlxA37zDXhG6cAwlcZtfnmNLDJra66EEIT3kYlw5aPJdbkJEhm59D6kA4Wi5ict6u6IDYHJaQlH+g==" + +"anymatch@3.1.3": + version "3.1.3" + resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz" + integrity "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==" + dependencies: + "normalize-path" "3.0.0" + "picomatch" "2.3.1" + +"argparse@2.0.1": + version "2.0.1" + resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" + integrity "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + +"array-buffer-byte-length@1.0.0": + 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==" + dependencies: + "call-bind" "1.0.2" + "is-array-buffer" "3.0.2" + +"array-includes@3.1.6": + version "3.1.6" + resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz" + integrity "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + "get-intrinsic" "1.2.1" + "is-string" "1.0.7" + +"array-union@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" + integrity "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + +"array.prototype.flat@1.3.1": + version "1.3.1" + resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz" + integrity "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + "es-shim-unscopables" "1.0.0" + +"array.prototype.flatmap@1.3.1": + version "1.3.1" + resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz" + integrity "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + "es-shim-unscopables" "1.0.0" + +"atob@2.1.2": + version "2.1.2" + resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz" + integrity "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + +"available-typed-arrays@1.0.5": + version "1.0.5" + resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz" + integrity "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" + +"babel-plugin-prismjs@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/babel-plugin-prismjs/-/babel-plugin-prismjs-2.1.0.tgz" + integrity "sha512-ehzSKYfeAz4U78zi/sfwsjDPlq0LvDKxNefcZTJ/iKBu+plsHsLqZhUeGf1+82LAcA35UZGbU6ksEx2Utphc/g==" + dependencies: + "prismjs" "1.29.0" + +"balanced-match@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" + integrity "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + +"binary-extensions@2.2.0": + version "2.2.0" + resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" + integrity "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + +"boolbase@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" + integrity "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" + +"brace-expansion@1.1.11": + version "1.1.11" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" + integrity "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" + dependencies: + "balanced-match" "1.0.2" + "concat-map" "0.0.1" + +"brace-expansion@2.0.1": + version "2.0.1" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz" + integrity "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==" + dependencies: + "balanced-match" "1.0.2" + +"braces@3.0.2": + version "3.0.2" + resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" + integrity "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==" + dependencies: + "fill-range" "7.0.1" + +"browserslist@4.21.9": + version "4.21.9" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz" + integrity "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==" + dependencies: + "caniuse-lite" "1.0.30001509" + "electron-to-chromium" "1.4.447" + "node-releases" "2.0.12" + "update-browserslist-db" "1.0.11" + +"call-bind@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" + integrity "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==" + dependencies: + "function-bind" "1.1.1" + "get-intrinsic" "1.2.1" + +"callsites@3.1.0": + version "3.1.0" + resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz" + integrity "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + +"caniuse-lite@1.0.30001509": + version "1.0.30001509" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz" + integrity "sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==" + +"chalk@2.4.2": + version "2.4.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" + integrity "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" + dependencies: + "ansi-styles" "3.2.1" + "escape-string-regexp" "1.0.5" + "supports-color" "5.5.0" + +"chalk@4.1.2": + version "4.1.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" + integrity "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==" + dependencies: + "ansi-styles" "4.3.0" + "supports-color" "7.2.0" + +"chokidar@3.5.3": + version "3.5.3" + resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" + integrity "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==" + dependencies: + "anymatch" "3.1.3" + "braces" "3.0.2" + "glob-parent" "5.1.2" + "is-binary-path" "2.1.0" + "is-glob" "4.0.3" + "normalize-path" "3.0.0" + "readdirp" "3.6.0" + +"color-convert@1.9.3": + version "1.9.3" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" + 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.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" + 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.npmjs.org/color-name/-/color-name-1.1.3.tgz" + integrity "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + +"color-name@1.1.4": + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + +"commander@7.2.0": + version "7.2.0" + resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" + integrity "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" + +"concat-map@0.0.1": + version "0.0.1" + resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + integrity "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + +"confusing-browser-globals@1.0.11": + version "1.0.11" + resolved "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz" + integrity "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==" + +"convert-source-map@1.9.0": + 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==" + +"cross-spawn@7.0.3": + version "7.0.3" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" + integrity "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==" + dependencies: + "path-key" "3.1.1" + "shebang-command" "2.0.0" + "which" "2.0.2" + +"css-select@5.1.0": + version "5.1.0" + resolved "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz" + integrity "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==" + dependencies: + "boolbase" "1.0.0" + "css-what" "6.1.0" + "domhandler" "5.0.3" + "domutils" "3.1.0" + "nth-check" "2.1.1" + +"css-tree@2.2.1": + version "2.2.1" + resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz" + integrity "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==" + dependencies: + "mdn-data" "2.0.28" + "source-map-js" "1.0.2" + +"css-tree@2.3.1": + version "2.3.1" + resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz" + integrity "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==" + dependencies: + "mdn-data" "2.0.30" + "source-map-js" "1.0.2" + +"css-what@6.1.0": + version "6.1.0" + resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz" + integrity "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==" + +"css@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/css/-/css-3.0.0.tgz" + integrity "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==" + dependencies: + "inherits" "2.0.4" + "source-map" "0.6.1" + "source-map-resolve" "0.6.0" + +"cssesc@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" + integrity "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" + +"csso@5.0.5": + version "5.0.5" + resolved "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz" + integrity "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==" + dependencies: + "css-tree" "2.2.1" + +"csstype@3.1.2": + version "3.1.2" + resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz" + integrity "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" + +"dayjs@^1.11.9", "dayjs@1.11.9": + version "1.11.9" + resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz" + integrity "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==" + +"de-indent@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz" + integrity "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==" + +"debug@3.2.7": + version "3.2.7" + resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" + integrity "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==" + dependencies: + "ms" "2.1.3" + +"debug@4.3.4": + version "4.3.4" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + integrity "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==" + dependencies: + "ms" "2.1.2" + +"decode-uri-component@0.2.2": + version "0.2.2" + resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz" + integrity "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==" + +"deep-is@0.1.4": + 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==" + +"define-properties@1.2.0": + 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==" + dependencies: + "has-property-descriptors" "1.0.0" + "object-keys" "1.1.1" + +"dir-glob@3.0.1": + version "3.0.1" + resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" + integrity "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==" + dependencies: + "path-type" "4.0.0" + +"doctrine@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz" + integrity "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==" + dependencies: + "esutils" "2.0.3" + +"doctrine@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz" + integrity "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==" + dependencies: + "esutils" "2.0.3" + +"dom-serializer@2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz" + integrity "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==" + dependencies: + "domelementtype" "2.3.0" + "domhandler" "5.0.3" + "entities" "4.5.0" + +"domelementtype@2.3.0": + version "2.3.0" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" + integrity "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==" + +"domhandler@5.0.3": + version "5.0.3" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz" + integrity "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==" + dependencies: + "domelementtype" "2.3.0" + +"domutils@3.1.0": + version "3.1.0" + resolved "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz" + integrity "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==" + dependencies: + "dom-serializer" "2.0.0" + "domelementtype" "2.3.0" + "domhandler" "5.0.3" + +"electron-to-chromium@1.4.447": + version "1.4.447" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.447.tgz" + integrity "sha512-sxX0LXh+uL41hSJsujAN86PjhrV/6c79XmpY0TvjZStV6VxIgarf8SRkUoUTuYmFcZQTemsoqo8qXOGw5npWfw==" + +"entities@4.5.0": + version "4.5.0" + resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz" + integrity "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==" + +"es-abstract@1.21.2": + version "1.21.2" + resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz" + integrity "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==" + dependencies: + "array-buffer-byte-length" "1.0.0" + "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-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-length" "1.0.4" + "unbox-primitive" "1.0.2" + "which-typed-array" "1.1.9" + +"es-set-tostringtag@2.0.1": + version "2.0.1" + resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz" + integrity "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==" + dependencies: + "get-intrinsic" "1.2.1" + "has" "1.0.3" + "has-tostringtag" "1.0.0" + +"es-shim-unscopables@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz" + integrity "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==" + dependencies: + "has" "1.0.3" + +"es-to-primitive@1.2.1": + version "1.2.1" + resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz" + integrity "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==" + dependencies: + "is-callable" "1.2.7" + "is-date-object" "1.0.5" + "is-symbol" "1.0.4" + +"esbuild@0.17.19": + version "0.17.19" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz" + integrity "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==" + +"escalade@3.1.1": + version "3.1.1" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz" + integrity "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + +"escape-string-regexp@1.0.5": + version "1.0.5" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + integrity "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" + +"escape-string-regexp@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" + integrity "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + +"escodegen@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz" + integrity "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==" + dependencies: + "esprima" "4.0.1" + "estraverse" "5.3.0" + "esutils" "2.0.3" + +"eslint-config-airbnb-base@^15.0.0", "eslint-config-airbnb-base@15.0.0": + version "15.0.0" + resolved "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz" + integrity "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==" + dependencies: + "confusing-browser-globals" "1.0.11" + "eslint" "8.44.0" + "eslint-plugin-import" "2.27.5" + "object.assign" "4.1.4" + "object.entries" "1.1.6" + "semver" "7.5.3" + +"eslint-config-airbnb-typescript@^17.0.0", "eslint-config-airbnb-typescript@17.0.0": + version "17.0.0" + resolved "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz" + integrity "sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==" + dependencies: + "@typescript-eslint/eslint-plugin" "5.60.1" + "@typescript-eslint/parser" "5.60.1" + "eslint" "8.44.0" + "eslint-config-airbnb-base" "15.0.0" + "eslint-plugin-import" "2.27.5" + +"eslint-config-prettier@^8.8.0", "eslint-config-prettier@8.8.0": + version "8.8.0" + resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz" + integrity "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==" + dependencies: + "eslint" "8.44.0" + +"eslint-import-resolver-node@0.3.7": + version "0.3.7" + resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz" + integrity "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==" + dependencies: + "debug" "3.2.7" + "is-core-module" "2.12.1" + "resolve" "1.22.2" + +"eslint-module-utils@2.8.0": + version "2.8.0" + resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz" + integrity "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==" + dependencies: + "@typescript-eslint/parser" "5.60.1" + "debug" "3.2.7" + "eslint" "8.44.0" + "eslint-import-resolver-node" "0.3.7" + +"eslint-plugin-import@^2.27.5", "eslint-plugin-import@2.27.5": + version "2.27.5" + resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz" + integrity "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==" + dependencies: + "@typescript-eslint/parser" "5.60.1" + "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" "8.44.0" + "eslint-import-resolver-node" "0.3.7" + "eslint-module-utils" "2.8.0" + "has" "1.0.3" + "is-core-module" "2.12.1" + "is-glob" "4.0.3" + "minimatch" "3.1.2" + "object.values" "1.1.6" + "resolve" "1.22.2" + "semver" "7.5.3" + "tsconfig-paths" "3.14.2" + +"eslint-plugin-prettier@^4.2.1", "eslint-plugin-prettier@4.2.1": + version "4.2.1" + resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz" + integrity "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==" + dependencies: + "eslint" "8.44.0" + "eslint-config-prettier" "8.8.0" + "prettier" "2.8.8" + "prettier-linter-helpers" "1.0.0" + +"eslint-plugin-promise@^6.1.1", "eslint-plugin-promise@6.1.1": + version "6.1.1" + resolved "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz" + integrity "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==" + dependencies: + "eslint" "8.44.0" + +"eslint-plugin-simple-import-sort@^10.0.0", "eslint-plugin-simple-import-sort@10.0.0": + version "10.0.0" + resolved "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz" + integrity "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==" + dependencies: + "eslint" "8.44.0" + +"eslint-plugin-vue-scoped-css@^2.5.0", "eslint-plugin-vue-scoped-css@2.5.0": + version "2.5.0" + resolved "https://registry.npmjs.org/eslint-plugin-vue-scoped-css/-/eslint-plugin-vue-scoped-css-2.5.0.tgz" + integrity "sha512-vR+raYNE1aQ69lS1lZGiKoz8rXFI3MWf2fxrfns/XCQ0XT5sIguhDtQS+9JmUQJClenLDEe2CQx7P+eeSdF4cA==" + dependencies: + "eslint" "8.44.0" + "eslint-utils" "3.0.0" + "lodash" "4.17.21" + "postcss" "8.4.24" + "postcss-safe-parser" "6.0.0" + "postcss-scss" "4.0.6" + "postcss-selector-parser" "6.0.13" + "postcss-styl" "0.12.3" + "vue-eslint-parser" "9.3.1" + +"eslint-plugin-vue@^9.15.1", "eslint-plugin-vue@9.15.1": + version "9.15.1" + resolved "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.15.1.tgz" + integrity "sha512-CJE/oZOslvmAR9hf8SClTdQ9JLweghT6JCBQNrT2Iel1uVw0W0OLJxzvPd6CxmABKCvLrtyDnqGV37O7KQv6+A==" + dependencies: + "@eslint-community/eslint-utils" "4.4.0" + "eslint" "8.44.0" + "natural-compare" "1.4.0" + "nth-check" "2.1.1" + "postcss-selector-parser" "6.0.13" + "semver" "7.5.3" + "vue-eslint-parser" "9.3.1" + "xml-name-validator" "4.0.0" + +"eslint-scope@5.1.1": + version "5.1.1" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" + integrity "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==" + dependencies: + "esrecurse" "4.3.0" + "estraverse" "4.3.0" + +"eslint-scope@7.2.0": + version "7.2.0" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz" + integrity "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==" + dependencies: + "esrecurse" "4.3.0" + "estraverse" "5.3.0" + +"eslint-utils@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz" + integrity "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==" + dependencies: + "eslint-visitor-keys" "1.3.0" + +"eslint-utils@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz" + integrity "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==" + dependencies: + "eslint" "8.44.0" + "eslint-visitor-keys" "2.1.0" + +"eslint-visitor-keys@1.3.0": + 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==" + +"eslint-visitor-keys@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" + integrity "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==" + +"eslint-visitor-keys@3.4.1": + version "3.4.1" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz" + integrity "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==" + +"eslint@^8.44.0", "eslint@8.44.0": + version "8.44.0" + resolved "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz" + integrity "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==" + dependencies: + "@eslint-community/eslint-utils" "4.4.0" + "@eslint-community/regexpp" "4.5.1" + "@eslint/eslintrc" "2.1.0" + "@eslint/js" "8.44.0" + "@humanwhocodes/config-array" "0.11.10" + "@humanwhocodes/module-importer" "1.0.1" + "@nodelib/fs.walk" "1.2.8" + "ajv" "6.12.6" + "chalk" "4.1.2" + "cross-spawn" "7.0.3" + "debug" "4.3.4" + "doctrine" "3.0.0" + "escape-string-regexp" "4.0.0" + "eslint-scope" "7.2.0" + "eslint-visitor-keys" "3.4.1" + "espree" "9.6.0" + "esquery" "1.5.0" + "esutils" "2.0.3" + "fast-deep-equal" "3.1.3" + "file-entry-cache" "6.0.1" + "find-up" "5.0.0" + "glob-parent" "6.0.2" + "globals" "13.20.0" + "graphemer" "1.4.0" + "ignore" "5.2.4" + "import-fresh" "3.3.0" + "imurmurhash" "0.1.4" + "is-glob" "4.0.3" + "is-path-inside" "3.0.3" + "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.3" + "strip-ansi" "6.0.1" + "strip-json-comments" "3.1.1" + "text-table" "0.2.0" + +"espree@6.2.1": + version "6.2.1" + resolved "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz" + integrity "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==" + dependencies: + "acorn" "7.4.1" + "acorn-jsx" "5.3.2" + "eslint-visitor-keys" "1.3.0" + +"espree@9.6.0": + version "9.6.0" + resolved "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz" + integrity "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==" + dependencies: + "acorn" "8.9.0" + "acorn-jsx" "5.3.2" + "eslint-visitor-keys" "3.4.1" + +"esprima@4.0.1": + version "4.0.1" + resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz" + integrity "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + +"esquery@1.5.0": + version "1.5.0" + resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz" + integrity "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==" + dependencies: + "estraverse" "5.3.0" + +"esrecurse@4.3.0": + version "4.3.0" + resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" + integrity "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==" + dependencies: + "estraverse" "5.3.0" + +"estraverse@4.3.0": + version "4.3.0" + resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" + integrity "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + +"estraverse@5.3.0": + version "5.3.0" + resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz" + integrity "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + +"estree-walker@2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz" + integrity "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + +"esutils@2.0.3": + version "2.0.3" + resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" + integrity "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + +"execa@5.1.1": + version "5.1.1" + resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" + integrity "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==" + dependencies: + "cross-spawn" "7.0.3" + "get-stream" "6.0.1" + "human-signals" "2.1.0" + "is-stream" "2.0.1" + "merge-stream" "2.0.0" + "npm-run-path" "4.0.1" + "onetime" "5.1.2" + "signal-exit" "3.0.7" + "strip-final-newline" "2.0.0" + +"fast-deep-equal@3.1.3": + 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==" + +"fast-diff@1.3.0": + version "1.3.0" + resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz" + integrity "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==" + +"fast-glob@3.3.0": + version "3.3.0" + resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz" + integrity "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==" + dependencies: + "@nodelib/fs.stat" "2.0.5" + "@nodelib/fs.walk" "1.2.8" + "glob-parent" "5.1.2" + "merge2" "1.4.1" + "micromatch" "4.0.5" + +"fast-json-stable-stringify@2.1.0": + 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==" + +"fast-levenshtein@2.0.6": + version "2.0.6" + resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" + integrity "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + +"fastq@1.15.0": + version "1.15.0" + resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz" + integrity "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==" + dependencies: + "reusify" "1.0.4" + +"file-entry-cache@6.0.1": + version "6.0.1" + resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" + integrity "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==" + dependencies: + "flat-cache" "3.0.4" + +"fill-range@7.0.1": + version "7.0.1" + resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" + integrity "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==" + dependencies: + "to-regex-range" "5.0.1" + +"find-up@5.0.0": + version "5.0.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" + 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.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz" + integrity "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==" + dependencies: + "flatted" "3.2.7" + "rimraf" "3.0.2" + +"flatted@3.2.7": + version "3.2.7" + resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz" + integrity "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" + +"floating-vue@^2.0.0-beta.24", "floating-vue@2.0.0-beta.24": + version "2.0.0-beta.24" + resolved "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0-beta.24.tgz" + integrity "sha512-URSzP6YXaF4u1oZ9XGL8Sn8puuM7ivp5jkOUrpy5Q1mfo9BfGppJOn+ierTmsSUfJEeHBae8KT7r5DeI3vQIEw==" + dependencies: + "@floating-ui/dom" "1.1.1" + "vue" "3.3.4" + "vue-resize" "2.0.0-alpha.1" + +"for-each@0.3.3": + version "0.3.3" + resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz" + integrity "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==" + dependencies: + "is-callable" "1.2.7" + +"fs.realpath@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + integrity "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + +"fsevents@2.3.2": + version "2.3.2" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" + integrity "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==" + +"function-bind@1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" + integrity "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + +"function.prototype.name@1.1.5": + 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==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + "functions-have-names" "1.2.3" + +"functions-have-names@1.2.3": + version "1.2.3" + resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz" + integrity "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" + +"fuse.js@^6.6.2", "fuse.js@6.6.2": + version "6.6.2" + resolved "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz" + integrity "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==" + +"gensync@1.0.0-beta.2": + 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==" + +"get-intrinsic@1.2.1": + version "1.2.1" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz" + integrity "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==" + dependencies: + "function-bind" "1.1.1" + "has" "1.0.3" + "has-proto" "1.0.1" + "has-symbols" "1.0.3" + +"get-stream@6.0.1": + version "6.0.1" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" + integrity "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" + +"get-symbol-description@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz" + integrity "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==" + dependencies: + "call-bind" "1.0.2" + "get-intrinsic" "1.2.1" + +"glob-parent@5.1.2": + version "5.1.2" + resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" + integrity "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==" + dependencies: + "is-glob" "4.0.3" + +"glob-parent@6.0.2": + version "6.0.2" + resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz" + integrity "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==" + dependencies: + "is-glob" "4.0.3" + +"glob@7.2.3": + version "7.2.3" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" + integrity "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==" + dependencies: + "fs.realpath" "1.0.0" + "inflight" "1.0.6" + "inherits" "2.0.4" + "minimatch" "3.1.2" + "once" "1.4.0" + "path-is-absolute" "1.0.1" + +"globals@11.12.0": + version "11.12.0" + resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" + integrity "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + +"globals@13.20.0": + version "13.20.0" + resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz" + integrity "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==" + dependencies: + "type-fest" "0.20.2" + +"globalthis@1.0.3": + version "1.0.3" + resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz" + integrity "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==" + dependencies: + "define-properties" "1.2.0" + +"globby@11.1.0": + version "11.1.0" + resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" + integrity "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==" + dependencies: + "array-union" "2.1.0" + "dir-glob" "3.0.1" + "fast-glob" "3.3.0" + "ignore" "5.2.4" + "merge2" "1.4.1" + "slash" "3.0.0" + +"gopd@1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz" + integrity "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==" + dependencies: + "get-intrinsic" "1.2.1" + +"grapheme-splitter@1.0.4": + version "1.0.4" + resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz" + integrity "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==" + +"graphemer@1.4.0": + version "1.4.0" + resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz" + integrity "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + +"has-bigints@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz" + integrity "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==" + +"has-flag@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" + integrity "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" + +"has-flag@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" + integrity "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + +"has-property-descriptors@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz" + integrity "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==" + dependencies: + "get-intrinsic" "1.2.1" + +"has-proto@1.0.1": + 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==" + +"has-symbols@1.0.3": + version "1.0.3" + resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz" + integrity "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + +"has-tostringtag@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" + integrity "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==" + dependencies: + "has-symbols" "1.0.3" + +"has@1.0.3": + 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" + +"he@1.2.0": + version "1.2.0" + resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz" + integrity "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + +"human-signals@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" + integrity "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" + +"humanize-duration@^3.28.0", "humanize-duration@3.28.0": + version "3.28.0" + resolved "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz" + integrity "sha512-jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A==" + +"ignore@5.2.4": + version "5.2.4" + resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz" + integrity "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==" + +"import-fresh@3.3.0": + version "3.3.0" + resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" + integrity "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==" + dependencies: + "parent-module" "1.0.1" + "resolve-from" "4.0.0" + +"imurmurhash@0.1.4": + version "0.1.4" + resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" + integrity "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" + +"inflight@1.0.6": + version "1.0.6" + resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" + integrity "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==" + dependencies: + "once" "1.4.0" + "wrappy" "1.0.2" + +"inherits@2.0.4": + version "2.0.4" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" + integrity "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + +"internal-slot@1.0.5": + version "1.0.5" + resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz" + integrity "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==" + dependencies: + "get-intrinsic" "1.2.1" + "has" "1.0.3" + "side-channel" "1.0.4" + +"is-array-buffer@3.0.2": + 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==" + dependencies: + "call-bind" "1.0.2" + "get-intrinsic" "1.2.1" + "is-typed-array" "1.1.10" + +"is-bigint@1.0.4": + version "1.0.4" + resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz" + integrity "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==" + dependencies: + "has-bigints" "1.0.2" + +"is-binary-path@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" + integrity "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==" + dependencies: + "binary-extensions" "2.2.0" + +"is-boolean-object@1.1.2": + version "1.1.2" + resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz" + integrity "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==" + dependencies: + "call-bind" "1.0.2" + "has-tostringtag" "1.0.0" + +"is-callable@1.2.7": + version "1.2.7" + resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz" + integrity "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==" + +"is-core-module@2.12.1": + version "2.12.1" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz" + integrity "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==" + dependencies: + "has" "1.0.3" + +"is-date-object@1.0.5": + version "1.0.5" + resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz" + integrity "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==" + dependencies: + "has-tostringtag" "1.0.0" + +"is-extglob@2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" + integrity "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" + +"is-glob@4.0.3": + version "4.0.3" + resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" + integrity "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==" + dependencies: + "is-extglob" "2.1.1" + +"is-negative-zero@2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz" + integrity "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==" + +"is-number-object@1.0.7": + version "1.0.7" + resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz" + integrity "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==" + dependencies: + "has-tostringtag" "1.0.0" + +"is-number@7.0.0": + version "7.0.0" + resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" + integrity "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + +"is-path-inside@3.0.3": + version "3.0.3" + resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" + integrity "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" + +"is-regex@1.1.4": + version "1.1.4" + resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" + integrity "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==" + dependencies: + "call-bind" "1.0.2" + "has-tostringtag" "1.0.0" + +"is-shared-array-buffer@1.0.2": + 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==" + dependencies: + "call-bind" "1.0.2" + +"is-stream@2.0.1": + version "2.0.1" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" + integrity "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" + +"is-string@1.0.7": + version "1.0.7" + resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" + integrity "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==" + dependencies: + "has-tostringtag" "1.0.0" + +"is-symbol@1.0.4": + version "1.0.4" + resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz" + integrity "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==" + dependencies: + "has-symbols" "1.0.3" + +"is-typed-array@1.1.10": + version "1.1.10" + resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz" + 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-weakref@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz" + integrity "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==" + dependencies: + "call-bind" "1.0.2" + +"isexe@2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" + integrity "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + +"javascript-time-ago@^2.5.9", "javascript-time-ago@2.5.9": + version "2.5.9" + resolved "https://registry.npmjs.org/javascript-time-ago/-/javascript-time-ago-2.5.9.tgz" + integrity "sha512-pQ8mNco/9g9TqWXWWjP0EWl6i/lAQScOyEeXy5AB+f7MfLSdgyV9BJhiOD1zrIac/lrxPYOWNbyl/IW8CW5n0A==" + dependencies: + "relative-time-format" "1.1.6" + +"jiti@1.18.2": + version "1.18.2" + resolved "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz" + integrity "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==" + +"js-tokens@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" + integrity "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + +"js-yaml@4.1.0": + version "4.1.0" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" + integrity "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==" + dependencies: + "argparse" "2.0.1" + +"jsesc@2.5.2": + version "2.5.2" + resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" + integrity "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + +"json-schema-traverse@0.4.1": + 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==" + +"json-stable-stringify-without-jsonify@1.0.1": + 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==" + +"json5@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz" + integrity "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==" + dependencies: + "minimist" "1.2.8" + +"json5@2.2.3": + version "2.2.3" + resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" + integrity "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" + +"jsonc-eslint-parser@1.4.1": + version "1.4.1" + resolved "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-1.4.1.tgz" + integrity "sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==" + dependencies: + "acorn" "7.4.1" + "eslint-utils" "2.1.0" + "eslint-visitor-keys" "1.3.0" + "espree" "6.2.1" + "semver" "7.5.3" + +"kolorist@1.8.0": + version "1.8.0" + resolved "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz" + integrity "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==" + +"levn@0.4.1": + version "0.4.1" + resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz" + integrity "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==" + dependencies: + "prelude-ls" "1.2.1" + "type-check" "0.4.0" + +"local-pkg@0.4.3": + version "0.4.3" + resolved "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz" + integrity "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==" + +"locate-path@6.0.0": + version "6.0.0" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" + integrity "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==" + dependencies: + "p-locate" "5.0.0" + +"lodash.merge@4.6.2": + version "4.6.2" + resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" + integrity "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + +"lodash.sortedlastindex@4.1.0": + version "4.1.0" + resolved "https://registry.npmjs.org/lodash.sortedlastindex/-/lodash.sortedlastindex-4.1.0.tgz" + integrity "sha512-s8xEQdsp2Tu5zUqVdFSe9C0kR8YlnAJYLqMdkh+pIRBRxF6/apWseLdHl3/+jv2I61dhPwtI/Ff+EqvCpc+N8w==" + +"lodash@^4.17.21", "lodash@4.17.21": + version "4.17.21" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" + integrity "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + +"lru-cache@5.1.1": + version "5.1.1" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz" + integrity "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" + dependencies: + "yallist" "3.1.1" + +"lru-cache@6.0.0": + version "6.0.0" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" + integrity "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==" + dependencies: + "yallist" "4.0.0" + +"magic-string@0.30.0": + version "0.30.0" + resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz" + integrity "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==" + dependencies: + "@jridgewell/sourcemap-codec" "1.4.15" + +"mdn-data@2.0.28": + version "2.0.28" + resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz" + integrity "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==" + +"mdn-data@2.0.30": + version "2.0.30" + resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz" + integrity "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==" + +"merge-stream@2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" + integrity "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + +"merge2@1.4.1": + version "1.4.1" + resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" + integrity "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" + +"micromatch@4.0.5": + version "4.0.5" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" + integrity "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==" + dependencies: + "braces" "3.0.2" + "picomatch" "2.3.1" + +"mimic-fn@2.1.0": + version "2.1.0" + resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" + integrity "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + +"minimatch@3.1.2": + version "3.1.2" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" + integrity "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==" + dependencies: + "brace-expansion" "1.1.11" + +"minimatch@7.4.6": + version "7.4.6" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz" + integrity "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==" + dependencies: + "brace-expansion" "2.0.1" + +"minimatch@9.0.2": + version "9.0.2" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.2.tgz" + integrity "sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==" + dependencies: + "brace-expansion" "2.0.1" + +"minimist@1.2.8": + version "1.2.8" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" + integrity "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" + +"ms@2.1.2": + version "2.1.2" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" + integrity "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + +"ms@2.1.3": + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + +"muggle-string@0.3.1": + version "0.3.1" + resolved "https://registry.npmjs.org/muggle-string/-/muggle-string-0.3.1.tgz" + integrity "sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==" + +"nanoid@3.3.6": + version "3.3.6" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz" + integrity "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" + +"natural-compare-lite@1.4.0": + version "1.4.0" + resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz" + integrity "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==" + +"natural-compare@1.4.0": + version "1.4.0" + resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" + integrity "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + +"node-emoji@^1.11.0", "node-emoji@1.11.0": + version "1.11.0" + resolved "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz" + integrity "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==" + dependencies: + "lodash" "4.17.21" + +"node-releases@2.0.12": + version "2.0.12" + resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz" + integrity "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==" + +"normalize-path@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" + integrity "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + +"npm-run-path@4.0.1": + version "4.0.1" + resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz" + integrity "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==" + dependencies: + "path-key" "3.1.1" + +"nth-check@2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz" + integrity "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==" + dependencies: + "boolbase" "1.0.0" + +"object-inspect@1.12.3": + version "1.12.3" + resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz" + integrity "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" + +"object-keys@1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" + integrity "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + +"object.assign@4.1.4": + version "4.1.4" + resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz" + integrity "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "has-symbols" "1.0.3" + "object-keys" "1.1.1" + +"object.entries@1.1.6": + version "1.1.6" + resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz" + integrity "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + +"object.values@1.1.6": + version "1.1.6" + resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz" + integrity "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + +"once@1.4.0": + version "1.4.0" + resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + integrity "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==" + dependencies: + "wrappy" "1.0.2" + +"onetime@5.1.2": + version "5.1.2" + resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" + integrity "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==" + dependencies: + "mimic-fn" "2.1.0" + +"optionator@0.9.3": + version "0.9.3" + resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz" + integrity "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==" + dependencies: + "@aashutoshrathi/word-wrap" "1.2.6" + "deep-is" "0.1.4" + "fast-levenshtein" "2.0.6" + "levn" "0.4.1" + "prelude-ls" "1.2.1" + "type-check" "0.4.0" + +"p-limit@3.1.0": + version "3.1.0" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz" + integrity "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==" + dependencies: + "yocto-queue" "0.1.0" + +"p-locate@5.0.0": + version "5.0.0" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz" + integrity "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==" + dependencies: + "p-limit" "3.1.0" + +"parent-module@1.0.1": + 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==" + dependencies: + "callsites" "3.1.0" + +"path-exists@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" + integrity "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + +"path-is-absolute@1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + integrity "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" + +"path-key@3.1.1": + version "3.1.1" + resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" + integrity "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + +"path-parse@1.0.7": + version "1.0.7" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" + integrity "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + +"path-type@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" + integrity "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" + +"pathe@1.1.1": + version "1.1.1" + resolved "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz" + integrity "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==" + +"picocolors@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" + integrity "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + +"picomatch@2.3.1": + version "2.3.1" + resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" + integrity "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + +"pinia@^2.1.4", "pinia@2.1.4": + version "2.1.4" + resolved "https://registry.npmjs.org/pinia/-/pinia-2.1.4.tgz" + integrity "sha512-vYlnDu+Y/FXxv1ABo1vhjC+IbqvzUdiUC3sfDRrRyY2CQSrqqaa+iiHmqtARFxJVqWQMCJfXx1PBvFs9aJVLXQ==" + dependencies: + "@vue/devtools-api" "6.5.0" + "typescript" "5.0.3" + "vue" "3.3.4" + "vue-demi" "0.14.5" + +"postcss-safe-parser@6.0.0": + version "6.0.0" + resolved "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz" + integrity "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==" + dependencies: + "postcss" "8.4.24" + +"postcss-scss@4.0.6": + version "4.0.6" + resolved "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz" + integrity "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==" + dependencies: + "postcss" "8.4.24" + +"postcss-selector-parser@6.0.13": + version "6.0.13" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz" + integrity "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==" + dependencies: + "cssesc" "3.0.0" + "util-deprecate" "1.0.2" + +"postcss-styl@0.12.3": + version "0.12.3" + resolved "https://registry.npmjs.org/postcss-styl/-/postcss-styl-0.12.3.tgz" + integrity "sha512-8I7Cd8sxiEITIp32xBK4K/Aj1ukX6vuWnx8oY/oAH35NfQI4OZaY5nd68Yx8HeN5S49uhQ6DL0rNk0ZBu/TaLg==" + dependencies: + "debug" "4.3.4" + "fast-diff" "1.3.0" + "lodash.sortedlastindex" "4.1.0" + "postcss" "8.4.24" + "stylus" "0.57.0" + +"postcss@8.4.24": + version "8.4.24" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz" + integrity "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==" + dependencies: + "nanoid" "3.3.6" + "picocolors" "1.0.0" + "source-map-js" "1.0.2" + +"prelude-ls@1.2.1": + version "1.2.1" + resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" + integrity "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" + +"prettier-linter-helpers@1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz" + integrity "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==" + dependencies: + "fast-diff" "1.3.0" + +"prettier@^2.8.8", "prettier@2.8.8": + version "2.8.8" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz" + integrity "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==" + +"prismjs@^1.29.0", "prismjs@1.29.0": + version "1.29.0" + resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz" + integrity "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==" + +"punycode@2.3.0": + version "2.3.0" + resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz" + integrity "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" + +"queue-microtask@1.2.3": + version "1.2.3" + resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" + integrity "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" + +"readdirp@3.6.0": + version "3.6.0" + resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" + integrity "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==" + dependencies: + "picomatch" "2.3.1" + +"regexp.prototype.flags@1.5.0": + version "1.5.0" + resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz" + integrity "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "functions-have-names" "1.2.3" + +"relative-time-format@1.1.6": + version "1.1.6" + resolved "https://registry.npmjs.org/relative-time-format/-/relative-time-format-1.1.6.tgz" + integrity "sha512-aCv3juQw4hT1/P/OrVltKWLlp15eW1GRcwP1XdxHrPdZE9MtgqFpegjnTjLhi2m2WI9MT/hQQtE+tjEWG1hgkQ==" + +"resolve-from@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" + integrity "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + +"resolve@1.22.2": + version "1.22.2" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz" + integrity "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==" + dependencies: + "is-core-module" "2.12.1" + "path-parse" "1.0.7" + "supports-preserve-symlinks-flag" "1.0.0" + +"reusify@1.0.4": + version "1.0.4" + resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" + integrity "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + +"rimraf@3.0.2": + version "3.0.2" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + integrity "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==" + dependencies: + "glob" "7.2.3" + +"rollup@3.26.0": + version "3.26.0" + resolved "https://registry.npmjs.org/rollup/-/rollup-3.26.0.tgz" + integrity "sha512-YzJH0eunH2hr3knvF3i6IkLO/jTjAEwU4HoMUbQl4//Tnl3ou0e7P5SjxdDr8HQJdeUJShlbEHXrrnEHy1l7Yg==" + +"run-parallel@1.2.0": + version "1.2.0" + resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" + integrity "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" + dependencies: + "queue-microtask" "1.2.3" + +"safe-regex-test@1.0.0": + 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==" + dependencies: + "call-bind" "1.0.2" + "get-intrinsic" "1.2.1" + "is-regex" "1.1.4" + +"safer-buffer@2.1.2": + version "2.1.2" + resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" + integrity "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + +"sax@1.2.4": + version "1.2.4" + resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" + integrity "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + +"semver@7.5.3": + version "7.5.3" + resolved "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz" + integrity "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==" + dependencies: + "lru-cache" "6.0.0" + +"shebang-command@2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" + integrity "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" + dependencies: + "shebang-regex" "3.0.0" + +"shebang-regex@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" + integrity "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + +"side-channel@1.0.4": + version "1.0.4" + resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" + integrity "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==" + dependencies: + "call-bind" "1.0.2" + "get-intrinsic" "1.2.1" + "object-inspect" "1.12.3" + +"signal-exit@3.0.7": + version "3.0.7" + resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" + integrity "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + +"slash@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" + integrity "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + +"source-map-js@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" + integrity "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" + +"source-map-resolve@0.6.0": + version "0.6.0" + resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz" + integrity "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==" + dependencies: + "atob" "2.1.2" + "decode-uri-component" "0.2.2" + +"source-map@0.6.1": + version "0.6.1" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" + integrity "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + +"source-map@0.7.4": + version "0.7.4" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz" + integrity "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==" + +"string.prototype.trim@1.2.7": + 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==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + +"string.prototype.trimend@1.0.6": + 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==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + +"string.prototype.trimstart@1.0.6": + version "1.0.6" + resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz" + integrity "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==" + dependencies: + "call-bind" "1.0.2" + "define-properties" "1.2.0" + "es-abstract" "1.21.2" + +"strip-ansi@6.0.1": + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" + integrity "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" + dependencies: + "ansi-regex" "5.0.1" + +"strip-bom@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" + integrity "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==" + +"strip-final-newline@2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz" + integrity "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + +"strip-json-comments@3.1.1": + version "3.1.1" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" + integrity "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" + +"stylus@0.57.0": + version "0.57.0" + resolved "https://registry.npmjs.org/stylus/-/stylus-0.57.0.tgz" + integrity "sha512-yOI6G8WYfr0q8v8rRvE91wbxFU+rJPo760Va4MF6K0I6BZjO4r+xSynkvyPBP9tV1CIEUeRsiidjIs2rzb1CnQ==" + dependencies: + "css" "3.0.0" + "debug" "4.3.4" + "glob" "7.2.3" + "safer-buffer" "2.1.2" + "sax" "1.2.4" + "source-map" "0.7.4" + +"supports-color@5.5.0": + version "5.5.0" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" + integrity "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" + dependencies: + "has-flag" "3.0.0" + +"supports-color@7.2.0": + version "7.2.0" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" + integrity "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==" + dependencies: + "has-flag" "4.0.0" + +"supports-preserve-symlinks-flag@1.0.0": + 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==" + +"svgo@3.0.2": + version "3.0.2" + resolved "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz" + integrity "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==" + dependencies: + "@trysound/sax" "0.2.0" + "commander" "7.2.0" + "css-select" "5.1.0" + "css-tree" "2.3.1" + "csso" "5.0.5" + "picocolors" "1.0.0" + +"text-table@0.2.0": + version "0.2.0" + resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" + integrity "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + +"to-fast-properties@2.0.0": + 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==" + +"to-regex-range@5.0.1": + version "5.0.1" + resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" + integrity "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==" + dependencies: + "is-number" "7.0.0" + +"tsconfig-paths@3.14.2": + version "3.14.2" + resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz" + integrity "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==" + dependencies: + "@types/json5" "0.0.29" + "json5" "1.0.2" + "minimist" "1.2.8" + "strip-bom" "3.0.0" + +"tslib@1.14.1": + version "1.14.1" + resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" + integrity "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + +"tsutils@3.21.0": + version "3.21.0" + resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz" + integrity "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==" + dependencies: + "tslib" "1.14.1" + "typescript" "5.0.3" + +"type-check@0.4.0": + version "0.4.0" + resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" + integrity "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==" + dependencies: + "prelude-ls" "1.2.1" + +"type-fest@0.20.2": + version "0.20.2" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" + integrity "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + +"typed-array-length@1.0.4": + 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==" + dependencies: + "call-bind" "1.0.2" + "for-each" "0.3.3" + "is-typed-array" "1.1.10" + +"typescript@5.0.3": + version "5.0.3" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz" + integrity "sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==" + +"unbox-primitive@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz" + 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" + +"unplugin-icons@^0.16.3", "unplugin-icons@0.16.3": + version "0.16.3" + resolved "https://registry.npmjs.org/unplugin-icons/-/unplugin-icons-0.16.3.tgz" + integrity "sha512-hivVVr6++WHSj6Iz+rjTa14/ALMYT+PFd2sPtTBKlQR3cdzui1VwM72TzSu94NkDm/KVncvOIiBwoHwUPeL9bg==" + dependencies: + "@antfu/install-pkg" "0.1.1" + "@antfu/utils" "0.7.4" + "@iconify/utils" "2.1.7" + "@vue/compiler-sfc" "3.3.4" + "debug" "4.3.4" + "kolorist" "1.8.0" + "local-pkg" "0.4.3" + "unplugin" "1.3.1" + +"unplugin-vue-components@^0.24.1", "unplugin-vue-components@0.24.1": + version "0.24.1" + resolved "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.24.1.tgz" + integrity "sha512-T3A8HkZoIE1Cja95xNqolwza0yD5IVlgZZ1PVAGvVCx8xthmjsv38xWRCtHtwl+rvZyL9uif42SRkDGw9aCfMA==" + dependencies: + "@antfu/utils" "0.7.4" + "@rollup/pluginutils" "5.0.2" + "chokidar" "3.5.3" + "debug" "4.3.4" + "fast-glob" "3.3.0" + "local-pkg" "0.4.3" + "magic-string" "0.30.0" + "minimatch" "7.4.6" + "resolve" "1.22.2" + "unplugin" "1.3.1" + "vue" "3.3.4" + +"unplugin@1.3.1": + version "1.3.1" + resolved "https://registry.npmjs.org/unplugin/-/unplugin-1.3.1.tgz" + integrity "sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw==" + dependencies: + "acorn" "8.9.0" + "chokidar" "3.5.3" + "webpack-sources" "3.2.3" + "webpack-virtual-modules" "0.5.0" + +"update-browserslist-db@1.0.11": + version "1.0.11" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz" + integrity "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==" + dependencies: + "browserslist" "4.21.9" + "escalade" "3.1.1" + "picocolors" "1.0.0" + +"uri-js@4.4.1": + version "4.4.1" + resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" + integrity "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==" + dependencies: + "punycode" "2.3.0" + +"util-deprecate@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + integrity "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + +"vite-plugin-prismjs@^0.0.8", "vite-plugin-prismjs@0.0.8": + version "0.0.8" + resolved "https://registry.npmjs.org/vite-plugin-prismjs/-/vite-plugin-prismjs-0.0.8.tgz" + integrity "sha512-mBPPMS/hwVUArdqCtp/oajZT7iq1qwJDDCciNZ3R5+Q5tQUuUHXtDKuZHYnklPLElNbENf2FyuOtC4FrgxQRAA==" + dependencies: + "@babel/core" "7.22.5" + "babel-plugin-prismjs" "2.1.0" + +"vite-plugin-windicss@^1.9.0", "vite-plugin-windicss@1.9.0": + version "1.9.0" + resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-1.9.0.tgz" + integrity "sha512-w0unPfcbVU5eaISAsFTLgIb41SLhmXoUF75Othu8NqFioe8+DEqiuvJ7/k/LRuEuvI8Rt/OKrY6cNzrB+dykaA==" + dependencies: + "@windicss/plugin-utils" "1.9.0" + "debug" "4.3.4" + "kolorist" "1.8.0" + "vite" "4.3.9" + "windicss" "3.5.6" + +"vite-svg-loader@^4.0.0", "vite-svg-loader@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/vite-svg-loader/-/vite-svg-loader-4.0.0.tgz" + integrity "sha512-0MMf1yzzSYlV4MGePsLVAOqXsbF5IVxbn4EEzqRnWxTQl8BJg/cfwIzfQNmNQxZp5XXwd4kyRKF1LytuHZTnqA==" + dependencies: + "@vue/compiler-sfc" "3.3.4" + "svgo" "3.0.2" + +"vite@^4.3.9", "vite@4.3.9": + version "4.3.9" + resolved "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz" + integrity "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==" + dependencies: + "@types/node" "18.16.19" + "esbuild" "0.17.19" + "postcss" "8.4.24" + "rollup" "3.26.0" + +"vue-demi@0.14.5": + version "0.14.5" + resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz" + integrity "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==" + dependencies: + "vue" "3.3.4" + +"vue-eslint-parser@^9.3.1", "vue-eslint-parser@9.3.1": + version "9.3.1" + resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz" + integrity "sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==" + dependencies: + "debug" "4.3.4" + "eslint" "8.44.0" + "eslint-scope" "7.2.0" + "eslint-visitor-keys" "3.4.1" + "espree" "9.6.0" + "esquery" "1.5.0" + "lodash" "4.17.21" + "semver" "7.5.3" + +"vue-i18n@^9.2.2", "vue-i18n@9.2.2": + version "9.2.2" + resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz" + integrity "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==" + dependencies: + "@intlify/core-base" "9.2.2" + "@intlify/shared" "9.2.2" + "@intlify/vue-devtools" "9.2.2" + "@vue/devtools-api" "6.5.0" + "vue" "3.3.4" + +"vue-resize@2.0.0-alpha.1": + version "2.0.0-alpha.1" + resolved "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz" + integrity "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==" + dependencies: + "vue" "3.3.4" + +"vue-router@^4.2.2", "vue-router@4.2.2": + version "4.2.2" + resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.2.2.tgz" + integrity "sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==" + dependencies: + "@vue/devtools-api" "6.5.0" + "vue" "3.3.4" + +"vue-template-compiler@2.7.14": + version "2.7.14" + resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz" + integrity "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==" + dependencies: + "de-indent" "1.0.2" + "he" "1.2.0" + +"vue-tsc@^1.8.3", "vue-tsc@1.8.3": + version "1.8.3" + resolved "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.3.tgz" + integrity "sha512-Ua4DHuYxjudlhCW2nRZtaXbhIDVncRGIbDjZhHpF8Z8vklct/G/35/kAPuGNSOmq0JcvhPAe28Oa7LWaUerZVA==" + dependencies: + "@vue/language-core" "1.8.3" + "@vue/typescript" "1.8.3" + "semver" "7.5.3" + "typescript" "5.0.3" + +"vue@^3.3.4", "vue@3.3.4": + version "3.3.4" + resolved "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz" + integrity "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==" + dependencies: + "@vue/compiler-dom" "3.3.4" + "@vue/compiler-sfc" "3.3.4" + "@vue/runtime-dom" "3.3.4" + "@vue/server-renderer" "3.3.4" + "@vue/shared" "3.3.4" + +"webpack-sources@3.2.3": + version "3.2.3" + resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" + integrity "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" + +"webpack-virtual-modules@0.5.0": + version "0.5.0" + resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz" + integrity "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==" + +"which-boxed-primitive@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz" + integrity "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==" + dependencies: + "is-bigint" "1.0.4" + "is-boolean-object" "1.1.2" + "is-number-object" "1.0.7" + "is-string" "1.0.7" + "is-symbol" "1.0.4" + +"which-typed-array@1.1.9": + version "1.1.9" + resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz" + 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@2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" + integrity "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" + dependencies: + "isexe" "2.0.0" + +"windicss@^3.5.6", "windicss@3.5.6": + version "3.5.6" + resolved "https://registry.npmjs.org/windicss/-/windicss-3.5.6.tgz" + integrity "sha512-P1mzPEjgFMZLX0ZqfFht4fhV/FX8DTG7ERG1fBLiWvd34pTLVReS5CVsewKn9PApSgXnVfPWwvq+qUsRwpnwFA==" + +"wrappy@1.0.2": + version "1.0.2" + resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + integrity "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + +"xml-name-validator@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz" + integrity "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==" + +"yallist@3.1.1": + version "3.1.1" + resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" + integrity "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + +"yallist@4.0.0": + version "4.0.0" + resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" + integrity "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + +"yaml-eslint-parser@0.3.2": + version "0.3.2" + resolved "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-0.3.2.tgz" + integrity "sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==" + dependencies: + "eslint-visitor-keys" "1.3.0" + "lodash" "4.17.21" + "yaml" "1.10.2" + +"yaml@1.10.2": + version "1.10.2" + resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" + integrity "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" + +"yocto-queue@0.1.0": + version "0.1.0" + resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" + integrity "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" diff --git a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix index 34cc516e0b..1ac7aaaaf8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fv1yaBnfn/wik1Ix24shwfritwxno3NoeJgHPsHgZOI="; + sha256 = "sha256-HOHUyO2Ct0BlQtLqqwsQZZPmnLij8AsayX+aIhIpZpw="; }; - cargoHash = "sha256-q0VrN+5Ypq4ga/gI5MlyRaMdD8NxzuaZ804KaRQzpRs="; + cargoHash = "sha256-p8aDqBZ0HpQ4iWG0lAF6KIvE4F5P1myd/Dt/txaoz0k="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix index b09bbe7e5d..d4c6a6d72c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-gH12lO8XiSlPHyifJeaZ5mdk8ylIbLYTKKkitTK4jCA="; + hash = "sha256-/qractCyItq1dNc8rBoipwmt4SGkdylxHu0Lnt4Jb/Q="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix index e13874ced6..99ac336a6a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yhRBaxt+hMNgnZK3qHgBnkRK/bWXeDfWHkiWzMLJn/g="; + sha256 = "sha256-93dSeZL3W/6S46JYSbj/7ccHFBI3VKBD8TNKRO9fIZc="; }; vendorHash = "sha256-YSr3fKqJJtNRbUW1TjwDM96cA6CoYz1LUit/pC8V3Fs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litefs/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/litefs/default.nix index 2c299d5c55..660d06c636 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/litefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/litefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CmWtQzoY/xY/LZL2swhYtDzPvpVOvKlhUH3plDEHrGI="; + sha256 = "sha256-EPOOQSjhhUgUcO+edcZIPomd6g/BI9Ee5MsmylKq1Sk="; }; - vendorHash = "sha256-1I18ITgFPpUv0mPrt1biJmQV9qd9HB23zJmnDp5WzkA="; + vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4="; subPackages = [ "cmd/litefs" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/mermerd/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/mermerd/default.nix index 2dd7317265..4b14501f35 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/mermerd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/mermerd/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "mermerd"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "KarnerTh"; repo = "mermerd"; rev = "refs/tags/v${version}"; - hash = "sha256-fqM+sOWk3gqbZ5xKR6CS1SY5bSRrAhHcM1d6ugqFbw4="; + hash = "sha256-L/ieDhducOpdJ0vu578YcjSLTARlih81xAyly4pVE80="; }; vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock index 5d7b32a4f6..aa430dc84a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -28,6 +28,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.19" @@ -262,6 +273,7 @@ name = "black-box-tests" version = "0.1.0" dependencies = [ "anyhow", + "enumflags2", "indoc", "insta", "query-engine-tests", @@ -296,7 +308,7 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d76085681585d39016f4d3841eb019201fc54d2dd0d92ad1e4fab3bfb32754" dependencies = [ - "ahash", + "ahash 0.7.6", "base64 0.13.1", "chrono", "hex", @@ -523,12 +535,9 @@ dependencies = [ [[package]] name = "connection-string" -version = "0.1.13" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97faeec45f49581c458f8bf81992c5e3ec17d82cda99f59d3cea14eff62698d" -dependencies = [ - "wasm-bindgen", -] +checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" [[package]] name = "console" @@ -543,6 +552,10 @@ dependencies = [ "winapi", ] +[[package]] +name = "context" +version = "0.1.0" + [[package]] name = "convert_case" version = "0.6.0" @@ -573,12 +586,10 @@ name = "core-tests" version = "0.1.0" dependencies = [ "dissimilar", - "prisma-models", "psl", "query-core", "request-handlers", "schema", - "schema-builder", "serde_json", "user-facing-errors", ] @@ -865,18 +876,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5" -[[package]] -name = "dml" -version = "0.1.0" -dependencies = [ - "chrono", - "cuid", - "nanoid", - "prisma-value", - "psl-core", - "uuid 1.1.2", -] - [[package]] name = "dmmf" version = "0.1.0" @@ -892,7 +891,6 @@ dependencies = [ "prisma-models", "psl", "schema", - "schema-builder", "serde", "serde_json", "similar", @@ -1015,9 +1013,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ "enumflags2_derive", "serde", @@ -1025,24 +1023,24 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.14", ] [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1361,9 +1359,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" dependencies = [ "bytes", "fnv", @@ -1390,7 +1388,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -1399,16 +1397,25 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", ] [[package]] name = "hashlink" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" dependencies = [ - "hashbrown 0.11.2", + "hashbrown 0.13.2", ] [[package]] @@ -1652,6 +1659,23 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +[[package]] +name = "js-drivers" +version = "0.1.0" +dependencies = [ + "async-trait", + "expect-test", + "napi", + "napi-derive", + "once_cell", + "quaint", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-core", +] + [[package]] name = "js-sys" version = "0.3.56" @@ -1671,17 +1695,6 @@ dependencies = [ "toml", ] -[[package]] -name = "json-rpc-stdio" -version = "0.1.0" -dependencies = [ - "jsonrpc-core", - "serde", - "serde_json", - "tokio", - "tracing", -] - [[package]] name = "jsonrpc-core" version = "17.1.0" @@ -1800,9 +1813,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.22.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", @@ -1957,7 +1970,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834" dependencies = [ - "ahash", + "ahash 0.7.6", "metrics-macros", ] @@ -1967,7 +1980,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" dependencies = [ - "ahash", + "ahash 0.7.6", "metrics-macros", ] @@ -2073,8 +2086,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.7.3" -source = "git+https://github.com/prisma/mobc?tag=1.0.6#80462c4870a2bf6aab49da15c88c021bae531da8" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc79c4a77e312fee9c7bd4b957c12ad1196db73c4a81e5c0b13f02083c4f7f2f" dependencies = [ "async-trait", "futures-channel", @@ -2222,7 +2236,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "mysql_async" version = "0.31.3" -source = "git+https://github.com/prisma/mysql_async?branch=vendored-openssl#d39990b6db77ab5116ee5b5d821b27bd5f54f268" +source = "git+https://github.com/prisma/mysql_async?branch=vendored-openssl#dad187b50dc7e8ce2b61fec126822e8e172a9c8a" dependencies = [ "bytes", "crossbeam", @@ -2330,10 +2344,11 @@ checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b" [[package]] name = "napi-derive" -version = "2.12.3" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2ac63101a19228b0881694cac07468d642fd10e4f943a9c9feebeebf1a4787" +checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" dependencies = [ + "cfg-if", "convert_case", "napi-derive-backend", "proc-macro2", @@ -2343,9 +2358,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.49" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e32b5bc4d803e40b783b0aa3fe488eac8711cfaa4c5c9915293dfd3d0b99925" +checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" dependencies = [ "convert_case", "once_cell", @@ -2614,9 +2629,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "output_vt100" @@ -2695,6 +2710,7 @@ dependencies = [ "either", "enumflags2", "indexmap", + "rustc-hash", "schema-ast", ] @@ -2973,7 +2989,22 @@ dependencies = [ ] [[package]] -name = "prisma-fmt-build" +name = "prisma-models" +version = "0.0.0" +dependencies = [ + "bigdecimal", + "chrono", + "cuid", + "itertools", + "nanoid", + "prisma-value", + "psl", + "thiserror", + "uuid 1.1.2", +] + +[[package]] +name = "prisma-schema-build" version = "0.1.0" dependencies = [ "prisma-fmt", @@ -2981,23 +3012,11 @@ dependencies = [ "wasm-logger", ] -[[package]] -name = "prisma-models" -version = "0.0.0" -dependencies = [ - "bigdecimal", - "dml", - "itertools", - "prisma-value", - "psl", - "thiserror", -] - [[package]] name = "prisma-value" version = "0.1.0" dependencies = [ - "base64 0.12.3", + "base64 0.13.1", "bigdecimal", "chrono", "once_cell", @@ -3142,11 +3161,10 @@ dependencies = [ "mongodb", "mongodb-client", "once_cell", - "parking_lot 0.12.1", "psl", "quaint", "schema-core", - "tempfile", + "sql-schema-connector", "test-setup", "url", ] @@ -3154,7 +3172,6 @@ dependencies = [ [[package]] name = "quaint" version = "0.2.0-alpha.13" -source = "git+https://github.com/prisma/quaint#5a708313ed488da9016e37edbb2f774fd7893250" dependencies = [ "async-trait", "base64 0.12.3", @@ -3167,7 +3184,6 @@ dependencies = [ "either", "futures", "hex", - "libsqlite3-sys", "lru-cache", "metrics 0.18.1", "mobc", @@ -3231,9 +3247,9 @@ name = "query-core" version = "0.1.0" dependencies = [ "async-trait", - "base64 0.12.3", "bigdecimal", "chrono", + "connection-string", "crossbeam-channel", "cuid", "enumflags2", @@ -3245,12 +3261,10 @@ dependencies = [ "opentelemetry", "petgraph 0.4.13", "prisma-models", - "prisma-value", "psl", "query-connector", "query-engine-metrics", "schema", - "schema-builder", "serde", "serde_json", "thiserror", @@ -3269,7 +3283,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64 0.12.3", + "base64 0.13.1", "connection-string", "enumflags2", "graphql-parser", @@ -3278,7 +3292,6 @@ dependencies = [ "mongodb-query-connector", "opentelemetry", "opentelemetry-otlp", - "prisma-models", "psl", "quaint", "query-connector", @@ -3325,12 +3338,14 @@ dependencies = [ "async-trait", "connection-string", "futures", + "js-drivers", "napi", "napi-build", "napi-derive", "opentelemetry", "prisma-models", "psl", + "quaint", "query-connector", "query-core", "query-engine-metrics", @@ -3356,6 +3371,7 @@ dependencies = [ "base64 0.13.1", "chrono", "colored", + "enumflags2", "futures", "indoc", "insta", @@ -3378,10 +3394,7 @@ name = "query-test-macros" version = "0.1.0" dependencies = [ "darling", - "indoc", - "itertools", "proc-macro2", - "query-tests-setup", "quote", "syn 1.0.99", ] @@ -3398,8 +3411,8 @@ dependencies = [ "indexmap", "indoc", "itertools", - "lazy_static", "nom", + "once_cell", "parse-hyperlinks", "prisma-models", "psl", @@ -3595,6 +3608,7 @@ name = "request-handlers" version = "0.1.0" dependencies = [ "bigdecimal", + "codspeed-criterion-compat", "connection-string", "dmmf", "futures", @@ -3603,10 +3617,12 @@ dependencies = [ "insta", "itertools", "mongodb-query-connector", + "once_cell", "prisma-models", "psl", + "quaint", "query-core", - "schema-builder", + "schema", "serde", "serde_json", "sql-query-connector", @@ -3680,17 +3696,16 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.25.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4b1eaf239b47034fb450ee9cdedd7d0226571689d8823030c4b6c2cb407152" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.1.0", "chrono", "fallible-iterator", "fallible-streaming-iterator", "hashlink", "libsqlite3-sys", - "memchr", "smallvec", ] @@ -3738,9 +3753,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.36.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags 1.3.2", "errno", @@ -3830,9 +3845,11 @@ dependencies = [ name = "schema" version = "0.1.0" dependencies = [ + "codspeed-criterion-compat", "once_cell", "prisma-models", "psl", + "rustc-hash", ] [[package]] @@ -3844,18 +3861,6 @@ dependencies = [ "pest_derive", ] -[[package]] -name = "schema-builder" -version = "0.1.0" -dependencies = [ - "codspeed-criterion-compat", - "once_cell", - "prisma-models", - "psl", - "rustc-hash", - "schema", -] - [[package]] name = "schema-connector" version = "0.1.0" @@ -3904,10 +3909,11 @@ dependencies = [ "connection-string", "expect-test", "indoc", - "json-rpc-stdio", + "jsonrpc-core", "quaint", "schema-connector", "schema-core", + "serde", "serde_json", "structopt", "tempfile", @@ -4245,7 +4251,6 @@ dependencies = [ "psl", "quaint", "schema-connector", - "serde_json", "sql-schema-connector", "sql-schema-describer", "test-macros", @@ -4620,9 +4625,9 @@ dependencies = [ [[package]] name = "tiberius" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cff04849bffc92a61210e3fea7a1e83faf3666cf55b26edc4d7656ea879293b" +checksum = "66303a42b7c5daffb95c10cd8f3007a9c29b3e90128cf42b3738f58102aa2516" dependencies = [ "async-native-tls", "async-trait", @@ -5295,12 +5300,11 @@ dependencies = [ [[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", ] @@ -5515,13 +5519,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" 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.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]] @@ -5530,7 +5534,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "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]] @@ -5539,13 +5552,28 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" 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.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]] @@ -5554,42 +5582,84 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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 = "winreg" version = "0.7.0" diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index 6f1a8e91a9..f1f8c77410 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.13.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-NJQvu+EREF40u5P3i8h2yGYC1vM6Q8xEXX9WyOnJkBM="; + sha256 = "sha256-/1wTqVvGUmN6PmoP6jXgUIB7QKkvkT5Rsg+L5zr4oN0="; }; # Use system openssl. @@ -31,10 +31,8 @@ rustPlatform.buildRustPackage rec { outputHashes = { "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; - "mobc-0.7.3" = "sha256-Ts2VVAuZakS+Sy/rEUrCe7RJX5MWs/TTO60c7mH+5sU="; - "mysql_async-0.31.3" = "sha256-hvuZTJ8W6L2s2gYAGJXBezkeAHTu06zIvJGQjoYX+7Q="; + "mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ="; "postgres-native-tls-0.5.0" = "sha256-OYbtGYAvDDCTeYfhav/BI2LJSyMyUERD7xa8GA/57rI="; - "quaint-0.2.0-alpha.13" = "sha256-Z7Zl1ZXzP3YE1Z1iuuj9V6dYBD2DpJngVbDLb4l/gjc="; }; }; @@ -75,7 +73,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pimeys tomhoule ivan ]; + maintainers = with maintainers; [ pimeys tomhoule ivan aqrln ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix index 92bbb19a59..6847b9aa20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix @@ -33,7 +33,6 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ makeWrapper git - maven # springframework boot gets angry about 1970 sources # fix from https://github.com/nix-community/mavenix/issues/25 diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlboiler-crdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlboiler-crdb/default.nix new file mode 100644 index 0000000000..559c8f2775 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlboiler-crdb/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "sqlboiler-crbd"; + version = "unstable-2022-06-12"; + + src = fetchFromGitHub { + owner = "glerchundi"; + repo = "sqlboiler-crdb"; + rev = "7b35c4d19c05fdc53d1efdcc074f20ee6b56f340"; + hash = "sha256-RlppCRYP7TlM1z1PiXtEVifNVxQHwLuoBXxgYIpUirE="; + }; + + vendorHash = "sha256-N16GH8ZDyeWWBsaaG4RkJwzAbuQ7E8YjZAgVsfeECo4"; + + doCheck = false; # requires a running testdb + + meta = with lib; { + description = "CockroachDB generator for usage with SQLBoiler"; + homepage = "https://github.com/glerchundi/sqlboiler-crdb/"; + maintainers = with maintainers; [ dgollings ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index 1e0a51e11d..0fac85bcad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.19.0"; + version = "1.19.1"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-/6CqzkdZMog0ldoMN0PH8QhL1QsOBaDAnqTHlgtHdP8="; + sha256 = "sha256-xZogHQ44amdhFewovFd1TWrul0wlofUqo46Ay13Mnig="; }; proxyVendor = true; - vendorHash = "sha256-AsOm86apA5EiZ9Ss7RPgVn/b2/O6wPj/ur0zG91JoJo="; + vendorHash = "sha256-owH+Gd6K+RzBRhWEs99qQLXV3UWysEkLinEFvzSzXIU="; subPackages = [ "cmd/sqlc" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix index ccf3bd4a23..67d905ae05 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix @@ -1,17 +1,12 @@ { lib, stdenv, makeWrapper, requireFile, unzip, jdk }: -let - version = "22.4.0.342.1212"; - fileVersion = "1032835-01"; -in - stdenv.mkDerivation { - - inherit version; +stdenv.mkDerivation rec { pname = "sqlcl"; + version = "23.2.0.178.1027"; src = requireFile rec { url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; - name = "V${fileVersion}.zip"; + name = "sqlcl-${version}.zip"; message = '' This Nix expression requires that ${name} already be part of the store. To obtain it you need to @@ -37,7 +32,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k"; + hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix index b29efd0b15..b6fac2c312 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-nMTC4bOv2Mgmt0GFXoBkbSayJ85i1mS/mcCsP8/x00A="; + sha256 = "sha256-d9XxE+yY3LEsg9JYOFYs9r2ZHaH0+tnEOqNV+5tEiAs="; }; vendorHash = "sha256-+buoX9etR34p1N2G8+48ZvF6cg/y4uKb89sSIwkoeuY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 338b1d22e0..3968a5de60 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.1.2"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XxaQlXXxd0CpVK2iIt2aJ5PoGWvanFf7oeCdnjOTaeI="; + hash = "sha256-3NNig7zt6ZQUXuzONKlE5h/uOrY8/0/oVbw+BZ99mPk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock index 69f4b7b09f..af36a997a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock @@ -2268,7 +2268,7 @@ dependencies = [ [[package]] name = "surrealdb-migrations" -version = "0.9.11" +version = "0.9.12" dependencies = [ "anyhow", "assert_cmd", diff --git a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix index 7e5d59b1b7..7cf5131719 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "0.9.11"; + version = "0.9.12"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-vCn5doVnD2TlwXhD7/mT+hLHTdNJUphID8MmX3D5+Xc="; + hash = "sha256-avDztyxjRTa66MUfIvwtxY1SiGNAtVdepUPHggrbDk0="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix index 5b7530c965..db4310b543 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "418"; + version = "422"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-IVLQG+y2Uvph+0WE+BE2beDSCGzfgkOdclESi+szcZM="; + sha256 = "sha256-isOcZDbm4Ykkolmcn4lRMkknZkTYRvMOXVZlGKRnXU8="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix index 56bcb8fa46..579ca692e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.9.10"; + version = "1.9.17"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-A5l5ZCKkDqVHy7DWd2Tb75g21t+WnLMiJuUxAYVTTUM="; + hash = "sha256-vGlvujN9/1e9X/c2WgVSuc+yuqECUF55NLPmBecwvT0="; }; vendorHash = "sha256-ECVKofvmLuFAFvncq63hYUaYW8/2+F4gZr8wIGQyrdU="; diff --git a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix index 2fd1c70873..13921b61ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/delve/default.nix @@ -44,7 +44,7 @@ buildGoModule rec { meta = with lib; { description = "debugger for the Go programming language"; homepage = "https://github.com/go-delve/delve"; - maintainers = with maintainers; [ SuperSandro2000 vdemeester ]; + maintainers = with maintainers; [ vdemeester ]; license = licenses.mit; mainProgram = "dlv"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix index d9de1b09c2..f3de637823 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -36,7 +36,7 @@ buildPythonApplication rec { hash = "sha256-tevQ/Ocusz2PythGnedP6r4xARgetVosAc8uTD49H3M="; }; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; postPatch = '' substituteInPlace tox.ini \ diff --git a/third_party/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix b/third_party/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix new file mode 100644 index 0000000000..3e78409039 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix @@ -0,0 +1,24 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "diesel-cli-ext"; + version = "0.3.13"; + + src = fetchCrate { + pname = "diesel_cli_ext"; + inherit version; + hash = "sha256-5AIzMxEcxL/vYWx3D/meA///Zo+1210HUMEE4dFBhkc="; + }; + + cargoHash = "sha256-Ya7RL3TuQjKkEkggK/ANChtVZRuTaooM+lE3KBZnvYU="; + + meta = with lib; { + description = "Provides different tools for projects using the diesel_cli"; + homepage = "https://crates.io/crates/diesel_cli_ext"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ siph ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/doc2go/default.nix b/third_party/nixpkgs/pkgs/development/tools/doc2go/default.nix new file mode 100644 index 0000000000..0635c7ba10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/doc2go/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "doc2go"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "abhinav"; + repo = "doc2go"; + rev = "v${version}"; + hash = "sha256-iypcjj6FFsus9mrafLBX0u7bHnzs718aEWC5dO3q0es="; + }; + vendorHash = "sha256-IMqYCVGsspYigTmYNHD1b6Sgzxl47cdiCs+rq4C3Y08="; + + ldflags = [ "-s" "-w" "-X main._version=${version}" ]; + + subPackages = [ "." ]; + + checkFlags = [ + # needs to fetch additional go modules + "-skip=TestFinder_ImportedPackage/Modules" + ]; + + preCheck = '' + # run all tests + unset subPackages + ''; + + meta = with lib; { + homepage = "https://github.com/abhinav/doc2go"; + changelog = "https://github.com/abhinav/doc2go/blob/${src.rev}/CHANGELOG.md"; + description = "Your Go project's documentation, to-go"; + longDescription = '' + doc2go is a command line tool that generates static HTML documentation + from your Go code. It is a self-hosted static alternative to + https://pkg.go.dev/ and https://godocs.io/. + ''; + license = with licenses; [ + # general project license + asl20 + # internal/godoc/synopsis*.go adapted from golang source + bsd3 + ]; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 2cb364bab7..df318159d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.97.0"; + version = "1.97.1"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-ii8j1SBG+dGIBzh5fekvVjHhpkQnL84b5yYz6fSYyvo="; + sha256 = "sha256-qEoSq4sLobsYYdwR8vp5WpugeQdLbXDtBVBTAztxPkY="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index 533c9a5f70..ac973700bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.37.1"; + version = "0.40.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-iDLydTwMJHalqtPLdSirr11AoVsdR+0er0kfB2+C1MA="; + sha256 = "sha256-leneOdV65aAUGRdVFpPuVnCmu3VmVzZXxOLJ5vspVB8="; }; - cargoHash = "sha256-z1DYbxeif4UJXRwEnEWfgALHR/iyVfQ2vD8AWEsC/2U="; + cargoHash = "sha256-C0cgN7G+zQZr+V/iPHh6HXV8DnPaE0bWkbJmbfIMwgk="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix index 788c4edc9a..c696fbaa99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.44"; + version = "0.0.46"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-+yN08MAoFaixvt2EexhRNucG6I4v2FdHf44XlYIwzhA="; + sha256 = "sha256-mGcpV4PDD6HJZH+3Lybsds4xPJS5rkOouKqKX7j+7WA="; }; - vendorSha256 = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q="; + vendorHash = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix index 9eb8475cee..e4a508ba21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix @@ -151,39 +151,39 @@ rec { headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn"; }; - electron_22-bin = mkElectron "22.3.15" { - armv7l-linux = "b1df49670162f4333e320e39626f50aeae8a0a44a4fd7c68ecddce997f7ac369"; - aarch64-linux = "4e1e1ca892d7812b2bfead0757f448549907a60204f7ff275e6b912a7d7691f9"; - x86_64-linux = "4c8a12045a7d49488a404a7e09f2fdd342a2755fe8300f3c709715a043d8944c"; - x86_64-darwin = "5eb5eb0cc4e0253a3e5bbe0f054040b5b9ba8eb0761ff51f74a8a462a3c81f63"; - aarch64-darwin = "1f047a4a136761d93c2ed9080dc8000aa7d48d0dbd7cd001c72834650a6d8511"; - headers = "106j087n4z8w8y749hdi4zyc7x7a0dzhw2jmk937frm9qzivjzb1"; + electron_22-bin = mkElectron "22.3.18" { + armv7l-linux = "109cd957e64c728bd1b921385250d413c9546c7ba44d191a9e6a62ea39eb093b"; + aarch64-linux = "4857d182cffb853b0c85c96e4e99d20316f95068398b7ac5424641e1f2263465"; + x86_64-linux = "8b65f6c6b960dd6bc52acbb0fc54f232dfa8a9d6ed0e1504ee6baf346c90598b"; + x86_64-darwin = "d3ecd733a174b8fd16927285f9e9f3a5d401c29578619a6c12aec5c3845d0d51"; + aarch64-darwin = "a11c41f2b1e740e77fccc1e2e299e89f370cd8153420976c1b16628733969af4"; + headers = "0h1d2l8wq10myaxa5xjnrnyjrjm7qlj9r4g3nldcqmsy4w468v66"; }; - electron_23-bin = mkElectron "23.3.9" { - armv7l-linux = "ad1a0c91cdb22371bf9ff99f6d407106ac8298517904de84875ce84cc690086a"; - aarch64-linux = "8d4ba11d1342898e2b7fea24e0053bc2ec81ab62ae2373ca5a458c8c482899b1"; - x86_64-linux = "10479bacbba8af4a5ff34c856017b5afb6e27bd806014d6632f552659118a833"; - x86_64-darwin = "e377786bbc647aa9c3cc0015225e58356e4319b3293438f5930c0b99a84cd190"; - aarch64-darwin = "12f8ee8fe4aabf98c37cecf48d55126b66704304a56239dd9442dc0d1c21d54b"; - headers = "0j47gh1f89znkvz9hssl043a6bzcmqy6xapvw0ysw4w9my5zaf07"; + electron_23-bin = mkElectron "23.3.10" { + armv7l-linux = "dd5e4395b3851c5561058980c883c1cb5871caae521efbd53a356de7e8e58a81"; + aarch64-linux = "be0e65b0920f7d6c2d6efbcf1a5bcfde3e677e28a9f743d003b5089b48fdbe7f"; + x86_64-linux = "b8f1a743ae5e9e3cc42b00c77eb91343e289a4d2d77d922cc719963ac4629475"; + x86_64-darwin = "6a8cb24879677d7997d1cba018e9630dc561d6646d79c7f282a747c85b17df7e"; + aarch64-darwin = "f2157e56f2e94c5a6bb8a5727674fb7e3f42c6ab155f9fdc00e7dacc7df20df7"; + headers = "04118gdcbnrw5np6r74ysqwfcn1kr5xvjm25jndmnzz8cspch6zq"; }; - electron_24-bin = mkElectron "24.6.1" { - armv7l-linux = "0e2fe8e8e97dd34809a63a5e3bc1d4ade6ba32a55bd90e5826b85970d983d314"; - aarch64-linux = "8c17efd4f5d578f6c93ea363fd4ff6e33c03bec298826be0fc32689ddef4c161"; - x86_64-linux = "c997469cb935fbe2e4cffe71769358375e69583d757eb2e19fae0ffc125bcac8"; - x86_64-darwin = "dfc3a2c003a81bc7b16ee3d677430d19d6a82894672a58f1622fed32590a9751"; - aarch64-darwin = "7f2be8bbab8d4990dd86387b98b44d1df6648988ad7835ce4d5fd592f8db1139"; - headers = "0wc7q2vdyc22xmi4z3mxbihd6zcrh7hv3silygb4r7j8f25109l9"; + electron_24-bin = mkElectron "24.6.4" { + armv7l-linux = "60a5d3936d86d78b166f0f62fc5de5de6f3250d2ae630886da297e30d2040eb4"; + aarch64-linux = "d50662a111e72c71596f614cd022ebe928dc2eea6d5060cb8313b19862abe080"; + x86_64-linux = "c211f38a7e5e46371a358f1db67b927fe340f8478a5fff306c4acc0ffce840f8"; + x86_64-darwin = "17293a5148c511cd92a6b08872801bd90de01888251a7b99085818511770fc47"; + aarch64-darwin = "61696d191710e053a1afccb4cd5ee851ad723c90929f0058b8221d1c840a316a"; + headers = "0nwwrxsrlx6spi1nwnvi6fy451sk38zxvnwkls4c4i9f6nrfsd4f"; }; - electron_25-bin = mkElectron "25.2.0" { - armv7l-linux = "ec15f85ef5bf1a8cafdd5bbe5ceb229a1c6b2f91e42bd7482500921114413341"; - aarch64-linux = "e58ff2c4484e80bc6253969036e772bfed8d822d66215ff68e84846cbd14c4a0"; - x86_64-linux = "4fb341f1cbe7ef38c1eb3463919bfb515b54875f835f28ce0d8ff9119802a025"; - x86_64-darwin = "21f69f236d89dc86ca63f24fa6b7a7ef825862250ad83d6f09973615b10360b6"; - aarch64-darwin = "50060b0cf8cd2e8180a1bea2c94bc9988ee66cfe065abe2b42cb999707b1b3ba"; - headers = "0fwxypcj8wav16r0fhfm8sdly94vsl8w8yg5xy892z6b3bd9x4s3"; + electron_25-bin = mkElectron "25.3.1" { + armv7l-linux = "6c837332b63a973304b1eaf769bd4054ee972f4b8a74832053715959e1555a15"; + aarch64-linux = "2ae9fd05ffe59d59586d9e8afdbb45381971d964527123506ae08e2411872b4d"; + x86_64-linux = "36f139c779ae0c0abc7227e9e3d65f34b8dfc3a0e4d40beb18bdf31750d4ca74"; + x86_64-darwin = "66c86c8651c4699b069fde53d5fcbf8887a2573c27e3eefc655462b27c047d07"; + aarch64-darwin = "1cc5e9b6451757ada1c07130b9454164d4206cf92595708fb6fc9ebff030f860"; + headers = "1vb767l9b2vgx9f03xb3iw2msli4lkswy49qc0zzdaym89b7ykrz"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/elkhound/default.nix b/third_party/nixpkgs/pkgs/development/tools/elkhound/default.nix index 5c29b10a61..19bb3b7005 100644 --- a/third_party/nixpkgs/pkgs/development/tools/elkhound/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/elkhound/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patchShebangs scripts ''; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ bison cmake flex perl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/enochecker-test/default.nix b/third_party/nixpkgs/pkgs/development/tools/enochecker-test/default.nix new file mode 100644 index 0000000000..ae1fb41186 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/enochecker-test/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pythonOlder +, pythonRelaxDepsHook + +, certifi +, charset-normalizer +, enochecker-core +, exceptiongroup +, idna +, iniconfig +, jsons +, packaging +, pluggy +, pytest +, requests +, tomli +, typish +, urllib3 +}: + +buildPythonApplication rec { + pname = "enochecker-test"; + version = "0.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "enochecker_test"; + hash = "sha256-M0RTstFePU7O51YVEncVDuuR6F7R8mfdKbO0j7k/o8Q="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = true; + + propagatedBuildInputs = [ + certifi + charset-normalizer + enochecker-core + exceptiongroup + idna + iniconfig + jsons + packaging + pluggy + pytest + requests + tomli + typish + urllib3 + ]; + + # tests require network access + doCheck = false; + + meta = with lib; { + description = "Automatically test services/checker using the enochecker API"; + homepage = "https://github.com/enowars/enochecker_test"; + changelog = "https://github.com/enowars/enochecker_test/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fwc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 1f9de23203..1e7c0b3ff1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.13"; + version = "0.18.17"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-NOuRJnYjfuDRP4ZVVfxMyfyaIlYjcPqqPQta0WbIXG8="; + hash = "sha256-OnAOomKVUIBTEgHywDSSx+ggqUl/vn/R0JdjOb3lUho="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; @@ -23,5 +23,6 @@ buildGoModule rec { changelog = "https://github.com/evanw/esbuild/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lucus16 marsam undefined-moe ]; + mainProgram = "esbuild"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/netlify.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/netlify.nix index ddf5b301d3..6854261229 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/netlify.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/netlify.nix @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://github.com/netlify/esbuild"; license = licenses.mit; maintainers = with maintainers; [ roberth ]; + mainProgram = "esbuild"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/espup/default.nix b/third_party/nixpkgs/pkgs/development/tools/espup/default.nix new file mode 100644 index 0000000000..6ff3a2972a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/espup/default.nix @@ -0,0 +1,82 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +, bzip2 +, openssl +, xz +, zstd +, stdenv +, darwin +, runCommand +, espup +}: + +rustPlatform.buildRustPackage rec { + pname = "espup"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "esp-rs"; + repo = "espup"; + rev = "v${version}"; + hash = "sha256-gzM+RT4Rt+LaYk7CwYUTIMci8DDI0y3+7y+N2yKRDOc="; + }; + + cargoHash = "sha256-GYhF6VDBAieZbu4x9EiQVVJkmx0aRYK0xwGGP0nuVGc="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + bzip2 + openssl + xz + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkFlags = [ + # makes network calls + "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version" + ]; + + postInstall = '' + installShellCompletion --cmd espup \ + --bash <($out/bin/espup completions bash) \ + --fish <($out/bin/espup completions fish) \ + --zsh <($out/bin/espup completions zsh) + ''; + + passthru.tests = { + simple = runCommand "${pname}-test" { } '' + if [[ `${espup}/bin/espup --version` != *"${version}"* ]]; then + echo "Error: program version does not match package version" + exit 1 + fi + + touch $out + ''; + }; + + meta = with lib; { + description = "Tool for installing and maintaining Espressif Rust ecosystem."; + homepage = "https://github.com/esp-rs/espup/"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ knightpp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/fatcat/default.nix b/third_party/nixpkgs/pkgs/development/tools/fatcat/default.nix new file mode 100644 index 0000000000..d5caaea08a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/fatcat/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "fatcat"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Gregwar"; + repo = "fatcat"; + rev = "v${version}"; + hash = "sha256-/iGNVP7Bz/UZAR+dFxAKMKM9jm07h0x0F3VGpdxlHdk="; + }; + + nativeBuildInputs = [ + cmake + ]; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "FAT filesystems explore, extract, repair, and forensic tool"; + homepage = "https://github.com/Gregwar/fatcat"; + license = licenses.mit; + maintainers = with maintainers; [ cynerd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix b/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix index d42e282289..b4c21da385 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flip-link/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "flip-link"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sf2HlAfPlg8Er2g17AnRmUkvRhTw5AVPuL2B92hFvpA="; + hash = "sha256-bwNtIuAALSOSUkbx2UbOEzHv064BVAHTBdJGPZVyEis="; }; - cargoSha256 = "sha256-2VgsO2hUIvSPNQhR13+bGTxXa6xZXcK0amfiWv2EIxk="; + cargoHash = "sha256-pY1/p3TMt/DCTadU0Ki0yMgmS7RwO9siZLvNNXSLrfg="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index 8de62a6369..c34b89d362 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.18.0"; + version = "9.21.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-fsw4gzp3R9ZgN3ZVr0xLUCqckEHA4OSpIdwiKYp06AM="; + sha256 = "sha256-jy+hgEmLs2jfW5zD9gIKUltcb4zD8hxLiP7ZyKLMpoU="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix index 51724575f6..ab4c3f7912 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.60.1"; + version = "0.61.1"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-8tXwAuljW1dJVX3jg2K5LmN+Is8sneM4OFm9n+Dkt+I="; + sha256 = "sha256-e5td3mHTjlwcxZDDJmqKmn9Tfhtp4EVJ8C8Qn1xyeBo="; }; nugetDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix index 6de624dd65..d752151b35 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gauge"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-67MHWJc4sOhOVe0n1RJLSez7SeUb79gGxjDqMrTuqFU="; + hash = "sha256-gdqb9atksAU2bjNdoOfxb3XYl3H/1F51Xnfnm78J3CQ="; }; - vendorHash = "sha256-qrRb8LRRmY5sZSSqsh0oSUq9MGYy7M8bgtBH8JPYQmc="; + vendorHash = "sha256-PmidtbtX+x5cxuop+OCrfdPP5EiJnyvFyxHveGVGAEo="; excludedPackages = [ "build" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix index 6f6a937efb..ef71dc143f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/geckodriver/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mozilla/geckodriver"; license = licenses.mpl20; maintainers = with maintainers; [ jraygauthier ]; + mainProgram = "geckodriver"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gen-license/default.nix b/third_party/nixpkgs/pkgs/development/tools/gen-license/default.nix new file mode 100644 index 0000000000..a349586657 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gen-license/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "gen-license"; + version = "0.1.2"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; + }; + + cargoHash = "sha256-2PT20eoXxBPhGsmHlEEGE2ZDyhyrD7tFdwnn3khjKNo="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Create licenses for your projects right from your terminal"; + homepage = "https://github.com/nexxeln/license-generator"; + license = licenses.mit; + maintainers = [ maintainers.ryanccn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix new file mode 100644 index 0000000000..eee07206a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, crystal +, gobject-introspection +}: +crystal.buildCrystalPackage rec { + pname = "gi-crystal"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "hugopl"; + repo = "gi-crystal"; + rev = "v${version}"; + hash = "sha256-DIH8L8P8lkWzzVUj1Tbf9oTUvu9X7OT66APyUHiDkYk="; + }; + + # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path + # when the package name happens to start with “lib”. + patches = [ ./src.patch ./store-friendly-library-name.patch ]; + + nativeBuildInputs = [ gobject-introspection ]; + buildTargets = [ "generator" ]; + + doCheck = false; + doInstallCheck = false; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r * $out + + runHook postInstall + ''; + + meta = with lib; { + description = "GI Crystal is a binding generator used to generate Crystal bindings for GObject based libraries using GObject Introspection."; + homepage = "https://github.com/hugopl/gi-crystal"; + mainProgram = "gi-crystal"; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/src.patch b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/src.patch new file mode 100644 index 0000000000..eb18035f99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/src.patch @@ -0,0 +1,57 @@ +--- a/src/generator/main.cr 2023-07-14 18:30:47.687581729 +0300 ++++ b/src/generator/main.cr 2023-07-17 07:55:24.177630085 +0300 +@@ -1,6 +1,8 @@ + require "colorize" + require "log" + require "option_parser" ++require "file" ++require "file_utils" + + require "./binding_config" + require "./error" +@@ -43,7 +45,7 @@ + end + end + +- output_dir = Path.new(project_dir, "lib/gi-crystal/src/auto").normalize if output_dir.nil? ++ output_dir = Path.new(Dir.current, "lib/gi-crystal/src/auto").normalize if output_dir.nil? + extra_bindings = argv.map { |path| Path.new(path).expand.to_s } + + {output_dir: output_dir, +@@ -74,11 +76,23 @@ + end + end + +-private def find_bindings : Array(String) +- find_pattern = Path.new(project_dir, "**/binding.yml").normalize ++private def find_bindings_yml(path) : Array(String) ++ find_pattern = File.join(path, "**/binding.yml") + Dir[find_pattern] + end + ++private def find_bindings : Array(String) ++ current_directory = Dir.current ++ ++ bindings = find_bindings_yml(current_directory) ++ Dir.glob(File.join(current_directory, "**/*")).each do |path| ++ if File.symlink?(path) ++ bindings += find_bindings_yml(path) ++ end ++ end ++ bindings ++end ++ + private def format_files(dir) + # We need to chdir into output dir since the formatter ignores everything under `lib` dir. + Dir.cd(dir) { `crystal tool format` } +@@ -102,7 +116,9 @@ + Log.info { "Generating bindings at #{options[:output_dir]}" } + + Generator::DocRepo.disable! unless options[:doc_gen] +- ++ ++ FileUtils.cp_r(project_dir, File.join(Dir.current, "lib/gi-crystal")) ++ + binding_yamls = find_bindings.concat(options[:extra_bindings]) + binding_yamls.each do |file| + Log.info { "Using binding config at #{file}" } diff --git a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch new file mode 100644 index 0000000000..c6fd4e18c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch @@ -0,0 +1,10 @@ +--- a/src/generator/lib_gen.cr 1969-12-31 17:00:01.000000000 -0700 ++++ b/src/generator/lib_gen.cr 2023-07-14 11:48:41.509397114 -0600 +@@ -10,7 +10,7 @@ + + private def libraries : Array(String) + namespace.shared_libraries.map do |library| +- library[/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1] ++ library[/(?:\/[^\/]*)+\/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1] + end + end \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index 5a0bc00069..47bac190dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -17,9 +17,9 @@ mavenJdk8.buildMavenPackage rec { sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg"; }; - mvnHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k="; + mvnHash = "sha256-xFcEZpJ0+ApJTDTuA63LgvUwLrxATVKoj5Mh3WZyfq8="; - nativeBuildInputs = [ jdk8 mavenJdk8 makeWrapper ]; + nativeBuildInputs = [ jdk8 makeWrapper ]; installPhase = '' mkdir -p "$out/lib/java" "$out/share/java" @@ -41,11 +41,10 @@ mavenJdk8.buildMavenPackage rec { homepage = "https://github.com/martinpaljak/GlobalPlatformPro"; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # deps + binaryBytecode # deps ]; license = with licenses; [ lgpl3 ]; maintainers = with maintainers; [ ekleog ]; mainProgram = "gp"; - platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index 118c8f52f7..215e7fcfe6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,27 +2,29 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.20.2"; + version = "2.32.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-MIEVAEjXM3QNz3PnjB/g5Ury+N9NJhxtcXF+SLAvqR4="; + sha256 = "sha256-fQzXgCRMIcGQRCnKn/vu3GzNrx4/xrMVmzqjOujyNNE="; }; preCheck = '' substituteInPlace ./pkg/generator_test.go --replace 0.0.0-dev ${version} + substituteInPlace ./pkg/logging/logging_test.go --replace v0.0 v${lib.versions.majorMinor version} ''; ldflags = [ "-s" "-w" - "-X" "github.com/vektra/mockery/v2/pkg/config.SemVer=v${version}" + "-X" "github.com/vektra/mockery/v2/pkg/logging.SemVer=v${version}" ]; CGO_ENABLED = false; - vendorHash = "sha256-3lx3wHnPQ/slRXnlVAnI1ZqSykDXNivjwg1WUITGj64="; + proxyVendor = true; + vendorHash = "sha256-c8HsrcS3x16x3x/VQjQ2XWxfMVYHJ6pbQWztqFj0ju4="; passthru.tests = { generateMock = runCommand "${pname}-test" { diff --git a/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix index 5ec826eecc..be07a10d90 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-outline/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { meta = with lib; { description = "Utility to extract JSON representation of declarations from a Go source file"; homepage = "https://github.com/ramya-rao-a/go-outline"; - maintainers = with maintainers; [ SuperSandro2000 vdemeester ]; + maintainers = with maintainers; [ vdemeester ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix index ed35f4bb7f..0d4cf62bf9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.27.1"; + version = "3.28.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-MwZtdxoWo5yeJKzbMIfigt0WUjZ52B8MeRsx43D8n1k="; + hash = "sha256-jVRQnZGM+N3W/f4mW322qPiv7PFrFoyUHNdZNoAkpAc="; }; - vendorHash = "sha256-05+/NbLks9Dp9Z7KscK9yeEzFJug7VFBqViievX6UOs="; + vendorHash = "sha256-gXWuKOTb/7AIF6orXlIHpdSxdYxl12Es2cl4egdJfxo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix index 563c346262..fb6c480cdc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pMy/cYyB9ncOuYysX0a9PmTuJdIrMcKL///57bniixI="; + sha256 = "sha256-zix04tIP9nhvYx8N7uk2cUWjSpMjb0XiPDK3km82XzQ="; }; - vendorHash = "sha256-44mxDswHIfVfAyvtyDHS4MnHCTPRlUvdhzHALICUJR4="; + vendorHash = "sha256-XOcCsb3zUChiYLTfOCbRQF71E2khzSt/ApFI8NAS13U="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/goa/default.nix b/third_party/nixpkgs/pkgs/development/tools/goa/default.nix index 8c427e1208..95a258886c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.12.1"; + version = "3.12.3"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-cQyBPg+3Sf2ABjRv3n9dVgMvhUpndNPUnOsRS4a+ABw="; + sha256 = "sha256-OWYIfzJcR0V5GogVntzu5hOe3h3JO5FYWxSqYSxRp6A="; }; - vendorHash = "sha256-XQyE99o6notsinQv39JbxW0XG3FqlMoDfDJQ72U5GTA="; + vendorHash = "sha256-Zt8Nzga9xRYuUv8ofCJa3yL2Kq+xvnqs3c0g2BnrgTo="; subPackages = [ "cmd/goa" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix index 6e1b166ecc..a39c8e9f50 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix @@ -36,29 +36,20 @@ assert lib.asserts.assertOneOf "withPrecision" withPrecision [ "single" "double" ]; let - options = { - # Options from 'godot/SConstruct' - platform = withPlatform; - target = withTarget; - precision = withPrecision; # Floating-point precision level - - # Options from 'godot/platform/linuxbsd/detect.py' - pulseaudio = withPulseaudio; # Use PulseAudio - dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings - speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support - fontconfig = withFontconfig; # Use fontconfig for system fonts support - udev = withUdev; # Use udev for gamepad connection callbacks - touch = withTouch; # Enable touch events - }; + mkSconsFlagsFromAttrSet = lib.mapAttrsToList (k: v: + if builtins.isString v + then "${k}=${v}" + else "${k}=${builtins.toJSON v}"); in stdenv.mkDerivation rec { pname = "godot"; version = "4.1-stable"; + commitHash = "970459615f6b2b4151742ec6d7ef8559f87fd5c5"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = version; + rev = commitHash; hash = "sha256-v9qKrPYQz4c+xkSu/2ru7ZE5EzKVyXhmrxyHZQkng2U="; }; @@ -96,15 +87,44 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py' - sconsFlags = [ "production=true" ]; + # Set the build name which is part of the version. In official downloads, this + # is set to 'official'. When not specified explicitly, it is set to + # 'custom_build'. Other platforms packaging Godot (Gentoo, Arch, Flatpack + # etc.) usually set this to their name as well. + # + # See also 'methods.py' in the Godot repo and 'build' in + # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info + BUILD_NAME = "nixpkgs"; + + # Required for the commit hash to be included in the version number. + # + # `methods.py` reads the commit hash from `.git/HEAD` and manually follows + # refs. Since we just write the hash directly, there is no need to emulate any + # other parts of the .git directory. + # + # See also 'hash' in + # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info preConfigure = '' - sconsFlags+=" ${ - lib.concatStringsSep " " - (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options) - }" + mkdir -p .git + echo ${commitHash} > .git/HEAD ''; + sconsFlags = mkSconsFlagsFromAttrSet { + # Options from 'SConstruct' + production = true; # Set defaults to build Godot for use in production + platform = withPlatform; + target = withTarget; + precision = withPrecision; # Floating-point precision level + + # Options from 'platform/linuxbsd/detect.py' + pulseaudio = withPulseaudio; # Use PulseAudio + dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings + speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support + fontconfig = withFontconfig; # Use fontconfig for system fonts support + udev = withUdev; # Use udev for gamepad connection callbacks + touch = withTouch; # Enable touch events + }; + outputs = [ "out" "man" ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix b/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix new file mode 100644 index 0000000000..2d36c207fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "goimports-reviser"; + version = "3.3.1"; + + src = fetchFromGitHub { + owner = "incu6us"; + repo = "goimports-reviser"; + rev = "v${version}"; + hash = "sha256-JIXBC7fk/Bd3tTHiK+qtB+5CdAATaB/j1nvKOJrz4n4="; + }; + vendorHash = "sha256-lyV4HlpzzxYC6OZPGVdNVL2mvTFE9yHO37zZdB/ePBg="; + + CGO_ENABLED = 0; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X=main.Tag=${src.rev}" + ]; + + checkFlags = [ + "-skip=TestSourceFile_Fix_WithAliasForVersionSuffix/success_with_set_alias" + ]; + + preCheck = '' + # unset to run all tests + unset subPackages + # unset as some tests require cgo + unset CGO_ENABLED + ''; + + meta = with lib; { + description = "Right imports sorting & code formatting tool (goimports alternative)"; + homepage = "https://github.com/incu6us/goimports-reviser"; + license = licenses.mit; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix index 142abf1dec..be7d55639d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "Language server for golangci-lint"; homepage = "https://github.com/nametake/golangci-lint-langserver"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix index 455bf63b3f..ddca0357b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { description = "go test with colors"; homepage = "https://github.com/rakyll/gotest"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/gron/default.nix b/third_party/nixpkgs/pkgs/development/tools/gron/default.nix index b89ab9e98f..a91723b1fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gron/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "sha256-K/QAG9mCIHe7PQhex3TntlGYAK9l0bESWk616N97dBs="; + ldflags = [ "-s" "-w" "-X main.gronVersion=${version}" ]; + meta = with lib; { description = "Make JSON greppable!"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix b/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix index 84174993ef..ee17ae777e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.16.0"; + version = "2.16.2"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-yoy3wESegXxlyaelex2gqr3GdzwwjxK7YTAzDCILr/c="; + sha256 = "sha256-oKmT1qvEWNk0q5JnzsUaCWCsllUtyIAsWXUP4DsmgnA="; }; - vendorHash = "sha256-dxzAiLEiZ+2+J9ZrkBemUt+slxz1zUa9Fx0VhUjFdN0="; + vendorHash = "sha256-YqDQ6dQQDzkehRN0jWmfjG4acB4rtL2HGHOl71IM8Lk="; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix b/third_party/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix index 6bb80306e6..5160760124 100644 --- a/third_party/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/guile/g-wrap/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libffi ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/ilspycmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/ilspycmd/default.nix new file mode 100644 index 0000000000..265a17f224 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ilspycmd/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildDotnetModule +, dotnetCorePackages +, powershell +, autoSignDarwinBinariesHook +, glibcLocales +}: +buildDotnetModule rec { + pname = "ilspycmd"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "icsharpcode"; + repo = "ILSpy"; + rev = "v${version}"; + hash = "sha256-ERBYXgpBRXISfqBSBEydEQuD/5T1dvJ+wNg2U5pKip4="; + }; + + nativeBuildInputs = [ + powershell + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; + + # https://github.com/NixOS/nixpkgs/issues/38991 + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj"; + nugetDeps = ./deps.nix; + + meta = with lib; { + description = "Tool for decompiling .NET assemblies and generating portable PDBs"; + homepage = "https://github.com/icsharpcode/ILSpy"; + changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${src.rev}"; + license = with licenses; [ + mit + # third party dependencies + mspl + asl20 + ]; + sourceProvenance = with sourceTypes; [ fromSource binaryBytecode ]; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ilspycmd/deps.nix b/third_party/nixpkgs/pkgs/development/tools/ilspycmd/deps.nix new file mode 100644 index 0000000000..f95ab0d6c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ilspycmd/deps.nix @@ -0,0 +1,78 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "K4os.Compression.LZ4"; version = "1.3.5"; sha256 = "1nv9inhz0n25lhkw9xgp6g5xbqmcdccdhx6mwrli0pdp6hjmlh9k"; }) + (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "3.1.0"; sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.0"; sha256 = "1skgkralqkg2srvgvrmbsmya67f37gzk40lg28j8nz5mg8k8g0ia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; sha256 = "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "TunnelVisionLabs.ReferenceAssemblyAnnotator"; version = "1.0.0-alpha.160"; sha256 = "1wvfa3098a984kydjgjvx43gncnr89fw20if2gqvz8kqn9pxqjbq"; }) +] diff --git a/third_party/nixpkgs/pkgs/development/tools/jaq/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/jaq/Cargo.lock deleted file mode 100644 index 9abd8a35a2..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/jaq/Cargo.lock +++ /dev/null @@ -1,562 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "ariadne" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1cb2a2046bea8ce5e875551f5772024882de0b540c7f93dfc5d6cf1ca8b030c" -dependencies = [ - "yansi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "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 = "chumsky" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "clap" -version = "4.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b9970d7505127a162fdaa9b96428d28a479ba78c9ec7550a63a5d9863db682" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "colored_json" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633215cdbb84194508d4c07c08d06e92ee9d489d54e68d17913d8d1bacfcfdeb" -dependencies = [ - "atty", - "serde", - "serde_json", - "yansi", -] - -[[package]] -name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "log", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hifijson" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ef6b41c333e6dd2a4aaa59125a19b633cd17e7aaf372b2260809777bcdef4a" - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "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 = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jaq" -version = "0.10.0" -dependencies = [ - "ariadne", - "atty", - "chumsky", - "clap", - "colored_json", - "env_logger", - "hifijson", - "jaq-core", - "jaq-std", - "memmap2", - "mimalloc", - "serde_json", - "tempfile", -] - -[[package]] -name = "jaq-core" -version = "0.10.0" -dependencies = [ - "ahash", - "dyn-clone", - "hifijson", - "indexmap", - "itertools", - "jaq-parse", - "log", - "once_cell", - "regex", - "serde_json", -] - -[[package]] -name = "jaq-parse" -version = "0.10.0" -dependencies = [ - "chumsky", - "serde", -] - -[[package]] -name = "jaq-std" -version = "0.10.0" -dependencies = [ - "bincode", - "jaq-core", - "jaq-parse", - "serde_json", -] - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -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 = "mimalloc" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "git+https://github.com/01mf02/regex?rev=90eebbd#90eebbdb9396ca10510130327073a3d596674d04" - -[[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 = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix index a10697d5bf..4ee02d0a51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix @@ -1,29 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - sha256 = "sha256-v3dC5Qi0Op+oFCcbkbK1ZUQxWTEYVvXsc+ye9Kk9y7c="; + hash = "sha256-P1NWkqRotL8h87iqxdVJhGVy9dw47fXeL10db1xsk00="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "regex-syntax-0.6.28" = "sha256-FltQ1TfA4XV+jC3dQZf7soTHc8R/nSwToPGcQUVwVYs="; - }; - }; + cargoHash = "sha256-ZsY3PwbjNILYR+dYSp1RVqw0QV9PVB5bPSX1RdVUZUg="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "A jq clone focused on correctness, speed and simplicity"; homepage = "https://github.com/01mf02/jaq"; + changelog = "https://github.com/01mf02/jaq/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ figsoda siraben ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix index 6087b0496b..cffd77a63e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/java-language-server/default.nix @@ -24,9 +24,9 @@ maven.buildMavenPackage rec { mvnFetchExtraArgs.dontConfigure = true; mvnParameters = "-DskipTests"; - mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc="; + mvnHash = "sha256-XhAqd67RtETd9XvqbiEuTOwPUsUtoLkhXy2Dde7NLTo="; - nativeBuildInputs = [ maven jdk makeWrapper ]; + nativeBuildInputs = [ jdk makeWrapper ]; dontConfigure = true; preBuild = '' @@ -56,6 +56,5 @@ maven.buildMavenPackage rec { homepage = "https://github.com/georgewfraser/java-language-server"; license = licenses.mit; maintainers = with maintainers; [ hqurve ]; - platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix index 926001e891..5b3be52777 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.109.0"; + version = "0.110.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-r/O9oQ5hzcnnjuZpyJHp7jbxaAF3t4Ef33ovCyMPt10="; + sha256 = "sha256-xxpuvMlfDflXmUkJcTxw3enz27OadebsDWxoP8Ooi1w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jless/default.nix b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix index 306a271936..6c6c70f890 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jless/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jless/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jless"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "PaulJuliusMartinez"; repo = "jless"; rev = "v${version}"; - sha256 = "sha256-NB/s29M46mVhTsJWFYnBgJjSjUVbfdmuz69VdpVuR7c="; + hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4="; }; - cargoSha256 = "sha256-cPj9cTRhWK/YU8Cae63p4Vm5ohB1IfGL5fu7yyFGSXA="; + cargoHash = "sha256-sas94liAOSIirIJGdexdApXic2gWIBDT4uJFRM3qMw0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ]; @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A command-line pager for JSON data"; homepage = "https://jless.io"; + changelog = "https://github.com/PaulJuliusMartinez/jless/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jfchevrette ]; + maintainers = with maintainers; [ figsoda jfchevrette ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix index 9c3d3c09ea..3c6d85e8dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin globin artturin ]; platforms = platforms.unix; downloadPage = "https://stedolan.github.io/jq/download/"; + mainProgram = "jq"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index 8730731c42..82363d0ca5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-JGD+E5QWrtRX047Nrufl+wQJnJXqKTZkXcU4/uXA6l0="; + hash = "sha256-lYm+zgZkt/iVJgehJM44VqWbcR4kqt8rUSEsnz07tbU="; }; - cargoHash = "sha256-t3QACjuHMpJULEpEcUPCAF27LIrjtn4i7Ud0DfDa0ek="; + cargoHash = "sha256-Gav89ub4ccv/lCCqNYn9NvK4Q8udlu6YaZPhouHOVss="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix b/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix index 605022ffc1..77c773cea1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kcli/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { homepage = "https://github.com/cswank/kcli"; license = licenses.mit; maintainers = with maintainers; [ cswank ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/krew/default.nix b/third_party/nixpkgs/pkgs/development/tools/krew/default.nix index 2bfcf2ca9f..900698989a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/krew/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/krew/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krew"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "krew"; rev = "v${version}"; - sha256 = "sha256-aW9yASskwDt+5Lvsdju9ZR/HeZ4x8heWljdhqK0ZTx8="; + sha256 = "sha256-SN6F7EmkgjtU4UHYPXWBiuXSSagjQYD6SBYBXRrSVGA="; }; - vendorSha256 = "sha256-VXGjKzkOpaxyJClwXbxg15xmGdFi6arH8f4nN5/1SA4="; + vendorHash = "sha256-3tEesDezIyB6005PZmOcrnEeAIvc5za3FxTmBBbKf7s="; subPackages = [ "cmd/krew" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix index 1e3c63983b..7cab205945 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubepug"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "rikatz"; repo = "kubepug"; rev = "v${version}"; - hash = "sha256-/VkJSZdiU93+GnLxIPPE2ewlm52tp7Wqry0TvjyeqhI="; + hash = "sha256-HjnkGEzTobtILqML5xcjpYVtg6a5PqMKYyaGTYrqEDo="; }; - vendorHash = "sha256-fPyXOMJ0rRssGzOca54A5l8ZWixOC58Xtb3SOYSibCo="; + vendorHash = "sha256-w2WwJa8qaXmgFwZJo2r2TowcTehgQY0nGY4u1UROaxM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix index c3aefd37da..bdafbc3ed8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2nRsaHCqZUF3M1Z0e//IjhYELHRxR6fSCfkWyC1fog4="; + sha256 = "sha256-OqBTlzHqnwu6GaNFS6cdcOoBNdSGus/piR4tXRfzpn0="; }; patches = [ ./version.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/3.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/3.nix index d9eb6ce298..c7c3eb229e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/3.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/3.nix @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = true; # avoid finding test and development commands - sourceRoot = "source/kustomize"; + sourceRoot = "${src.name}/kustomize"; vendorSha256 = "sha256-xLeetcmzvpILLLMhMx7oahWLxguFjG3qbYpeeWpFUlw="; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/ansible-language-server/default.nix index a20f588627..2f0907d36b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/ansible-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/ansible-language-server/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "ansible-language-server"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ansible"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5QzwDsWjuq/gMWFQEkl4sqvsqfxTOZhaFBMhjiiOZSY="; + hash = "sha256-e6cOWoryOxWnl8q62rlGmSgwLVnoxLMwNFoGlUZw2bQ="; }; - npmDepsHash = "sha256-bzffCAGn0aYVoG8IDaXd5I3x3AnGl5urX7BaBKf0tVI="; + npmDepsHash = "sha256-Lzwj0/2fxa44DJBsgDPa43AbRxggqh881X/DFnlNLig="; npmBuildScript = "compile"; # We remove/ignore the prepare and prepack scripts because they run the diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix index 8de4ae8087..67ecfdcb7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.9.0"; + version = "0.10.0"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - sha256 = "sha256-kx3rdGqIbrOaHY7V3uXLqIFEYzzsMKzNwZ6Neq8zM3c="; + hash = "sha256-g4k/vP7yYbTAy2bTAfr6HQhkskWfI6Zv2lxP+AZf6yw="; }; format = "crystal"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix index 987a1d13dc..3ae6bdef70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.12.4"; + version = "0.13.1"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-OieIbWgc5l7HS6otkRxsKYQmNIjPbADQ+C3A6qJr2h0="; + hash = "sha256-2eGnctA5HlNRGv9iV5HoT4ByA8fK/mTxldHll0UMD5c="; }; modRoot = "gopls"; - vendorSha256 = "sha256-0Svz0VFmNW/f8Po+DpIQi0bJB1ICLcSJM1sG/Nju+ZY="; + vendorHash = "sha256-2H8Qh88ikmEqToGOCOoovcCh3dMToeFP/GavG9dlML8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix index af1c972a26..3de28f6514 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "jdt-language-server"; - version = "1.21.0"; - timestamp = "202303161431"; + version = "1.26.0"; + timestamp = "202307271613"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz"; - sha256 = "sha256-c8RDSvOgLbl05LDNelKgQXucbJnjJ7GVcut6mVT6GjA="; + sha256 = "sha256-ul/l7jsqg5UofiSu8gzm4Xg0z46HcRfmyqysamiKbFM="; }; sourceRoot = "."; @@ -97,5 +97,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl20; maintainers = with maintainers; [ matt-snider ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index bbf18316d7..9cf575ec54 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }: +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation, ditto }: stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.23"; + version = "3.6.25"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-tax4Pb99khAMDE6KH288Gihr8McpKg3DHBNVJnPnXbs="; + sha256 = "sha256-fERsqOjuZSIPpTEAQbKZ/ZYzQENxJi8Gibb6Oi073pA="; fetchSubmodules = true; }; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Foundation + ditto ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock index c26e8a0b36..e9208f2e31 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -28,11 +28,12 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.6" +version = "0.12.9" dependencies = [ "config", "diagnostic", "elapsed", + "fast-hash", "fmt-util", "input", "mlb-statics", @@ -53,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "autocfg" @@ -65,15 +66,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -94,6 +95,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "cc" version = "1.0.79" @@ -108,7 +115,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "str-util", @@ -117,11 +124,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" [[package]] name = "cm-syntax" -version = "0.12.6" +version = "0.12.9" dependencies = [ "lex-util", "paths", @@ -133,7 +140,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "fast-hash", ] @@ -150,7 +157,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "serde", @@ -178,7 +185,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "once_cell", @@ -212,20 +219,10 @@ dependencies = [ "cfg-if", ] -[[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 = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" [[package]] name = "diff" @@ -242,7 +239,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "log", ] @@ -268,9 +265,9 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -296,7 +293,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "drop_bomb", "rowan", @@ -306,7 +303,7 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "rustc-hash", ] @@ -318,13 +315,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" [[package]] name = "form_urlencoded" @@ -370,9 +367,9 @@ checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[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 = "humantime" @@ -383,7 +380,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" [[package]] name = "idna" @@ -398,7 +395,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "nohash-hasher", ] @@ -415,7 +412,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.6" +version = "0.12.9" dependencies = [ "cm-syntax", "config", @@ -438,34 +435,22 @@ dependencies = [ "topo-sort", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "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", - "io-lifetimes", "rustix", "windows-sys 0.48.0", ] [[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 = "la-arena" @@ -475,7 +460,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.6" +version = "0.12.9" dependencies = [ "analysis", "anyhow", @@ -503,13 +488,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.6" +version = "0.12.9" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "line-index" @@ -523,9 +508,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "log" @@ -535,9 +520,9 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lsp-server" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3711e4d6f491dc9edc0f1df80e204f38206775ac92c1241e89b79229a850bc00" +checksum = "37ea9ae5a5082ca3b6ae824fc7666cd206b99168a4d4c769ad8fe9cc740df6a6" dependencies = [ "crossbeam-channel", "log", @@ -551,7 +536,7 @@ version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -575,7 +560,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.6" +version = "0.12.9" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +578,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.6" +version = "0.12.9" dependencies = [ "anyhow", "env_logger", @@ -602,15 +587,6 @@ dependencies = [ "panic-hook", ] -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -622,7 +598,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "paths", @@ -633,7 +609,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.6" +version = "0.12.9" dependencies = [ "config", "diagnostic", @@ -657,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.6" +version = "0.12.9" dependencies = [ "lex-util", "paths", @@ -705,9 +681,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.4" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -718,18 +694,9 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "panic-hook" -version = "0.12.6" +version = "0.12.9" dependencies = [ "better-panic", ] @@ -737,7 +704,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "fast-hash", "glob", @@ -749,7 +716,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "fast-hash", ] @@ -768,21 +735,19 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[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 = "proc-macro2" -version = "1.0.61" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a6f739a0c0addeaf6ed75150b95743aa18643a3c6f40409ed7b6db3a6911f" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -793,7 +758,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ - "bitflags", + "bitflags 1.3.2", "getopts", "memchr", "unicase", @@ -801,18 +766,30 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", @@ -821,9 +798,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rowan" @@ -852,13 +829,12 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0", @@ -866,35 +842,35 @@ dependencies = [ [[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 = "serde" -version = "1.0.156" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -903,13 +879,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" dependencies = [ "proc-macro2", "quote", - "syn 2.0.20", + "syn", ] [[package]] @@ -923,7 +899,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "str-util", @@ -931,14 +907,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.6" +version = "0.12.9" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +925,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.6" +version = "0.12.9" dependencies = [ "config", "pretty_assertions", @@ -965,7 +941,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.6" +version = "0.12.9" dependencies = [ "config", "elapsed", @@ -979,7 +955,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +964,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.6" +version = "0.12.9" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +975,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.6" +version = "0.12.9" dependencies = [ "config", "cov-mark", @@ -1014,14 +990,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.6" +version = "0.12.9" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.6" +version = "0.12.9" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1012,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1021,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.6" +version = "0.12.9" [[package]] name = "sml-parse" -version = "0.12.6" +version = "0.12.9" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1037,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.6" +version = "0.12.9" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.6" +version = "0.12.9" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1053,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.6" +version = "0.12.9" dependencies = [ "chain-map", "config", @@ -1100,7 +1076,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.6" +version = "0.12.9" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1095,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.6" +version = "0.12.9" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,12 +1103,10 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.6" +version = "0.12.9" dependencies = [ - "char-name", "code-h2-md-map", "fast-hash", - "identifier-case", "rowan", "syntax-gen", "token", @@ -1140,7 +1114,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.6" +version = "0.12.9" dependencies = [ "fast-hash", "sml-hir", @@ -1148,9 +1122,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.1.24" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ "serde", ] @@ -1158,27 +1132,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "1.0.109" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb8d4cebc40aa517dfb69618fa647a346562e67228e2236ae0042ee6ac14775" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -1188,8 +1151,9 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ + "char-name", "fast-hash", "identifier-case", "proc-macro2", @@ -1208,7 +1172,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.6" +version = "0.12.9" dependencies = [ "analysis", "cm-syntax", @@ -1234,7 +1198,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "line-index", "text-size-util", @@ -1242,14 +1206,14 @@ dependencies = [ [[package]] name = "text-size" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" +checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" dependencies = [ "text-size", ] @@ -1272,13 +1236,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -1297,9 +1261,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap", "serde", @@ -1311,7 +1275,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" [[package]] name = "ungrammar" @@ -1336,9 +1300,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" @@ -1358,7 +1322,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e8615477b5ec64ddc656" +source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" [[package]] name = "url" @@ -1424,7 +1388,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.1", ] [[package]] @@ -1444,9 +1408,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -1543,16 +1507,16 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] [[package]] name = "xtask" -version = "0.12.6" +version = "0.12.9" dependencies = [ "anyhow", "flate2", diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index 495d234c94..8b1fc8c477 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.6"; + version = "0.12.9"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-HYnBzAR994LSjsyUkwfkxHXi+f+KOFy/5z+RpwKbEdQ="; + hash = "sha256-PGB5sgYxiXYTj6O9SY/druDpNCf4O8HsivT8zhJM62M="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-hElcqzsfU6c6HzOqnUpbz+jbNGk6qBS+uk4fo1PC86Y="; + "char-name-0.1.0" = "sha256-mAzrBqaESZhLNozdgrGaRbOzwT+5j9nw9rRot9Xg1Ts="; "sml-libs-0.1.0" = "sha256-q3n4UfDcpDaN8v9UewAz2G26NeDDsZFuczS7N6nkl5Q="; }; }; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A language server for Standard ML"; homepage = "https://github.com/azdavis/millet"; - changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/CHANGELOG.md"; + changelog = "https://github.com/azdavis/millet/blob/v${version}/docs/CHANGELOG.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; mainProgram = "millet-ls"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix index d900046701..fde707ec66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.5.18"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-3Bv1tRskxQ4Fk+gEGCYRq8WtkBHYP2VjirtTZ3SWJlQ="; + hash = "sha256-wwFek9668tC+j2F12b9YiYbYJWp5z4J4F09dlj+hlq0="; }; - cargoHash = "sha256-O8E5PmXYrNOB8fXFs5ar30c1X5flIQZ/lrRSl/3XH+o="; + cargoHash = "sha256-XmacBalkevCmYxWFcez/++1ng2yyURge466VX6QZC9M="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ rewine ]; + mainProgram = "neocmakelsp"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix index 0df11acc34..6b3976dfa1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/nil/default.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/oxalica/nil/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ figsoda oxalica ]; + mainProgram = "nil"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/default.nix index 9b9fea87b3..9b6ff78047 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , nickel +, stdenv }: rustPlatform.buildRustPackage { @@ -12,6 +13,9 @@ rustPlatform.buildRustPackage { cargoBuildFlags = [ "-p nickel-lang-lsp" ]; + # Disable checks on Darwin because of issue described in https://github.com/tweag/nickel/pull/1454 + doCheck = !stdenv.isDarwin; + meta = { inherit (nickel.meta) homepage changelog license maintainers; description = "A language server for the Nickel programming language"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix index 61e48b5f1f..819ba778ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -5,27 +5,30 @@ , git , python3 , makeWrapper +, writeScriptBin , darwin , which }: rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.37"; + version = "0.0.39"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "v${version}"; - hash = "sha256-MzcGWOJud8SA6cpTdhms+Hfi0sAqelOr7dgy/k1H+qw="; + hash = "sha256-GHrB4FmZWmnkcfr3y4Ulk3TBmVn1Xsixqeni8h9PykY="; }; - cargoHash = "sha256-Xl0YxBmhhFKBzxbO1GXIds3XdSS78/7Z1rOAmLgTYSw="; + cargoHash = "sha256-Fe/bD8pIXElYfxYHF6JPVlpHhRrgJMDjEFfnequ00Bo="; nativeBuildInputs = [ git python3 makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ + (writeScriptBin "diskutil" "") ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index aa07359c6c..f4ccfe90d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -34,9 +43,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arrayref" @@ -46,19 +55,30 @@ 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 = "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-trait" -version = "0.1.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -85,6 +105,21 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.21.2" @@ -129,6 +164,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[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" @@ -137,9 +178,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" dependencies = [ "serde", ] @@ -168,6 +209,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +[[package]] +name = "castaway" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" + [[package]] name = "cc" version = "1.0.79" @@ -243,6 +290,15 @@ dependencies = [ "syn 1.0.109", ] +[[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 = "core-foundation-sys" version = "0.8.4" @@ -258,6 +314,55 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "csv" version = "1.2.2" @@ -280,13 +385,43 @@ dependencies = [ ] [[package]] -name = "dashmap" -version = "5.4.0" +name = "curl" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi", +] + +[[package]] +name = "curl-sys" +version = "0.4.64+curl-8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f96069f0b1cb1241c838740659a771ef143363f52772a9ce1bd9c04c75eee0dc" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi", +] + +[[package]] +name = "dashmap" +version = "5.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", @@ -327,7 +462,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -338,9 +473,9 @@ checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" [[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 = "elsa" @@ -360,7 +495,35 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[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.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", ] [[package]] @@ -373,6 +536,15 @@ dependencies = [ "regex", ] +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "fdeflate" version = "0.3.0" @@ -398,6 +570,19 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +[[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", +] + [[package]] name = "fnv" version = "1.0.7" @@ -473,6 +658,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" @@ -481,7 +681,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -521,8 +721,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -535,12 +737,33 @@ dependencies = [ "weezl", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[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" +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "hayagriva" version = "0.3.0" @@ -570,11 +793,19 @@ 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" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "libc", + "bytes", + "fnv", + "itoa", ] [[package]] @@ -749,11 +980,14 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", + "qoi", + "tiff", ] [[package]] @@ -769,7 +1003,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "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 = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "isahc" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" +dependencies = [ + "async-channel", + "castaway", + "crossbeam-utils", + "curl", + "curl-sys", + "event-listener", + "futures-lite", + "http", + "log", + "once_cell", + "polling", + "slab", + "sluice", + "tracing", + "tracing-futures", + "url", + "waker-fn", ] [[package]] @@ -792,21 +1076,24 @@ 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 = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -827,10 +1114,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libc" -version = "0.2.146" +name = "lebe" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libm" @@ -838,6 +1131,18 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +[[package]] +name = "libz-sys" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121f7402cc6ab5821dad08d1b9d11618a9ea4da992343909fecf8e430e86364c" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -906,13 +1211,22 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180d4b35be83d33392d1d1bfbd2ae1eca7ff5de1a94d3fc87faaa99a069e7cbd" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -923,6 +1237,26 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -957,9 +1291,9 @@ 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", "libm", @@ -967,9 +1301,9 @@ 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", "libc", @@ -981,18 +1315,150 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-http" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a819b71d6530c4297b49b3cae2939ab3a8cc1b9f382826a1bc29dd0ca3864906" +dependencies = [ + "async-trait", + "bytes", + "http", + "isahc", + "opentelemetry_api", +] + +[[package]] +name = "opentelemetry-jaeger" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08e028dc9f4f304e9320ce38c80e7cf74067415b1ad5a8750a38bae54a4d450d" +dependencies = [ + "async-trait", + "futures", + "futures-executor", + "http", + "isahc", + "once_cell", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-semantic-conventions", + "thiserror", + "thrift", + "tokio", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e33428e6bf08c6f7fcea4ddb8e358fab0fe48ab877a87c70c6ebe20f673ce5" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_api" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + [[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.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1018,9 +1484,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" @@ -1041,18 +1507,18 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_shared", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -1065,29 +1531,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1104,6 +1570,12 @@ dependencies = [ "ttf-parser", ] +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + [[package]] name = "png" version = "0.17.9" @@ -1118,10 +1590,26 @@ dependencies = [ ] [[package]] -name = "postcard" -version = "1.0.4" +name = "polling" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys", +] + +[[package]] +name = "postcard" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" dependencies = [ "cobs", "serde", @@ -1159,9 +1647,9 @@ dependencies = [ [[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", ] @@ -1176,10 +1664,19 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.28" +name = "qoi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quote" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1190,6 +1687,8 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", + "rand_chacha", "rand_core", ] @@ -1208,6 +1707,31 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] [[package]] name = "rctree" @@ -1246,13 +1770,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", ] [[package]] @@ -1263,9 +1799,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "resvg" @@ -1313,10 +1849,16 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.12" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" @@ -1336,9 +1878,9 @@ dependencies = [ [[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 = "same-file" @@ -1350,36 +1892,45 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.1.0" +name = "schannel" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -1388,20 +1939,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[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", ] @@ -1412,17 +1963,26 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", ] [[package]] -name = "simd-adler32" -version = "0.3.5" +name = "sharded-slab" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simplecss" @@ -1458,10 +2018,40 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.10.0" +name = "sluice" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel", + "futures-core", + "futures-io", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "stable_deref_trait" @@ -1521,8 +2111,8 @@ checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" [[package]] name = "svg2pdf" -version = "0.4.1" -source = "git+https://github.com/typst/svg2pdf#35f4bb87fb677473661c6d12919e01a6d64a716d" +version = "0.5.0" +source = "git+https://github.com/typst/svg2pdf#14eb3eb5be2f70d6735c88661387fddf0e110871" dependencies = [ "image", "miniz_oxide", @@ -1553,9 +2143,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -1597,29 +2187,72 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "log", + "ordered-float", + "threadpool", +] + +[[package]] +name = "tiff" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "serde", @@ -1635,9 +2268,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -1696,13 +2329,17 @@ 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", + "libc", + "mio", "num_cpus", "pin-project-lite", + "socket2", "tokio-macros", "windows-sys", ] @@ -1715,7 +2352,18 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", +] + +[[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]] @@ -1734,9 +2382,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -1746,20 +2394,20 @@ 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.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -1833,6 +2481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -1840,13 +2489,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.18", + "syn 2.0.27", ] [[package]] @@ -1856,6 +2505,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a39dcf9bfc1742fa4d6215253b33a6e474be78275884c216fc2a06267b3600" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", ] [[package]] @@ -1875,7 +2571,7 @@ name = "typst" version = "0.5.0" source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.3", "bytemuck", "comemo", "ecow", @@ -1883,7 +2579,7 @@ dependencies = [ "fontdb", "if_chain", "image", - "indexmap", + "indexmap 1.9.3", "log", "miniz_oxide", "once_cell", @@ -1953,7 +2649,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.7.1" +version = "0.7.2" dependencies = [ "anyhow", "chrono", @@ -1962,11 +2658,13 @@ dependencies = [ "elsa", "futures", "if_chain", - "indexmap", + "indexmap 1.9.3", "itertools", "lazy_static", - "memmap2 0.7.0", + "memmap2 0.7.1", "once_cell", + "opentelemetry", + "opentelemetry-jaeger", "parking_lot", "regex", "same-file", @@ -1976,6 +2674,9 @@ dependencies = [ "strum", "tokio", "tower-lsp", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", "typst", "typst-library", "walkdir", @@ -1989,7 +2690,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -2036,9 +2737,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[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-math-class" @@ -2097,6 +2798,12 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "usvg" version = "0.32.0" @@ -2163,12 +2870,30 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "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" @@ -2187,9 +2912,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", @@ -2197,24 +2922,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.18", + "syn 2.0.27", "wasm-bindgen-shared", ] [[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", @@ -2222,22 +2947,22 @@ 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.18", + "syn 2.0.27", "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 = "weezl" @@ -2296,9 +3021,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2353,9 +3078,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" dependencies = [ "memchr", ] @@ -2461,3 +3186,12 @@ dependencies = [ "syn 1.0.109", "synstructure", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix index bca3371dca..04c048a956 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -5,20 +5,20 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "nvarner"; repo = pname; rev = "v${version}"; - hash = "sha256-to+M/1TcQTeojwVMuXR2moyZ0L3vhGiokJrWustF/go="; + hash = "sha256-z6IG0qJXzwisazR/tLq6dwsZzgzhYKh/NnKmnYySS18="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "elsa-1.8.1" = "sha256-/85IriplPxx24TE/CsvjIsve100QUZiVqS0TWgPFRbw="; - "svg2pdf-0.4.1" = "sha256-WeVP+yhqizpTdRfyoj2AUxFKhGvVJIIiRV0GTXkgLtQ="; + "svg2pdf-0.5.0" = "sha256-v/ARFI+Uw5KtLe2F3ty9u3uKkWSradRmLnD2VJ+jmSI="; "typst-0.5.0" = "sha256-obUe9OVQ8M7MORudQGN7zaYjUv4zjeh7XidHHmUibTA="; }; }; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "A brand-new language server for Typst"; homepage = "https://github.com/nvarner/typst-lsp"; changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}"; - license = with licenses; [ mit ]; + license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda GaetanLepage ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch index a72c6722a0..a23ee367a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch @@ -1,15 +1,15 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -1873,7 +1873,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" +@@ -2569,7 +2569,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" version = "0.5.0" -source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c" +source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.3.3", "bytemuck", -@@ -1915,7 +1915,7 @@ dependencies = [ +@@ -2611,7 +2611,7 @@ dependencies = [ [[package]] name = "typst-library" version = "0.5.0" @@ -18,7 +18,7 @@ dependencies = [ "az", "chinese-number", -@@ -1983,7 +1983,7 @@ dependencies = [ +@@ -2685,7 +2685,7 @@ dependencies = [ [[package]] name = "typst-macros" version = "0.5.0" @@ -29,10 +29,10 @@ "proc-macro2", --- a/Cargo.toml +++ b/Cargo.toml -@@ -32,6 +32,6 @@ tokio = { version = "1.26.0", features = [ - "io-std", +@@ -49,6 +49,6 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features = + "registry", + "fmt", ] } - tower-lsp = "0.19.0" -typst = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" } -typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" } +typst = { git = "https://github.com/typst/typst.git", rev = "30bb33aafced4f1bf4a00803550f0e1e42672ded" } diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index 262204c067..e26184cd74 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.38.2"; + version = "0.39.4"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HxOM2M2EoeM0IHCrFQqLdP9Rai6DbC1uRG0CiQyqRdE="; + hash = "sha256-1eJmnLsQrcGw+A0rGXfZUFHwJAthZSNhNcc2zt/dx5M="; }; vendorHash = null; @@ -21,6 +21,6 @@ buildGoModule rec { homepage = "https://github.com/jesseduffield/lazygit"; changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ equirosa Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne equirosa paveloom ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix b/third_party/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix new file mode 100644 index 0000000000..52866b041c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libplist +, openssl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ldid-procursus"; + version = "2.1.5-procursus7"; + src = fetchFromGitHub { + owner = "ProcursusTeam"; + repo = "ldid"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ="; + }; + nativeBuildInputs = [ pkg-config libplist openssl ]; + stripDebugFlags = [ "--strip-unneeded" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Put real or fake signatures in a Mach-O binary"; + homepage = "https://github.com/ProcursusTeam/ldid"; + maintainers = with maintainers; [ keto ]; + platforms = platforms.unix; + license = licenses.agpl3Only; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix index 4add6e5bae..6b4452a391 100644 --- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: rec { sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; patches = [ # Remove FAQ diff --git a/third_party/nixpkgs/pkgs/development/tools/loganalyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/loganalyzer/default.nix index d8368df1e4..d992b539da 100644 --- a/third_party/nixpkgs/pkgs/development/tools/loganalyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/loganalyzer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix index 207ef4d9fe..eb8b5a799c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Koihik/LuaFormatter"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ figsoda SuperSandro2000 ]; + maintainers = with maintainers; [ figsoda ]; mainProgram = "lua-format"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/lv_img_conv/default.nix b/third_party/nixpkgs/pkgs/development/tools/lv_img_conv/default.nix index dc1a4f5ae0..e00b960c46 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lv_img_conv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lv_img_conv/default.nix @@ -52,9 +52,7 @@ buildNpmPackage rec { makeWrapper ${nodePackages.ts-node}/bin/ts-node $out/bin/lv_img_conv --add-flags $out/lib/node_modules/lv_img_conv/lib/cli.ts ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { changelog = "https://github.com/lvgl/lv_img_conv/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/memray/default.nix b/third_party/nixpkgs/pkgs/development/tools/memray/default.nix index 2b9611cce5..600316e295 100644 --- a/third_party/nixpkgs/pkgs/development/tools/memray/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/memray/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.8.1"; + version = "1.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ztoIUYuXfD8Mgj5vIsZnpuF8a5F9Za6xXHKW0Hscz20="; + hash = "sha256-DaJ1Hhg7q4ckA5feUx0twOsmy28v5aBBCTUAkn43xAo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index 0a97e8f96e..d5d72d2c99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.9.4"; + version = "4.0.1"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-enMzwuvbh8C0xzPJTP2DiGc/h4VF5LR2EnM3TCNNmN4="; + sha256 = "sha256-yCCnEFz6PGhfrbWwo/HVLPr6qrIxvlZhAdIU4XoOjqc="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix index f89f067d20..bacd769271 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -15,7 +15,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; - sourceRoot = "source/MiniZincIDE"; + sourceRoot = "${src.name}/MiniZincIDE"; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index fc2d856ec1..470f5e21cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix index 35ec0cb05e..47d7db0390 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix @@ -6,26 +6,25 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-jLb2xMrsBuw+ty1S4X+YdvPfiDyDUuLdJH5dw+e+9Pk="; + hash = "sha256-Il7VJyp4iIo8KrFHRoE4QptgzlJGKr+Npp2IkjDx/vc="; }; - cargoHash = "sha256-ayzR0LjKPXWgtMFznjDDFJM4Ef2HW1HK8aOCcDiwvAA="; + cargoHash = "sha256-KReLBqdXtef20tULasw47wrm5k+qUBwo8tPiOTvD9cQ="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' rm .cargo/config.toml ''; - checkFlags = lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ - # fails on emulated x86_64-darwin - # mach-o file, but is an incompatible architecture (have 'arm64', need 'x86_64') - "--skip=test::test_load_parser" + checkFlags = [ + # disable flaky test + "--skip=test::test_load_parser_mac" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix index 61df38f68c..4e776b34de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildPackages.buildPackages.autogen buildPackages.texinfo ]; buildInputs = [ - guile libxml2 + guile_2_2 libxml2 ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 0a2610ffd2..fe9ec6a865 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -18,6 +18,7 @@ in , zlib , enableGold ? withGold stdenv.targetPlatform +, enableGoldDefault ? false , enableShared ? !stdenv.hostPlatform.isStatic # WARN: Enabling all targets increases output size to a multiple. , withAllTargets ? false @@ -26,6 +27,7 @@ in # WARN: configure silently disables ld.gold if it's unsupported, so we need to # make sure that intent matches result ourselves. assert enableGold -> withGold stdenv.targetPlatform; +assert enableGoldDefault -> enableGold; let @@ -217,8 +219,10 @@ stdenv.mkDerivation (finalAttrs: { "--with-lib-path=:" ] ++ lib.optionals withAllTargets [ "--enable-targets=all" ] - ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ] - ++ (if enableShared + ++ lib.optionals enableGold [ + "--enable-gold${lib.optionalString enableGoldDefault "=default"}" + "--enable-plugins" + ] ++ (if enableShared then [ "--enable-shared" "--disable-static" ] else [ "--disable-shared" "--enable-static" ]) ; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 9afe362a5d..d0d69fa269 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.17.0"; + version = "2.19.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "7s0gh+H/g8QjyLs42mQFuMhTE8kAE96meVijjryBEFs="; + sha256 = "hzHRloC0KSKzXpdheqqqFmjVS6IGXV7r5vo1OiW5Dms="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "yyAcxmM6KF0BUU7glfUoP6ixFX92WDAwu/iGY5ZHUeg="; + sha256 = "GUbSB7MRtiYSvgrW1oBbQhhJg7SkPAWegw6UNxZIG9I="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "SJDjxykt793ZBVbAN0SO4nA7KXbo4ZB4TJarFXkaYxI="; + sha256 = "ayA+vIcSIKjivlJAKoXAfvAt1VIgthipC6SzPD/2dqI="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "pQFseYi2idjCTm+qfyLCTR/sYCIwZIVwYUPnNAtPH78="; + sha256 = "7TTcWHL6JWJAW4faEeGvSYQKEbdibEpQvIH9n96BcTA="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "7qq1+P+6nfo3gvWSHU/YnAsEPEPcyJHFANxVcXiz5yA="; + sha256 = "Dk4cSfukFBcnjwATfcQU6R+i2phVsfXMAwFb/iFjFAg="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix new file mode 100644 index 0000000000..f0ba4aae74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchPypi +, python3 +, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "catppuccin-catwalk"; + version = "0.4.0"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "catppuccin_catwalk"; + hash = "sha256-5TAw5H3soxe9vLhfj1qs8uMr4ybrHlCj4zdsMzvPo6s="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pillow + ]; + + pythonImports = [ + "catwalk" + ]; + + meta = with lib; { + homepage = "https://github.com/catppuccin/toolbox"; + description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once"; + license = licenses.mit; + maintainers = with maintainers; [ ryanccn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index e40ded4042..443f1b2c45 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -31,9 +31,11 @@ stdenv.mkDerivation (finalAttrs: { # Linux it uses objdump. We don't have dwarfdump packaged for # Darwin, so this patch updates the test to also use objdump on # Darwin. + # Additionally, when cross compiling, the correct target prefix + # needs to be set. (substituteAll { - src = ./force-objdump-on-darwin.patch; - objdump = "${binutils.bintools}/bin/objdump"; + src = ./fix-objdump-path.patch; + objdump = "${binutils.bintools}/bin/${binutils.targetPrefix}objdump"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/fix-objdump-path.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch rename to third_party/nixpkgs/pkgs/development/tools/misc/ccache/fix-objdump-path.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 6dec4e6454..a6808c2bb3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.27054"; + version = "0.1.28084"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t273BD2plrsBKQqYg1EHdPIXR3qs9coHhTc/k5297cw="; + sha256 = "sha256-LyD9zAS/tjI6Ad+tC2mCadOEuXHlhkNpF0M5lzli5Qc="; }; - vendorHash = "sha256-IUDiKAwhJdDkp7qXPMcP6+QjEZvevBH0IFKFPAsHKio="; + vendorHash = "sha256-bPi0voXVJPAMWuovDInzk2PzbP0kPFpyOyjYoPZTNLM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix index 5dbdaf6c86..a122a2a7ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage { pname = "complgen"; - version = "unstable-2023-07-10"; + version = "unstable-2023-07-20"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; - rev = "6b1fbc50d56061c74e3324362b23ba5211aaff25"; - hash = "sha256-y94DOMW3w+/YJ4uNvEM4y/dZXZuwFPYhDuh2TOyBn8U="; + rev = "18ad7e5def8e9b9701a79511a23a2091baad8a9e"; + hash = "sha256-1nNxcYi7HrA2vcggiLC5UPTX3dmM5xgjubnX7WtCq/A="; }; - cargoHash = "sha256-fzLM1vxY1FBpw/5JDp4+VO9SVfCQCH8Et5a0WTYSHwk="; + cargoHash = "sha256-rR9wj34QUmIn5HE0k2nOa7HHO5DI+w6BbCgJ4Aelt44="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix index e3f37ca5cc..3d0a9855bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix @@ -15,17 +15,17 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.63.3"; + version = "1.64.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-PBFBepG7b5M9LKSQOp7+mVhtwSLgQzUTu3i1055uNBk="; + hash = "sha256-JIw1I60Av5hUSRyqhc4nK5x9gHJcHTUIdYBTfQf8ob4="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-ciJUjkItnwzKH6k8a5zxIbARQAEfg/GJEsKfSaygsXU="; + vendorHash = "sha256-kGeQIlNTHhlIEFH4MdWF5smc9lLg4YHx11bZS4BTPgI="; nativeBuildInputs = [ buf diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix index b7270f79c4..312f693285 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix @@ -26,7 +26,7 @@ let configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" CXXFLAGS="-O2 -fno-strict-aliasing" --mandir=$out/share/man - ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} + ${lib.optionalString (sysconfDir != "") "--sysconfdir=${sysconfDir}"} ${lib.optionalString static "LDFLAGS=-static"} ${lib.withFeature (static == true || popt == null) "included-popt"} ${lib.withFeature (avahi != null) "avahi"} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index 129b55e740..a88bd9f0b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -4,7 +4,7 @@ , fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time -, ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, dejagnu, sourceHighlight +, ncurses, readline, gmp, mpfr, expat, libipt, zlib, zstd, dejagnu, sourceHighlight, libiconv , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform elfutils, elfutils @@ -57,7 +57,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline gmp mpfr expat libipt zlib zstd guile sourceHighlight ] ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu - ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }); + ++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; }) + ++ lib.optional stdenv.isDarwin libiconv; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix index 09573ee226..c40fea7f39 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "grcov"; - version = "0.8.18"; + version = "0.8.19"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IC5ROi4kwZLCX7/kFb7VgOzQtsj74hujQ5IrrFneFTA="; + sha256 = "sha256-1t+hzB9sSApLScCkjBnLk9i2dsoEwZmWCFukEOvHhZI="; }; - cargoHash = "sha256-DcPidu3WFyVWBS4EVavxFhy9wwqP4rGmaALKnfxua2E="; + cargoHash = "sha256-4KzFbfUqnGmle2fwSaHMPIJHQFDq8H2Qzm4FdYdqpuM="; # tests do not find grcov path correctly checkFlags = let diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix index 96bdce6d0e..8a44d484dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - sourceRoot = "source/packages/grpc-tools"; + sourceRoot = "${src.name}/packages/grpc-tools"; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix index 242df1d44c..f4dc16a7c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix @@ -123,13 +123,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2023-06-25"; + version = "2023-07-17"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "526e8bd7441d1beb271ff89bbca3604077ecffdb"; - sha256 = "sha256-VRNI3H/WUTi7VTNLwO/I0gMnJ6ZMYRbBfgdsAj+TmP4="; + rev = "d135b123cde78576e99e919a5db0428cb70fcd1e"; + sha256 = "sha256-wjHHcJr1liYKESUtCjIdvC+USjd9EWjEFssvIKiEuVU="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix index d4950caaa9..0f2633d71e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix @@ -1,19 +1,33 @@ -{ stdenv, lib, fetchurl, python3 }: +{ stdenv +, lib +, fetchurl +, python3 +}: stdenv.mkDerivation rec { pname = "itstool"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "http://files.itstool.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; + hash = "sha256-a5p80poSu5VZj1dQ6HY87niDahogf4W3TYsydbJ+h8o="; }; strictDeps = true; - nativeBuildInputs = [ python3 python3.pkgs.wrapPython ]; - buildInputs = [ python3 python3.pkgs.libxml2 ]; - pythonPath = [ python3.pkgs.libxml2 ]; + nativeBuildInputs = [ + python3 + python3.pkgs.wrapPython + ]; + + buildInputs = [ + python3 + python3.pkgs.libxml2 + ]; + + pythonPath = [ + python3.pkgs.libxml2 + ]; postFixup = '' wrapPythonPrograms diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix index b9e3237292..6970d2a94e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix @@ -34,5 +34,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; + + mainProgram = "libtool"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix index a2c58010ef..50c064cadf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.unix; + mainProgram = "libtool"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/licenseclassifier/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/licenseclassifier/default.nix index 11d8f8a390..05a858130b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/licenseclassifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/licenseclassifier/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { }; # The new and improved "License Classifier v2" is hidden in a subdirectory. - sourceRoot = "source/v2"; + sourceRoot = "${src.name}/v2"; vendorHash = "sha256-u0VR8DCmbZS0MF26Y4HfqtLaGyX2n2INdAidVNbnXPE="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix index d3bca0b684..560cfa0c0d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/micronucleus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "micronucleus"; version = "2.04"; - sourceRoot = "source/commandline"; + sourceRoot = "${src.name}/commandline"; src = fetchFromGitHub { owner = "micronucleus"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index 12ddea4d33..7c899e614e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.12.11"; + version = "1.12.12"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-cJfBv1I8zw9Qtn9APb7+JbSahrzYYI8dkFM8fMnDVl0="; + hash = "sha256-0ppkexmVchHL+lCfB+xtLcDCZ24Sv0Opr5RNLILKg2M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index a675109ce7..790fbd52b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2023-06-08"; + version = "unstable-2023-07-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "519766900c63f3cf227c9a38fc7aa8a53fc4f90c"; - sha256 = "sha256-NiJr/7kzLN7gnhgbg/12s7E0qe0TJpncQ05zsDLhUFs="; + rev = "c40128936fc804b74abddaa0bc1d8ef6e5dba48e"; + sha256 = "sha256-qX0pGkHeX+KssiATwwohzUlGIZQqpIjKsLv32U2nyWA="; }; # Drop test that fails on musl (?) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix index 4eb4be4a5e..3d6f4fb5ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix @@ -2,14 +2,14 @@ let pname = "phpunit"; - version = "10.2.3"; + version = "10.2.6"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://phar.phpunit.de/phpunit-${version}.phar"; - hash = "sha256-lSNrFsLF5t3vduIUGjlD6L6Ii5R5CU/ViXuSe2dV4X8="; + hash = "sha256-F2YKbAZtWIgwuFIg+wf57LaWPcY5mzYGR7sNDLH9Bb0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix index 70a3ece26a..56e6662b7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-1fopV2qWbWoCH5cT3s6vLxNTv5LgBm8bug0MJ9p7NmU="; + hash = "sha256-RRMT//OnwzoZEsOPZyHfQQbkphopZBI1u8xQe8LsPBo="; }; - cargoHash = "sha256-4IFhUIP5MWNYoHoVi9tjRRzQrsdduiCnmVde5gctdsY="; + cargoHash = "sha256-o9L6GUYDDm/WM8iD0k/OGf26w9O8DLH0jMr//ruKnrs="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix index f6f9ac052d..60b2fbfe32 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix @@ -2,6 +2,7 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, nodejs , runtimeShell , stdenv , testers @@ -10,21 +11,25 @@ buildGoModule rec { pname = "runme"; - version = "1.4.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-VA5YgPq/zr3yN59VyrFoIlr/Utvq1P7wyPdsXpyFdxQ="; + hash = "sha256-vtlsa+XdsE33oR5MH1zaHUIJ4Rsn/RqtryTgNGgEHJw="; }; - vendorHash = "sha256-BJhda5mE5f4kvi8CLjgMJYjdUS3vsUSwmHhTW/AVKCI="; + vendorHash = "sha256-5FMrz4I/i/uJDI4vK9hiet4zMRf0CSbc/YJAFi8hlEM="; nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ + nodejs + ]; + subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix index e1f39eaadd..d3ac55b131 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rustywind"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-xDpRS8WrFu5uPtbXJGXrxElJinxl1lkpYZ1tGrNrBHA="; + hash = "sha256-cRQdPOiERvxBZzaS26op1bDba9sCn3TyBIhlwI5XCro="; }; - cargoHash = "sha256-2bo6KkHVw1lyLD4iWidAyxZzQMRTO5DWvYmqUQld15g="; + cargoHash = "sha256-hw9DUe4iJ0DLX4P48ZpvZr6Xmq5rQ5rGmT13fO5uRoY="; meta = with lib; { description = "CLI for organizing Tailwind CSS classes"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix new file mode 100644 index 0000000000..9d70b9bc14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/samply/default.nix @@ -0,0 +1,55 @@ +{ lib +, rustPlatform +, fetchCrate +, jq +, moreutils +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "samply"; + version = "0.11.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-V0uAS7Oo7wv0yU5CgqqYhltwM5PXJ3GP/TLVZV2GkkI="; + }; + + cargoHash = "sha256-jsuICNVY3noZi/+mgVj9uUu53z+5bW9Vi5CBKcHOqSI="; + + # the dependencies linux-perf-data and linux-perf-event-reader contains both README.md and Readme.md, + # which causes a hash mismatch on systems with a case-insensitive filesystem + # this removes the readme files and updates cargo's checksum file accordingly + depsExtraArgs = { + nativeBuildInputs = [ + jq + moreutils + ]; + + postBuild = '' + for crate in linux-perf-data linux-perf-event-reader; do + pushd $name/$crate + + rm -f README.md Readme.md + jq 'del(.files."README.md") | del(.files."Readme.md")' \ + .cargo-checksum.json -c \ + | sponge .cargo-checksum.json + + popd + done + ''; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + + meta = with lib; { + description = "A command line profiler for macOS and Linux"; + homepage = "https://github.com/mstange/samply"; + changelog = "https://github.com/mstange/samply/releases/tag/samply-v${version}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix index a05fac0fb5..92bc871185 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qtcharts, qtbase, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, cmake, gdb, qtcharts, qtbase, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "seer"; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { cd src ''; + patchPhase = '' + substituteInPlace src/{SeerGdbConfigPage,SeerMainWindow,SeerGdbWidget}.cpp \ + --replace "/usr/bin/gdb" "${gdb}/bin/gdb" + ''; + buildInputs = [ qtbase qtcharts ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix index 8670d9b2f8..db0591cab1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { description = "Analyzes strace output"; homepage = "https://github.com/wookietreiber/strace-analyzer"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix new file mode 100644 index 0000000000..4a6f57fdb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terramate/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +}: + +buildGoModule rec { + pname = "terramate"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "terramate-io"; + repo = "terramate"; + rev = "v${version}"; + hash = "sha256-/e3NbUhHQlREjb3YYSfrPq/GE+BfFI3mUO4eRE4mk9U="; + }; + + vendorHash = "sha256-bja4v48BSPZC/vJVps2LKq90fReYpMY/yKTThsQQCHE="; + + # required for version info + nativeBuildInputs = [ git ]; + + ldflags = [ "-extldflags" "-static" ]; + + meta = with lib; { + description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform"; + homepage = "https://github.com/terramate-io/terramate"; + license = licenses.mpl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 879e37cfdb..4f1334f4dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-GvORAPbQOdVpz4yY66b3OObewU98V26cZ6nrJ35nlkg="; + hash = "sha256-KjCE7ei01ks4TMYiHE9In2Z3AWOw/4D4kIl0vFA4YKs="; }; - cargoHash = "sha256-b7v3ODOjY5BQCzVqlLCNUOaZS95AvIvyjOeas2XfRjM="; + cargoHash = "sha256-1R9bNyNHDcRwn5nlkEFtSGA4V7Bn1Pq3v0E8njGUAYU="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index a93eee5cb1..b91460160c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner lilyball ]; + mainProgram = "tokei"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/unixbench/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/unixbench/default.nix index 3d1b424ab0..9f4546248e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/unixbench/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/unixbench/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; - sourceRoot = "source/UnixBench"; + sourceRoot = "${src.name}/UnixBench"; postPatch = '' substituteInPlace Makefile \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xxdiff/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/xxdiff/default.nix index abc4265a1c..8f30a165df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/xxdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/xxdiff/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { # c++11 and above is needed for building with Qt 5.9+ env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' substituteInPlace xxdiff.pro --replace ../bin ./bin diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index ac60a01a1a..8a83d05664 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -8,17 +8,18 @@ , zlib , testers , mold +, nix-update-script }: stdenv.mkDerivation rec { pname = "mold"; - version = "1.11.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dfdrXp05eJALTQnx2F3GxRWKMA+Icj0mRPcb72z7qMw="; + hash = "sha256-dEmwVgo9XiU3WtObVL5VbFW7rEzdFfnRepcbyGxX1JM="; }; nativeBuildInputs = [ @@ -49,7 +50,10 @@ stdenv.mkDerivation rec { "-faligned-allocation" ]); - passthru.tests.version = testers.testVersion { package = mold; }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = mold; }; + }; meta = with lib; { description = "A faster drop-in replacement for existing Unix linkers"; @@ -61,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/rui314/mold"; changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; - license = licenses.agpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ azahi nitsky ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix index 208c957148..837d560f4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix @@ -38,16 +38,16 @@ let in stdenv.mkDerivation rec { pname = "mysql-shell"; - version = "8.0.33"; + version = "8.0.34"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - hash = "sha256-ElcAOvyQjXNns35p4J+jnGu8orZR81Itz/fxYh7Usbs="; + hash = "sha256-QY1PmhGw3PhqZ79+H/Xbb9uOvmrBlFQRS7idnV5OXF0="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI="; + hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix index c8bddd6849..acfac70d4b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix @@ -6,7 +6,7 @@ , fetchpatch }: -buildGoModule rec { +buildGoModule { pname = "nc4nix"; version = "unstable-2023-06-06"; @@ -25,6 +25,15 @@ buildGoModule rec { sha256 = "sha256-0JxyhSQLtlgLtsMv82wMjQHGdmOoQ2dcPPNAw2cFByE="; name = "switch_hash_calculation_method.patch"; }) + + # Fix invalid entries (pre-releases of apps are not to be taken into account, + # but if only pre-releases are compatible with a given Nextcloud version, + # invalid entries are generated) + (fetchpatch { + url = "https://github.com/helsinki-systems/nc4nix/commit/c48131b5ca382585fd3294d51d59acc1e92fadb1.patch"; + sha256 = "sha256-/zc3Smjd6CksC5wUvoB6uAyTzPcIgqimb+zASIuTft0="; + excludes = [ "25.json" "26.json" "27.json" ]; + }) ]; vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; diff --git a/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix b/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix index 73fb701278..189b9b87d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "norminette"; - version = "3.3.51"; + version = "3.3.53"; src = fetchFromGitHub { owner = "42School"; repo = pname; rev = version; - hash = "sha256-JpWziUKZPOD+AwiYeHR7e0B9l3XKNNp+XQkZEvynKGY="; + hash = "sha256-IvLy6ryu3Cwfl8XAV+Hyof6mjKDGQy17gYQFrQU5kXg="; }; nativeCheckInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix index 24fd8f3931..73795811d5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-8MPOSfNsczuK7nJhHxB88G3mvEI75yYqqxuz8DwFqHg="; + hash = "sha256-n/AzhKmKjfeYUsxnTwtHOLqK7BcCm24u61FPiV5xA1U="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 80e19af292..4b2020c0b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "5.3.0"; + version = "5.4.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - hash = "sha256-vp497rmOXSjxvLLZhHwE0ohfwH7VjM2LCKpLZijNZNI="; + hash = "sha256-8SFd4TOGf+/bFuJ5iiJe4ERkaaV0Yq8N7r3SLSqNO5Q="; }; nativeBuildInputs = [ menhir ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index a06c5fca63..e2f0abd65c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "utop"; - version = "2.13.0"; + version = "2.13.1"; propagatedBuildInputs = [ findlib lambda-term xdg zed logs ]; minimalOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "sha256-iEUPIABsLRB4Gr6YQbrSpX5ymLXs8b4zu/Hq3r0Shtg="; + sha256 = "sha256-sE7Co5TRpqKKeURMWPZuq3e390QB9HFKpubxwhJab/0="; }; nativeBuildInputs = [ makeWrapper cppo ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index 06e3ff5b81..6c2a95ec26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "17.9.0"; + version = "18.1.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Wcn+3hb90QFlQ/jf4jHQubmCH4P/cA0xP8ZWU7h5xd8="; + hash = "sha256-qK9hjsWhVTzxFo4SSvKb5IgZteVabWlCtoetu9v9xIE="; }; - vendorHash = "sha256-FDVzJQuxrzypqke9gbDdQfMR3dM/y8msAvZYyrlMv+o="; + vendorHash = "sha256-cATGMi/nL8dvlsR+cuvKH6Y9eR3UqcVjvZAj35Ydn2c="; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix index 314e921408..dd5c8dd40e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.16.5"; + version = "2.18.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-K3GkdcUNaBTo5sMfLONQ2o7SYUNMJ45WA5FQQ3+0+RY="; + hash = "sha256-u0Ue5padTT2hPEta0ysm7W2oR1/FMFyTZd9yuciCehU="; }; - vendorHash = "sha256-aNXKRP7WFzscDPjZmDTbgKItNEQrRpsq+XiOuggx85w="; + vendorHash = "sha256-ruDXfDwVmMLFsIF+YV4CryEPSeU2cEul9FfRiApII9g="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index f2befa44aa..54dc859d0b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -11,13 +11,13 @@ let in let finalPackage = buildDotnetModule rec { pname = "omnisharp-roslyn"; - version = "1.39.7"; + version = "1.39.8"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jFmn/p1ewjE5dICbPVgCrn4eDFdcVt8RzKkJUaexNq0="; + hash = "sha256-QjkZg3BsI8oDeEe455GqBpM/3H3b89bRBKDjQIc8cO4="; }; projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix index 6a7ea5564f..296cf51c46 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -18,7 +18,6 @@ (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; sha256 = "1p8ikc91qc2b1h68w44brb64dy5kmkb089hdliwp02gba3dszw67"; }) (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.4.1"; sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; sha256 = "1mxm6xrq4illg502kjz4l7j0vjcpfv2li9wrvf4ix9m09vdwk2jl"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.0.0"; sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; }) (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; sha256 = "0r82hrjjqpxjp3l7ncy8jdj30p7y0p1hhr1dbfrj5l3i0zxrrcj4"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; }) @@ -38,47 +37,34 @@ (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "7.0.0"; sha256 = "1hv94kwd4v7969cq3ik2afg5ipn44zbhpsgaga9cd0z47swz4r3a"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "7.0.0"; sha256 = "09mq6g61rqjy5mdhsz2224m0rb0z9rkrxhhqym9zwpn272bbc9df"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "7.0.0"; sha256 = "1pmgjrvwdzqrxjb24cg3fd624r64lgywbqc9symd5hyl4175pwk8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "7.0.0"; sha256 = "0nhh7rnh45s39x8sjn88czg7nyfpry85pkm0g619j8b468zj8nb4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "7.0.0"; sha256 = "1fk7dcz6gfhd1k1d8ksz22rnjvj1waqjzk29ym4i3dz73rsq8j1i"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "7.0.0"; sha256 = "05zjmrpp99l128wijp1fy8asskc11ls871qaqr4mjnz3gbfycxnj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "7.0.0"; sha256 = "04wb6hw3r7mmhg57215r1mb01q17glyaddjw1j5g1drsws914fj4"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "7.0.0"; sha256 = "0ff20yklyjgyjzdyv7sybczgqhgd557m05dbwxzjznr0x41b180d"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "7.0.0"; sha256 = "1f1h0l47abw0spssd64qkhgd7b54pyzslyb586zp21milimcfmgv"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "7.0.0"; sha256 = "1812vnkn8n0i4yr3k5azcxcfx1bbpcsmms95rdyxjfrzfksr05ai"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; sha256 = "1sg1wr7lza5c0xc4cncqr9fbsr30jlzrd1kwszr9744pfqfk1jj3"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.0.0"; sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.0.0"; sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.2"; sha256 = "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.6.0"; sha256 = "0dz65afvab3bmffwj50gdy4jqi0xrn93yn7f476kz3c7ll6v5ck1"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; }) @@ -92,28 +78,16 @@ (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.57"; sha256 = "05p1vqs09xj6pa3nv08xymzz8sg5sg59598bn1rmfmbpqp3glvax"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.2.0"; sha256 = "1xvjlly8x3gs26sbcil8vn3xf8wfb7lkmb36sics46b7a6fmkdhn"; }) (fetchNuGet { pname = "NuGet.Common"; version = "6.7.0-preview.1.20"; sha256 = "117ndnifk093l0lhgfvg0ix8ypvc742fa07scif21mkw49lpsq5w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.7.0-preview.1.20/nuget.common.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.2.0"; sha256 = "07hmnm1v5qbqpa2m77gikm0pds8c7blnc98il17alswc5hhmblm8"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "6.7.0-preview.1.20"; sha256 = "0qzkars3p6agyhpc4yj51m9byql1mdqgnbjydffwvk9i17dzz0vc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.7.0-preview.1.20/nuget.configuration.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.2.0"; sha256 = "0b00072yx20qnr9riq3b72ia1129llhw9a2fw6yv7ak77a70c3pq"; }) (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.7.0-preview.1.20"; sha256 = "17bnr9axdxg1i7md3s5pv55p0jq6gyi7bv5fy2bm1dyxhb84ffws"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.7.0-preview.1.20/nuget.dependencyresolver.core.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.2.0"; sha256 = "0swbxdzvrd6jnpnr5kss6v5f7grhgzl1z5nk6b00z2x8pbrjfr42"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.7.0-preview.1.20"; sha256 = "0lqvqx1lbl783r535i71zdzxq5xfl5mrdij4xg02qmh42ya6zn0w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.7.0-preview.1.20/nuget.frameworks.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.2.0"; sha256 = "02l13hkpc6p86ibni8gzk65gdv85fmm1wqn39j86s68p5wf8l892"; }) (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.7.0-preview.1.20"; sha256 = "1ba2q5ib72lsd4qx9vm5x90xd0mdaaaqn8rks05pnfv8j600vy7s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.7.0-preview.1.20/nuget.librarymodel.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.2.0"; sha256 = "05xkba6bckq1vpni9j7ng20zy0l7srk8lyx4mxy9cf1z14ca30bl"; }) (fetchNuGet { pname = "NuGet.Packaging"; version = "6.7.0-preview.1.20"; sha256 = "13a4llnaz8j19gjlm9mn1p2lshi1w20rgdyjmzailf0yph2sl841"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.7.0-preview.1.20/nuget.packaging.6.7.0-preview.1.20.nupkg"; }) (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.7.0-preview.1.20"; sha256 = "08n6dyb28p6hi0nk84nby905fgfzc8wpffpv9x5dcmn632zfpbj4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.7.0-preview.1.20/nuget.packaging.core.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.2.0"; sha256 = "1fsr9dzxibllhzd80dap593snms7jp7mzsihq7mh55vbj3n6qss8"; }) (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.7.0-preview.1.20"; sha256 = "10gj24nkjc0flylr4mz8zmcyn5m97m0l8d2fcagv82zbk7p3khrq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.7.0-preview.1.20/nuget.projectmodel.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.2.0"; sha256 = "1fai84b45sv2h4wm6jqghf16x8hc6ksdsq4llay9qh1mak0zfg33"; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "6.7.0-preview.1.20"; sha256 = "1rs88r7gg9wx4fcl41dnjs04ffjaij5sh17mzfr7kw541w9nqhaj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.7.0-preview.1.20/nuget.protocol.6.7.0-preview.1.20.nupkg"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.2.0"; sha256 = "0qpsf9wywwi49d0p9gvb0h6m6ja17lg8wyiyk1gg502cb73b90zn"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "6.7.0-preview.1.20"; sha256 = "1kcaii7vxaxlqw9vfddxlq22lvc6adhgqhjhbbbksncmsai6w5ib"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.7.0-preview.1.20/nuget.versioning.6.7.0-preview.1.20.nupkg"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.7"; sha256 = "02fsw54jmh037a5q518nrsd9657kdy111m31q13ll759a601bai7"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.7"; sha256 = "15wy1ql68bdbz507488ivdlc4wsd3f73cbwqwc8yci1mwpfcwryd"; }) @@ -138,12 +112,8 @@ (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; sha256 = "12a6s3knynfrzf9vxxy6hwg4hvxncc0ad59g3bigqx86p8xfb4nq"; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "7.0.0"; sha256 = "1gkn56gclkn6qnsvaw5fzw6qb45pa7rffxph1gyqhq7ywvmm0nc3"; }) @@ -153,11 +123,8 @@ (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.0"; sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) @@ -167,38 +134,27 @@ (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.5.1"; sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.WindowsRuntime"; version = "4.3.0"; sha256 = "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.1"; sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2"; }) @@ -208,14 +164,10 @@ (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; sha256 = "0aybd4mp9f8d4kgdnrnad7bmdg872044p75nk37f8a4lvkh2sywd"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index e83782cb7e..7b7da31ad1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-sMJ+mf6AR4qTx+nXk18ElFiPfymf/ZEoBJDZLGWtPUI="; + hash = "sha256-piQ8Cig2zG6UhzVbiDCTruAXNis8P5HUja4xiiol9jA="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix index 68a606edcd..e3c17c78e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-imdVXgW3w0Bv4qWPJIRhZPim7c0WRHKvRS/uBk7nzaI="; + sha256 = "sha256-ptWy54UCPXPm2vxiysZSRFn4DMQOBORaajipFC+npRw="; }; - vendorHash = "sha256-aRjSYnb8xyjI4Gn4I91aP3evCqimlL5zR6jpgWNFRME="; + vendorHash = "sha256-svoXUaiQprik/aZfpEmIuBZdOGMcdY0nG59fMYt9c3c="; subPackages = [ "." ]; @@ -32,7 +32,7 @@ buildGoModule rec { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick ]; + maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick qjoly ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix index 94ca0fee52..512732d062 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix @@ -81,7 +81,7 @@ let pname = "antlr-runtime-cpp"; inherit version; src = source; - sourceRoot = "source/runtime/Cpp"; + sourceRoot = "${source.name}/runtime/Cpp"; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix index 24b47119dc..f359ed9c16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix @@ -25,6 +25,8 @@ let doCheck = true; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix index 2719933f29..6f19a48864 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.3.5"; + version = "3.3.7"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-vZfoCtLlLV4bxXn5SUvTQ77AP+TSNpYoer7qiid6bG4="; + sha256 = "sha256-YLWMVsfmb1cSYWtxCkTkANYRiUenkNZ7n2QFEI6SU1A="; }; nativeBuildInputs = [ boost autoconf automake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix index a7d7d8c8c5..b68a8908d1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.6.0"; + version = "2.6.1"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ja3LPKfrqs1evNzjOJ3oxh2vxqw8oZJDIsyZGT0q3PY="; + hash = "sha256-bB3yaQweXyj4O2TMHBhyMz5tm2Th0cDqRZ1B9lv+ARk="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index fbef8970a8..8bdcf5a804 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -2964,9 +2964,7 @@ lib.composeManyExtensions [ }); wcwidth = super.wcwidth.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ - lib.optional self.isPy27 (self.backports-functools-lru-cache or self.backports_functools_lru_cache) - ; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]); }); wtforms = super.wtforms.overridePythonAttrs (old: { diff --git a/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix b/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix index a95a0c1b7f..b3ba24db42 100644 --- a/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/prettierd/default.nix @@ -41,6 +41,7 @@ mkYarnPackage rec { doDist = false; meta = with lib; { + mainProgram = "prettierd"; description = "Prettier, as a daemon, for improved formatting speed"; homepage = "https://github.com/fsouza/prettierd"; license = licenses.isc; diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix index fc2e21173b..3d2adfd8cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules, - zlib, boost, libunwind, elfutils, sparsehash, zstd, + zlib, boost179, libunwind, elfutils, sparsehash, zstd, qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram }: @@ -17,7 +17,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - zlib boost libunwind elfutils sparsehash zstd + zlib boost179 libunwind elfutils sparsehash zstd qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix index 7ff94299af..05539f6658 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/pprof/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pprof"; - version = "unstable-2022-05-09"; + version = "unstable-2023-07-05"; src = fetchFromGitHub { owner = "google"; repo = "pprof"; - rev = "59ca7ad80af3faf4f87f4d82ff02f5d390c08ed6"; - sha256 = "0jni73ila3glg7rl11v0al947d94dd0syhkjqnliaryh8dkxbx80"; + rev = "200ffdc848b879f8aff937ffeba601c186916257"; + hash = "sha256-/Y1Tj9z+2MNe+b2vzd4F+PwHGSbCYP7HpbaDUL9ZzKQ="; }; - vendorSha256 = "0vr8jp3kxgadb73g67plfrl5dkxfwrxaxjs664918jssy25vyk2y"; + vendorHash = "sha256-MuejFoK49VMmLt7xsiX/4Av7TijPwM9/mewXlfdufd8="; meta = with lib; { description = "A tool for visualization and analysis of profiling data"; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix index 03e626ab78..1df865b829 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix @@ -13,7 +13,7 @@ buildDartApplication rec { rev = "protobuf-v${version}"; sha256 = "sha256-uBQ8s1NBSWm88mpLfZwobTe/BDDT6UymSra88oUuPIA="; }; - sourceRoot = "source/protoc_plugin"; + sourceRoot = "${src.name}/protoc_plugin"; pubspecLockFile = ./pubspec.lock; vendorHash = "sha256-jyhHZ1OUFo6ce3C5jEQPqmtRL4hr2nTfgVMR0k6AXtM="; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 15d2e9ec0c..28a83a07d8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-OetDAZ6zC8r7e82FILpQQnM+JHG9eludwhEuPaklrnw="; }; - sourceRoot = "source/javascript/net/grpc/web/generator"; + sourceRoot = "${finalAttrs.src.name}/javascript/net/grpc/web/generator"; enableParallelBuilding = true; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index 2aabe3bcce..9211974075 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -2,16 +2,17 @@ buildGoModule { pname = "protoc-gen-twirp_typescript"; - version = "unstable-2021-03-29"; + version = "unstable-2022-08-14"; src = fetchFromGitHub { owner = "larrymyers"; repo = "protoc-gen-twirp_typescript"; - rev = "97fd63e543beb2d9f6a90ff894981affe0f2faf1"; + rev = "535986b31881a214db3c04f122bcc96a2823a155"; sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + proxyVendor = true; + vendorSha256 = "sha256-UyxHa28SY60U8VeL7TbSTyscqN5T7tKGfuN2GIL6QIg"; subPackages = [ "." ]; @@ -19,6 +20,6 @@ buildGoModule { description = "Protobuf Plugin for Generating a Twirp Typescript Client"; homepage = "https://github.com/larrymyers/protoc-gen-twirp_typescript"; license = licenses.mit; - maintainers = with maintainers; [ jojosch ]; + maintainers = with maintainers; [ jojosch dgollings ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index 1bcc1df08c..e5480cc776 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.147.0"; + version = "0.150.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-G23KJe0KvqdFOfuvbPHPiTOz/++IEFl3SKqqS+MsD2o="; + sha256 = "sha256-tDpiInZab7RZ54Ho9uXnNEturINMhv0YqK5A9pmnEgs="; }; - vendorHash = "sha256-E8ianic0W63P52qXCn2EKjZC9pAQ1bkLCx0jobD2/UE="; + vendorHash = "sha256-I/cZa5IDmnYw/MU5h7jarYqbTY+5NrDDj5pz9WTcvGo="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/pup/default.nix b/third_party/nixpkgs/pkgs/development/tools/pup/default.nix index 9383b8af0c..d7ca815bab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pup/default.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "Parsing HTML at the command line"; homepage = "https://github.com/ericchiang/pup"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 yana ]; + maintainers = with maintainers; [ yana ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix index b9bcd3c6f5..da10a9ba8f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.22"; + version = "2.3.23"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-kIjhxr39r8PT3pMvUQohkS2QHwX3QwtZn9n1Z7/nOxc="; + hash = "sha256-gvxun/izEC7KQVfuPe0yjYKqJyqaoTFYNSAldhfBKVc="; }; postPatch = '' @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ tjni ]; platforms = platforms.all; + mainProgram = "pyenv"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/third_party/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch deleted file mode 100644 index f0e8c3d2c5..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp -index b656f8e1..a830d3c3 100644 ---- a/src/plugins/cpptools/headerpathfilter.cpp -+++ b/src/plugins/cpptools/headerpathfilter.cpp -@@ -124,8 +124,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths) - { - // include/c++, include/g++, libc++\include and libc++abi\include - static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))" -- R"(|(.*libc\+\+/include))" -- R"(|(.*libc\+\+abi/include))" -+ R"(|(.*libc\+\+.*\/include))" -+ R"(|(.*libc\+\+abi.*\/include))"; - R"(|(/usr/local/include))"; - static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z"); - diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch b/third_party/nixpkgs/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch deleted file mode 100644 index b0427e94c7..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp -index a830d3c3..80e2f933 100644 ---- a/src/plugins/cpptools/headerpathfilter.cpp -+++ b/src/plugins/cpptools/headerpathfilter.cpp -@@ -157,7 +157,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths) - - void HeaderPathFilter::tweakHeaderPaths() - { -- removeClangSystemHeaderPaths(builtInHeaderPaths); - removeGccInternalIncludePaths(); - - auto split = resourceIterator(builtInHeaderPaths); diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 5072bb88f4..2617de1658 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -1,96 +1,104 @@ -{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch -, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8, elfutils, perf -, withDocumentation ? false, withClangPlugins ? true +{ stdenv +, lib +, fetchurl +, cmake +, pkg-config +, ninja +, python3 +, qtbase +, qt5compat +, qtdeclarative +, qtdoc +, qtquick3d +, qtquicktimeline +, qtserialport +, qtsvg +, qttools +, qtwebengine +, qtwayland +, qtshadertools +, wrapQtAppsHook +, yaml-cpp +, litehtml +, gumbo +, llvmPackages +, rustc-demangle +, elfutils +, perf }: -let - # Fetch clang from qt vendor, this contains submodules like this: - # clang<-clang-tools-extra<-clazy. - clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { - # file RPATH_CHANGE could not write new RPATH - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - src = fetchgit { - url = "https://code.qt.io/clang/clang.git"; - rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; - sha256 = "0mgmnazgr19hnd03xcrv7d932j6dpz88nhhx008b0lv4bah9mqm0"; - }; - unpackPhase = ""; - }); -in - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qtcreator"; - version = "5.0.3"; - baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version)); + version = "11.0.1"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1sz21ijzvhf5avblikffykbqa8zdq3sbg32g2dmyxv5w211v3lvz"; + url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + hash = "sha256-T55ZOFPPO/gGxlc6u2/EF2dhQWAj2X3e0H4ZxFbW23M="; }; - buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++ - lib.optionals withClangPlugins [ llvmPackages_8.libclang - clang_qt_vendor - llvmPackages_8.llvm ]; + nativeBuildInputs = [ + cmake + pkg-config + (qttools.override { withClang = true; }) + wrapQtAppsHook + python3 + ninja + ]; - nativeBuildInputs = [ qmake ]; + buildInputs = [ + qtbase + qtdoc + qtsvg + qtquick3d + qtwebengine + qtwayland + qtserialport + qtshadertools + qt5compat + qtdeclarative + qtquicktimeline + yaml-cpp + litehtml + gumbo + llvmPackages.libclang + llvmPackages.llvm + rustc-demangle + elfutils + ]; - # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to - # find clang libc++ library include paths. By default it's not covering paths - # like libc++-version, which is default name for libc++ folder in nixos. - # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not - # remove system clang include paths. - patches = [ ./0001-Fix-clang-libcpp-regexp.patch - ./0002-Dont-remove-clang-header-paths.patch ]; + cmakeFlags = [ + # workaround for missing CMAKE_INSTALL_DATAROOTDIR + # in pkgs/development/tools/build-managers/cmake/setup-hook.sh + "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" + # qtdeclarative in nixpkgs does not provide qmlsc + # fix can't find Qt6QmlCompilerPlusPrivate + "-DQT_NO_FIND_QMLSC=TRUE" + "-DWITH_DOCS=ON" + "-DBUILD_DEVELOPER_DOCS=ON" + "-DBUILD_QBS=OFF" + "-DQTC_CLANG_BUILDMODE_MATCH=ON" + "-DCLANGTOOLING_LINK_CLANG_DYLIB=ON" + ]; - doCheck = true; - - buildFlags = lib.optional withDocumentation "docs"; - - installFlags = [ "INSTALL_ROOT=$(out)" ] ++ lib.optional withDocumentation "install_docs"; - - qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ]; - - preConfigure = '' - substituteInPlace src/plugins/plugins.pro \ - --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' - substituteInPlace src/libs/libs.pro \ - --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' - '' + lib.optionalString withClangPlugins '' - # Fix paths for llvm/clang includes directories. - substituteInPlace src/shared/clang/clang_defines.pri \ - --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \ - --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin' - - # Fix paths to libclang library. - substituteInPlace src/shared/clang/clang_installation.pri \ - --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang.lib}/lib' \ - --replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang' \ - --replace 'LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}' 'LIBTOOLING_LIBS = -L${clang_qt_vendor}/lib' \ - --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}' - ''; - - preBuild = lib.optionalString withDocumentation '' - ln -s ${lib.getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share - ''; + qtWrapperArgs = [ + "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" + ]; postInstall = '' - mkdir -p $out/share/applications - cp share/applications/org.qt-project.qtcreator.desktop $out/share/applications substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" ''; - meta = { + meta = with lib; { description = "Cross-platform IDE tailored to the needs of Qt developers"; longDescription = '' Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; - license = "LGPL"; - maintainers = [ lib.maintainers.akaWolf ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + homepage = "https://wiki.qt.io/Qt_Creator"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.rewine ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/qt6.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/qt6.nix deleted file mode 100644 index 25d056917e..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/qt6.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ stdenv -, lib -, fetchurl -, cmake -, pkg-config -, ninja -, python3 -, qtbase -, qt5compat -, qtdeclarative -, qtdoc -, qtquick3d -, qtquicktimeline -, qtserialport -, qtsvg -, qttools -, qtwebengine -, qtshadertools -, wrapQtAppsHook -, yaml-cpp -, litehtml -, gumbo -, llvmPackages -, rustc-demangle -, elfutils -, perf -}: - -stdenv.mkDerivation rec { - pname = "qtcreator"; - version = "10.0.2"; - - src = fetchurl { - url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-2n/F59wagMccCeJFt9JxHrAbpXXi+ZEQ0Ep855mSbU4="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - (qttools.override { withClang = true; }) - wrapQtAppsHook - python3 - ninja - ]; - - buildInputs = [ - qtbase - qtdoc - qtsvg - qtquick3d - qtwebengine - qtserialport - qtshadertools - qt5compat - qtdeclarative - qtquicktimeline - yaml-cpp - litehtml - gumbo - llvmPackages.libclang - llvmPackages.llvm - rustc-demangle - elfutils - ]; - - cmakeFlags = [ - # workaround for missing CMAKE_INSTALL_DATAROOTDIR - # in pkgs/development/tools/build-managers/cmake/setup-hook.sh - "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" - # qtdeclarative in nixpkgs does not provide qmlsc - # fix can't find Qt6QmlCompilerPlusPrivate - "-DQT_NO_FIND_QMLSC=TRUE" - "-DWITH_DOCS=ON" - "-DBUILD_DEVELOPER_DOCS=ON" - "-DBUILD_QBS=OFF" - "-DQTC_CLANG_BUILDMODE_MATCH=ON" - "-DCLANGTOOLING_LINK_CLANG_DYLIB=ON" - ]; - - qtWrapperArgs = [ - "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" - ]; - - postInstall = '' - substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ - --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" - ''; - - meta = with lib; { - description = "Cross-platform IDE tailored to the needs of Qt developers"; - longDescription = '' - Qt Creator is a cross-platform IDE (integrated development environment) - tailored to the needs of Qt developers. It includes features such as an - advanced code editor, a visual debugger and a GUI designer. - ''; - homepage = "https://wiki.qt.io/Qt_Creator"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.rewine ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix index 15f5b05a13..f1a4338fcc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-TzkJupn2oy7zUZybAuTnXZXVLSe72GM7XByo0Kd66Qs="; + sha256 = "sha256-jymn3xqFwAKskBivkm9s/pLkPLpX1haQhNuH18xgiYw="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix index c6a6e1b387..1d075250a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-RxZa1NH3DpHmrGbNlm85Dv1dydCC344D3lgN0lGVFt8="; + hash = "sha256-pydnIUqUBMLHonEGcvB+K+48QQYQuFfZxbAETJjU+3o="; }; - cargoHash = "sha256-3ZP4D2cEYzqrupYtKANRaMNNIZ83fTDoUedKCruk6CY="; + cargoHash = "sha256-VgLQfUk1xeAwr9KUo1Vz4Ndw0FAnYGw3af0v3ueNPuA="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch new file mode 100644 index 0000000000..d2bf9f9431 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch @@ -0,0 +1,25 @@ +From d9df7aaaaf9c758499f569376a041045d99e4015 Mon Sep 17 00:00:00 2001 +From: Bob van der Linden +Date: Thu, 9 Feb 2023 16:17:46 +0100 +Subject: [PATCH 1/2] cargo: lock: update version + +--- + Cargo.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 79a81d1..374c10a 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -642,7 +642,7 @@ dependencies = [ + + [[package]] + name = "rubyfmt-main" +-version = "0.8.0-pre" ++version = "0.8.1" + dependencies = [ + "atty", + "clap", +-- +2.39.1 + diff --git a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0002-remove-dependency-on-git.patch b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0002-remove-dependency-on-git.patch new file mode 100644 index 0000000000..d7e3b90ab7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/0002-remove-dependency-on-git.patch @@ -0,0 +1,62 @@ +From 3bbc396c4ddc8a5e26f7776155bb366c8d47c440 Mon Sep 17 00:00:00 2001 +From: Bob van der Linden +Date: Thu, 9 Feb 2023 16:55:00 +0100 +Subject: [PATCH 2/2] remove dependency on git + +--- + librubyfmt/build.rs | 35 +++-------------------------------- + 1 file changed, 3 insertions(+), 32 deletions(-) + +diff --git a/librubyfmt/build.rs b/librubyfmt/build.rs +index ef94c09..4668785 100644 +--- a/librubyfmt/build.rs ++++ b/librubyfmt/build.rs +@@ -26,27 +26,9 @@ fn main() -> Output { + let path = std::env::current_dir()?; + let ruby_checkout_path = path.join("ruby_checkout"); + +- let old_checkout_sha = if ruby_checkout_path.join(ripper).exists() { +- Some(get_ruby_checkout_sha()) +- } else { +- None +- }; +- +- let _ = Command::new("git") +- .args(&["submodule", "update", "--init"]) +- .status(); +- +- let new_checkout_sha = get_ruby_checkout_sha(); +- +- // Only rerun this build if the ruby_checkout has changed +- match old_checkout_sha { +- Some(old_sha) if old_sha == new_checkout_sha => {} +- _ => { +- make_configure(&ruby_checkout_path)?; +- run_configure(&ruby_checkout_path)?; +- build_ruby(&ruby_checkout_path)?; +- } +- } ++ make_configure(&ruby_checkout_path)?; ++ run_configure(&ruby_checkout_path)?; ++ build_ruby(&ruby_checkout_path)?; + + cc::Build::new() + .file("src/rubyfmt.c") +@@ -152,14 +134,3 @@ fn check_process_success(command: &str, code: ExitStatus) -> Output { + } + } + +-fn get_ruby_checkout_sha() -> String { +- String::from_utf8( +- Command::new("git") +- .args(&["rev-parse", "HEAD"]) +- .current_dir("./ruby_checkout") +- .output() +- .expect("git rev-parse shouldn't fail") +- .stdout, +- ) +- .expect("output should be valid utf8") +-} +-- +2.39.1 + diff --git a/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix new file mode 100644 index 0000000000..6cf2324b1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rubyfmt/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, autoconf +, automake +, bison +, ruby +, zlib +, readline +, libiconv +, libobjc +, libunwind +, libxcrypt +, Foundation +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "rubyfmt"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "fables-tales"; + repo = "rubyfmt"; + rev = "v${version}"; + hash = "sha256-lHq9lcLMp6HUHMonEe3T2YGwMYW1W131H1jo1cy6kyc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoconf + automake + bison + ruby + ]; + + buildInputs = [ + zlib + libxcrypt + ] ++ lib.optionals stdenv.isDarwin [ + readline + libiconv + libobjc + libunwind + Foundation + Security + ]; + + preConfigure = '' + pushd librubyfmt/ruby_checkout + autoreconf --install --force --verbose + ./configure + popd + ''; + + cargoPatches = [ + # The 0.8.1 release did not have an up-to-date lock file. The rubyfmt + # version in Cargo.toml was bumped, but it wasn't updated in the lock file. + ./0001-cargo-lock-update-version.patch + + # Avoid checking whether ruby gitsubmodule is up-to-date. + ./0002-remove-dependency-on-git.patch + ]; + + cargoHash = "sha256-keeIonGNgE0U0IVi8DeXAy6ygTXVXH+WDjob36epUDI="; + + preFixup = '' + mv $out/bin/rubyfmt{-main,} + ''; + + meta = with lib; { + description = "A Ruby autoformatter"; + homepage = "https://github.com/fables-tales/rubyfmt"; + license = licenses.mit; + maintainers = with maintainers; [ bobvanderlinden ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock index 12414ea02e..622032c09a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock @@ -133,6 +133,21 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + [[package]] name = "assert_cmd" version = "2.0.11" @@ -169,6 +184,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" @@ -188,7 +218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata", + "regex-automata 0.3.0", "serde", ] @@ -609,6 +639,16 @@ dependencies = [ "dirs-sys 0.4.1", ] +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -632,6 +672,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -656,6 +707,15 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -732,9 +792,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flake8-to-ruff" -version = "0.0.278" +version = "0.0.282" dependencies = [ "anyhow", "clap", @@ -776,6 +842,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -961,8 +1033,15 @@ dependencies = [ "number_prefix", "portable-atomic", "unicode-width", + "vt100", ] +[[package]] +name = "indoc" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" + [[package]] name = "inotify" version = "0.9.6" @@ -985,14 +1064,15 @@ dependencies = [ [[package]] name = "insta" -version = "1.30.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28491f7753051e5704d4d0ae7860d45fae3238d7d235bc4289dcd45c48d3cec3" +checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" dependencies = [ "console", "globset", "lazy_static", "linked-hash-map", + "regex", "similar", "walkdir", "yaml-rust", @@ -1086,6 +1166,28 @@ dependencies = [ "libc", ] +[[package]] +name = "lalrpop" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax 0.7.3", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + [[package]] name = "lalrpop-util" version = "0.20.0" @@ -1186,12 +1288,31 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +[[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 = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matches" version = "0.1.10" @@ -1255,6 +1376,12 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + [[package]] name = "nextest-workspace-hack" version = "0.1.0" @@ -1273,12 +1400,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - [[package]] name = "nom" version = "7.1.3" @@ -1307,6 +1428,16 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -1389,6 +1520,35 @@ dependencies = [ "winapi", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.1", +] + [[package]] name = "paste" version = "1.0.13" @@ -1480,14 +1640,23 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + [[package]] name = "phf" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -1497,7 +1666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -1506,21 +1675,17 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", + "phf_shared 0.11.2", "rand", ] [[package]] -name = "phf_macros" -version = "0.11.2" +name = "phf_shared" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.23", + "siphasher", ] [[package]] @@ -1583,6 +1748,18 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + [[package]] name = "predicates" version = "3.0.3" @@ -1707,6 +1884,18 @@ 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", ] @@ -1715,6 +1904,9 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] [[package]] name = "rayon" @@ -1775,8 +1967,17 @@ checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" dependencies = [ "aho-corasick 1.0.2", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.3.0", + "regex-syntax 0.7.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -1787,9 +1988,15 @@ checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" dependencies = [ "aho-corasick 1.0.2", "memchr", - "regex-syntax", + "regex-syntax 0.7.3", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.7.3" @@ -1835,7 +2042,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.278" +version = "0.0.282" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1856,14 +2063,12 @@ dependencies = [ "log", "memchr", "natord", - "nohash-hasher", "num-bigint", "num-traits", "once_cell", "path-absolutize", "pathdiff", "pep440_rs", - "phf", "pretty_assertions", "pyproject-toml", "quick-junit", @@ -1874,15 +2079,16 @@ dependencies = [ "ruff_index", "ruff_macros", "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_index", + "ruff_python_literal", + "ruff_python_parser", "ruff_python_semantic", "ruff_python_stdlib", - "ruff_python_whitespace", - "ruff_rustpython", + "ruff_python_trivia", + "ruff_source_file", "ruff_text_size", - "ruff_textwrap", "rustc-hash", - "rustpython-format", - "rustpython-parser", "schemars", "semver", "serde", @@ -1893,12 +2099,14 @@ dependencies = [ "smallvec", "strum", "strum_macros", + "tempfile", "test-case", "thiserror", "toml", "typed-arena", "unicode-width", "unicode_names2", + "wsl", ] [[package]] @@ -1911,7 +2119,7 @@ dependencies = [ "ruff", "ruff_python_ast", "ruff_python_formatter", - "rustpython-parser", + "ruff_python_parser", "serde", "serde_json", "tikv-jemallocator", @@ -1933,7 +2141,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.278" +version = "0.0.282" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1950,6 +2158,7 @@ dependencies = [ "filetime", "glob", "ignore", + "insta", "itertools", "itoa", "log", @@ -1961,17 +2170,20 @@ dependencies = [ "ruff", "ruff_cache", "ruff_diagnostics", + "ruff_macros", "ruff_python_ast", "ruff_python_formatter", "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_source_file", "ruff_text_size", - "ruff_textwrap", "rustc-hash", "serde", "serde_json", "shellexpand", "similar", "strum", + "tempfile", "tikv-jemallocator", "ureq", "walkdir", @@ -1986,9 +2198,9 @@ dependencies = [ "clap", "ignore", "indicatif", + "indoc", "itertools", "libcst", - "log", "once_cell", "pretty_assertions", "rayon", @@ -1997,17 +2209,24 @@ dependencies = [ "ruff_cli", "ruff_diagnostics", "ruff_formatter", + "ruff_python_ast", + "ruff_python_codegen", "ruff_python_formatter", + "ruff_python_literal", + "ruff_python_parser", "ruff_python_stdlib", - "ruff_textwrap", - "rustpython-format", - "rustpython-parser", + "ruff_python_trivia", "schemars", + "serde", "serde_json", "similar", "strum", "strum_macros", "tempfile", + "toml", + "tracing", + "tracing-indicatif", + "tracing-subscriber", ] [[package]] @@ -2050,7 +2269,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "ruff_textwrap", + "ruff_python_trivia", "syn 2.0.23", ] @@ -2058,24 +2277,32 @@ dependencies = [ name = "ruff_python_ast" version = "0.0.0" dependencies = [ - "anyhow", "bitflags 2.3.3", "insta", "is-macro", - "itertools", - "log", "memchr", "num-bigint", "num-traits", "once_cell", - "ruff_python_whitespace", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", "ruff_text_size", "rustc-hash", - "rustpython-ast", - "rustpython-literal", - "rustpython-parser", "serde", "smallvec", + "static_assertions", +] + +[[package]] +name = "ruff_python_codegen" +version = "0.0.0" +dependencies = [ + "once_cell", + "ruff_python_ast", + "ruff_python_literal", + "ruff_python_parser", + "ruff_source_file", ] [[package]] @@ -2092,16 +2319,66 @@ dependencies = [ "once_cell", "ruff_formatter", "ruff_python_ast", - "ruff_python_whitespace", + "ruff_python_index", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", "ruff_text_size", "rustc-hash", - "rustpython-parser", "serde", "serde_json", "similar", "smallvec", "thiserror", +] + +[[package]] +name = "ruff_python_index" +version = "0.0.0" +dependencies = [ + "itertools", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", +] + +[[package]] +name = "ruff_python_literal" +version = "0.0.0" +dependencies = [ + "bitflags 2.3.3", + "hexf-parse", + "is-macro", + "itertools", + "lexical-parse-float", + "num-bigint", + "num-traits", + "rand", + "unic-ucd-category", +] + +[[package]] +name = "ruff_python_parser" +version = "0.0.0" +dependencies = [ + "anyhow", + "insta", + "is-macro", + "itertools", + "lalrpop", + "lalrpop-util", + "num-bigint", + "num-traits", + "ruff_python_ast", + "ruff_text_size", + "rustc-hash", + "static_assertions", + "tiny-keccak", + "unic-emoji-char", "unic-ucd-ident", + "unicode_names2", ] [[package]] @@ -2120,14 +2397,13 @@ version = "0.0.0" dependencies = [ "bitflags 2.3.3", "is-macro", - "nohash-hasher", "num-traits", "ruff_index", "ruff_python_ast", "ruff_python_stdlib", + "ruff_source_file", "ruff_text_size", "rustc-hash", - "rustpython-parser", "smallvec", ] @@ -2136,36 +2412,54 @@ name = "ruff_python_stdlib" version = "0.0.0" [[package]] -name = "ruff_python_whitespace" +name = "ruff_python_trivia" version = "0.0.0" dependencies = [ + "insta", "memchr", + "ruff_python_ast", + "ruff_python_parser", + "ruff_source_file", "ruff_text_size", + "smallvec", + "unic-ucd-ident", ] [[package]] -name = "ruff_rustpython" -version = "0.0.0" +name = "ruff_shrinking" +version = "0.1.0" dependencies = [ "anyhow", - "rustpython-parser", + "clap", + "fs-err", + "regex", + "ruff_python_ast", + "ruff_python_parser", + "ruff_text_size", + "shlex", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "ruff_source_file" +version = "0.0.0" +dependencies = [ + "insta", + "memchr", + "once_cell", + "ruff_text_size", + "serde", ] [[package]] name = "ruff_text_size" version = "0.0.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0" dependencies = [ "schemars", "serde", -] - -[[package]] -name = "ruff_textwrap" -version = "0.0.0" -dependencies = [ - "ruff_python_whitespace", - "ruff_text_size", + "serde_test", + "static_assertions", ] [[package]] @@ -2179,8 +2473,11 @@ dependencies = [ "ruff", "ruff_diagnostics", "ruff_python_ast", - "ruff_rustpython", - "rustpython-parser", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_index", + "ruff_python_parser", + "ruff_source_file", "serde", "serde-wasm-bindgen", "wasm-bindgen", @@ -2252,74 +2549,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustpython-ast" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0" -dependencies = [ - "is-macro", - "num-bigint", - "rustpython-parser-core", - "static_assertions", -] - -[[package]] -name = "rustpython-format" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0" -dependencies = [ - "bitflags 2.3.3", - "itertools", - "num-bigint", - "num-traits", - "rustpython-literal", -] - -[[package]] -name = "rustpython-literal" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0" -dependencies = [ - "hexf-parse", - "is-macro", - "lexical-parse-float", - "num-traits", - "unic-ucd-category", -] - -[[package]] -name = "rustpython-parser" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0" -dependencies = [ - "anyhow", - "is-macro", - "itertools", - "lalrpop-util", - "log", - "num-bigint", - "num-traits", - "phf", - "phf_codegen", - "rustc-hash", - "rustpython-ast", - "rustpython-parser-core", - "tiny-keccak", - "unic-emoji-char", - "unic-ucd-ident", - "unicode_names2", -] - -[[package]] -name = "rustpython-parser-core" -version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0" -dependencies = [ - "is-macro", - "memchr", - "ruff_text_size", -] - [[package]] name = "rustversion" version = "1.0.13" @@ -2455,6 +2684,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_test" +version = "1.0.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" +dependencies = [ + "serde", +] + [[package]] name = "serde_with" version = "3.0.0" @@ -2483,6 +2721,15 @@ dependencies = [ "syn 2.0.23", ] +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + [[package]] name = "shellexpand" version = "3.1.0" @@ -2492,6 +2739,12 @@ dependencies = [ "dirs 5.0.1", ] +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + [[package]] name = "similar" version = "2.2.1" @@ -2522,6 +2775,19 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", +] + [[package]] name = "strsim" version = "0.10.0" @@ -2595,6 +2861,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + [[package]] name = "termcolor" version = "1.2.0" @@ -2845,6 +3122,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-indicatif" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b38ed3722d27705c3bd7ca0ccf29acc3d8e1c717b4cd87f97891a2c1834ea1af" +dependencies = [ + "indicatif", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -2944,6 +3263,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + [[package]] name = "unicode_names2" version = "0.6.0" @@ -2998,12 +3323,51 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vt100" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" +dependencies = [ + "itoa", + "log", + "unicode-width", + "vte", +] + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "wait-timeout" version = "0.2.0" @@ -3345,6 +3709,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "wsl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" + [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix index 9fca0feec6..96ef5f4d3c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -10,20 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.278"; + version = "0.0.282"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-CM5oV9q9XYhaUV173VoFZl6dDALan4Lkl5PrvZN81c4="; + hash = "sha256-CQsgRTpZTBj07/9SYkrQXtb5FOguCtf5LCli65v20YA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libcst-0.1.0" = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8="; - "ruff_text_size-0.0.0" = "sha256-N4IzMeU8vqkfPBbC3o2bqkecCUcbgmX35QVdsTCtFfc="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; @@ -45,6 +44,11 @@ rustPlatform.buildRustPackage rec { export JEMALLOC_SYS_WITH_LG_VADDR=48 ''; + # tests expect no colors + preCheck = '' + export NO_COLOR=1 + ''; + postInstall = '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix index a61d558821..0a7aeb9acc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-all-features"; - version = "1.9.0"; + version = "1.10.0"; src = fetchCrate { inherit pname version; - hash = "sha256-OLnz1SmMLs/yats/lZugqNUlBQHSNR1bOuEmnHGdoN8="; + hash = "sha256-/w3Xd7PXUNtqzRYmUqJtth+GDuXSnsk1NiYCTYsHuAQ="; }; - cargoHash = "sha256-Gg5tF8IvbtIoqR0AKRS7IbcCNOCJO8oxwX0KkUr+l/M="; + cargoHash = "sha256-d69jj2FGptjndJG1tq3Fb/8F3kuFXN5otsYGhXYhhZg="; meta = with lib; { description = "A Cargo subcommand to build and test all feature flag combinations"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index ec06bdc48b..c0bf5131b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-43AXxTuHwaNLDTDmLps/HbRvQFWyUgLQhTrxHtQCk3k="; + hash = "sha256-TAHM+R66S8I0QmCI5RHb0mJUf5Ffq6CKH28rxlFoE/I="; }; - cargoHash = "sha256-F26wjIsBjQ+z+sHGzE7PdYOZi7XwStlOXfbK/lpepDY="; + cargoHash = "sha256-ef7Q+qQRadNseQwoVvAHWADSE7IgrgKppMmMUL2JB10="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock index 1d35a599e8..78bd6c4691 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock @@ -29,27 +29,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.0.2" @@ -110,7 +89,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -120,32 +99,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "arc-swap" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -168,9 +135,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", @@ -186,7 +153,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -247,7 +214,7 @@ dependencies = [ "futures-lite", "rustix 0.37.23", "signal-hook", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -258,7 +225,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -269,13 +236,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -292,9 +259,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" dependencies = [ "async-trait", "axum-core", @@ -343,14 +310,14 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" +checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -410,15 +377,6 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -454,7 +412,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -470,15 +428,6 @@ dependencies = [ "serde", ] -[[package]] -name = "btoi" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" -dependencies = [ - "num-traits", -] - [[package]] name = "bumpalo" version = "3.13.0" @@ -498,78 +447,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] -name = "bytesize" -version = "1.2.0" +name = "camino" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" - -[[package]] -name = "cargo" -version = "0.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359c6dff8d490c19dc5202655e184e25835b286300d7547b98e3ba2d6fa183c" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ - "anyhow", - "base64 0.21.2", - "bytesize", - "cargo-platform", - "cargo-util", - "clap", - "crates-io", - "curl", - "curl-sys", - "env_logger", - "filetime", - "flate2", - "fwdansi", - "git2", - "git2-curl", - "gix", - "gix-features", - "glob", - "hex", - "hmac", - "home", - "http-auth", - "humantime", - "ignore", - "im-rc", - "indexmap 1.9.3", - "is-terminal", - "itertools", - "jobserver", - "lazy_static", - "lazycell", - "libc", - "libgit2-sys", - "log", - "memchr", - "opener", - "os_info", - "pasetors", - "pathdiff", - "rand", - "rustc-workspace-hack", - "rustfix", - "semver", "serde", - "serde-value", - "serde_ignored", - "serde_json", - "sha1", - "shell-escape", - "strip-ansi-escapes", - "tar", - "tempfile", - "termcolor", - "time", - "toml", - "toml_edit", - "unicode-width", - "unicode-xid", - "url", - "walkdir", - "windows-sys 0.45.0", ] [[package]] @@ -578,19 +461,17 @@ version = "0.1.0" dependencies = [ "anyhow", "assert_cmd", - "async-trait", "bytes", - "cargo", - "cargo-util", + "cargo-component-core", + "cargo_metadata", "clap", "futures", "heck", - "hex", - "home", - "indexmap 1.9.3", - "keyring", + "indexmap 2.0.0", + "libc", "log", "p256", + "parse_arg", "predicates", "pretty_env_logger", "rand_core", @@ -598,7 +479,6 @@ dependencies = [ "semver", "serde", "serde_json", - "termcolor", "tokio", "tokio-util", "toml_edit", @@ -607,45 +487,80 @@ dependencies = [ "warg-crypto", "warg-protocol", "warg-server", - "wasm-metadata", - "wasmparser", + "wasm-metadata 0.10.1", + "wasmparser 0.110.0", "wat", - "wit-bindgen-core", - "wit-bindgen-rust", "wit-bindgen-rust-lib", - "wit-component", + "wit-component 0.13.1", "wit-parser", ] +[[package]] +name = "cargo-component-bindings" +version = "0.1.0" +dependencies = [ + "cargo-component-macro", + "wit-bindgen", +] + +[[package]] +name = "cargo-component-core" +version = "0.1.0" +dependencies = [ + "anyhow", + "futures", + "indexmap 2.0.0", + "keyring", + "libc", + "log", + "owo-colors", + "semver", + "serde", + "tokio", + "toml_edit", + "unicode-width", + "url", + "warg-client", + "warg-crypto", + "warg-protocol", + "windows-sys", + "wit-component 0.13.1", + "wit-parser", +] + +[[package]] +name = "cargo-component-macro" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", + "wit-bindgen-core", + "wit-bindgen-rust", + "wit-component 0.13.1", +] + [[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", ] [[package]] -name = "cargo-util" -version = "0.2.4" +name = "cargo_metadata" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e2320a2b1242f9181a3347ae0884bb497e1853d299da99780fa1e96f9abe23" +checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" dependencies = [ - "anyhow", - "core-foundation", - "filetime", - "hex", - "jobserver", - "libc", - "log", - "miow", - "same-file", - "sha2", - "shell-escape", - "tempfile", - "walkdir", - "windows-sys 0.45.0", + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", ] [[package]] @@ -653,9 +568,6 @@ name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] [[package]] name = "cfg-if" @@ -687,9 +599,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -698,9 +610,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -710,14 +622,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -726,12 +638,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" -[[package]] -name = "clru" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" - [[package]] name = "colorchoice" version = "1.0.0" @@ -749,9 +655,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" [[package]] name = "core-foundation" @@ -778,39 +684,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crates-io" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9973744e6d1f35e47df29ad99f9bb6a8270e8feaea79c5a5f1febb4c99f1b" -dependencies = [ - "anyhow", - "curl", - "percent-encoding", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -842,48 +715,11 @@ dependencies = [ "typenum", ] -[[package]] -name = "ct-codecs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.63+curl-8.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - [[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -891,27 +727,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -954,33 +790,13 @@ dependencies = [ "subtle", ] -[[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-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", + "dirs-sys", ] [[package]] @@ -992,7 +808,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1001,17 +817,11 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der", "digest", @@ -1021,20 +831,11 @@ dependencies = [ "spki", ] -[[package]] -name = "ed25519-compact" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" -dependencies = [ - "getrandom", -] - [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1048,7 +849,6 @@ dependencies = [ "ff", "generic-array", "group", - "hkdf", "pem-rfc7468", "pkcs8", "rand_core", @@ -1084,7 +884,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -1102,9 +902,9 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -1114,7 +914,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1142,6 +942,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "ff" version = "0.13.0" @@ -1152,41 +958,12 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", -] - [[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "libz-sys", - "miniz_oxide", -] - [[package]] name = "float-cmp" version = "0.9.0" @@ -1280,7 +1057,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", @@ -1297,7 +1074,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -1330,16 +1107,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fwdansi" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" -dependencies = [ - "memchr", - "termcolor", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1358,10 +1125,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1370,605 +1135,6 @@ version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" -[[package]] -name = "git2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "git2-curl" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c" -dependencies = [ - "curl", - "git2", - "log", - "url", -] - -[[package]] -name = "gix" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0" -dependencies = [ - "gix-actor", - "gix-attributes", - "gix-config", - "gix-credentials", - "gix-date", - "gix-diff", - "gix-discover", - "gix-features", - "gix-glob", - "gix-hash", - "gix-hashtable", - "gix-index", - "gix-lock", - "gix-mailmap", - "gix-object", - "gix-odb", - "gix-pack", - "gix-path", - "gix-prompt", - "gix-protocol", - "gix-ref", - "gix-refspec", - "gix-revision", - "gix-sec", - "gix-tempfile", - "gix-transport", - "gix-traverse", - "gix-url", - "gix-validate", - "gix-worktree", - "log", - "once_cell", - "prodash", - "signal-hook", - "smallvec", - "thiserror", - "unicode-normalization", -] - -[[package]] -name = "gix-actor" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf" -dependencies = [ - "bstr", - "btoi", - "gix-date", - "itoa", - "nom", - "thiserror", -] - -[[package]] -name = "gix-attributes" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1" -dependencies = [ - "bstr", - "gix-features", - "gix-glob", - "gix-path", - "gix-quote", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-bitmap" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311e2fa997be6560c564b070c5da2d56d038b645a94e1e5796d5d85a350da33c" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-chunk" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39db5ed0fc0a2e9b1b8265993f7efdbc30379dec268f3b91b7af0c2de4672fdd" -dependencies = [ - "thiserror", -] - -[[package]] -name = "gix-command" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb" -dependencies = [ - "bstr", -] - -[[package]] -name = "gix-config" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1" -dependencies = [ - "bstr", - "gix-config-value", - "gix-features", - "gix-glob", - "gix-path", - "gix-ref", - "gix-sec", - "memchr", - "nom", - "once_cell", - "smallvec", - "thiserror", - "unicode-bom", -] - -[[package]] -name = "gix-config-value" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" -dependencies = [ - "bitflags 1.3.2", - "bstr", - "gix-path", - "libc", - "thiserror", -] - -[[package]] -name = "gix-credentials" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b" -dependencies = [ - "bstr", - "gix-command", - "gix-config-value", - "gix-path", - "gix-prompt", - "gix-sec", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-date" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" -dependencies = [ - "bstr", - "itoa", - "thiserror", - "time", -] - -[[package]] -name = "gix-diff" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103a0fa79b0d438f5ecb662502f052e530ace4fe1fe8e1c83c0c6da76d728e67" -dependencies = [ - "gix-hash", - "gix-object", - "imara-diff", - "thiserror", -] - -[[package]] -name = "gix-discover" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350" -dependencies = [ - "bstr", - "dunce", - "gix-hash", - "gix-path", - "gix-ref", - "gix-sec", - "thiserror", -] - -[[package]] -name = "gix-features" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" -dependencies = [ - "bytes", - "crc32fast", - "crossbeam-channel", - "flate2", - "gix-hash", - "libc", - "once_cell", - "parking_lot", - "prodash", - "sha1_smol", - "thiserror", - "walkdir", -] - -[[package]] -name = "gix-glob" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" -dependencies = [ - "bitflags 1.3.2", - "bstr", -] - -[[package]] -name = "gix-hash" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7" -dependencies = [ - "hex", - "thiserror", -] - -[[package]] -name = "gix-hashtable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e55e40dfd694884f0eb78796c5bddcf2f8b295dace47039099dd7e76534973" -dependencies = [ - "gix-hash", - "hashbrown 0.13.2", - "parking_lot", -] - -[[package]] -name = "gix-index" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616" -dependencies = [ - "bitflags 1.3.2", - "bstr", - "btoi", - "filetime", - "gix-bitmap", - "gix-features", - "gix-hash", - "gix-lock", - "gix-object", - "gix-traverse", - "itoa", - "memmap2", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-lock" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e" -dependencies = [ - "fastrand", - "gix-tempfile", - "thiserror", -] - -[[package]] -name = "gix-mailmap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a" -dependencies = [ - "bstr", - "gix-actor", - "thiserror", -] - -[[package]] -name = "gix-object" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017" -dependencies = [ - "bstr", - "btoi", - "gix-actor", - "gix-features", - "gix-hash", - "gix-validate", - "hex", - "itoa", - "nom", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-odb" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80" -dependencies = [ - "arc-swap", - "gix-features", - "gix-hash", - "gix-object", - "gix-pack", - "gix-path", - "gix-quote", - "parking_lot", - "tempfile", - "thiserror", -] - -[[package]] -name = "gix-pack" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775" -dependencies = [ - "clru", - "gix-chunk", - "gix-diff", - "gix-features", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-traverse", - "memmap2", - "parking_lot", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-packetline" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63e5e5a9a92d4fc6b63ff9d94954d25c779ce25c98d5bbe2e4399aa42f7073c" -dependencies = [ - "bstr", - "hex", - "thiserror", -] - -[[package]] -name = "gix-path" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "gix-prompt" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3034d4d935aef2c7bf719aaa54b88c520e82413118d886ae880a31d5bdee57" -dependencies = [ - "gix-command", - "gix-config-value", - "nix", - "parking_lot", - "thiserror", -] - -[[package]] -name = "gix-protocol" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d372ab11d5d28ac21800e3f1a6603a67c1ead57f6f5fab07e1e73e960f331c1" -dependencies = [ - "bstr", - "btoi", - "gix-credentials", - "gix-features", - "gix-hash", - "gix-transport", - "maybe-async", - "nom", - "thiserror", -] - -[[package]] -name = "gix-quote" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3874de636c2526de26a3405b8024b23ef1a327bebf4845d770d00d48700b6a40" -dependencies = [ - "bstr", - "btoi", - "thiserror", -] - -[[package]] -name = "gix-ref" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632" -dependencies = [ - "gix-actor", - "gix-features", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-validate", - "memmap2", - "nom", - "thiserror", -] - -[[package]] -name = "gix-refspec" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65" -dependencies = [ - "bstr", - "gix-hash", - "gix-revision", - "gix-validate", - "smallvec", - "thiserror", -] - -[[package]] -name = "gix-revision" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6f6ff53f888858afc24bf12628446a14279ceec148df6194481f306f553ad2" -dependencies = [ - "bstr", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "thiserror", -] - -[[package]] -name = "gix-sec" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" -dependencies = [ - "bitflags 1.3.2", - "dirs 4.0.0", - "gix-path", - "libc", - "windows 0.43.0", -] - -[[package]] -name = "gix-tempfile" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31" -dependencies = [ - "libc", - "once_cell", - "parking_lot", - "signal-hook", - "signal-hook-registry", - "tempfile", -] - -[[package]] -name = "gix-transport" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d633947b36a2fbbc089195bdc71621158f1660c2ff2a6b12b0279c16e2f764bc" -dependencies = [ - "base64 0.21.2", - "bstr", - "curl", - "gix-command", - "gix-credentials", - "gix-features", - "gix-packetline", - "gix-quote", - "gix-sec", - "gix-url", - "thiserror", -] - -[[package]] -name = "gix-traverse" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3" -dependencies = [ - "gix-hash", - "gix-hashtable", - "gix-object", - "thiserror", -] - -[[package]] -name = "gix-url" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528" -dependencies = [ - "bstr", - "gix-features", - "gix-path", - "home", - "thiserror", - "url", -] - -[[package]] -name = "gix-validate" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d092b594c8af00a3a31fe526d363ee8a51a6f29d8496cdb991ed2f01ec0ec13" -dependencies = [ - "bstr", - "thiserror", -] - -[[package]] -name = "gix-worktree" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb" -dependencies = [ - "bstr", - "gix-attributes", - "gix-features", - "gix-glob", - "gix-hash", - "gix-index", - "gix-object", - "gix-path", - "io-close", - "thiserror", -] - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - [[package]] name = "group" version = "0.13.0" @@ -2005,12 +1171,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - [[package]] name = "hashbrown" version = "0.14.0" @@ -2081,15 +1241,6 @@ 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 = "http" version = "0.2.9" @@ -2101,15 +1252,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-auth" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5430cacd7a1f9a02fbeb350dfc81a0e5ed42d81f3398cb0ba184017f85bdcfbc" -dependencies = [ - "memchr", -] - [[package]] name = "http-body" version = "0.4.5" @@ -2123,9 +1265,9 @@ dependencies = [ [[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" @@ -2193,7 +1335,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows", ] [[package]] @@ -2227,47 +1369,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "im-rc" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" -dependencies = [ - "bitmaps", - "rand_core", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] -name = "imara-diff" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" -dependencies = [ - "ahash", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -2287,6 +1388,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -2298,16 +1400,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-close" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -2316,7 +1408,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2327,13 +1419,13 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.3", - "windows-sys 0.48.0", + "rustix 0.38.4", + "windows-sys", ] [[package]] @@ -2346,19 +1438,19 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.8" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] [[package]] -name = "jobserver" -version = "0.1.26" +name = "itoa" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" @@ -2371,9 +1463,9 @@ dependencies = [ [[package]] name = "keyring" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ac4b8b0884cdf23c4619d139acf43839eac4f0739b92980c2a6d460d9c84f5" +checksum = "9549a129bd08149e0a71b2d1ce2729780d47127991bfd0a78cc1df697ec72492" dependencies = [ "byteorder", "lazy_static", @@ -2389,12 +1481,6 @@ 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 = "leb128" version = "0.2.5" @@ -2407,56 +1493,6 @@ version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -[[package]] -name = "libgit2-sys" -version = "0.15.2+1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libnghttp2-sys" -version = "0.1.7+1.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-keyutils" version = "0.2.3" @@ -2515,7 +1551,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -2533,32 +1569,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" -[[package]] -name = "maybe-async" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "memchr" 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" @@ -2570,9 +1586,9 @@ dependencies = [ [[package]] name = "miette" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a236ff270093b0b67451bc50a509bd1bad302cb1d3c7d37d5efe931238581fa9" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "miette-derive", "once_cell", @@ -2582,13 +1598,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -2607,12 +1623,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2630,16 +1640,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "miow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2679,16 +1680,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -2701,7 +1692,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2716,9 +1707,9 @@ 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", @@ -2783,9 +1774,9 @@ 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", ] @@ -2800,15 +1791,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "object" version = "0.31.1" @@ -2830,16 +1812,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "opener" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" -dependencies = [ - "bstr", - "winapi", -] - [[package]] name = "openssl" version = "0.10.55" @@ -2863,7 +1835,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -2890,15 +1862,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "ordered-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-stream" version = "0.2.0" @@ -2909,34 +1872,18 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "orion" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462" -dependencies = [ - "fiat-crypto", - "subtle", - "zeroize", -] - -[[package]] -name = "os_info" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" -dependencies = [ - "log", - "serde", - "winapi", -] - [[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + [[package]] name = "p256" version = "0.13.2" @@ -2949,18 +1896,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - [[package]] name = "parking" version = "2.1.0" @@ -2987,29 +1922,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] [[package]] -name = "pasetors" -version = "0.6.7" +name = "parse_arg" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" -dependencies = [ - "ct-codecs", - "ed25519-compact", - "getrandom", - "orion", - "p384", - "rand_core", - "regex", - "serde", - "serde_json", - "sha2", - "subtle", - "time", - "zeroize", -] +checksum = "14248cc8eced350e20122a291613de29e4fa129ba2731818c4cdbb44fccd3e55" [[package]] name = "pathdiff" @@ -3034,7 +1954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24" dependencies = [ "heck", - "itertools", + "itertools 0.10.5", "prost", "prost-types", ] @@ -3096,7 +2016,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -3140,7 +2060,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3158,7 +2078,7 @@ dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -3221,22 +2141,13 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] -[[package]] -name = "prodash" -version = "23.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9516b775656bc3e8985e19cd4b8c0c0de045095074e453d2c0a513b5f978392d" -dependencies = [ - "parking_lot", -] - [[package]] name = "prost" version = "0.11.9" @@ -3255,7 +2166,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -3276,7 +2187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -3306,9 +2217,9 @@ dependencies = [ [[package]] name = "protox" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24022a7eb88547eaba87a1db7954c9c4cb4a143565c4e8f2b7f3e76eed63db2d" +checksum = "06a5aacd1f6147ceac5e3896e0c766187dc6a9645f3b93ec821fabbaf821b887" dependencies = [ "bytes", "miette", @@ -3321,9 +2232,9 @@ dependencies = [ [[package]] name = "protox-parse" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a2a651fa4466e67df6c967df5d7fc6cbffac89afc7b834f97ec49846c9c11" +checksum = "30fc6d0af2dec2c39da31eb02cc78cbc05b843b04f30ad78ccc6e8a342ec5518" dependencies = [ "logos", "miette", @@ -3333,9 +2244,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ "bitflags 1.3.2", "memchr", @@ -3344,9 +2255,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3381,15 +2292,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -3421,25 +2323,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.3", + "regex-syntax 0.7.4", ] [[package]] name = "regex-automata" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.3", + "regex-syntax 0.7.4", ] [[package]] @@ -3450,9 +2352,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -3530,24 +2432,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-workspace-hack" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" - -[[package]] -name = "rustfix" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd2853d9e26988467753bd9912c3a126f642d05d229a4b53f5752ee36c56481" -dependencies = [ - "anyhow", - "log", - "serde", - "serde_json", -] - [[package]] name = "rustix" version = "0.37.23" @@ -3559,33 +2443,33 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "rustix" -version = "0.38.3" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ "bitflags 2.3.3", "errno", "libc", "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -3602,20 +2486,20 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[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 = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -3655,9 +2539,9 @@ 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 1.3.2", "core-foundation", @@ -3668,9 +2552,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", @@ -3678,57 +2562,38 @@ 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" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", -] - -[[package]] -name = "serde_ignored" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de9d103529a9ba50008099785839df1e6f40b4576ed4c000cbfdb051182b827" -dependencies = [ - "serde", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -3737,9 +2602,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc4422959dd87a76cb117c191dcbffc20467f06c9100b76721dab370f24d3a" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ "itoa", "serde", @@ -3747,13 +2612,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -3779,9 +2644,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" dependencies = [ "base64 0.21.2", "chrono", @@ -3795,14 +2660,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" +checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -3816,12 +2681,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.10.7" @@ -3842,17 +2701,11 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - [[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", @@ -3877,16 +2730,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.8" @@ -3912,6 +2755,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "spdx" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b19b32ed6d899ab23174302ff105c1577e45a06b08d4fe0a9dd13ce804bbbf71" +dependencies = [ + "smallvec", +] + [[package]] name = "spki" version = "0.7.2" @@ -3928,15 +2780,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strip-ansi-escapes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" -dependencies = [ - "vte", -] - [[package]] name = "strsim" version = "0.10.0" @@ -3962,9 +2805,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -3977,28 +2820,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", -] - [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.23", - "windows-sys 0.48.0", + "rustix 0.38.4", + "windows-sys", ] [[package]] @@ -4018,22 +2850,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.41" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.41" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -4048,13 +2880,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", - "libc", - "num_threads", "serde", "time-core", "time-macros", @@ -4068,9 +2898,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -4107,7 +2937,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4118,7 +2948,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -4168,9 +2998,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.12" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -4197,9 +3027,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ "bitflags 2.3.3", "bytes", @@ -4253,7 +3083,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", ] [[package]] @@ -4328,17 +3158,11 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -[[package]] -name = "unicode-bom" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32" - [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -4403,27 +3227,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vte" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "wait-timeout" version = "0.2.0" @@ -4461,8 +3264,9 @@ dependencies = [ [[package]] name = "warg-api" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ + "itertools 0.11.0", "serde", "serde_with", "thiserror", @@ -4473,15 +3277,15 @@ dependencies = [ [[package]] name = "warg-client" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "async-trait", "bytes", "clap", - "dirs 5.0.1", + "dirs", "futures-util", - "itertools", + "itertools 0.11.0", "libc", "normpath", "once_cell", @@ -4500,13 +3304,13 @@ dependencies = [ "warg-crypto", "warg-protocol", "warg-transparency", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "warg-crypto" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "base64 0.21.2", @@ -4526,7 +3330,7 @@ dependencies = [ [[package]] name = "warg-protobuf" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "pbjson", @@ -4544,12 +3348,12 @@ dependencies = [ [[package]] name = "warg-protocol" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "base64 0.21.2", "hex", - "indexmap 1.9.3", + "indexmap 2.0.0", "pbjson-types", "prost", "prost-types", @@ -4560,25 +3364,27 @@ dependencies = [ "warg-crypto", "warg-protobuf", "warg-transparency", - "wasmparser", + "wasmparser 0.108.0", ] [[package]] name = "warg-server" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", "axum", "bytes", "clap", "futures", - "indexmap 1.9.3", + "indexmap 2.0.0", + "secrecy", "serde", "tempfile", "thiserror", "tokio", "tokio-util", + "toml", "tower", "tower-http", "tracing", @@ -4588,19 +3394,16 @@ dependencies = [ "warg-crypto", "warg-protocol", "warg-transparency", - "wasmparser", + "wasmparser 0.108.0", ] [[package]] name = "warg-transparency" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#9c4e2efdb7d35c2e5a39b69d5d210e9124824454" +source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" dependencies = [ "anyhow", - "pbjson-build", "prost", - "prost-build", - "regex", "thiserror", "warg-crypto", "warg-protobuf", @@ -4633,7 +3436,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", "wasm-bindgen-shared", ] @@ -4667,7 +3470,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.27", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4680,24 +3483,50 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +checksum = "b2f8e9778e04cbf44f58acc301372577375a666b966c50b03ef46144f80436a8" +dependencies = [ + "leb128", +] + +[[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-metadata" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e5156581ff4a302405c44ca7c85347563ca431d15f1a773f12c9c7b9a6cdc9" +checksum = "d51db59397fc650b5f2fc778e4a5c4456cd856bed7fc1ec15f8d3e28229dc463" dependencies = [ "anyhow", - "indexmap 1.9.3", + "indexmap 2.0.0", "serde", - "wasm-encoder", - "wasmparser", + "serde_json", + "spdx", + "wasm-encoder 0.30.0", + "wasmparser 0.108.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be44e148f09a188971ec512250b3ae136029e2df586dd740586ce76a17ee657d" +dependencies = [ + "anyhow", + "indexmap 2.0.0", + "serde", + "serde_json", + "spdx", + "wasm-encoder 0.31.1", + "wasmparser 0.110.0", ] [[package]] @@ -4715,31 +3544,41 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.107.0" +version = "0.108.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +checksum = "76c956109dcb41436a39391139d9b6e2d0a5e0b158e1293ef352ec977e5e36c5" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +dependencies = [ + "indexmap 2.0.0", "semver", ] [[package]] name = "wast" -version = "60.0.0" +version = "62.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd06cc744b536e30387e72a48fdd492105b9c938bb4f415c39c616a7a0a697ad" +checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.31.1", ] [[package]] name = "wat" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abe520f0ab205366e9ac7d3e6b2fc71de44e32a2b58f2ec871b6b575bdcea3b" +checksum = "842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637" dependencies = [ "wast", ] @@ -4796,52 +3635,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" -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" 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.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]] @@ -4850,22 +3650,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] @@ -4874,93 +3659,51 @@ 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", + "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" -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" @@ -4969,9 +3712,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" dependencies = [ "memchr", ] @@ -4986,64 +3729,105 @@ dependencies = [ ] [[package]] -name = "wit-bindgen-core" -version = "0.8.0" +name = "wit-bindgen" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d422d36cbd78caa0e18c3371628447807c66ee72466b69865ea7e33682598158" +checksum = "f5c3d15a04ce994fad2c5442a754b404ab1fee23c903a04a560f84f94fdf63c0" +dependencies = [ + "bitflags 2.3.3", + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9658ec54d4a3c9e2f079bc65a131093337595b595fbf82f805008469838cdea" dependencies = [ "anyhow", - "wit-component", + "wit-component 0.12.0", "wit-parser", ] [[package]] name = "wit-bindgen-rust" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b76db68264f5d2089dc4652581236d8e75c5b89338de6187716215fd0e68ba3" +checksum = "21ae6a6198ba9765771b977e2af985a0d5ac71b59f999da5c4ee1c7bbd8ca8dc" dependencies = [ "heck", - "wasm-metadata", + "wasm-metadata 0.9.0", "wit-bindgen-core", "wit-bindgen-rust-lib", - "wit-component", + "wit-component 0.12.0", ] [[package]] name = "wit-bindgen-rust-lib" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c50f334bc08b0903a43387f6eea6ef6aa9eb2a085729f1677b29992ecef20ba" +checksum = "5c31de8c6c77cac1fd4927c7584d1314cd5e838cfb40b53333d6dffc7a132dda" dependencies = [ "heck", "wit-bindgen-core", ] [[package]] -name = "wit-component" -version = "0.11.0" +name = "wit-bindgen-rust-macro" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cbd4c7f8f400327c482c88571f373844b7889e61460650d650fc5881bb3575c" +checksum = "0a2abe5c7c4c08468d01590aa96c8a684dd94fb9241a248af88eef7edac61e43" +dependencies = [ + "anyhow", + "proc-macro2", + "syn 2.0.27", + "wit-bindgen-core", + "wit-bindgen-rust", + "wit-bindgen-rust-lib", + "wit-component 0.12.0", +] + +[[package]] +name = "wit-component" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "253bd426c532f1cae8c633c517c63719920535f3a7fada3589de40c5b734e393" dependencies = [ "anyhow", "bitflags 1.3.2", - "indexmap 1.9.3", + "indexmap 2.0.0", "log", - "wasm-encoder", - "wasm-metadata", - "wasmparser", + "wasm-encoder 0.30.0", + "wasm-metadata 0.9.0", + "wasmparser 0.108.0", + "wit-parser", +] + +[[package]] +name = "wit-component" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d843f4dfead0d465b09e8bfba4d3dcb1a1bcc857f87917d348c7fa401158bc5" +dependencies = [ + "anyhow", + "bitflags 2.3.3", + "indexmap 2.0.0", + "log", + "wasm-encoder 0.31.1", + "wasm-metadata 0.10.1", + "wasmparser 0.110.0", "wit-parser", ] [[package]] name = "wit-parser" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" +checksum = "541efa2046e544de53a9da1e2f6299e63079840360c9e106f1f8275a97771318" dependencies = [ "anyhow", "id-arena", - "indexmap 1.9.3", + "indexmap 2.0.0", "log", "pulldown-cmark", "semver", diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index cfd461d4a5..9269ff431f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -1,47 +1,38 @@ { lib , rustPlatform , fetchFromGitHub -, curl , pkg-config -, libgit2 , openssl -, zlib , stdenv , darwin }: rustPlatform.buildRustPackage { pname = "cargo-component"; - version = "unstable-2023-07-05"; + version = "unstable-2023-07-28"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "84ad1dc2c383dd3335953f9d1b059aeef9a5833e"; - hash = "sha256-C066dXuGpl9bwKRh5kgN0DOjaEke84cj5ustYrM867I="; + rev = "b58f10c867f666c1c799b766fb8cd1941ede8ed7"; + hash = "sha256-BwrbenOg+Q6BAy/Mn8AHB0VvvIZ0cYvq4r791QEFTdo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "warg-api-0.1.0" = "sha256-ElLwaOv0ifi8og2SJ6XZkjZX83IXoveicAUPBok/MLE="; + "warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc="; }; }; nativeBuildInputs = [ - curl pkg-config ]; buildInputs = [ - curl - libgit2 openssl - zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation ]; # requires the wasm32-wasi target diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index e004ea9a6e..c8769abc8a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-xr3YNjQp+XhIWIqJ1rPUyM9mbtWGExlFEj28/SB8vfE="; + hash = "sha256-6XW8aCXepbVnTubbM4sfRIC87uYSCEbuj+jJcPayEEU="; }; - cargoHash = "sha256-NsBY+wb4IAlKOMh5BMvT734z//Wp/s0zimm04v8pqyc="; + cargoHash = "sha256-BG/vfa5L6Iibfon3A5TP8/K8jbJsWqc+axdvIXc7GmM="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index 37f4967a8a..1ff7abaa4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -2,41 +2,33 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_5 -, openssl -, zlib , zstd , stdenv -, curl , darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.13.9"; + version = "0.14.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; - repo = pname; + repo = "cargo-deny"; rev = version; - hash = "sha256-fkbYPn7GmnOgLvJqbizVKKLBnzVn0Ji6jQc23DimIX4="; + hash = "sha256-3k8UPA4zf2WfEZ8fnBhqpYH269nfecBv+68+7IDkuY4="; }; - cargoHash = "sha256-WHr2Ky0LlK/EVOrSK3MF9Yt/Qe/6o7Ftx7X8iECj6pM="; + cargoHash = "sha256-w72T2MGtf6+YePscCHBWMzHXnB7+kdguZDuB7Hqs4rI="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libgit2_1_5 - openssl - zlib - zstd - ] ++ lib.optionals stdenv.isDarwin [ - curl - darwin.apple_sdk.frameworks.Security + nativeBuildInputs = [ + pkg-config ]; - buildNoDefaultFeatures = true; + buildInputs = [ + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix index f3804f4d17..da3036187e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-diet"; - version = "1.2.5"; + version = "1.2.7"; src = fetchFromGitHub { owner = "the-lean-crate"; - repo = pname; + repo = "cargo-diet"; rev = "v${version}"; - sha256 = "sha256-JzhSTbEf2Yl5cEIb+88y+s8lUN6c1Mir4NYvzAWMZwY="; + hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ="; }; - cargoSha256 = "sha256-zW6ec8DHzP6AuNI6fcOQLH03ca+/yjdh56nltSM9pAA="; + cargoHash = "sha256-MASftcn3WmB3M6bvmtnK3nlroE8nq9zdkleSEgzA5lk="; meta = with lib; { description = "Help computing optimal include directives for your Cargo.toml manifest"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espflash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espflash/default.nix index 1439e95987..f0774b2fd0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espflash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espflash/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-espflash"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; rev = "v${version}"; - hash = "sha256-3E0OC8DVP2muLyoN4DQfrdnK+idQEm7IpaA/CUIyYnU="; + hash = "sha256-PYW5OM3pbmROeGkbGiLhnVGrYq6xn3B1Z4sbIjtAPlk="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-8VIAmmtaQoIvD7wN+W3yUM0CEDadOQrv1wnJ4/AWKFA="; + cargoHash = "sha256-gTehRP9Ct150n3Kdz+NudJcKGeOCT059McrXURhy2iQ="; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 591cd0b33f..a4e2a78c9c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.59"; + version = "1.0.62"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-qY7OulMMhrsS0ROh1XeaMex10X66/0PuCQnG/bjK7jc="; + sha256 = "sha256-ebqb1RY8qYvmo8gScI5XAsEV/so/ugsBGHWbswwIK34="; }; - cargoHash = "sha256-9X+kR8zcrkFQno1D3OAXqVccBzy9T0p14Iaq1qJYUMM="; + cargoHash = "sha256-uckhtJT3K9DyTUa06Zcp/t+w0lHyvstI7l30OYXHi8Y="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix index f1e066f1b9..4596b93b32 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-guppy"; - version = "unstable-2023-06-26"; + version = "unstable-2023-07-29"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; - rev = "c05b95997a127cebef76d3b238e0341086e59e32"; - sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs="; + rev = "7c7f352d9d2dea1007b4475d4a76f86f061b6ba9"; + sha256 = "sha256-H2vU7qax0P8Ulh1/DHnlmGRqSqzLuRy9TZOvikSLONw="; }; - cargoSha256 = "sha256-OHtg3za8EyQVYQ6XQzLK7UgvGSl8ObfeKURFL6vBDnE="; + cargoSha256 = "sha256-lr7N/qqB1AwhNA+mbEAJFSp/rDxGp3qIGSKP9B3JAls="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix index 06c1fd6016..842ea1a191 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.26"; + version = "0.9.27"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; rev = "cargo-hakari-${version}"; - sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs="; + sha256 = "sha256-H2vU7qax0P8Ulh1/DHnlmGRqSqzLuRy9TZOvikSLONw="; }; - cargoHash = "sha256-F6+GRn3l849vRVKE1KhLMnxwR5NWu1b78xTxrHi817A="; + cargoHash = "sha256-fRaGtQc9CA5A6fQ1yj5zsg1Qv42yIi8ZlIcp4o5cNBU="; cargoBuildFlags = [ "-p" "cargo-hakari" ]; cargoTestFlags = [ "-p" "cargo-hakari" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix index 6574646e93..bc53e09feb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-info/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-info"; - version = "0.7.3"; + version = "0.7.6"; src = fetchFromGitLab { owner = "imp"; repo = "cargo-info"; rev = version; - hash = "sha256-m8YytirD9JBwssZFO6oQ9TGqjqvu1GxHN3z8WKLiKd4="; + hash = "sha256-02Zkp7Vc1M5iZsG4iJL30S73T2HHg3lqrPJ9mW3FOuk="; }; - cargoHash = "sha256-gI/DGPCVEi4Mg9nYLaPpeqpV7LBbxoLP0ditU6hPS1w="; + cargoHash = "sha256-zp7qklME28HNGomAcQgrEi7W6zQ1QCJc4FjxtnKySUE="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix index 0d8bfffdf9..2fd9eaeb38 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hQaVUBw8X60DW1Ox4GzO+OCWMHmVYuCkjH5x/sMULiE="; }; - sourceRoot = "source/cargo-insta"; + sourceRoot = "${src.name}/cargo-insta"; cargoHash = "sha256-q6Ups4SDGjT5Zc9ujhRpRdh3uWq99lizgA7gpPVSl+A="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock new file mode 100644 index 0000000000..d5a55c6d16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock @@ -0,0 +1,3294 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if 1.0.0", + "getrandom", + "once_cell", + "serde", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +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.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "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 = "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.18", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +dependencies = [ + "async-trait", + "axum-core", + "base64 0.21.2", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ + "byteorder", + "safemem", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64-simd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +dependencies = [ + "simd-abstraction", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "browserslist-rs" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9bda9b4595376bf255f68dafb5dcc5b0e2842b38dc2a7b52c4e0bfe9fd1c651" +dependencies = [ + "ahash 0.8.3", + "anyhow", + "chrono", + "either", + "getrandom", + "itertools", + "js-sys", + "nom", + "once_cell", + "quote", + "serde", + "serde-wasm-bindgen", + "serde_json", + "string_cache", + "string_cache_codegen", + "thiserror", + "wasm-bindgen", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "camino" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-leptos" +version = "0.1.11" +dependencies = [ + "ansi_term", + "anyhow", + "axum", + "bytes", + "camino", + "cargo_metadata", + "clap", + "derive_more", + "dirs", + "dotenvy", + "dunce", + "envy", + "flate2", + "flexi_logger", + "insta", + "itertools", + "lazy_static", + "leptos_hot_reload", + "lightningcss", + "log", + "notify", + "once_cell", + "regex", + "reqwest", + "seahash", + "serde", + "serde_json", + "tar", + "temp-dir", + "tokio", + "toml", + "wasm-bindgen-cli-support", + "which", + "zip", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" +dependencies = [ + "camino", + "cargo-platform", + "derive_builder", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clap" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "const-str" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21077772762a1002bb421c3af42ac1725fa56066bfc53d9a55bb79905df2aaf3" +dependencies = [ + "const-str-proc-macro", +] + +[[package]] +name = "const-str-proc-macro" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if 1.0.0", + "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 1.0.0", + "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 1.0.0", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.29.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "matches", + "phf", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.18", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "data-url" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" +dependencies = [ + "matches", +] + +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dtoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "envy" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965" +dependencies = [ + "serde", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flexi_logger" +version = "0.25.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e7b68b1f7ce9c62856598e99cd6742b9cedb6186b47aa989a82640f20bfa9b" +dependencies = [ + "chrono", + "glob", + "is-terminal", + "lazy_static", + "log", + "nu-ansi-term", + "regex", + "thiserror", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags 1.3.2", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", +] + +[[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-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +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]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +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 = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[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 = "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", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[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 = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +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 = "insta" +version = "1.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", + "yaml-rust", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +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 = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "leptos_hot_reload" +version = "0.3.0" +source = "git+https://github.com/leptos-rs/leptos#55bb63edea430e6c4756c9d9cd73d9ecfd50e1c7" +dependencies = [ + "anyhow", + "camino", + "indexmap", + "parking_lot", + "proc-macro2", + "quote", + "rstml", + "serde", + "syn 2.0.18", + "walkdir", +] + +[[package]] +name = "libc" +version = "0.2.146" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + +[[package]] +name = "lightningcss" +version = "1.0.0-alpha.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00aabc173bdf67a26da17777a5584ae344238b043626b5eb1c6b137af9c9edb" +dependencies = [ + "ahash 0.7.6", + "bitflags 2.3.2", + "browserslist-rs", + "const-str", + "cssparser", + "dashmap", + "data-encoding", + "itertools", + "lazy_static", + "parcel_selectors", + "parcel_sourcemap", + "paste", + "pathdiff", + "rayon", + "serde", + "smallvec", +] + +[[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.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[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 = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net2" +version = "0.2.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags 1.3.2", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "nu-ansi-term" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df031e117bca634c262e9bd3173776844b6c17a90b3741c9163663b4385af76" +dependencies = [ + "windows-sys 0.45.0", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "openssl" +version = "0.10.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +dependencies = [ + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "outref" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" + +[[package]] +name = "parcel_selectors" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e808c7a75aedcc522bd24187de6903adab3265d690a61f8b8181edaa988377" +dependencies = [ + "bitflags 2.3.2", + "cssparser", + "fxhash", + "log", + "phf", + "phf_codegen", + "precomputed-hash", + "smallvec", +] + +[[package]] +name = "parcel_sourcemap" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb" +dependencies = [ + "base64-simd", + "data-url", + "rkyv", + "serde", + "serde_json", + "vlq", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.0", +] + +[[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 = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros", + "phf_shared", + "proc-macro-hack", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", + "version_check", + "yansi", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +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 = "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 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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "rend" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rstml" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afcc74cab5d3118523b1f75900e1fcbeae7cac6c6cb800430621bf58add0bd" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.18", + "syn_derive", + "thiserror", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "serde_json" +version = "1.0.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "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]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-abstraction" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +dependencies = [ + "outref", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "similar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn_derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8128874d02f9a114ade6d9ad252078cb32d3cb240e26477ac73d7e9c495c605e" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio 0.8.8", + "num_cpus", + "parking_lot", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +dependencies = [ + "base64 0.13.1", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vlq" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff" + +[[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 = "walrus" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" +dependencies = [ + "anyhow", + "id-arena", + "leb128", + "log", + "walrus-macro", + "wasmparser", +] + +[[package]] +name = "walrus-macro" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.18", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-cli-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d21c60239a09bf9bab8dfa752be4e6c637db22296b9ded493800090448692da9" +dependencies = [ + "anyhow", + "base64 0.9.3", + "log", + "rustc-demangle", + "serde_json", + "tempfile", + "unicode-ident", + "walrus", + "wasm-bindgen-externref-xform", + "wasm-bindgen-multi-value-xform", + "wasm-bindgen-shared", + "wasm-bindgen-threads-xform", + "wasm-bindgen-wasm-conventions", + "wasm-bindgen-wasm-interpreter", +] + +[[package]] +name = "wasm-bindgen-externref-xform" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafbe1984f67cc12645f12ab65e6145e8ddce1ab265d0be58435f25bb0ce2608" +dependencies = [ + "anyhow", + "walrus", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581419e3995571a1d2d066e360ca1c0c09da097f5a53c98e6f00d96eddaf0ffe" +dependencies = [ + "anyhow", + "walrus", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-bindgen-threads-xform" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05d272073981137e8426cf2a6830d43d1f84f988a050b2f8b210f0e266b8983" +dependencies = [ + "anyhow", + "walrus", + "wasm-bindgen-wasm-conventions", +] + +[[package]] +name = "wasm-bindgen-wasm-conventions" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e9c65b1ff5041ea824ca24c519948aec16fb6611c617d601623c0657dfcd47b" +dependencies = [ + "anyhow", + "walrus", +] + +[[package]] +name = "wasm-bindgen-wasm-interpreter" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c5c796220738ab5d44666f37205728a74141c0039d1166bcf8110b26bafaa1e" +dependencies = [ + "anyhow", + "log", + "walrus", + "wasm-bindgen-wasm-conventions", +] + +[[package]] +name = "wasmparser" +version = "0.77.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[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-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-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", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix index 44bd1a0ccc..de51bbf7a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -11,20 +11,26 @@ let CoreServices Security; inherit (lib) optionals; - inherit (stdenv) isDarwin isLinux; + inherit (stdenv) isDarwin; in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.1.8"; + version = "0.1.11"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; - rev = version; - hash = "sha256-z4AqxvKu9E8GGMj6jNUAAWeqoE/j+6NoAEZWeNZ+1BA="; + rev = "v${version}"; + hash = "sha256-hZevu2lwyYFenABu1uV7/mZc7SXfLzR6Pdmc3zHJ2vw="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "leptos_hot_reload-0.3.0" = "sha256-Pl3nZaz5r5ZFagytLMczIyXEWQ6AFLb3+TrI/6Sevig="; + }; }; - cargoHash = "sha256-w/9W4DXbh4G5DZ8IGUz4nN3LEjHhL7HgybHqODMFzHw="; nativeBuildInputs = optionals (!isDarwin) [ pkg-config ]; buildInputs = optionals (!isDarwin) [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 31997a8661..15fd02bba6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.23"; + version = "0.5.24"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sAuarLfvgX6qjZV2eum3+wY5gRiCbRSbJUBgFIHd8y0="; + sha256 = "sha256-Woayb/SgSCHwYYYezQXsna9N0Jot0/iga+jrOhjsSvc="; }; - cargoSha256 = "sha256-gGzVQqPHvjERvQV2Yo3wFP7n/w3atuLrHSch1CWui4I="; + cargoSha256 = "sha256-8rP/wtDFH7hL3jt/QpWqriRwxlm0E2QvIqbCLiN7ZiM="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index ff376c42b8..8ccc4d9a29 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.31"; + version = "0.4.32"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-DshvnPqbFvS1o3CYex+ObN5J4DNQH3CxaZReIAPKTns="; + hash = "sha256-uoIfB+jkLamrsDRMaxExQC1syN6VeTJhfei8FgikTCE="; }; - cargoHash = "sha256-Ic4ZqONusG+7TbB0GYSqzNQ3LIPxCm8ppRN94o8IYSE="; + cargoHash = "sha256-SXiFkPm/2C5dABKPZBq3XXdElZemZN5E2vQTceATyE0="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix index 782610812c..6d7addf411 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-local-registry/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-local-registry"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "dhovart"; repo = "cargo-local-registry"; rev = version; - hash = "sha256-3xp0LLk3MpL54PMGLHTAKcsM6fwMxB8LOdN0Xcap/xA="; + hash = "sha256-2tSO82XRCUekEBrd9wDzxeg2r2C+F9wgz3ffYFG7+q8="; }; - cargoHash = "sha256-HknfcJfOQ40ecpKM8GGbquRxLQTEGyRFkwXhsjrl8FA="; + cargoHash = "sha256-vxdQLfr4G73MpPrrcbcQRZGbTHJztUP3FwShj6zFhEY="; nativeBuildInputs = [ curl @@ -35,6 +35,8 @@ rustPlatform.buildRustPackage rec { zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk.frameworks.CoreFoundation ]; # tests require internet access diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index ecaed4e280..0a2301152e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.11"; + version = "0.36.12"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kISukYfjEKwwahMGdkEyRbZESetsx/6aU6U+/bZWnbQ="; + sha256 = "sha256-dsHjSy3LV6L/P5cAKTqOjT4LM33qvjKTIHGcqrBzWqU="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-q2Cyu/+ZVAj6gv9dH0FMuyf7FkhNTfcnxWz/STFb3b8="; + cargoHash = "sha256-w1TmUMEKg1/VP/AQQWdW4olp0gwCm9zmiuPQ9fQh9ak="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix index a7725ad4ee..ba38d5be85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.54"; + version = "0.9.57"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-HkDGW91XDoYMfknPg6td51KTYniCfGtGQd3dkzumRpo="; + hash = "sha256-vtKe0cl9PxZgc1zUJQI1YCQm4cRHmzqlBEC4RGUxM44="; }; - cargoHash = "sha256-McL5G/PtdOou17hWLiNTSJEjTh4YpT1GUPjTMAVNxQA="; + cargoHash = "sha256-o7nuDoBpSst84jyAVfrE8pLoYcKMF922r39G+gruBUo="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix index 12d8ac1b5a..295ac413fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-raze/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-ip0WuBn1b7uN/pAhOl5tfmToK73ZSHK7rucdtufsbCQ="; }; - sourceRoot = "source/impl"; + sourceRoot = "${src.name}/impl"; cargoHash = "sha256-hNZgQwhm4UPqmANplZGxG0DYHa31tu06nmqYaCA7Vdg="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix index eee42285b0..d0ec880ac2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.19"; + version = "0.2.20"; src = fetchCrate { inherit pname version; - hash = "sha256-bIaEXlMIEQ2pnzjp7ll6iJFGAQjGb3HVBTbfGSPHrvg="; + hash = "sha256-uLF/xDRxw8sLWXkxxHa2cQ6MVMhcN5dop/qfWNEdyIE="; }; - cargoHash = "sha256-qmxd6qt8pL/5TWPDCiBQrvqb6r7VAJOrSR1OSpibQFU="; + cargoHash = "sha256-HDHsTc7JKvLp5Ezaxctjlhd304TXdcVndkuiE9GBSZ0="; nativeBuildInputs = [ installShellFiles @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommand showing the assembly, LLVM-IR and MIR generated for Rust code"; homepage = "https://github.com/pacak/cargo-show-asm"; + changelog = "https://github.com/pacak/cargo-show-asm/blob/${version}/Changelog.md"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda oxalica ]; mainProgram = "cargo-asm"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 583c501f48..0705235d85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -308,9 +308,9 @@ dependencies = [ [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] @@ -660,7 +660,7 @@ dependencies = [ "async-trait", "axum-core", "base64 0.21.2", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "headers", @@ -811,6 +811,12 @@ dependencies = [ "vsimd", ] +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "basic-toml" version = "0.1.2" @@ -850,6 +856,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] + [[package]] name = "bitvec" version = "1.0.1" @@ -944,7 +959,7 @@ dependencies = [ "base64 0.13.1", "bitvec", "hex", - "indexmap", + "indexmap 1.9.3", "js-sys", "lazy_static", "rand", @@ -1124,7 +1139,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "assert_cmd", @@ -1252,7 +1267,7 @@ checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", - "bitflags", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -1342,6 +1357,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "const-oid" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" + [[package]] name = "const-random" version = "0.1.15" @@ -1618,7 +1639,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -1746,6 +1767,17 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +[[package]] +name = "der" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + [[package]] name = "der-parser" version = "8.2.0" @@ -1825,6 +1857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -1925,6 +1958,9 @@ name = "either" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +dependencies = [ + "serde", +] [[package]] name = "encode_unicode" @@ -1966,6 +2002,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -1987,6 +2029,17 @@ dependencies = [ "libc", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if 1.0.0", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -2197,13 +2250,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot 0.12.1", ] [[package]] @@ -2301,7 +2354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] @@ -2311,7 +2364,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2362,7 +2415,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bstr", "gix-path", "libc", @@ -2418,7 +2471,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bstr", ] @@ -2507,7 +2560,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" dependencies = [ - "bitflags", + "bitflags 1.3.2", "dirs 4.0.0", "gix-path", "libc", @@ -2577,7 +2630,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -2625,7 +2678,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", @@ -2959,6 +3012,16 @@ dependencies = [ "serde", ] +[[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 = "indicatif" version = "0.17.5" @@ -3160,6 +3223,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 = "leb128" @@ -3195,9 +3261,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", @@ -3492,7 +3558,7 @@ checksum = "ebe15399de63ad4294c80069967736cbb87ebe467a8cd0629df9cab88a6fbde6" dependencies = [ "async-trait", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bson", "chrono", "derivative", @@ -3559,7 +3625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -3572,7 +3638,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 1.0.0", "libc", "static_assertions", @@ -3627,6 +3693,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -3637,6 +3720,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.15" @@ -3689,7 +3783,7 @@ checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", "hashbrown 0.13.2", - "indexmap", + "indexmap 1.9.3", "memchr", ] @@ -3720,7 +3814,7 @@ version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3830,7 +3924,7 @@ dependencies = [ "fnv", "futures-channel", "futures-util", - "indexmap", + "indexmap 1.9.3", "once_cell", "pin-project-lite", "thiserror", @@ -3986,6 +4080,15 @@ dependencies = [ "base64 0.13.1", ] +[[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" @@ -4043,7 +4146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -4087,6 +4190,27 @@ dependencies = [ "crossbeam-channel", ] +[[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" @@ -4210,7 +4334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -4292,7 +4416,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "memchr", "unicase", ] @@ -4409,7 +4533,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4418,7 +4542,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4611,7 +4735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd29fa1f740be6dc91982013957e08c3c4232d7efcfe19e12da87d50bad47758" dependencies = [ "ahash 0.8.3", - "bitflags", + "bitflags 1.3.2", "instant", "num-traits", "rhai_codegen", @@ -4667,6 +4791,28 @@ dependencies = [ "serde", ] +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rust-embed" version = "6.7.0" @@ -4757,7 +4903,7 @@ version = "0.36.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -4771,7 +4917,7 @@ version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "itoa", @@ -4801,7 +4947,7 @@ checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.100.1", "sct", ] @@ -4836,6 +4982,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.101.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustrict" version = "0.7.7" @@ -4843,7 +4999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "991ae78d5c4b604c9a419490fdee1c6adfaee3e40ecb97217e02508a91f9550e" dependencies = [ "arrayvec 0.7.4", - "bitflags", + "bitflags 1.3.2", "doc-comment", "finl_unicode", "itertools", @@ -4927,7 +5083,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5003,7 +5159,7 @@ version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ - "indexmap", + "indexmap 1.9.3", "itoa", "ryu", "serde", @@ -5069,7 +5225,7 @@ dependencies = [ "base64 0.13.1", "chrono", "hex", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "time", @@ -5165,7 +5321,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "clap", @@ -5182,7 +5338,7 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "async-trait", @@ -5211,7 +5367,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.21.0" +version = "0.22.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5223,7 +5379,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "async-trait", @@ -5270,9 +5426,18 @@ dependencies = [ "uuid", ] +[[package]] +name = "shuttle-common-tests" +version = "0.22.0" +dependencies = [ + "hyper", + "shuttle-common", + "tower", +] + [[package]] name = "shuttle-deployer" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "async-trait", @@ -5322,7 +5487,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "async-trait", @@ -5379,7 +5544,7 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "chrono", @@ -5396,7 +5561,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.21.0" +version = "0.22.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5420,9 +5585,33 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "shuttle-resource-recorder" +version = "0.22.0" +dependencies = [ + "async-trait", + "chrono", + "clap", + "portpicker", + "pretty_assertions", + "prost-types", + "serde_json", + "shuttle-common", + "shuttle-common-tests", + "shuttle-proto", + "sqlx", + "strum", + "thiserror", + "tokio", + "tonic", + "tracing", + "tracing-subscriber", + "ulid", +] + [[package]] name = "shuttle-runtime" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "async-trait", @@ -5455,7 +5644,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "async-trait", @@ -5501,6 +5690,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.7", + "rand_core", +] + [[package]] name = "simple_asn1" version = "0.6.2" @@ -5590,6 +5789,16 @@ 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.1" @@ -5603,101 +5812,208 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", "atoi", - "base64 0.13.1", - "bitflags", "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", - "dirs 4.0.0", "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 0.21.2", + "rustls-pemfile", + "serde", + "serde_json", + "sha2 0.10.7", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", + "webpki-roots 0.24.0", +] + +[[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", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2 0.10.7", + "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.2", + "bitflags 2.3.3", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac 0.12.1", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2 0.10.7", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "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.2", + "bitflags 2.3.3", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha1", + "sha2 0.10.7", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "chrono", "flume", "futures-channel", "futures-core", "futures-executor", "futures-intrusive", "futures-util", - "hashlink", - "hex", - "hkdf", - "hmac 0.12.1", - "indexmap", - "itoa", - "libc", "libsqlite3-sys", "log", - "md-5", - "memchr", - "once_cell", - "paste", "percent-encoding", - "rand", - "rustls 0.20.8", - "rustls-pemfile", "serde", - "serde_json", - "sha1", - "sha2 0.10.7", - "smallvec", - "sqlformat", - "sqlx-rt", - "stringprep", - "thiserror", - "tokio-stream", + "sqlx-core", + "tracing", "url", "uuid", - "webpki-roots 0.22.6", - "whoami", -] - -[[package]] -name = "sqlx-macros" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" -dependencies = [ - "dotenvy", - "either", - "heck", - "once_cell", - "proc-macro2", - "quote", - "serde_json", - "sha2 0.10.7", - "sqlx-core", - "sqlx-rt", - "syn 1.0.109", - "url", -] - -[[package]] -name = "sqlx-rt" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.23.4", ] [[package]] @@ -5808,7 +6124,7 @@ version = "0.25.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "928ebd55ab758962e230f51ca63735c5b283f26292297c81404289cda5d78631" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cap-fs-ext", "cap-std", "fd-lock", @@ -6174,7 +6490,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd30deba9a1cd7153c22aecf93e86df639e7b81c622b0af8d9255e989991a7b7" dependencies = [ - "indexmap", + "indexmap 1.9.3", "itertools", "nom8", "toml_datetime 0.5.1", @@ -6186,7 +6502,7 @@ version = "0.19.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" dependencies = [ - "indexmap", + "indexmap 1.9.3", "serde", "serde_spanned", "toml_datetime 0.6.2", @@ -6246,7 +6562,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.3", "pin-project", "pin-project-lite", "rand", @@ -6264,7 +6580,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -6282,7 +6598,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -6301,7 +6617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ "base64 0.20.0", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -6575,6 +6891,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +[[package]] +name = "ulid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +dependencies = [ + "rand", +] + [[package]] name = "unarray" version = "0.1.4" @@ -6691,7 +7016,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ae74ef183fae36d650f063ae7bde1cacbe1cd7e72b617cbe1e985551878b98" dependencies = [ - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "utoipa-gen", @@ -6825,7 +7150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "474a216b3461220699d5e192ceac8fbc5b489af020760803b5a9d1e030dc8b0f" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "cap-rand", "cap-std", "io-extras", @@ -6934,7 +7259,7 @@ version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ - "indexmap", + "indexmap 1.9.3", "url", ] @@ -6948,7 +7273,7 @@ dependencies = [ "async-trait", "bincode", "cfg-if 1.0.0", - "indexmap", + "indexmap 1.9.3", "libc", "log", "object", @@ -7050,7 +7375,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap", + "indexmap 1.9.3", "log", "object", "serde", @@ -7129,7 +7454,7 @@ dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap", + "indexmap 1.9.3", "libc", "log", "mach", @@ -7264,7 +7589,16 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.100.1", +] + +[[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki 0.101.2", ] [[package]] @@ -7283,10 +7617,6 @@ name = "whoami" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" -dependencies = [ - "wasm-bindgen", - "web-sys", -] [[package]] name = "widestring" @@ -7302,7 +7632,7 @@ checksum = "6627da83e9cdf851594a1dcf047573e700ecaa7ce79b70e02f3df5e5d24d0096" dependencies = [ "anyhow", "async-trait", - "bitflags", + "bitflags 1.3.2", "thiserror", "tracing", "wasmtime", @@ -7572,7 +7902,7 @@ version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c52a121f0fbf9320d5f2a9a5d82f6cb7557eda5e8b47fc3e7f359ec866ae960" dependencies = [ - "bitflags", + "bitflags 1.3.2", "io-lifetimes", "windows-sys 0.48.0", ] @@ -7585,7 +7915,7 @@ checksum = "f887c3da527a51b321076ebe6a7513026a4757b6d4d144259946552d6fc728b3" dependencies = [ "anyhow", "id-arena", - "indexmap", + "indexmap 1.9.3", "log", "pulldown-cmark", "unicode-xid", diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix index 8c73a286e8..fb5061349a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-tmFj1hqsAWeWOCmw1rELveK57uxMtCEkZygRjGm54IY="; + hash = "sha256-mHmeNKr9Q/wIHO2G8xVOJTSr5myIzhXWl6R+SLEbDN8="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix index fa3e03d415..a8d959db55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 - sourceRoot = "source/tooling/cli"; + sourceRoot = "${src.name}/tooling/cli"; cargoHash = "sha256-ErUzhmPA2M1H4B4SrEt4FRWHcWLA1UzQqVA1gkrmdJQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 70639540ff..fbec63f6c8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.16.12"; + version = "0.17.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qrttPpbmh8yL80naXeOosBDjxKjWRxmsVHJLRzLOehQ="; + hash = "sha256-Zezrn1whQ62TnAFUZFyxORvRl4BFFeK/MEa29kaFj28="; }; - cargoSha256 = "sha256-6bGRV1qYF+VWJjA5qS6PYx/4iLvsIDABxkN2N3AYXAU="; + cargoHash = "sha256-921ULk061l7HHg6hLMany61N2SbMRw4wMaDvUbSGEq8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix index b3a12c5e10..cba3b4b3dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; }; - sourceRoot = "source/crate2nix"; + sourceRoot = "${src.name}/crate2nix"; cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix index b1756e62ee..def31b1ce4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -1,17 +1,24 @@ -{ lib, fetchCrate, rustPlatform, openssl, pkg-config, stdenv, CoreServices }: +{ lib, fetchCrate, rustPlatform, openssl, pkg-config, cacert, stdenv, CoreServices }: rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.1.4"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-SnmDOMxc+39LX6kOzma2zA6T91UGCnvr7WWhX+wXnLo="; + sha256 = "sha256-8S8zUOb2oiXbJQRgY/g9H2+EW+wWOQugr8+ou34CYPg="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config cacert ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - cargoSha256 = "sha256-Mf/WtOO/vFuhg90DoPDwOZ6XKj423foHZ8vHugXakb0="; + cargoSha256 = "sha256-sCP8njwYA29XmYu2vfuog0NCL1tZlsZiupkDVImrYCE="; + + checkFlags = [ + # these tests require dioxous binary in PATH, + # can be removed after: https://github.com/DioxusLabs/dioxus/pull/1138 + "--skip=cli::autoformat::spawn_properly" + "--skip=cli::translate::generates_svgs" + ]; meta = with lib; { description = "CLI tool for developing, testing, and publishing Dioxus apps"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/measureme/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/measureme/Cargo.lock new file mode 100644 index 0000000000..a1e663a7d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/measureme/Cargo.lock @@ -0,0 +1,993 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +dependencies = [ + "const-random", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "analyzeme" +version = "9.2.0" +source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" +dependencies = [ + "byteorder", + "measureme 9.2.0", + "memchr", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "analyzeme" +version = "10.1.1" +dependencies = [ + "analyzeme 9.2.0", + "decodeme", + "flate2", + "measureme 10.1.1", + "memchr", + "rustc-hash", + "serde", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[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 = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[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 = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crox" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "rustc-hash", + "serde", + "serde_json", + "structopt", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "csv" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +dependencies = [ + "csv-core", + "itoa 1.0.6", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "decodeme" +version = "10.1.1" +dependencies = [ + "measureme 10.1.1", + "memchr", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[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 = "flamegraph" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "inferno", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[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 = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "inferno" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2a71c56e4c218f2a1d36bc5177cbfdedf89697ac68610ac3c8452cde152231" +dependencies = [ + "ahash", + "itoa 0.4.8", + "lazy_static", + "log", + "num-format", + "quick-xml", + "rgb", + "str_stack", +] + +[[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 = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[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.146" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[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 = "measureme" +version = "9.2.0" +source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef0392f0f6a7201f4946502ef41" +dependencies = [ + "log", + "memmap2", + "parking_lot", + "perf-event-open-sys 1.0.1", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "measureme" +version = "10.1.1" +dependencies = [ + "log", + "memmap2", + "parking_lot", + "perf-event-open-sys 3.0.0", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" +dependencies = [ + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mmedit" +version = "10.1.1" +dependencies = [ + "decodeme", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "mmview" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "num-format" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" +dependencies = [ + "arrayvec", + "itoa 1.0.6", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "perf-event-open-sys" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a" +dependencies = [ + "libc", +] + +[[package]] +name = "perf-event-open-sys" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29be2ba35c12c6939f6bc73187f728bba82c3c062ecdc5fa90ea739282a1f58" +dependencies = [ + "libc", +] + +[[package]] +name = "prettytable-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "csv", + "encode_unicode", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[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 = "regex" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "serde_json" +version = "1.0.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +dependencies = [ + "itoa 1.0.6", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "stack_collapse" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "structopt", +] + +[[package]] +name = "str_stack" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "summarize" +version = "10.1.1" +dependencies = [ + "analyzeme 10.1.1", + "measureme 10.1.1", + "prettytable-rs", + "rustc-hash", + "serde", + "serde_json", + "structopt", +] + +[[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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "version_checker" +version = "10.1.1" +dependencies = [ + "glob", + "regex", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +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/development/tools/rust/measureme/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/measureme/default.nix new file mode 100644 index 0000000000..79b938b2ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/measureme/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "measureme"; + version = "10.1.1"; + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "measureme"; + rev = version; + hash = "sha256-RCh6fTa4d+/Fj5ID5Su3pCZj/O+FhITzfKixXu9G550="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "analyzeme-9.2.0" = "sha256-YOZiux4ouWBToGFx0+fiqjcyrnSjwc+8Qfi2rLGT/18="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = with lib; { + description = "Support crate for rustc's self-profiling feature"; + homepage = "https://github.com/rust-lang/measureme"; + license = licenses.asl20; + maintainers = [ maintainers.t4ccer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix index 91dc69c6dc..ef9588a12a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs"; - version = "0.19.0"; + version = "0.20.0"; src = fetchCrate { inherit pname version; - hash = "sha256-SPfCZil56UMr1Gy9pPZyngT0sHMQJrcE4KcjLvTD4js="; + hash = "sha256-IjeQPsHDHmKmS0UeivgmM8dQyhwak1PBIBw31KlVu64="; }; - cargoHash = "sha256-QEOlsKnCMpm4L2Y1Byqntxjgg3zQFYCGkkwFRqmqx0I="; + cargoHash = "sha256-BkYidZzqiI7EIgEuYbeGC7qeVvhC1GARFC4EZpDdBmg="; cargoBuildFlags = [ "--features=cli" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix index f69ebb750d..0a1fa745dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.9"; + version = "0.3.10"; src = fetchCrate { inherit pname version; - hash = "sha256-VNFLX+aPkanX573YpRok2JUWf74O7gtlgmuHkI30y2g="; + hash = "sha256-PIUL7aUIHyHuetkMbJsZ3x1coyzKGwI/AJE/R6uFBM4="; }; - cargoHash = "sha256-cjr7lNwzqcIfjXn1CVHKgeRZlsJ0QG+0x9h6q5e3D0o="; + cargoHash = "sha256-7q5M3huI7Qje5E3Rl2i/9I4g90R8vhJD9Hk78biewBE="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/ra-multiplex/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/ra-multiplex/default.nix new file mode 100644 index 0000000000..ce579c76ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/ra-multiplex/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, makeWrapper +, rustPlatform +, rust-analyzer +}: + +rustPlatform.buildRustPackage { + pname = "ra-multiplex"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "pr2502"; + repo = "ra-multiplex"; + rev = "dcb5f83890cb91016b0a1590cc1b732606bb6ec1"; + hash = "sha256-Hf4Gj9eXEP4gXiqNV4Jq0oiGLX3DtDF9At1feEZ+bUE="; + }; + + cargoHash = "sha256-MeUtkPjOsL1kQ2W0Q1/OqhKDVXs4cECkATHISpyfp9U="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/ra-multiplex \ + --suffix PATH ${lib.makeBinPath [ rust-analyzer ]} + ''; + + meta = with lib; { + description = "A multiplexer for rust-analyzer"; + homepage = "https://github.com/pr2502/ra-multiplex"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ norfair ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 120018d252..9708354794 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-07-10"; - cargoSha256 = "sha256-vC1LwbSnz8TNkmt23XIEZEzOViLJgn+J5e98MYWG+BU="; + version = "2023-07-17"; + cargoSha256 = "sha256-Xi2SG+mMwFvgO0tRdC5RPYhAxN7+Aw9woRVqDA+S4Ts="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-LPU6TxxzZd3FlAL+W6oo4g0WA/+6G2JccC93W4ED8yA="; + sha256 = "sha256-TcSjq91OCaJ7L3paN9XYsgOw990ZtDveI3fT/YW9nD8="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix index 9a4ad9e571..8fd71919a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = version; - sha256 = "sha256-c55MiXpMnOsMUI5Bg6k8Ta9iT3G+ixzfMbj9T17OKAY="; + sha256 = "sha256-H1F+sz7PLpuBgQCo/InxPStbg/S6JILjr0IZ+GEGaSM="; }; - cargoSha256 = "sha256-yuwerF4gICPSpwopB4iMheXC7SMtX7IgSEgRwJ/gJdg="; + cargoSha256 = "sha256-O8JveH5RzkhUVHqUSzfPOujfH3HcoRMZ455QvMFyJLI="; # tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix new file mode 100644 index 0000000000..451ae2f956 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustycli/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchCrate +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rustycli"; + version = "0.1.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0="; + }; + + cargoHash = "sha256-WU3lgGJH6qVDI1Un3HBqg0edqiP5sobTsAIXdnjeNTU="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + # some examples fail to compile + cargoTestFlags = [ "--tests" ]; + + meta = with lib; { + description = "Access the rust playground right in terminal"; + homepage = "https://github.com/pwnwriter/rustycli"; + changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix new file mode 100644 index 0000000000..01068b3ab6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix @@ -0,0 +1,23 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "specr-transpile"; + version = "0.1.20"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-HXqUp80vPFwG0B+f/Zfem0gOHF/igmtxTvS1c8amLmo="; + }; + + cargoHash = "sha256-UCIXuVwMDCJkHQJtmRUw6EiGDYCF5DeUVxBrQM4lgxg="; + + meta = with lib; { + description = "Converts Specr lang code to Rust"; + homepage = "https://github.com/RalfJung/minirust-tooling"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index 87a6468340..74da630ff9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,35 +2,50 @@ , lib , rustPlatform , fetchFromGitHub +, installShellFiles , pkg-config -, openssl -, SystemConfiguration -, CoreFoundation -, Security , libiconv , testers , sqlx-cli +, CoreFoundation +, Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - hash = "sha256-f9DCavvqq/a+1wusKlc3jOjyFRVMIAHGCryZxV5qews="; + hash = "sha256-567/uJPQhrNqDqBF/PqklXm2avSjvtQsddjChwUKUCI="; }; - cargoHash = "sha256-9vbrehtfw6ctIF7uXZPvODx3kkxz+m9h2Uv+2t45I0w="; + cargoHash = "sha256-X7fLbih1s3sxn8vb2kQeFUKDK2DlC+sjm9ZTwj3FD1Y="; doCheck = false; - cargoBuildFlags = [ "-p sqlx-cli" ]; + cargoBuildFlags = [ "--package sqlx-cli --no-default-features --features rustls,postgres,sqlite,mysql,completions" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreFoundation + Security + SystemConfiguration + libiconv + ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/sqlx completions $shell > sqlx.$shell + installShellCompletion sqlx.$shell + done + ''; passthru.tests.version = testers.testVersion { package = sqlx-cli; @@ -42,6 +57,6 @@ rustPlatform.buildRustPackage rec { "SQLx's associated command-line utility for managing databases, migrations, and enabling offline mode with sqlx::query!() and friends."; homepage = "https://github.com/launchbadge/sqlx"; license = licenses.asl20; - maintainers = with maintainers; [ greizgh xrelkd ]; + maintainers = with maintainers; [ greizgh xrelkd fd ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/tauri-mobile/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/tauri-mobile/default.nix index 7870a440d1..7bdf412ebe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/tauri-mobile/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/tauri-mobile/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 - # sourceRoot = "source/tooling/cli"; + # sourceRoot = "${src.name}/tooling/cli"; cargoHash = "sha256-MtLfcDJcLVhsIGD6pjpomuu9GYGqa7L8xnaQ++f+0H4="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock index c528a5ec60..23192dcfe6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rye/Cargo.lock @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9e4dfef09bebad6d85efa8b6e1b2f7a809c4419d7135ab573c4fd133c0e8ead" dependencies = [ "age-core", - "base64", + "base64 0.13.1", "bech32", "chacha20poly1305", "cookie-factory", @@ -61,7 +61,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d2e815ac879dc23c1139e720d21c6cd4d1276345c772587285d965a69b8f32" dependencies = [ - "base64", + "base64 0.13.1", "chacha20poly1305", "cookie-factory", "hkdf", @@ -72,6 +72,17 @@ dependencies = [ "sha2", ] +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom 0.2.9", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -138,6 +149,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + [[package]] name = "bech32" version = "0.9.1" @@ -246,6 +263,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "charset" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" +dependencies = [ + "base64 0.13.1", + "encoding_rs", +] + +[[package]] +name = "chumsky" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23170228b96236b5a7299057ac284a321457700bc8c41a4476052f0f4ba5349d" +dependencies = [ + "hashbrown", + "stacker", +] + [[package]] name = "cipher" version = "0.4.4" @@ -259,9 +296,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.7" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc" dependencies = [ "clap_builder", "clap_derive", @@ -270,9 +307,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae" dependencies = [ "anstyle", "bitflags", @@ -291,9 +328,9 @@ 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", @@ -303,9 +340,15 @@ dependencies = [ [[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 = "configparser" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5458d9d1a587efaf5091602c59d299696a3877a439c8f6d461a2d3cce11df87a" [[package]] name = "console" @@ -326,6 +369,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + [[package]] name = "cpufeatures" version = "0.2.7" @@ -454,6 +503,12 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + [[package]] name = "decompress" version = "0.6.0" @@ -562,6 +617,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + [[package]] name = "errno" version = "0.3.1" @@ -610,7 +674,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] @@ -682,6 +746,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + [[package]] name = "generic-array" version = "0.14.7" @@ -761,6 +831,9 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "heck" @@ -808,7 +881,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml", + "toml 0.5.11", "unic-langid", ] @@ -1053,6 +1126,17 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "mailparse" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b56570f5f8c0047260d1c8b5b331f62eb9c660b9dd4071a8c46f8c7d3f280aa" +dependencies = [ + "charset", + "data-encoding", + "quoted_printable", +] + [[package]] name = "memchr" version = "2.5.0" @@ -1061,9 +1145,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "minijinja" -version = "0.31.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1dbc390e4447b2500c4071d7bc2a808cf07e925bae6b92db8a3c3eae773c58" +checksum = "1f75e6f2b03d9292f6e18aaeeda21d58c91f6943a58ea19a2e8672dcf9d91d5b" dependencies = [ "serde", "serde_json", @@ -1093,6 +1177,21 @@ dependencies = [ "adler", ] +[[package]] +name = "monotrail-utils" +version = "0.0.1" +source = "git+https://github.com/konstin/poc-monotrail#596c51ed1955ada7117b09b526eba6140cbdc288" +dependencies = [ + "anyhow", + "fs-err", + "pep508_rs", + "serde", + "serde_json", + "toml 0.7.3", + "tracing", + "unscanny", +] + [[package]] name = "nix" version = "0.26.2" @@ -1121,6 +1220,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -1222,6 +1330,7 @@ checksum = "fe1d15693a11422cfa7d401b00dc9ae9fb8edbfbcb711a77130663f4ddf67650" dependencies = [ "lazy_static", "regex", + "serde", "tracing", "unicode-width", ] @@ -1235,6 +1344,7 @@ dependencies = [ "once_cell", "pep440_rs", "regex", + "serde", "thiserror", "tracing", "unicode-width", @@ -1344,6 +1454,31 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "python-pkginfo" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e23988cc0f9fbe3c42ae6e399daa7c0273d6013784b744b1742c6e1060611b0e" +dependencies = [ + "flate2", + "fs-err", + "mailparse", + "rfc2047-decoder", + "serde", + "tar", + "thiserror", + "zip", +] + [[package]] name = "quote" version = "1.0.27" @@ -1353,6 +1488,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "quoted_printable" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" + [[package]] name = "rand" version = "0.7.3" @@ -1444,9 +1585,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick 1.0.1", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick 1.0.1", "memchr", @@ -1455,9 +1608,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reword" @@ -1468,6 +1621,20 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "rfc2047-decoder" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e" +dependencies = [ + "base64 0.21.2", + "charset", + "chumsky", + "memchr", + "quoted_printable", + "thiserror", +] + [[package]] name = "rust-embed" version = "6.6.1" @@ -1530,13 +1697,14 @@ dependencies = [ [[package]] name = "rye" -version = "0.6.0" +version = "0.11.0" dependencies = [ "age", "anyhow", "bzip2", "clap", "clap_complete", + "configparser", "console", "curl", "decompress", @@ -1550,11 +1718,13 @@ dependencies = [ "license", "memchr", "minijinja", + "monotrail-utils", "nix", "once_cell", "pathdiff", "pep440_rs", "pep508_rs", + "python-pkginfo", "regex", "same-file", "self-replace", @@ -1564,6 +1734,7 @@ dependencies = [ "shlex", "simple-home-dir", "slug", + "sysinfo", "tar", "tempfile", "toml_edit", @@ -1637,9 +1808,9 @@ dependencies = [ [[package]] name = "self-replace" -version = "1.3.2" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f21725f004568aa515e4699949b3453e0603a11e407e88c6fe0e6d548a4a20e" +checksum = "a0e7c919783db74b5995f13506069227e4721d388bea4a8ac3055acac864ac16" dependencies = [ "fastrand", "tempfile", @@ -1683,6 +1854,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +dependencies = [ + "serde", +] + [[package]] name = "sha2" version = "0.10.6" @@ -1740,6 +1920,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -1780,6 +1973,20 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sysinfo" +version = "0.29.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "winapi", +] + [[package]] name = "tar" version = "0.4.38" @@ -1894,11 +2101,26 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -1907,6 +2129,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -2021,6 +2245,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + [[package]] name = "url" version = "2.3.1" @@ -2318,9 +2548,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" dependencies = [ "byteorder", + "bzip2", "crc32fast", "crossbeam-utils", "flate2", + "time", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/development/tools/rye/default.nix b/third_party/nixpkgs/pkgs/development/tools/rye/default.nix index 7d1eb3c597..63873b7a67 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rye/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rye/default.nix @@ -1,30 +1,29 @@ { lib -, fetchFromGitHub , rustPlatform -, git -, openssl +, fetchFromGitHub , pkg-config +, openssl , stdenv +, Libsystem , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.6.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = pname; - rev = version; - # One of the tests runs git command so we need .git directory there - leaveDotGit = true; - sha256 = "llm4aqMfaVf3VbHudWjb9V2GFgJpP9S211Ui7xXdrAU="; + rev = "refs/tags/${version}"; + hash = "sha256-00Q+qvK1fq9CGb6umtCiUJZZ1M5LMxiSIM3/s7eOumM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "dialoguer-0.10.4" = "sha256-WDqUKOu7Y0HElpPxf2T8EpzAY3mY8sSn9lf0V0jyAFc="; + "monotrail-utils-0.0.1" = "sha256-4x5jnXczXnToU0QXpFalpG5A+7jeyaEBt8vBwxbFCKQ="; }; }; @@ -35,12 +34,16 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - git openssl ] - ++ lib.optional stdenv.isDarwin SystemConfiguration; + ++ lib.optionals stdenv.isDarwin [ + Libsystem + SystemConfiguration + ]; - nativeCheckInputs = [ git ]; + checkFlags = [ + "--skip=utils::test_is_inside_git_work_tree" + ]; meta = with lib; { description = "A tool to easily manage python dependencies and environments"; diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index e1f3d4375b..f17208fbfb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ }: let - upstream-info = (lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver; + upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver; allSpecs = { x86_64-linux = { system = "linux64"; @@ -14,12 +14,12 @@ let }; x86_64-darwin = { - system = "mac64"; + system = "mac-x64"; sha256 = upstream-info.sha256_darwin; }; aarch64-darwin = { - system = "mac_arm64"; + system = "mac-arm64"; sha256 = upstream-info.sha256_darwin_aarch64; }; }; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { version = upstream-info.version; src = fetchurl { - url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; + url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${version}/${spec.system}/chromedriver-${spec.system}.zip"; sha256 = spec.sha256; }; @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { unpackPhase = "unzip $src"; installPhase = '' - install -m755 -D chromedriver $out/bin/chromedriver + install -m755 -D "chromedriver-${spec.system}/chromedriver" $out/bin/chromedriver '' + lib.optionalString (!stdenv.isDarwin) '' patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}" @@ -73,5 +73,6 @@ in stdenv.mkDerivation rec { # Note from primeos: By updating Chromium I also update Google Chrome and # ChromeDriver. platforms = attrNames allSpecs; + mainProgram = "chromedriver"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index a81cc6bddd..5b8c3e9412 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-IgTAUxA1Cfe0LaYKrKtbm1PELGic31XRdGMIoLDG6w0="; + hash = "sha256-dCGUTt5pqT3HmlUNIdrgKFvMVhyosyQFElFHBswTbio="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index d4668c4496..4b705ebcaf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-PSBwwF6tIQ6EZD/nWj5Lw0ifk1aLLJl/qaj5EsksBBo="; + hash = "sha256-R9W9ZjH/McB5EwJ/RXeShoRKA6GRFiQX3mgQOCBm8sA="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix index 00c5c3fc20..58eb966001 100644 --- a/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.75.6"; + version = "1.82.4"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-kFndbCQgS9cyByPayCuN9b0+3Np76z4HhmasRfqP0cM="; + sha256 = "sha256-lxdIwLhyFDKh3Gb2hkbZcamDEf4DdGEWkaizkGod0Eo="; }; - vendorSha256 = "sha256-Z499rGTsgsYgrTtAcwwhE39wgMFCl44iEZ0feIZBc9A="; + vendorSha256 = "sha256-/jYZp0bZUIHUn2Tmbgrpvz3mTQt3rF14wbcvWhEUAzw="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index f17f00e79d..aee1a2d150 100644 --- a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.6"; - vendorHash = "sha256-AfgDsd4W8wV0GeymD9SLeHtOeFP9qbFy+GTdMxQSkDA="; + version = "5.5.7"; + vendorHash = "sha256-OXV/hTSHJvYfe2SiFamkedC01J/DOgd8I60yIpQToos="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-lE8RBjBXucL0DJjEnBLbHqOVE6g358rwmaEUqU6QhOw="; + hash = "sha256-LC6QQIVHllBRu8B6XfV8SuTB3O+FmqYr+LQnVmLj2nU="; }; ldflags = [ @@ -27,11 +27,11 @@ buildGoModule rec { $GOPATH/bin/symfony-cli ''; - meta = with lib; { + meta = { description = "Symfony CLI"; homepage = "https://github.com/symfony-cli/symfony-cli"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ drupol ]; + license = lib.licenses.agpl3Plus; mainProgram = "symfony"; + maintainers = with lib.maintainers; [ drupol ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix b/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix index 8084279deb..c1675a806a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-GXSFDXRBGnEgqfISou85Ivd5npjZB7aMsfrQ2Y+EN0g="; - aarch64-linux = "sha256-H2kbeso8/566czi1pEyip5rAgFJQYfdLnAImP25tDe0="; - armv7l-linux = "sha256-52XyCmsjuHKs3aGUaAA0uQxGTY06k8gxK/fLYSVdP74="; - x86_64-darwin = "sha256-8gwu/sVTjQGE4mSdxtk7ivQyAiRwCuL0Ot/aCrER/as="; - x86_64-linux = "sha256-W9JRBB4JDTighDry21ukaFm1H1iKyg7HVG9RJHmIn2Q="; + aarch64-darwin = "sha256-tlsAztU6Rk7xq1T3NNDlB0Gt3iRpvAk72VO+gGuYEps="; + aarch64-linux = "sha256-bYe/QJ7UuMq5tDhhof/83gfUN0DbenQu/wbrvLylKeM="; + armv7l-linux = "sha256-d0kK0clkSUW4ARTNUVWpmJidXwxLucjC4Vwu924YB1E="; + x86_64-darwin = "sha256-4cvrHklkQ0fo7fVi1aRKOMhX4ky7dENwGh2jqTneQLo="; + x86_64-linux = "sha256-FX0N1WmV9pixd3ZoBXnSdBSSDBqj//S8e5nEaQuEdxc="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix index 32c3c47b21..2c003913b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "sha256-z6/CogY7X3u4BvvP8gRjBeKw0Cci9d6TKZYrKLwoTqs="; + sha256 = "sha256-A6h8TmYK5WOcmANk/uM9QO1h767BWASWTwLthtKqrEk="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-7j4SNBMNtu4vFkZic4I6Wjlt+oHQ1o8gOxweIq8t7ro="; + cargoHash = "sha256-+jz0J1qFK2fZ4OX089pgNtT2vfiOTf39qQjeXmLoFNs="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; diff --git a/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix index f9f74eec6b..7daa9401a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.19"; + version = "1.1.20"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-osR7+oQ0QBIk/OrMb4Txhb31zELi+eoM47GsWgF/PAg="; + hash = "sha256-hIyZwXDI3lJQOK27RaABf7cnj7jOxKdLUdZB5fp+7kY="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index 9ab8a36b74..79c8205c3b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-Hs/fvsQCp3QrkqjYYE5oLYfhuJyvyMKXa/EGDmFL254="; + hash = "sha256-1s9wN72QnlvtcB8W26Mw4uC8c6/txUfv6QBpqcWzYZQ="; }; - cargoHash = "sha256-SgZK8U1j5dNhjueFriVL3Zb4YrnznaqOoEfDZjAKCmE="; + cargoHash = "sha256-0bzW34QuD0OJLXDzrVRPzVTyCZHWiQZh6MUP5Wix+Tg="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix index e0b5c93ee8..0b2f219014 100644 --- a/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-OWvWi3mIgcWTnRMsnKgYqB9qzICBOmCcWenTfqhaz+k="; + hash = "sha256-+vvlj8gGCHKQ2T245fwaZxCiglRnrDFwupQIh3I47Ys="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-WwhoKHWZSOcocpqPqmSFYzNKxxXtpKpRreaPHqc+/40="; + cargoHash = "sha256-0Qr40hMA59WaHinkUkebF0CwPy3aublgfzSz1er7Uws="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/third_party/nixpkgs/pkgs/development/tools/volta/default.nix b/third_party/nixpkgs/pkgs/development/tools/volta/default.nix index 125c396d1a..b61347c05f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/volta/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/volta/default.nix @@ -46,6 +46,9 @@ rustPlatform.buildRustPackage rec { switch between Nodes. You can install npm package binaries in your toolchain without having to periodically reinstall them or figure out why they’ve stopped working. + + Note: Volta cannot be used on NixOS out of the box because it downloads + Node binaries that assume shared libraries are in FHS standard locations. ''; homepage = "https://volta.sh/"; changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index ec336d422a..d7b6aba2a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -7,28 +7,27 @@ , stdenv , curl , Security -, runCommand +, version ? "0.2.87" +, hash ? "sha256-0u9bl+FkXEK2b54n7/l9JOCtKo+pb42GF9E1EnAUQa0=" +, cargoHash ? "sha256-AsZBtE2qHJqQtuCt/wCAgOoxYMfvDh8IzBPAOkYSYko=" }: rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.84"; + inherit version hash cargoHash; src = fetchCrate { - inherit pname version; - sha256 = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; + inherit pname version hash; }; - cargoSha256 = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; nativeCheckInputs = [ nodejs ]; - # other tests require it to be ran in the wasm-bindgen monorepo - cargoTestFlags = [ "--test=interface-types" ]; + # tests require it to be ran in the wasm-bindgen monorepo + doCheck = false; meta = with lib; { homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix index 43ff3318d7..cc810b15b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wasmedge"; - version = "0.13.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = finalAttrs.version; - sha256 = "sha256-NbjjfK6qMKl6PRNSOmAYKB2prPEo9WCZuVWN1hLdGbU="; + sha256 = "sha256-AU+EfNC6Au93ajj8cMTbJDvJ5iWLtT5Law7l55Knxuk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmserve/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasmserve/default.nix new file mode 100644 index 0000000000..3248082e2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/wasmserve/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, lib +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "wasmserve"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "hajimehoshi"; + repo = "wasmserve"; + rev = "v${version}"; + hash = "sha256-KlCbUre6yIorE1ZM++Rto8vgwVGsC1wZj1xCd3AwQy0="; + }; + + vendorHash = null; + + meta = with lib; { + description = "An HTTP server for testing Wasm"; + homepage = "https://github.com/hajimehoshi/wasmserve"; + license = licenses.asl20; + maintainers = with maintainers; [ kirillrdy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix new file mode 100644 index 0000000000..b8181e812f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix @@ -0,0 +1,43 @@ +{ fetchFromGitHub, lib, nodejs, stdenv, yarn }: + +stdenv.mkDerivation rec { + name = "yarn-berry"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "yarnpkg"; + repo = "berry"; + rev = "@yarnpkg/cli/${version}"; + hash = "sha256-eBBB/F+mnGi93Qf23xgt306/ogoV76RXOM90O14u5Tw="; + }; + + buildInputs = [ + nodejs + ]; + + nativeBuildInputs = [ + yarn + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + yarn workspace @yarnpkg/cli build:cli + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm 755 ./packages/yarnpkg-cli/bundles/yarn.js "$out/bin/yarn" + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://yarnpkg.com/"; + description = "Fast, reliable, and secure dependency management."; + license = licenses.bsd2; + maintainers = with maintainers; [ ryota-ka ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index ee595164dd..c471a118ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.34.1"; + version = "4.34.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-rkf3yoTB7umGHvbVb7eg21a4AJTyYOuWf4jHs274SGc="; + hash = "sha256-g+IqMYUgsab3bC9SX7Kgo6UGKfMQRtxTUxPg6MgFsXg="; }; - vendorHash = "sha256-726kRRxFj7tqVguPDiHuPpHRN2+FDsqBtIJ4J8I/0Oc="; + vendorHash = "sha256-iI0BHSXiOTm5TlLWTDPVlZRGdTHJS9aNzEXimk8xJUM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index 7c35fb29a9..6eacf78e56 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -1,6 +1,5 @@ { lib , stdenvNoCC -, callPackage , fetchurl , autoPatchelfHook , unzip @@ -12,7 +11,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.6.14"; + version = "0.7.1"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +32,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "adXsZjg2dmUzaKTBARfS195y3eTUgiOep5pr6y36c6g="; + hash = "sha256-5AC1jd2rTVZ+Rfn7B1uvps9NVVAByMlo0mjhM8Wc6jI="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "IHGYARyeRHN3vORW/fBX7+j3vpfQX+ZQWX2TcIOrMHc="; + hash = "sha256-DM1HVlbqPCOkT05IAVciP1c5g7PIZPmjHmlbWD8DmoU="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "uESJFXTVXpK2HPUszU0l5Jgnvz28toBP/0DgVFvqYGY="; + hash = "sha256-UjInXqkdfigrmIJycee4Nxjv+LhYGLjP+Z/B8WnAfmI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "5iU+1FevTjjzo/qN0zjIoCQflbWCmdfMXkx+6BOEEcc="; + hash = "sha256-l5lSbJwsPHejcgCXvTDPjvzSP6s/OBgOS44g2xTxfYo="; }; }; updateScript = writeShellScript "update-bun" '' @@ -64,7 +63,7 @@ stdenvNoCC.mkDerivation rec { }; meta = with lib; { homepage = "https://bun.sh"; - changelog = "https://github.com/Jarred-Sumner/bun/releases/tag/bun-v${version}"; + changelog = "https://bun.sh/blog/bun-v${version}"; description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; longDescription = '' @@ -74,7 +73,7 @@ stdenvNoCC.mkDerivation rec { mit # bun core lgpl21Only # javascriptcore and webkit ]; - maintainers = with maintainers; [ DAlperin jk thilobillerbeck ]; + maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman ]; platforms = builtins.attrNames passthru.sources; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index 1d68d92dea..4532b77430 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -18,7 +18,7 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-wzdtFHsSzXl8TCtTBVAwwsvzUd4DakCAPRVHtwoGLB0="; + checksum = "sha256-khMJRCGNIITvs56SHHKxoxptoMBb7lqA3FS293qfMys="; }; aarch64-linux = { platform = "linux-arm64"; @@ -30,7 +30,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "12.17.1"; + version = "12.17.3"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 52123496e6..751e891a32 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.35.1"; + version = "1.35.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-8Q2U3+exWL3rz/YKCk0IvyfgTW6EGmzHG5py0cjW07U="; + hash = "sha256-KyFQtJO78F2CdOqEQOXRoEWtc1N0qp1QWATOC+2JTCg="; }; - cargoHash = "sha256-ErCihNFxnQJUHG4QYeGTFwFq9jaOzAcXIREGsHTfmHM="; + cargoHash = "sha256-9Lxkhc0Edpthycwm27d+RZReXut2nUU9i5OZhcwE1YU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix b/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix index 644349697c..b5115aca9f 100644 --- a/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/edge-runtime/default.nix @@ -11,7 +11,7 @@ let pname = "edge-runtime"; - version = "1.6.7"; + version = "1.8.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,11 +20,11 @@ rustPlatform.buildRustPackage { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-Jq9UXFgbTDKe1AWyg4fxn62ODqWu0AUqzlUOo+JUYpo="; + hash = "sha256-B8XsH2aOvd87nxUGpSpaNnpTIY0tKDWh7RkXoJcBjrs="; fetchSubmodules = true; }; - cargoHash = "sha256-fOqo9aPgpW6oAEHtZIE7iHjTIRrgDPbdSFBaq4s0r94="; + cargoHash = "sha256-I8BC13WUlBdT6OxTD2t0Aw5qYXpUyOa0MYUB8H2XNx8="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 907cba187c..00a3bd586f 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.56"; + version = "0.1.62"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-Megf4kQ17rwvHKlREzEw7YIibtl/wol0U5bVvPuwxxI="; + hash = "sha256-/IIHe3OG/r/cZ4PaYZazv/aPBzyxNBCWbgkzFbJMpvc="; }; - vendorHash = "sha256-EI1cyLCiUEkit80gh0BV6Ti8CX8KYuIqz2od7LDLTXg="; + vendorHash = "sha256-bjlNwhhhvwrw5GtWO8+1HV2IauqexKSb+O9WGX06qGA="; subPackages = [ "." ]; @@ -25,6 +25,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + patches = [ ./disable-auto-update.patch ]; + preBuild = '' go generate ./... ''; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch b/third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch new file mode 100644 index 0000000000..d6c59755f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch @@ -0,0 +1,25 @@ +From 9c76dbff982b0fd8beaffae42a6e98bc1e67f089 Mon Sep 17 00:00:00 2001 +From: Gabriel Simmer +Date: Fri, 21 Jul 2023 08:16:52 +0100 +Subject: [PATCH] Disable auto update + +--- + internal/config/config.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/internal/config/config.go b/internal/config/config.go +index 1914f8e0..958baf27 100644 +--- a/internal/config/config.go ++++ b/internal/config/config.go +@@ -141,7 +141,7 @@ func (cfg *Config) ApplyFile(path string) (err error) { + AutoUpdate bool `yaml:"auto_update"` + } + w.SendMetrics = true +- w.AutoUpdate = true ++ w.AutoUpdate = false + + if err = unmarshal(path, &w); err == nil { + cfg.AccessToken = w.AccessToken +-- +2.41.0 + diff --git a/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix b/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix index 2136876483..7e6d3b6618 100644 --- a/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dMN1OY9r2lK/z692gq3mLhmDm2LaNdoCT2/zxmFS0uA="; + sha256 = "sha256-z03+3x1xGYSa+WVEuHBgUQ9NdqG3rCziNYcwTjWBNV8="; }; - cargoHash = "sha256-y5anlqt7deQDjfrfKpXHKle5g24Cruy7bs68pm0bCD4="; + cargoHash = "sha256-4sgf7WfaX7jnV8YynZNLi/N8MfkuAc4tk/8eiKEyyxI="; meta = with lib; { description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix b/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix index 10dd7950f9..614dd83df7 100644 --- a/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/ihp-new/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; dontConfigure = true; - sourceRoot = "source/ProjectGenerator"; + sourceRoot = "${src.name}/ProjectGenerator"; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index 8925378e62..abf2ff4b43 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.2.2"; + version = "2023.4.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-XM7OLr5ety95jjlVqNuQp3rD9laoe1uC1HNP66HJe5M="; + sha256 = "sha256-7tkd0HaJeDdCvX1t1XCHrrQ23xFrcMsy1nhJJEp6klk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock b/third_party/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock index 69cc56a002..b2268cfba6 100644 --- a/third_party/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock @@ -1,35 +1,143 @@ GEM remote: https://rubygems.org/ specs: - daemons (1.3.1) - eventmachine (1.0.9.1) - mail (2.7.1) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) + capybara (3.39.2) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + capybara-screenshot (1.0.26) + capybara (>= 1.0, < 4) + launchy + chunky_png (1.4.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + compass (1.0.3) + chunky_png (~> 1.2) + compass-core (~> 1.0.2) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.3) + multi_json (~> 1.0) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) + concurrent-ruby (1.2.2) + daemons (1.4.1) + date (3.3.3) + diff-lcs (1.5.0) + eventmachine (1.2.7) + execjs (2.8.1) + faye-websocket (0.11.3) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) + ffi (1.15.5) + launchy (2.5.2) + addressable (~> 2.8) + mail (2.8.1) mini_mime (>= 0.1.1) - mailcatcher (0.7.1) - eventmachine (= 1.0.9.1) + net-imap + net-pop + net-smtp + mailcatcher (0.9.0) + eventmachine (= 1.2.7) + faye-websocket (~> 0.11.1) mail (~> 2.3) + net-smtp rack (~> 1.5) sinatra (~> 1.2) - skinny (~> 0.2.3) sqlite3 (~> 1.3) - thin (~> 1.5.0) - mini_mime (1.0.1) - rack (1.6.11) + thin (~> 1.8) + matrix (0.4.2) + mini_mime (1.1.2) + mini_portile2 (2.8.4) + multi_json (1.15.0) + net-imap (0.3.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + psych (5.1.0) + stringio + public_suffix (5.0.3) + racc (1.7.1) + rack (1.6.13) rack-protection (1.5.5) rack + rack-test (2.1.0) + rack (>= 1.3) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rdoc (6.5.0) + psych (>= 4.0.0) + regexp_parser (2.8.1) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubyzip (2.3.2) + sass (3.4.25) + selenium-webdriver (4.9.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - skinny (0.2.4) - eventmachine (~> 1.0.0) - thin (>= 1.5, < 1.7) - sqlite3 (1.4.0) - thin (1.5.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) - tilt (2.0.9) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-helpers (1.4.0) + sprockets (>= 2.2) + sprockets-sass (2.0.0.beta2) + sprockets (>= 2.0, < 4.0) + sqlite3 (1.6.3) + mini_portile2 (~> 2.8.0) + stringio (3.0.7) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + tilt (2.2.0) + timeout (0.4.0) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + websocket (1.2.9) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/development/web/mailcatcher/default.nix b/third_party/nixpkgs/pkgs/development/web/mailcatcher/default.nix index 8be3c7ebb9..df6ed0a523 100644 --- a/third_party/nixpkgs/pkgs/development/web/mailcatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/mailcatcher/default.nix @@ -1,9 +1,10 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ pkgs, lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mailcatcher"; gemdir = ./.; exes = [ "mailcatcher" "catchmail" ]; + ruby = pkgs.ruby_3_0; passthru.updateScript = bundlerUpdateScript "mailcatcher"; diff --git a/third_party/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix b/third_party/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix index 96d07e2dfc..65595451c5 100644 --- a/third_party/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix @@ -1,65 +1,350 @@ { + addressable = { + dependencies = ["public_suffix"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + type = "gem"; + }; + version = "2.8.4"; + }; + capybara = { + dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; + type = "gem"; + }; + version = "3.39.2"; + }; + capybara-screenshot = { + dependencies = ["capybara" "launchy"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1"; + type = "gem"; + }; + version = "1.0.26"; + }; + chunky_png = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; + type = "gem"; + }; + version = "1.4.0"; + }; + coffee-script = { + dependencies = ["coffee-script-source" "execjs"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + type = "gem"; + }; + version = "2.4.1"; + }; + coffee-script-source = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; + type = "gem"; + }; + version = "1.12.2"; + }; + compass = { + dependencies = ["chunky_png" "compass-core" "compass-import-once" "rb-fsevent" "rb-inotify" "sass"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c"; + type = "gem"; + }; + version = "1.0.3"; + }; + compass-core = { + dependencies = ["multi_json" "sass"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a"; + type = "gem"; + }; + version = "1.0.3"; + }; + compass-import-once = { + dependencies = ["sass"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq"; + type = "gem"; + }; + version = "1.0.5"; + }; + concurrent-ruby = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + type = "gem"; + }; + version = "1.2.2"; + }; daemons = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.1"; + }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; + diff-lcs = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; }; eventmachine = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.0.9.1"; + version = "1.2.7"; + }; + execjs = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + type = "gem"; + }; + version = "2.8.1"; + }; + faye-websocket = { + dependencies = ["eventmachine" "websocket-driver"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01xkpv5b4fjc5n6n1fq6z1ris991av2fbadvs8r71i9r34b8g48h"; + type = "gem"; + }; + version = "0.11.3"; + }; + ffi = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + launchy = { + dependencies = ["addressable"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; + type = "gem"; + }; + version = "2.5.2"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.1"; }; mailcatcher = { - dependencies = ["eventmachine" "mail" "rack" "sinatra" "skinny" "sqlite3" "thin"]; + dependencies = ["eventmachine" "faye-websocket" "mail" "net-smtp" "rack" "sinatra" "sqlite3" "thin"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02w1ycyfv7x0sh9799lz7xa65p5qvl5z4pa8a7prb68h2zwkfq0n"; + sha256 = "003d2a6i97syw67jxrjq0p4xm19p9cfqnbmsg4b1c3mdb5c78rfz"; type = "gem"; }; - version = "0.7.1"; + version = "0.9.0"; + }; + matrix = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; }; mini_mime = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + mini_portile2 = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + type = "gem"; + }; + version = "2.8.4"; + }; + multi_json = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + net-imap = { + dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "1.0.1"; + version = "0.3.7"; + }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; + type = "gem"; + }; + version = "1.15.3"; + }; + psych = { + dependencies = ["stringio"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1msambb54r3d1sg6smyj4k2pj9h9lz8jq4jamip7ivcyv32a85vz"; + type = "gem"; + }; + version = "5.1.0"; + }; + public_suffix = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + type = "gem"; + }; + version = "5.0.3"; + }; + racc = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + type = "gem"; + }; + version = "1.7.1"; }; rack = { - groups = ["default"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.13"; }; rack-protection = { dependencies = ["rack"]; @@ -72,6 +357,164 @@ }; version = "1.5.5"; }; + rack-test = { + dependencies = ["rack"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; + type = "gem"; + }; + version = "2.1.0"; + }; + rake = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rb-fsevent = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; + type = "gem"; + }; + version = "0.11.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + rdoc = { + dependencies = ["psych"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05r2cxscapr9saqjw8dlp89as7jvc2mlz1h5kssrmkbz105qmfcm"; + type = "gem"; + }; + version = "6.5.0"; + }; + regexp_parser = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; + type = "gem"; + }; + version = "2.8.1"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + type = "gem"; + }; + version = "3.2.6"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; + type = "gem"; + }; + version = "3.12.3"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; + type = "gem"; + }; + version = "3.12.6"; + }; + rspec-support = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; + type = "gem"; + }; + version = "3.12.1"; + }; + rubyzip = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + sass = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kfpcwh8dgw4lc81qglkvjl73689jy3g7196zkxm4fpskg1p5lkw"; + type = "gem"; + }; + version = "3.4.25"; + }; + selenium-webdriver = { + dependencies = ["rexml" "rubyzip" "websocket"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg"; + type = "gem"; + }; + version = "4.9.0"; + }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; groups = ["default"]; @@ -83,46 +526,142 @@ }; version = "1.4.8"; }; - skinny = { - dependencies = ["eventmachine" "thin"]; - groups = ["default"]; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9"; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; type = "gem"; }; - version = "0.2.4"; + version = "3.7.2"; }; - sqlite3 = { - groups = ["default"]; + sprockets-helpers = { + dependencies = ["sprockets"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pmgpqx2sg8pms54rk7kjjy8jwsw21g1f7mb02fggbdcqy8jk3fx"; + sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij"; type = "gem"; }; version = "1.4.0"; }; + sprockets-sass = { + dependencies = ["sprockets"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02g153dhzmrlik5dd9kyq0rvr2xjm3fwx8rm7apqfrykc47aizqr"; + type = "gem"; + }; + version = "2.0.0.beta2"; + }; + sqlite3 = { + dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; + type = "gem"; + }; + version = "1.6.3"; + }; + stringio = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0557v4z7996cgqw7i9197848mymv02krads93dn9lyqa5d7xd0dn"; + type = "gem"; + }; + version = "3.0.7"; + }; thin = { dependencies = ["daemons" "eventmachine" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga"; + sha256 = "08g1yq6zzvgndj8fd98ah7pp8g2diw28p8bfjgv7rvjvp8d2am8w"; type = "gem"; }; - version = "1.5.1"; + version = "1.8.2"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; - version = "2.0.9"; + version = "2.2.0"; + }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + type = "gem"; + }; + version = "0.4.0"; + }; + uglifier = { + dependencies = ["execjs"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; + type = "gem"; + }; + version = "4.2.0"; + }; + websocket = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; + type = "gem"; + }; + version = "0.7.6"; + }; + websocket-extensions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; + xpath = { + dependencies = ["nokogiri"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/development/web/minify/default.nix index 13589bb0f6..3e3d139bec 100644 --- a/third_party/nixpkgs/pkgs/development/web/minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/minify/default.nix @@ -1,24 +1,50 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, nix-update-script +, testers +, minify +}: buildGoModule rec { pname = "minify"; - version = "2.11.1"; + version = "2.12.8"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qna2u+Y4eRGLNvRKDbL/VQud1pn8b1wWzbKQM1p0Yws="; + hash = "sha256-5p1HWXx9kKKaiC0dTQDd1JpRDhKkDGdnDpuz+I0kgpo="; }; - vendorSha256 = "sha256-stj3fOaPM70kF6vTX/DEs4qFq/O0Vq0TFw0J/3L5NmA="; + vendorHash = "sha256-RBBCcqahIF1KjnK/Kxr0TZlRJirFffo9Dt40gNk5EQE="; + + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + subPackages = [ "cmd/minify" ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + inherit version; + package = minify; + command = "minify --version"; + }; + }; + + postInstall = '' + installShellCompletion --cmd minify --bash cmd/minify/bash_completion + ''; + meta = with lib; { - description = "Minifiers for web formats"; - license = licenses.mit; + description = "Go minifiers for web formats"; homepage = "https://go.tacodewolff.nl/minify"; downloadPage = "https://github.com/tdewolff/minify"; + changelog = "https://github.com/tdewolff/minify/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ gaelreyrol ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/netlify-cli/default.nix b/third_party/nixpkgs/pkgs/development/web/netlify-cli/default.nix index 5f702b4b08..f6f403a66d 100644 --- a/third_party/nixpkgs/pkgs/development/web/netlify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/netlify-cli/default.nix @@ -8,7 +8,7 @@ in export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; src = fetchFromGitHub { - inherit (sourceInfo) owner repo rev sha256; + inherit (sourceInfo) owner repo rev hash; }; bypassCache = true; reconstructLock = true; diff --git a/third_party/nixpkgs/pkgs/development/web/netlify-cli/generate.sh b/third_party/nixpkgs/pkgs/development/web/netlify-cli/generate.sh index 6377d204a3..3eaed13a85 100755 --- a/third_party/nixpkgs/pkgs/development/web/netlify-cli/generate.sh +++ b/third_party/nixpkgs/pkgs/development/web/netlify-cli/generate.sh @@ -2,7 +2,7 @@ set -eu -o pipefail cd "$( dirname "${BASH_SOURCE[0]}" )" rm -f ./node-env.nix -src="$(nix-build --expr 'let pkgs = import ../../../.. {}; meta = (pkgs.lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub { inherit (meta) owner repo rev sha256; }')" +src="$(nix-build --expr 'let pkgs = import ../../../.. {}; meta = (pkgs.lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub { inherit (meta) owner repo rev hash; }')" echo $src node2nix \ --input $src/package.json \ diff --git a/third_party/nixpkgs/pkgs/development/web/netlify-cli/netlify-cli.json b/third_party/nixpkgs/pkgs/development/web/netlify-cli/netlify-cli.json index bffa1f03d0..1fe187bcbc 100644 --- a/third_party/nixpkgs/pkgs/development/web/netlify-cli/netlify-cli.json +++ b/third_party/nixpkgs/pkgs/development/web/netlify-cli/netlify-cli.json @@ -2,8 +2,5 @@ "owner": "netlify", "repo": "cli", "rev": "6c7e8c9a4db4e2e408f65e6098a194497944e306", - "sha256": "YMnQrurZDJtfeHBCIzy6vToGHnqtdRGvWFPX5RcWyPg=", - "fetchSubmodules": false, - "leaveDotGit": false, - "deepClone": false + "hash": "sha256-YMnQrurZDJtfeHBCIzy6vToGHnqtdRGvWFPX5RcWyPg=" } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix index 07fb168eeb..b1b5aea576 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.4.0"; - sha256 = "sha256-Cb0Lc8UmtjwCnV3f2IXRCWLnrYfJdblFg8H4zpDuU0g="; + version = "20.5.0"; + sha256 = "sha256-yzJ1aVje8cBOBpp5txtSymHtFZDBfyz6HuOvZB9y4Fg="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix index ae0daf3df7..831ad4f5cd 100644 --- a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix @@ -1,16 +1,16 @@ { lib, buildNpmPackage, fetchFromGitHub }: buildNpmPackage rec { pname = "pnpm-lock-export"; - version = "0.4.0"; + version = "unstable-2023-07-31"; src = fetchFromGitHub { - owner = "cvent"; + owner = "adamcstephens"; repo = "pnpm-lock-export"; - rev = "v${version}"; - hash = "sha256-vS6AW3R4go1Fdr3PBOCnuN4JDrDkl1lWVF7q+q+xDGg="; + rev = "cc03755d6718a9c0d268d0f375907328ac15dc92"; + hash = "sha256-9OlFgmdKjvz4pB36Wm/fUAQDsD8zs32OSA3m2IAgrH8="; }; - npmDepsHash = "sha256-3uW/lzB+UDhFQtRb3X8szNlgAWTcSdwVdtyZvLu+cjI="; + npmDepsHash = "sha256-nqkH7vFD78YvYr9Klguk2o7qHr5wr3ZjaywUKRRRjJo="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json index 9ef62b10e5..7ca48860c5 100644 --- a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json +++ b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json @@ -10,45 +10,54 @@ "license": "MIT", "dependencies": { "@manypkg/get-packages": "^1.1.3", - "@pnpm/lockfile-file": "^5.1.4", - "@pnpm/lockfile-utils": "^4.1.0", - "@pnpm/logger": "^4.0.0", - "@pnpm/prune-lockfile": "^4.0.12", - "@pnpm/read-project-manifest": "^3.0.6", - "@pnpm/types": "^8.4.0", + "@pnpm/lockfile-file": "^8.1.2", + "@pnpm/lockfile-utils": "^8.0.3", + "@pnpm/logger": "^5.0.0", + "@pnpm/prune-lockfile": "^5.0.5", + "@pnpm/read-project-manifest": "^5.0.4", + "@pnpm/types": "^9.2.0", "argparse": "^2.0.1", - "dependency-path": "^9.2.3", - "semver": "^7.3.7" + "dependency-path": "^9.2.8", + "semver": "^7.5.4" }, "bin": { "pnpm-lock-export": "dist/src/bin/pnpm-lock-export.js" }, "devDependencies": { - "@pnpm/lockfile-types": "^4.2.0", - "@pnpm/registry-mock": "^2.20.0", - "@swc/core": "^1.2.218", - "@swc/jest": "^0.2.22", - "@tsconfig/node16-strictest": "^1.0.0", + "@pnpm/lockfile-types": "^5.1.1", + "@pnpm/registry-mock": "^3.10.2", + "@swc/core": "^1.3.70", + "@swc/jest": "^0.2.26", + "@tsconfig/node16-strictest": "^1.0.4", "@types/argparse": "^2.0.10", - "@types/jest": "^28.1.6", - "@types/node": "^16", - "@types/semver": "^7.3.10", - "@typescript-eslint/eslint-plugin": "^5.31.0", - "@typescript-eslint/parser": "^5.31.0", - "eslint": "^8.20.0", + "@types/jest": "^29.5.3", + "@types/node": "^18.16.19", + "@types/semver": "^7.5.0", + "@typescript-eslint/eslint-plugin": "^6.1.0", + "@typescript-eslint/parser": "^6.1.0", + "eslint": "^8.45.0", "jest": "^28.1.3", - "prettier": "^2.7.1", + "prettier": "^3.0.0", "tmp-promise": "^3.0.3", - "typescript": "^4.7.4" + "typescript": "^4.9.5" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "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.1.0", + "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { @@ -56,46 +65,46 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", - "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "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==", "dependencies": { - "@babel/highlight": "^7.18.6" + "@babel/highlight": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz", - "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==", + "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.21.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz", - "integrity": "sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==", + "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.18.6", - "@babel/generator": "^7.21.3", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.21.2", - "@babel/helpers": "^7.21.0", - "@babel/parser": "^7.21.3", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.21.3", - "@babel/types": "^7.21.3", + "@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.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -106,21 +115,21 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "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.21.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz", - "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", + "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.21.3", + "@babel/types": "^7.22.5", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -129,31 +138,17 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "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/@babel/helper-compilation-targets": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", - "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", + "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.20.5", - "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.21.3", + "@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.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -163,158 +158,158 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "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.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "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.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", - "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", + "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.20.7", - "@babel/types": "^7.21.0" + "@babel/template": "^7.22.5", + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "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.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "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.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.21.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", - "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", + "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.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.21.2", - "@babel/types": "^7.21.2" + "@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.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", - "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", + "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.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "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.20.2" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "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.18.6" + "@babel/types": "^7.22.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", - "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", + "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.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", + "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==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz", - "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==", + "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.21.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz", - "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==", + "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.20.7", - "@babel/traverse": "^7.21.0", - "@babel/types": "^7.21.0" + "@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.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", + "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -387,9 +382,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz", - "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", + "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" @@ -546,12 +541,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz", - "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==", + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz", + "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -572,33 +567,33 @@ } }, "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", + "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.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" + "@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.21.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz", - "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", + "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.18.6", - "@babel/generator": "^7.21.3", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.21.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.21.3", - "@babel/types": "^7.21.3", + "@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" }, @@ -616,13 +611,13 @@ } }, "node_modules/@babel/types": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz", - "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==", + "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.19.4", - "@babel/helper-validator-identifier": "^7.19.1", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", "to-fast-properties": "^2.0.0" }, "engines": { @@ -656,23 +651,23 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.1.tgz", - "integrity": "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", + "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz", - "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz", + "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.0", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -700,18 +695,26 @@ } }, "node_modules/@eslint/js": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz", - "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz", + "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@gwhitney/detect-indent": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@gwhitney/detect-indent/-/detect-indent-7.0.1.tgz", + "integrity": "sha512-7bQW+gkKa2kKZPeJf6+c6gFK9ARxQfn+FKy9ScTBppyKRWH2KzsmweXUoklqeEiHiNVWaeP5csIdsNq6w7QhzA==", + "engines": { + "node": ">=12.20" + } + }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", + "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -814,6 +817,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/console/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/console/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -831,15 +846,85 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/console/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/console/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/@jest/console/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/console/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/console/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/console/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/core": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", @@ -888,6 +973,18 @@ } } }, + "node_modules/@jest/core/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/core/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -905,15 +1002,85 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/core/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/core/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/@jest/core/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/core/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/core/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/core/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/create-cache-key-function": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/create-cache-key-function/-/create-cache-key-function-27.5.1.tgz", @@ -941,6 +1108,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/environment/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/environment/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -958,10 +1137,16 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/environment/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/environment/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -981,6 +1166,18 @@ } }, "node_modules/@jest/expect-utils": { + "version": "29.6.2", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz", + "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.4.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect/node_modules/@jest/expect-utils": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", @@ -992,6 +1189,178 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/expect/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/@jest/types": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", + "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, + "node_modules/@jest/expect/node_modules/@types/yargs": { + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@jest/expect/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/expect/node_modules/diff-sequences": { + "version": "28.1.1", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", + "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/expect": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", + "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", + "dev": true, + "dependencies": { + "@jest/expect-utils": "^28.1.3", + "jest-get-type": "^28.0.2", + "jest-matcher-utils": "^28.1.3", + "jest-message-util": "^28.1.3", + "jest-util": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/jest-diff": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", + "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^28.1.1", + "jest-get-type": "^28.0.2", + "pretty-format": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/jest-get-type": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", + "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/jest-matcher-utils": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", + "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^28.1.3", + "jest-get-type": "^28.0.2", + "pretty-format": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/expect/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/fake-timers": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", @@ -1009,6 +1378,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/fake-timers/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/fake-timers/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -1026,15 +1407,85 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/fake-timers/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/fake-timers/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/@jest/fake-timers/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/fake-timers/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/fake-timers/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/fake-timers/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/globals": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", @@ -1049,6 +1500,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/globals/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/globals/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -1066,10 +1529,16 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/globals/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/globals/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -1119,6 +1588,18 @@ } } }, + "node_modules/@jest/reporters/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/reporters/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -1136,27 +1617,97 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/reporters/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/reporters/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/schemas": { + "node_modules/@jest/reporters/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/reporters/node_modules/jest-message-util": { "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", "dev": true, "dependencies": { - "@sinclair/typebox": "^0.24.1" + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" }, "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/reporters/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/reporters/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.0", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz", + "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/@jest/source-map": { "version": "28.1.2", "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", @@ -1186,6 +1737,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/test-result/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/test-result/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -1203,10 +1766,16 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/test-result/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/test-result/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -1253,6 +1822,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/transform/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/@jest/transform/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -1270,15 +1851,51 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/@jest/transform/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/@jest/transform/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/@jest/transform/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/transform/node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/@jest/types": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", @@ -1296,13 +1913,14 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "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.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" @@ -1327,21 +1945,27 @@ } }, "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==", + "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.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "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/@manypkg/find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz", @@ -1404,11 +2028,11 @@ } }, "node_modules/@pnpm/constants": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/constants/-/constants-6.1.0.tgz", - "integrity": "sha512-L6AiU3OXv9kjKGTJN9j8n1TeJGDcLX9atQlZvAkthlvbXjvKc5SKNWESc/eXhr5nEfuMWhQhiKHDJCpYejmeCQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@pnpm/constants/-/constants-7.1.1.tgz", + "integrity": "sha512-31pZqMtjwV+Vaq7MaPrT1EoDFSYwye3dp6BiHIGRJmVThCQwySRKM7hCvqqI94epNkqFAAYoWrNynWoRYosGdw==", "engines": { - "node": ">=14.19" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" @@ -1429,202 +2053,150 @@ } }, "node_modules/@pnpm/dependency-path": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-1.1.3.tgz", - "integrity": "sha512-HXmS9XzZ1CLCGFtfydAkWayn/o3jaftVFESXrJH0W6NENS92rYCUVvutqL/4Kfx72k0HHUbIZLQAsoISxKId8Q==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-2.1.3.tgz", + "integrity": "sha512-OKuLDqRZfAJAb4fnPZyPyrR827ISL1WV5YBs0q4BitPAz8ORUPSXSCFVailLhoyZWLE0Ag6hROy42Jkw/WnCUw==", "dependencies": { - "@pnpm/crypto.base32-hash": "1.0.1", - "@pnpm/types": "8.10.0", + "@pnpm/crypto.base32-hash": "2.0.0", + "@pnpm/types": "9.2.0", "encode-registry": "^3.0.0", - "semver": "^7.3.8" + "semver": "^7.5.4" }, "engines": { - "node": ">=14.6" + "node": ">=16.14" + }, + "funding": { + "url": "https://opencollective.com/pnpm" + } + }, + "node_modules/@pnpm/dependency-path/node_modules/@pnpm/crypto.base32-hash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/crypto.base32-hash/-/crypto.base32-hash-2.0.0.tgz", + "integrity": "sha512-3ttOeHBpmWRbgJrpDQ8Nwd3W8s8iuiP5YZM0JRyKWaMtX8lu9d7/AKyxPmhYsMJuN+q/1dwHa7QFeDZJ53b0oA==", + "dependencies": { + "rfc4648": "^1.5.2" + }, + "engines": { + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/error/-/error-3.1.0.tgz", - "integrity": "sha512-bmXBD/kzlgHqlIZPP8QJUDAxGqug2qhPdnqNnuXyWQSyIEgeaXyPiUh91MLj9GwLoHA9Zdrx5+dfEougzxf4mA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@pnpm/error/-/error-5.0.2.tgz", + "integrity": "sha512-0TEm+tWNYm+9uh6DSKyRbv8pv/6b4NL0PastLvMxIoqZbBZ5Zj1cYi332R9xsSUi31ZOsu2wpgn/bC7DA9hrjg==", "dependencies": { - "@pnpm/constants": "6.1.0" + "@pnpm/constants": "7.1.1" }, "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/git-utils": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/git-utils/-/git-utils-0.1.0.tgz", - "integrity": "sha512-W3zsG9585cKL+FqgcT+IfTgZX5C+CbNkFjOnJN+qbysT1N30+BbvEByCcDMsTy7QDrAk6oS7WU1Rym3U2xlh2Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/git-utils/-/git-utils-1.0.0.tgz", + "integrity": "sha512-lUI+XrzOJN4zdPGOGnFUrmtXAXpXi8wD8OI0nWOZmlh+raqbLzC3VkXu1zgaduOK6YonOcnQW88O+ojav1rAdA==", "dependencies": { - "execa": "npm:safe-execa@^0.1.1" + "execa": "npm:safe-execa@0.1.2" }, "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/graceful-fs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@pnpm/graceful-fs/-/graceful-fs-2.0.0.tgz", - "integrity": "sha512-ogUZCGf0/UILZt6d8PsO4gA4pXh7f0BumXeFkcCe4AQ65PXPKfAkHC0C30Lheh2EgFOpLZm3twDP1Eiww18gew==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/graceful-fs/-/graceful-fs-3.0.0.tgz", + "integrity": "sha512-72kkqIL2sacOVr6Y6B6xDGjRC4QgTLeIGkw/5XYyeMgMeL9mDE0lonZEOL9JuLS0XPOXQoyDtRCSmUrzAA57LQ==", "dependencies": { - "graceful-fs": "^4.2.6" + "graceful-fs": "^4.2.11" }, "engines": { - "node": ">=14.19" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/lockfile-file": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/@pnpm/lockfile-file/-/lockfile-file-5.3.8.tgz", - "integrity": "sha512-fgXUwTeyW6yhJp1pUdMZJoFTg7qgi1yr7n3rlqm5sgM7leX1Zzx+6+oNSldeRfz0M2jMANU0PXvqyx2meknO/Q==", + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@pnpm/lockfile-file/-/lockfile-file-8.1.2.tgz", + "integrity": "sha512-7HqPs4qDgfyBpnYqELwLvQQm/4xVRAzQ0Zv3sNt8IhJz8pncjPKcNVVXsGQEUg6Y922ThXfTCumbkSuPFl/rlA==", "dependencies": { - "@pnpm/constants": "6.1.0", - "@pnpm/error": "3.1.0", - "@pnpm/git-utils": "0.1.0", - "@pnpm/lockfile-types": "4.3.3", - "@pnpm/merge-lockfile-changes": "3.0.11", - "@pnpm/types": "8.7.0", + "@pnpm/constants": "7.1.1", + "@pnpm/dependency-path": "2.1.3", + "@pnpm/error": "5.0.2", + "@pnpm/git-utils": "1.0.0", + "@pnpm/lockfile-types": "5.1.1", + "@pnpm/merge-lockfile-changes": "5.0.3", + "@pnpm/types": "9.2.0", + "@pnpm/util.lex-comparator": "1.0.0", "@zkochan/rimraf": "^2.1.2", "comver-to-semver": "^1.0.0", - "dependency-path": "9.2.6", - "js-yaml": "npm:@zkochan/js-yaml@^0.0.6", + "js-yaml": "npm:@zkochan/js-yaml@0.0.6", "normalize-path": "^3.0.0", "ramda": "npm:@pnpm/ramda@0.28.1", - "semver": "^7.3.8", + "semver": "^7.5.4", "sort-keys": "^4.2.0", "strip-bom": "^4.0.0", - "write-file-atomic": "^4.0.2" + "write-file-atomic": "^5.0.1" }, "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" }, "peerDependencies": { - "@pnpm/logger": "^4.0.0" - } - }, - "node_modules/@pnpm/lockfile-file/node_modules/@pnpm/lockfile-types": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/@pnpm/lockfile-types/-/lockfile-types-4.3.3.tgz", - "integrity": "sha512-FY+u1JOclJNy/O3EuOPWhQyN23aQTisxmm29Tj52EGFy8zPz7SZev2+K06jUzqKuo7EChQlrR8Tqv/gTOMQN2w==", - "dependencies": { - "@pnpm/types": "8.7.0" - }, - "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/lockfile-file/node_modules/@pnpm/types": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-8.7.0.tgz", - "integrity": "sha512-2j4ldzfOQNa3EZfJEmJrBQefE+OWBMgAoWWnVeXi5B7itVHRcg27Np+q0FxzuZE//O0N44WKH4WJG53sBsUqCQ==", - "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/lockfile-file/node_modules/dependency-path": { - "version": "9.2.6", - "resolved": "https://registry.npmjs.org/dependency-path/-/dependency-path-9.2.6.tgz", - "integrity": "sha512-B6t52bLlGj/vpyVcqGuido0QNYIMpFKzfZzmgmYVjwuzLrlIuY9Dky4Dru8J5vWPcj/GHu3DtXUUemzCVwJ3Iw==", - "dependencies": { - "@pnpm/crypto.base32-hash": "1.0.1", - "@pnpm/types": "8.7.0", - "encode-registry": "^3.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" + "@pnpm/logger": "^5.0.0" } }, "node_modules/@pnpm/lockfile-types": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@pnpm/lockfile-types/-/lockfile-types-4.3.6.tgz", - "integrity": "sha512-5vvdV3tEVOCzzeGv2FXK4590qPUVpZ+5gdqCawFuiNTJavx+4rmmY4aDUjdVXUcKGwqkIBPVKe/SNUBA3A2rtg==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@pnpm/lockfile-types/-/lockfile-types-5.1.1.tgz", + "integrity": "sha512-QswQGFENlosERR2rCxp/0MhyOwBsRyfDvngTOmn8QG2IPd3KsCJFUNFnLddAp13L+9bxcTgijYIuyN2MlShoFw==", "dependencies": { - "@pnpm/types": "8.10.0" + "@pnpm/types": "9.2.0" }, "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/lockfile-utils": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/@pnpm/lockfile-utils/-/lockfile-utils-4.2.8.tgz", - "integrity": "sha512-4vonZnjhNPd7GFzDmcQeBoIucNWpbbrTQNT61QxB5cNbdYej3WBVtuApwEzkZ65/rpnv3+ek1DoXomMi1ttozQ==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/@pnpm/lockfile-utils/-/lockfile-utils-8.0.3.tgz", + "integrity": "sha512-NezoTk3xdA9Dh7dd7lqi1v3QM2GR+ZvuPz9VaDXToqhUKYlcARgSbR56+eIAtraImeZdANIKjvwmJExVkUHAug==", "dependencies": { - "@pnpm/lockfile-types": "4.3.5", - "@pnpm/resolver-base": "9.1.4", - "@pnpm/types": "8.9.0", - "dependency-path": "9.2.8", + "@pnpm/dependency-path": "2.1.3", + "@pnpm/lockfile-types": "5.1.1", + "@pnpm/resolver-base": "10.0.2", + "@pnpm/types": "9.2.0", "get-npm-tarball-url": "^2.0.3", "ramda": "npm:@pnpm/ramda@0.28.1" }, "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/lockfile-utils/node_modules/@pnpm/lockfile-types": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@pnpm/lockfile-types/-/lockfile-types-4.3.5.tgz", - "integrity": "sha512-5GdnnhGdz+4JphrKYYZ7rcv9t37BllNwdCbFLYli6ajyIeoSCklNNCHWNewskWs3PZZUHW8LxD/nKHPaarbm9g==", - "dependencies": { - "@pnpm/types": "8.9.0" - }, - "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/lockfile-utils/node_modules/@pnpm/types": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-8.9.0.tgz", - "integrity": "sha512-3MYHYm8epnciApn6w5Fzx6sepawmsNU7l6lvIq+ER22/DPSrr83YMhU/EQWnf4lORn2YyiXFj0FJSyJzEtIGmw==", - "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/logger": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@pnpm/logger/-/logger-4.0.0.tgz", - "integrity": "sha512-SIShw+k556e7S7tLZFVSIHjCdiVog1qWzcKW2RbLEHPItdisAFVNIe34kYd9fMSswTlSRLS/qRjw3ZblzWmJ9Q==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/logger/-/logger-5.0.0.tgz", + "integrity": "sha512-YfcB2QrX+Wx1o6LD1G2Y2fhDhOix/bAY/oAnMpHoNLsKkWIRbt1oKLkIFvxBMzLwAEPqnYWguJrYC+J6i4ywbw==", "dependencies": { - "bole": "^4.0.0", + "bole": "^5.0.0", "ndjson": "^2.0.0" }, "engines": { @@ -1632,107 +2204,62 @@ } }, "node_modules/@pnpm/merge-lockfile-changes": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@pnpm/merge-lockfile-changes/-/merge-lockfile-changes-3.0.11.tgz", - "integrity": "sha512-LICYA0yc46ELJe6uECMO4rYhRb5W8DQDHFlVAkg7/tm9UT65aweiNopxVCHUNaHn5+m9u1QamsIXzvKnBwV+Kw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@pnpm/merge-lockfile-changes/-/merge-lockfile-changes-5.0.3.tgz", + "integrity": "sha512-RmWcpl7wWDx17upkxPfGorpLr85FbyihZoi2naoc04nocawKkVVeI68PDWFkgEmImuoQgHZaFCgAVgTbwJyb9A==", "dependencies": { - "@pnpm/lockfile-types": "4.3.3", + "@pnpm/lockfile-types": "5.1.1", "comver-to-semver": "^1.0.0", "ramda": "npm:@pnpm/ramda@0.28.1", - "semver": "^7.3.7" + "semver": "^7.5.4" }, "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/merge-lockfile-changes/node_modules/@pnpm/lockfile-types": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/@pnpm/lockfile-types/-/lockfile-types-4.3.3.tgz", - "integrity": "sha512-FY+u1JOclJNy/O3EuOPWhQyN23aQTisxmm29Tj52EGFy8zPz7SZev2+K06jUzqKuo7EChQlrR8Tqv/gTOMQN2w==", - "dependencies": { - "@pnpm/types": "8.7.0" - }, - "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/merge-lockfile-changes/node_modules/@pnpm/types": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-8.7.0.tgz", - "integrity": "sha512-2j4ldzfOQNa3EZfJEmJrBQefE+OWBMgAoWWnVeXi5B7itVHRcg27Np+q0FxzuZE//O0N44WKH4WJG53sBsUqCQ==", - "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/prune-lockfile": { - "version": "4.0.24", - "resolved": "https://registry.npmjs.org/@pnpm/prune-lockfile/-/prune-lockfile-4.0.24.tgz", - "integrity": "sha512-v0NA9ZkxUkaT9LxwCwN6JNrQ8ok1L7skxn9wk+1icLYKPQXgSNKap0zSAJeBtyNd9NXGXxO0QG8Noeto/MCAKg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@pnpm/prune-lockfile/-/prune-lockfile-5.0.5.tgz", + "integrity": "sha512-XY6P824cS1YN3LTy6IQzL9PDnE44Dq7SCxEaxWikPamgNRWO8m5rw1P8bdEzZQVuqJFdy8SjCgkE5VQrEEEiBw==", "dependencies": { - "@pnpm/constants": "6.2.0", - "@pnpm/dependency-path": "1.1.3", - "@pnpm/lockfile-types": "4.3.6", - "@pnpm/types": "8.10.0", + "@pnpm/constants": "7.1.1", + "@pnpm/dependency-path": "2.1.3", + "@pnpm/lockfile-types": "5.1.1", + "@pnpm/types": "9.2.0", "ramda": "npm:@pnpm/ramda@0.28.1" }, "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/prune-lockfile/node_modules/@pnpm/constants": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@pnpm/constants/-/constants-6.2.0.tgz", - "integrity": "sha512-GlDVUkeTR2WK0oZAM+wtDY6RBMLw6b0Z/5qKgBbDszx4e+R7CHyfG7JofyypogRCfeWXeAXp2C2FkFTh+sNgIg==", - "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/read-project-manifest": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@pnpm/read-project-manifest/-/read-project-manifest-3.0.13.tgz", - "integrity": "sha512-DEpAO64fA6VhcAudrjTAM4RIWCvw0Pmr4L0gaZqV0yta5zIkOTfFXT07lo80Zch4bvqmcOxlbM6Bazd4W+6Cww==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@pnpm/read-project-manifest/-/read-project-manifest-5.0.4.tgz", + "integrity": "sha512-fEfk7jjEhQrKm6xdQ9zIUVEqy8gAACo8TNaflVoXj+6QRul3mKaqW5zrjo11zYvDUA6lHIFw5ka1QnHXGlu67A==", "dependencies": { - "@pnpm/error": "3.1.0", - "@pnpm/graceful-fs": "2.0.0", - "@pnpm/types": "8.7.0", - "@pnpm/write-project-manifest": "3.0.10", - "detect-indent": "^6.1.0", + "@gwhitney/detect-indent": "7.0.1", + "@pnpm/error": "5.0.2", + "@pnpm/graceful-fs": "3.0.0", + "@pnpm/text.comments-parser": "2.0.0", + "@pnpm/types": "9.2.0", + "@pnpm/write-project-manifest": "5.0.2", "fast-deep-equal": "^3.1.3", "is-windows": "^1.0.2", - "json5": "^2.2.1", + "json5": "^2.2.3", + "lodash.clonedeep": "^4.5.0", "parse-json": "^5.2.0", "read-yaml-file": "^2.1.0", "sort-keys": "^4.2.0", "strip-bom": "^4.0.0" }, "engines": { - "node": ">=14.6" - }, - "funding": { - "url": "https://opencollective.com/pnpm" - } - }, - "node_modules/@pnpm/read-project-manifest/node_modules/@pnpm/types": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-8.7.0.tgz", - "integrity": "sha512-2j4ldzfOQNa3EZfJEmJrBQefE+OWBMgAoWWnVeXi5B7itVHRcg27Np+q0FxzuZE//O0N44WKH4WJG53sBsUqCQ==", - "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" @@ -1762,14 +2289,14 @@ } }, "node_modules/@pnpm/registry-mock": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/@pnpm/registry-mock/-/registry-mock-2.20.0.tgz", - "integrity": "sha512-ADVI/RsdN+l4GHD9gKJvXpNd/UBX5W0Nfv/PEuc4kf++aBzDvEHd2n0QAnk5LZTidCHXvYCagFgcCy/oFkkIJg==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/@pnpm/registry-mock/-/registry-mock-3.11.0.tgz", + "integrity": "sha512-Uc2h/h97YepX0Depm6/nOIUzjLz1Ny7xoL91GYcRRq/pbWJamCCGFSmZTHiBc3oX1WzremOqe4vvqE3uTkWZQg==", "dev": true, "dependencies": { "anonymous-npm-registry-client": "^0.2.0", - "cpr": "^3.0.1", "execa": "^5.1.1", + "fs-extra": "^11.1.1", "read-yaml-file": "^2.1.0", "rimraf": "^3.0.2", "tempy": "^1.0.1", @@ -1806,6 +2333,20 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/@pnpm/registry-mock/node_modules/fs-extra": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", + "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, "node_modules/@pnpm/registry-mock/node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -1818,6 +2359,18 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/@pnpm/registry-mock/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/@pnpm/registry-mock/node_modules/read-yaml-file": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-2.1.0.tgz", @@ -1831,74 +2384,107 @@ "node": ">=10.13" } }, + "node_modules/@pnpm/registry-mock/node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@pnpm/resolver-base": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/@pnpm/resolver-base/-/resolver-base-9.1.4.tgz", - "integrity": "sha512-OoclNn2NxqyJ+BjrB6gaR2Vj1rA6eryIn+xEh5UDX5y3rNrFL1pKCYHkEJv4qqKSayX1JsGHv7NzK5iSh4g3iA==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@pnpm/resolver-base/-/resolver-base-10.0.2.tgz", + "integrity": "sha512-5Uop0eLVxoGnG+K5aNkiBeJqyDD4F34+ZpQxxFLtL7xGf9aISPY6OlFfHU0hBD/8aFtZ5JSXhHUsb42aFyqP5Q==", "dependencies": { - "@pnpm/types": "8.9.0" + "@pnpm/types": "9.2.0" }, "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, - "node_modules/@pnpm/resolver-base/node_modules/@pnpm/types": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-8.9.0.tgz", - "integrity": "sha512-3MYHYm8epnciApn6w5Fzx6sepawmsNU7l6lvIq+ER22/DPSrr83YMhU/EQWnf4lORn2YyiXFj0FJSyJzEtIGmw==", + "node_modules/@pnpm/text.comments-parser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/text.comments-parser/-/text.comments-parser-2.0.0.tgz", + "integrity": "sha512-DRWtTmmxQQtuWHf1xPt9bqzCSq8d0MQF5x1kdpCDMLd7xk3nP4To2/OGkPrb8MKbrWsgCNDwXyKCFlEKrAg7fg==", + "dependencies": { + "strip-comments-strings": "1.2.0" + }, "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, "node_modules/@pnpm/types": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-8.10.0.tgz", - "integrity": "sha512-A4pcNNvFJdkMXArEjTCOIYNL2VxD4uBynWZ6cBIELXb5qJ0tUzwKsaSz4J953I0rQFqnsFpUYqaWIquI10W1sw==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-9.2.0.tgz", + "integrity": "sha512-LtkHgtJ5Bjny4poUWyMhOKHc822/zm8NhPx+7VbopfDYnTrKgJwTyTbZjZEyN5KpDw3R1Fr8VYdmv5gn4eyWbw==", "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, + "node_modules/@pnpm/util.lex-comparator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/util.lex-comparator/-/util.lex-comparator-1.0.0.tgz", + "integrity": "sha512-3aBQPHntVgk5AweBWZn+1I/fqZ9krK/w01197aYVkAJQGftb+BVWgEepxY5GChjSW12j52XX+CmfynYZ/p0DFQ==", + "engines": { + "node": ">=12.22.0" + } + }, "node_modules/@pnpm/write-project-manifest": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@pnpm/write-project-manifest/-/write-project-manifest-3.0.10.tgz", - "integrity": "sha512-sw5AXR+KplipHL3GiPq8xNib8XUsi8ieh4XFVgjrAGkLIhfOrslonULY7d0QpVMotFMS7ha74s0s059T/5cnmQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@pnpm/write-project-manifest/-/write-project-manifest-5.0.2.tgz", + "integrity": "sha512-BSYKyVOp+GbqxqYBuBex05iJgplgbiwoJGxLsK989lGT9Ekc0QatNpbyhk1vVhocv7AlRySrAyI7Yk2l4do/9g==", "dependencies": { - "@pnpm/types": "8.7.0", - "json5": "^2.2.1", - "write-file-atomic": "^4.0.2", - "write-yaml-file": "^4.2.0" + "@pnpm/text.comments-parser": "2.0.0", + "@pnpm/types": "9.2.0", + "json5": "^2.2.3", + "write-file-atomic": "^5.0.1", + "write-yaml-file": "^5.0.0" }, "engines": { - "node": ">=14.6" + "node": ">=16.14" }, "funding": { "url": "https://opencollective.com/pnpm" } }, - "node_modules/@pnpm/write-project-manifest/node_modules/@pnpm/types": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@pnpm/types/-/types-8.7.0.tgz", - "integrity": "sha512-2j4ldzfOQNa3EZfJEmJrBQefE+OWBMgAoWWnVeXi5B7itVHRcg27Np+q0FxzuZE//O0N44WKH4WJG53sBsUqCQ==", - "engines": { - "node": ">=14.6" + "node_modules/@pnpm/write-project-manifest/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" }, - "funding": { - "url": "https://opencollective.com/pnpm" + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@pnpm/write-project-manifest/node_modules/write-yaml-file": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/write-yaml-file/-/write-yaml-file-5.0.0.tgz", + "integrity": "sha512-FdNA4RyH1L43TlvGG8qOMIfcEczwA5ij+zLXUy3Z83CjxhLvcV7/Q/8pk22wnCgYw7PJhtK+7lhO+qqyT4NdvQ==", + "dependencies": { + "js-yaml": "^4.1.0", + "write-file-atomic": "^5.0.1" + }, + "engines": { + "node": ">=16.14" } }, "node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true }, "node_modules/@sinonjs/commons": { @@ -1920,9 +2506,9 @@ } }, "node_modules/@swc/core": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.42.tgz", - "integrity": "sha512-nVFUd5+7tGniM2cT3LXaqnu3735Cu4az8A9gAKK+8sdpASI52SWuqfDBmjFCK9xG90MiVDVp2PTZr0BWqCIzpw==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.72.tgz", + "integrity": "sha512-+AKjwLH3/STfPrd7CHzB9+NG1FVT0UKJMUChuWq9sQ8b9xlV8vUeRgZXgh/EHYvNQgl/OUTQKtL6xU2yOLuEuA==", "dev": true, "hasInstallScript": true, "engines": { @@ -1933,22 +2519,30 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.3.42", - "@swc/core-darwin-x64": "1.3.42", - "@swc/core-linux-arm-gnueabihf": "1.3.42", - "@swc/core-linux-arm64-gnu": "1.3.42", - "@swc/core-linux-arm64-musl": "1.3.42", - "@swc/core-linux-x64-gnu": "1.3.42", - "@swc/core-linux-x64-musl": "1.3.42", - "@swc/core-win32-arm64-msvc": "1.3.42", - "@swc/core-win32-ia32-msvc": "1.3.42", - "@swc/core-win32-x64-msvc": "1.3.42" + "@swc/core-darwin-arm64": "1.3.72", + "@swc/core-darwin-x64": "1.3.72", + "@swc/core-linux-arm-gnueabihf": "1.3.72", + "@swc/core-linux-arm64-gnu": "1.3.72", + "@swc/core-linux-arm64-musl": "1.3.72", + "@swc/core-linux-x64-gnu": "1.3.72", + "@swc/core-linux-x64-musl": "1.3.72", + "@swc/core-win32-arm64-msvc": "1.3.72", + "@swc/core-win32-ia32-msvc": "1.3.72", + "@swc/core-win32-x64-msvc": "1.3.72" + }, + "peerDependencies": { + "@swc/helpers": "^0.5.0" + }, + "peerDependenciesMeta": { + "@swc/helpers": { + "optional": true + } } }, "node_modules/@swc/core-darwin-arm64": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.42.tgz", - "integrity": "sha512-hM6RrZFyoCM9mX3cj/zM5oXwhAqjUdOCLXJx7KTQps7NIkv/Qjvobgvyf2gAb89j3ARNo9NdIoLjTjJ6oALtiA==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.72.tgz", + "integrity": "sha512-oNSI5hVfZ+1xpj+dH1g4kQqA0VsGtqd8S9S+cDqkHZiOOVOevw9KN6dzVtmLOcPtlULVypVc0TVvsB55KdVZhQ==", "cpu": [ "arm64" ], @@ -1962,9 +2556,9 @@ } }, "node_modules/@swc/core-darwin-x64": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.42.tgz", - "integrity": "sha512-bjsWtHMb6wJK1+RGlBs2USvgZ0txlMk11y0qBLKo32gLKTqzUwRw0Fmfzuf6Ue2a/w//7eqMlPFEre4LvJajGw==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.72.tgz", + "integrity": "sha512-y5O/WQ1g0/VfTgeNahWIOutbdD5U2Gi703jaefdcoJo3FUx8WU108QQdbVGwGMgaqapo3iQB6Qs9paixYQAYsA==", "cpu": [ "x64" ], @@ -1978,9 +2572,9 @@ } }, "node_modules/@swc/core-linux-arm-gnueabihf": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.42.tgz", - "integrity": "sha512-Oe0ggMz3MyqXNfeVmY+bBTL0hFSNY3bx8dhcqsh4vXk/ZVGse94QoC4dd92LuPHmKT0x6nsUzB86x2jU9QHW5g==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.72.tgz", + "integrity": "sha512-05JdWcso0OomHF+7bk5MBDgI8MZ9skcQ/4nhSv5gboSgSiuBmKM15Bg3lZ5iAUwGByNj7pGkSmmd3YwTrXEB+g==", "cpu": [ "arm" ], @@ -1994,9 +2588,9 @@ } }, "node_modules/@swc/core-linux-arm64-gnu": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.42.tgz", - "integrity": "sha512-ZJsa8NIW1RLmmHGTJCbM7OPSbBZ9rOMrLqDtUOGrT0uoJXZnnQqolflamB5wviW0X6h3Z3/PSTNGNDCJ3u3Lqg==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.72.tgz", + "integrity": "sha512-8qRELJaeYshhJgqvyOeXCKqBOpai+JYdWuouMbvvDUL85j3OcZhzR+bipexEbbJKcOCdRnoYB7Qg6mjqZ0t7VA==", "cpu": [ "arm64" ], @@ -2010,9 +2604,9 @@ } }, "node_modules/@swc/core-linux-arm64-musl": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.42.tgz", - "integrity": "sha512-YpZwlFAfOp5vkm/uVUJX1O7N3yJDO1fDQRWqsOPPNyIJkI2ydlRQtgN6ZylC159Qv+TimfXnGTlNr7o3iBAqjg==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.72.tgz", + "integrity": "sha512-tOqAGZw+Pe7YrBHFrwFVyRiKqjgjzwYbJmY+UDxLrzWrZSVtC3eO2TPrp7kWmhirg40Og81BbdfRAl8ds48w0Q==", "cpu": [ "arm64" ], @@ -2026,9 +2620,9 @@ } }, "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.42.tgz", - "integrity": "sha512-0ccpKnsZbyHBzaQFdP8U9i29nvOfKitm6oJfdJzlqsY/jCqwvD8kv2CAKSK8WhJz//ExI2LqNrDI0yazx5j7+A==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.72.tgz", + "integrity": "sha512-U2W2xWR3s9nplGVWz376GiBlcLTgxyYKlpZPBNZk0w3OvTcjKC62gW1Pe7PUkk4NgJUnaQDBa/mb4V4Zl+GZPA==", "cpu": [ "x64" ], @@ -2042,9 +2636,9 @@ } }, "node_modules/@swc/core-linux-x64-musl": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.42.tgz", - "integrity": "sha512-7eckRRuTZ6+3K21uyfXXgc2ZCg0mSWRRNwNT3wap2bYkKPeqTgb8pm8xYSZNEiMuDonHEat6XCCV36lFY6kOdQ==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.72.tgz", + "integrity": "sha512-3+2dUiZBsifKgvnFEHWdysXjInK8K+BfPBw2tTZJmq1+fZLt0rvuErYDVMLfIJnVWLCcJMnDtTXrvkFV1y/6iA==", "cpu": [ "x64" ], @@ -2058,9 +2652,9 @@ } }, "node_modules/@swc/core-win32-arm64-msvc": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.42.tgz", - "integrity": "sha512-t27dJkdw0GWANdN4TV0lY/V5vTYSx5SRjyzzZolep358ueCGuN1XFf1R0JcCbd1ojosnkQg2L7A7991UjXingg==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.72.tgz", + "integrity": "sha512-ndI8xZ2AId806D25xgqw2SFJ9gc/jhg21+5hA8XPq9ZL+oDiaYDztaP3ijVmZ1G5xXKD9DpgB7xmylv/f6o6GA==", "cpu": [ "arm64" ], @@ -2074,9 +2668,9 @@ } }, "node_modules/@swc/core-win32-ia32-msvc": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.42.tgz", - "integrity": "sha512-xfpc/Zt/aMILX4IX0e3loZaFyrae37u3MJCv1gJxgqrpeLi7efIQr3AmERkTK3mxTO6R5urSliWw2W3FyZ7D3Q==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.72.tgz", + "integrity": "sha512-F3TK8JHP3SRFjLRlzcRVZPnvvGm2CQ5/cwbIkaEq0Dla3kyctU8SiRqvtYwWCW4JuY10cUygIg93Ec/C9Lkk4g==", "cpu": [ "ia32" ], @@ -2090,9 +2684,9 @@ } }, "node_modules/@swc/core-win32-x64-msvc": { - "version": "1.3.42", - "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.42.tgz", - "integrity": "sha512-ra2K4Tu++EJLPhzZ6L8hWUsk94TdK/2UKhL9dzCBhtzKUixsGCEqhtqH1zISXNvW8qaVLFIMUP37ULe80/IJaA==", + "version": "1.3.72", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.72.tgz", + "integrity": "sha512-FXMnIUtLl0yEmGkw+xbUg/uUPExvUxUlLSHbX7CnbSuOIHqMHzvEd9skIueLAst4bvmJ8kT1hDyAIWQcTIAJYQ==", "cpu": [ "x64" ], @@ -2106,9 +2700,9 @@ } }, "node_modules/@swc/jest": { - "version": "0.2.24", - "resolved": "https://registry.npmjs.org/@swc/jest/-/jest-0.2.24.tgz", - "integrity": "sha512-fwgxQbM1wXzyKzl1+IW0aGrRvAA8k0Y3NxFhKigbPjOJ4mCKnWEcNX9HQS3gshflcxq8YKhadabGUVfdwjCr6Q==", + "version": "0.2.27", + "resolved": "https://registry.npmjs.org/@swc/jest/-/jest-0.2.27.tgz", + "integrity": "sha512-Xt8EJ6Wy0NYVL8KDPcDMsuUSzyV2UAByamyy28x2iDZCJw2eVz3acedCGBYxxlPR/DNr6QbA35OSymuXhC9QVA==", "dev": true, "dependencies": { "@jest/create-cache-key-function": "^27.4.2", @@ -2134,9 +2728,9 @@ "dev": true }, "node_modules/@types/babel__core": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", - "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "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", @@ -2166,12 +2760,12 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "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.3.0" + "@babel/types": "^7.20.7" } }, "node_modules/@types/graceful-fs": { @@ -2208,19 +2802,19 @@ } }, "node_modules/@types/jest": { - "version": "28.1.8", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.8.tgz", - "integrity": "sha512-8TJkV++s7B6XqnDrzR1m/TT0A0h948Pnl/097veySPN67VRAgQ4gZ7n2KfJo2rVq6njQjdxU3GCCyDvAeuHoiw==", + "version": "29.5.3", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.3.tgz", + "integrity": "sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==", "dev": true, "dependencies": { - "expect": "^28.0.0", - "pretty-format": "^28.0.0" + "expect": "^29.0.0", + "pretty-format": "^29.0.0" } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, "node_modules/@types/lodash": { @@ -2230,21 +2824,21 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.18.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.20.tgz", - "integrity": "sha512-9fH66vSJnF563exTu3y1g2IbDz1vCj01Lbqms97r8j0qzfFisT2biypSfybVv/eYrtTB74x9xQTdRU8RyMiRrg==", + "version": "18.17.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.1.tgz", + "integrity": "sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==", "dev": true }, "node_modules/@types/prettier": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", - "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", + "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", "dev": true }, "node_modules/@types/semver": { - "version": "7.3.13", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", - "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", + "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", "dev": true }, "node_modules/@types/stack-utils": { @@ -2269,32 +2863,34 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.56.0.tgz", - "integrity": "sha512-ZNW37Ccl3oMZkzxrYDUX4o7cnuPgU+YrcaYXzsRtLB16I1FR5SHMqga3zGsaSliZADCWo2v8qHWqAYIj8nWCCg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.0.tgz", + "integrity": "sha512-rClGrMuyS/3j0ETa1Ui7s6GkLhfZGKZL3ZrChLeAiACBE/tRc1wq8SNZESUuluxhLj9FkUefRs2l6bCIArWBiQ==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/type-utils": "5.56.0", - "@typescript-eslint/utils": "5.56.0", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.2.0", + "@typescript-eslint/type-utils": "6.2.0", + "@typescript-eslint/utils": "6.2.0", + "@typescript-eslint/visitor-keys": "6.2.0", "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -2303,25 +2899,26 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.56.0.tgz", - "integrity": "sha512-sn1OZmBxUsgxMmR8a8U5QM/Wl+tyqlH//jTqCg8daTAmhAk26L2PFhcqPLlYBhYUJMZJK276qLXlHN3a83o2cg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.0.tgz", + "integrity": "sha512-igVYOqtiK/UsvKAmmloQAruAdUHihsOCvplJpplPZ+3h4aDkC/UKZZNKgB6h93ayuYLuEymU3h8nF1xMRbh37g==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/typescript-estree": "5.56.0", + "@typescript-eslint/scope-manager": "6.2.0", + "@typescript-eslint/types": "6.2.0", + "@typescript-eslint/typescript-estree": "6.2.0", + "@typescript-eslint/visitor-keys": "6.2.0", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -2330,16 +2927,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz", - "integrity": "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz", + "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0" + "@typescript-eslint/types": "6.2.0", + "@typescript-eslint/visitor-keys": "6.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -2347,25 +2944,25 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.56.0.tgz", - "integrity": "sha512-8WxgOgJjWRy6m4xg9KoSHPzBNZeQbGlQOH7l2QEhQID/+YseaFxg5J/DLwWSsi9Axj4e/cCiKx7PVzOq38tY4A==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.0.tgz", + "integrity": "sha512-DnGZuNU2JN3AYwddYIqrVkYW0uUQdv0AY+kz2M25euVNlujcN2u+rJgfJsBFlUEzBB6OQkUqSZPyuTLf2bP5mw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.56.0", - "@typescript-eslint/utils": "5.56.0", + "@typescript-eslint/typescript-estree": "6.2.0", + "@typescript-eslint/utils": "6.2.0", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "*" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -2374,12 +2971,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz", + "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -2387,21 +2984,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz", - "integrity": "sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz", + "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0", + "@typescript-eslint/types": "6.2.0", + "@typescript-eslint/visitor-keys": "6.2.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -2414,42 +3011,41 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.56.0.tgz", - "integrity": "sha512-XhZDVdLnUJNtbzaJeDSCIYaM+Tgr59gZGbFuELgF7m0IY03PlciidS7UQNKLE0+WpUTn1GlycEr6Ivb/afjbhA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz", + "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/typescript-estree": "5.56.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.2.0", + "@typescript-eslint/types": "6.2.0", + "@typescript-eslint/typescript-estree": "6.2.0", + "semver": "^7.5.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz", + "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.2.0", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -2585,6 +3181,39 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, + "node_modules/@verdaccio/config/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@verdaccio/config/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@verdaccio/config/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@verdaccio/core": { "version": "6.0.0-6-next.67", "resolved": "https://registry.npmjs.org/@verdaccio/core/-/core-6.0.0-6-next.67.tgz", @@ -2628,6 +3257,39 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, + "node_modules/@verdaccio/core/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@verdaccio/core/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@verdaccio/core/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@verdaccio/file-locking": { "version": "10.3.0", "resolved": "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-10.3.0.tgz", @@ -2911,6 +3573,39 @@ "url": "https://opencollective.com/verdaccio" } }, + "node_modules/@verdaccio/utils/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@verdaccio/utils/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@verdaccio/utils/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@zkochan/rimraf": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/@zkochan/rimraf/-/rimraf-2.1.2.tgz", @@ -2962,9 +3657,9 @@ } }, "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -3411,9 +4106,9 @@ } }, "node_modules/bole": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bole/-/bole-4.0.1.tgz", - "integrity": "sha512-42r0aSOJFJti2l6LasBHq2BuWJzohGs349olQnH/ETlJo87XnoWw7UT8pGE6UstjxzOKkwz7tjoFcmSr6L16vg==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/bole/-/bole-5.0.6.tgz", + "integrity": "sha512-HtZbVmxHqreaC29XVvGPShDtL2zSafkLe8vMdvFr4ppvtjrObVxtejoU/3jpRbxzxFeqDLXv5oIxUhSVw1NaAw==", "dependencies": { "fast-safe-stringify": "^2.0.7", "individual": "^3.0.0" @@ -3440,9 +4135,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", - "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "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": [ { @@ -3452,13 +4147,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001449", - "electron-to-chromium": "^1.4.284", - "node-releases": "^2.0.8", - "update-browserslist-db": "^1.0.10" + "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" @@ -3559,9 +4258,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001469", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001469.tgz", - "integrity": "sha512-Rcp7221ScNqQPP3W+lVOYDyjdR6dC+neEQCttoNr5bAyz54AboB4iwpnWgyi8P4YUsPybVzT4LgWiBbI3drL4g==", + "version": "1.0.30001518", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz", + "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==", "dev": true, "funding": [ { @@ -3571,6 +4270,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -3621,9 +4324,9 @@ } }, "node_modules/cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", "dev": true }, "node_modules/clean-stack": { @@ -3705,9 +4408,9 @@ } }, "node_modules/collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", "dev": true }, "node_modules/color-convert": { @@ -3926,33 +4629,6 @@ "node": ">= 0.10" } }, - "node_modules/cpr": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz", - "integrity": "sha512-Xch4PXQ/KC8lJ+KfJ9JI6eG/nmppLrPPWg5Q+vh65Qr9EjuJEubxh/H/Le1TmCZ7+Xv7iJuNRqapyOFZB+wsxA==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.5", - "minimist": "^1.2.0", - "mkdirp": "~0.5.1", - "rimraf": "^2.5.4" - }, - "bin": { - "cpr": "bin/cpr" - } - }, - "node_modules/cpr/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -4116,14 +4792,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "engines": { - "node": ">=8" - } - }, "node_modules/detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", @@ -4134,12 +4802,12 @@ } }, "node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", + "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/dir-glob": { @@ -4217,9 +4885,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.340", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.340.tgz", - "integrity": "sha512-zx8hqumOqltKsv/MF50yvdAlPF9S/4PXbyfzJS6ZGhbddGkRegdwImmfSVqCkEziYzrIGZ/TlrzBND4FysfkDg==", + "version": "1.4.477", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.477.tgz", + "integrity": "sha512-shUVy6Eawp33dFBFIoYbIwLHrX0IZ857AlH9ug2o4rvbWmpaCUdBpQ5Zw39HRrfzAFm4APJE9V+E2A/WB0YqJw==", "dev": true }, "node_modules/emittery": { @@ -4317,27 +4985,27 @@ } }, "node_modules/eslint": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", - "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz", + "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.1", - "@eslint/js": "8.36.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.1", + "@eslint/js": "^8.46.0", + "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "ajv": "^6.12.4", "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-visitor-keys": "^3.3.0", - "espree": "^9.5.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.2", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -4345,22 +5013,19 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "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", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -4374,31 +5039,9 @@ } }, "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -4406,15 +5049,21 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "node_modules/eslint-visitor-keys": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz", + "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==", "dev": true, "engines": { - "node": ">=4.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/find-up": { @@ -4476,14 +5125,14 @@ } }, "node_modules/espree": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz", - "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4516,15 +5165,6 @@ "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", @@ -4537,7 +5177,7 @@ "node": ">=4.0" } }, - "node_modules/esrecurse/node_modules/estraverse": { + "node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", @@ -4546,15 +5186,6 @@ "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/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -4593,9 +5224,9 @@ }, "node_modules/execa": { "name": "safe-execa", - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/safe-execa/-/safe-execa-0.1.3.tgz", - "integrity": "sha512-KuOb5C35fJRrhTfErHX+Bw03PayibKwpmOPHnyWMkwSqeiyjq2/D6E524rtJFrvqoUKH6iTe/NC4nOtgWflU7g==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/safe-execa/-/safe-execa-0.1.2.tgz", + "integrity": "sha512-vdTshSQ2JsRCgT8eKZWNJIL26C6bVqy1SOmuCMlKHegVeo8KYRobRrefOdUq9OozSPUUiSxrylteeRmLOMFfWg==", "dependencies": { "@zkochan/which": "^2.0.3", "execa": "^5.1.1", @@ -4637,19 +5268,20 @@ } }, "node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", + "version": "29.6.2", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz", + "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==", "dev": true, "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" + "@jest/expect-utils": "^29.6.2", + "@types/node": "*", + "jest-get-type": "^29.4.3", + "jest-matcher-utils": "^29.6.2", + "jest-message-util": "^29.6.2", + "jest-util": "^29.6.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/express": { @@ -5219,10 +5851,10 @@ "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/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, "node_modules/handlebars": { @@ -5629,7 +6261,8 @@ "node_modules/is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true }, "node_modules/is-windows": { "version": "1.0.2", @@ -5682,26 +6315,26 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "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": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, "dependencies": { "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", + "make-dir": "^4.0.0", "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" } }, "node_modules/istanbul-lib-source-maps": { @@ -5719,9 +6352,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -5823,6 +6456,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-circus/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-circus/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -5840,15 +6485,133 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-circus/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-circus/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-circus/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-circus/node_modules/diff-sequences": { + "version": "28.1.1", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", + "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-circus/node_modules/jest-diff": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", + "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^28.1.1", + "jest-get-type": "^28.0.2", + "pretty-format": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-circus/node_modules/jest-get-type": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", + "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-circus/node_modules/jest-matcher-utils": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", + "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^28.1.3", + "jest-get-type": "^28.0.2", + "pretty-format": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-circus/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-circus/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-circus/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-cli": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", @@ -5883,6 +6646,18 @@ } } }, + "node_modules/jest-cli/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-cli/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -5900,15 +6675,38 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-cli/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-cli/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-cli/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-config": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", @@ -5954,6 +6752,18 @@ } } }, + "node_modules/jest-config/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-config/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -5971,30 +6781,89 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-config/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-config/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-diff": { + "node_modules/jest-config/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-config/node_modules/jest-get-type": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", + "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-config/node_modules/jest-util": { "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", "dev": true, "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" }, "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-config/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-diff": { + "version": "29.6.2", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz", + "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.4.3", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.6.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/jest-docblock": { "version": "28.1.1", "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", @@ -6023,6 +6892,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-each/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-each/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6040,15 +6921,74 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-each/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-each/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-each/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-each/node_modules/jest-get-type": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", + "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-each/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-each/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-environment-node": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", @@ -6066,6 +7006,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-environment-node/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-environment-node/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6083,24 +7035,47 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-environment-node/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-environment-node/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "node_modules/jest-environment-node/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-get-type": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz", + "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/jest-haste-map": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", @@ -6126,6 +7101,18 @@ "fsevents": "^2.3.2" } }, + "node_modules/jest-haste-map/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-haste-map/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6143,15 +7130,38 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-haste-map/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-haste-map/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-haste-map/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-leak-detector": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", @@ -6165,48 +7175,102 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, - "node_modules/jest-matcher-utils": { + "node_modules/jest-leak-detector/node_modules/@jest/schemas": { "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", "dev": true, "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "@sinclair/typebox": "^0.24.1" }, "engines": { "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, - "node_modules/jest-message-util": { + "node_modules/jest-leak-detector/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, + "node_modules/jest-leak-detector/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-leak-detector/node_modules/jest-get-type": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", + "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-leak-detector/node_modules/pretty-format": { "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "29.6.2", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz", + "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.6.2", + "jest-get-type": "^29.4.3", + "pretty-format": "^29.6.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "29.6.2", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz", + "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.1", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", + "pretty-format": "^29.6.2", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", + "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.0", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6214,13 +7278,13 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -6239,6 +7303,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-mock/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-mock/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6256,10 +7332,16 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-mock/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-mock/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -6324,6 +7406,67 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-resolve/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-resolve/node_modules/@jest/types": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", + "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-resolve/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, + "node_modules/jest-resolve/node_modules/@types/yargs": { + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/jest-resolve/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-runner": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", @@ -6356,6 +7499,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-runner/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-runner/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6373,15 +7528,85 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-runner/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-runner/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-runner/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-runner/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-runner/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-runner/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-runtime": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", @@ -6415,6 +7640,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-runtime/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-runtime/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6432,15 +7669,33 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-runtime/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-runtime/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-runtime/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/jest-runtime/node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -6464,6 +7719,58 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/jest-runtime/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-runtime/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-runtime/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-snapshot": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", @@ -6498,6 +7805,30 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-snapshot/node_modules/@jest/expect-utils": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", + "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", + "dev": true, + "dependencies": { + "jest-get-type": "^28.0.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-snapshot/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6515,16 +7846,118 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-snapshot/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-snapshot/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-util": { + "node_modules/jest-snapshot/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-snapshot/node_modules/diff-sequences": { + "version": "28.1.1", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", + "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/expect": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", + "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", + "dev": true, + "dependencies": { + "@jest/expect-utils": "^28.1.3", + "jest-get-type": "^28.0.2", + "jest-matcher-utils": "^28.1.3", + "jest-message-util": "^28.1.3", + "jest-util": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/jest-diff": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", + "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^28.1.1", + "jest-get-type": "^28.0.2", + "pretty-format": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/jest-get-type": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", + "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/jest-matcher-utils": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", + "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^28.1.3", + "jest-get-type": "^28.0.2", + "pretty-format": "^28.1.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/jest-util": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", @@ -6541,13 +7974,45 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, - "node_modules/jest-util/node_modules/@jest/types": { + "node_modules/jest-snapshot/node_modules/pretty-format": { "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", "dev": true, "dependencies": { "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-util": { + "version": "29.6.2", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz", + "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.1", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-util/node_modules/@jest/types": { + "version": "29.6.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", + "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.0", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6555,13 +8020,13 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-util/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -6584,6 +8049,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-validate/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-validate/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6601,15 +8078,33 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-validate/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-validate/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-validate/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/jest-validate/node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -6622,6 +8117,30 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/jest-validate/node_modules/jest-get-type": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", + "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-validate/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dev": true, + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-watcher": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", @@ -6641,6 +8160,18 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-watcher/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-watcher/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6658,15 +8189,38 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest-watcher/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest-watcher/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, + "node_modules/jest-watcher/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dev": true, + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest-worker": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", @@ -6696,6 +8250,18 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jest/node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/jest/node_modules/@jest/types": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", @@ -6713,25 +8279,21 @@ "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" } }, + "node_modules/jest/node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", + "dev": true + }, "node_modules/jest/node_modules/@types/yargs": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.23.tgz", - "integrity": "sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ==", + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/js-sdsl": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz", - "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/js-sdsl" - } - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6977,6 +8539,11 @@ "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", "dev": true }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -7033,29 +8600,20 @@ } }, "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "dependencies": { - "semver": "^6.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/makeerror": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", @@ -7378,9 +8936,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", - "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "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": { @@ -7552,17 +9110,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -7876,9 +9434,9 @@ } }, "node_modules/pirates": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", - "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==", + "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" @@ -7915,33 +9473,32 @@ } }, "node_modules/prettier": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz", - "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz", + "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "version": "29.6.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz", + "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", + "@jest/schemas": "^29.6.0", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/pretty-format/node_modules/ansi-styles": { @@ -8392,9 +9949,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -8849,6 +10406,11 @@ "node": ">=8" } }, + "node_modules/strip-comments-strings": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/strip-comments-strings/-/strip-comments-strings-1.2.0.tgz", + "integrity": "sha512-zwF4bmnyEjZwRhaak9jUWNxc0DoeKBJ7lwSN/LEc8dQXZcUFG6auaaTQJokQWXopLdM3iTx01nQT8E4aL29DAQ==" + }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -9099,11 +10661,17 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "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/ts-api-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", + "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } }, "node_modules/tsscmp": { "version": "1.0.6", @@ -9114,21 +10682,6 @@ "node": ">=0.6.x" } }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -9209,6 +10762,7 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, "dependencies": { "is-typedarray": "^1.0.0" } @@ -9275,9 +10829,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "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": [ { @@ -9287,6 +10841,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { @@ -9294,7 +10852,7 @@ "picocolors": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -9573,6 +11131,39 @@ "node": ">=10" } }, + "node_modules/verdaccio/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/verdaccio/node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/verdaccio/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -9642,15 +11233,6 @@ "string-width": "^1.0.2 || 2 || 3 || 4" } }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", @@ -9703,21 +11285,33 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/write-file-atomic": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", - "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", "dependencies": { "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" + "signal-exit": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/write-file-atomic/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/write-yaml-file": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/write-yaml-file/-/write-yaml-file-4.2.0.tgz", "integrity": "sha512-LwyucHy0uhWqbrOkh9cBluZBeNVxzHjDaE9mwepZG3n3ZlbM4v3ndrFw51zW/NXYFFqP+QWZ72ihtLWTh05e4Q==", + "dev": true, "dependencies": { "js-yaml": "^4.0.0", "write-file-atomic": "^3.0.3" @@ -9730,6 +11324,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -9741,6 +11336,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, "dependencies": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", @@ -9764,9 +11360,9 @@ "dev": true }, "node_modules/yargs": { - "version": "17.7.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", - "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, "dependencies": { "cliui": "^8.0.1", diff --git a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/update.sh b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/update.sh index 12c11c60b1..d45948bb3b 100755 --- a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/update.sh +++ b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/update.sh @@ -16,22 +16,19 @@ fi set -x cd "$(dirname "$0")" -version="$1" +rev="$1" set -euo pipefail -if [ -z "$version" ]; then - version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/cvent/pnpm-lock-export/releases?per_page=1" | jq -r '.[0].tag_name')" +if [ -z "$rev" ]; then + rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/adamcstephens/pnpm-lock-export/commits?per_page=1" | jq -r '.[0].sha')" fi -# strip leading "v" -version="${version#v}" - # pnpm-lock-export repository -src_hash=$(nix-prefetch-github cvent pnpm-lock-export --rev "v${version}" | jq -r .sha256) +src_hash=$(nix-prefetch-github adamcstephens pnpm-lock-export --rev "${rev}" | jq -r .hash) # Front-end dependencies -upstream_src="https://raw.githubusercontent.com/cvent/pnpm-lock-export/v$version" +upstream_src="https://raw.githubusercontent.com/adamcstephens/pnpm-lock-export/${rev}" trap 'rm -rf package.json' EXIT wget "${TOKEN_ARGS[@]}" "$upstream_src/package.json" @@ -39,9 +36,8 @@ npm install --package-lock-only deps_hash=$(prefetch-npm-deps package-lock.json) # Use friendlier hashes -src_hash=$(nix hash to-sri --type sha256 "$src_hash") deps_hash=$(nix hash to-sri --type sha256 "$deps_hash") -sed -i -E -e "s#version = \".*\"#version = \"$version\"#" default.nix +sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" default.nix sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix sed -i -E -e "s#npmDepsHash = \".*\"#npmDepsHash = \"$deps_hash\"#" default.nix diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index 7284bc95e5..aad8998064 100644 --- a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,20 +1,28 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib +, stdenv +, fetchurl +, unzip +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bootstrap"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-RUN0HbrDlUt7fMDjSHaIoTyOchSmfsMQZyATZmz2zY0="; + url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip"; + hash = "sha256-SfxkgJujf07f2vq0ViDhjGgRDCeg32L0RKDHHTWBp6Q="; }; nativeBuildInputs = [ unzip ]; dontBuild = true; installPhase = '' + runHook preInstall + mkdir $out cp -r * $out/ + + runHook postInstall ''; meta = { @@ -22,5 +30,4 @@ stdenv.mkDerivation rec { homepage = "https://getbootstrap.com/"; license = lib.licenses.mit; }; - -} +}) diff --git a/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix b/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix index 25110ee532..1db4f31e79 100644 --- a/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix +++ b/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.33"; + version = "1.4.39"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-PE5TYzfO2/3DehCVmo9mNNXgghnNR02frqRe6I0EfFY="; + hash = "sha256-eawsTvPJwWKDSZd/2XBneitoydSRxEAU5RAPZgE6NSo="; fetchSubmodules = true; }; - vendorHash = "sha256-qnn+2aUpYQYg31p+rAHTGHgrwfEHRtZECOg9oIERrrc="; + vendorHash = "sha256-uHTYp8PBXdQ2w+kjxLVvUOzOvDfXF53lcBriK8sif7A="; buildInputs = [ alsa-lib diff --git a/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix b/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix new file mode 100644 index 0000000000..4608df45d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, mkDerivation +, cmake +, pkg-config +, protobuf +, python3 +, ffmpeg_6 +, libopus +, qtbase +, qtmultimedia +, qtsvg +, SDL2 +, libevdev +, udev +, hidapi +, fftw +}: + +mkDerivation rec { + pname = "chiaki4deck"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "streetpea"; + repo = pname; + rev = "v${version}"; + hash = "sha256-DXer39+j8QaI1IAIcLhVzSVNyGvwoT93knRibpFsEeY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + protobuf + python3 + python3.pkgs.protobuf + python3.pkgs.setuptools + ]; + + buildInputs = [ + ffmpeg_6 + libopus + qtbase + qtmultimedia + qtsvg + protobuf + SDL2 + hidapi + fftw + libevdev + udev + ]; + + meta = with lib; { + homepage = "https://streetpea.github.io/chiaki4deck/"; + description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ devusb ]; + platforms = platforms.linux; + mainProgram = "chiaki"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/ckan/default.nix b/third_party/nixpkgs/pkgs/games/ckan/default.nix index 4a6f8d0c8e..960798cde2 100644 --- a/third_party/nixpkgs/pkgs/games/ckan/default.nix +++ b/third_party/nixpkgs/pkgs/games/ckan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ckan"; - version = "1.32.0"; + version = "1.33.2"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - sha256 = "sha256-cD8S5UcS5tBJoW1IExrmtoYn8k/P7RjCRAx7BEhAWGk="; + sha256 = "sha256-FIndxRyGDgXinP8ZX0o6LEJgGNNw84tCPw5FdVAU3TI="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix index 0243644222..fc71514533 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/doomrunner/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomrunner"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "Youda008"; repo = "DoomRunner"; rev = "v${finalAttrs.version}"; - hash = "sha256-8355WuVF3OQ2xl1VCvMZYDRRhHaTd8rdll5e4YzrYLc="; + hash = "sha256-twiykuUhp4+TMgUhezgelldJBbtlqA32Ah3DalFsvPo="; }; buildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/prboom-plus/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/prboom-plus/default.nix index 15875296ff..2d9be1073f 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/prboom-plus/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/prboom-plus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-moU/bZ2mS1QfKPP6HaAwWP1nRNZ4Ue5DFl9zBBrJiHw="; }; - sourceRoot = "source/prboom2"; + sourceRoot = "${src.name}/prboom2"; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix b/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix index c95ca576ec..ea68c3a110 100644 --- a/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix +++ b/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix @@ -1,23 +1,71 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkg-config -, freetype ? null, fmt, glib, harfbuzz ? null -, liblcf, libpng, libsndfile ? null, libvorbis ? null, libxmp ? null -, libXcursor, libXext, libXi, libXinerama, libXrandr, libXScrnSaver, libXxf86vm -, mpg123 ? null, opusfile ? null, pcre, pixman, SDL2, speexdsp ? null, wildmidi ? null, zlib +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, doxygen +, pkg-config +, freetype +, fmt +, glib +, harfbuzz +, liblcf +, libpng +, libsndfile +, libvorbis +, libxmp +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, libXScrnSaver +, libXxf86vm +, mpg123 +, opusfile +, pcre +, pixman +, SDL2 +, speexdsp +, wildmidi +, zlib , libdecor +, alsa-lib +, asciidoctor +, Foundation +, AudioUnit +, AudioToolbox }: stdenv.mkDerivation rec { pname = "easyrpg-player"; - version = "0.7.0"; + version = "0.8"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "Player"; rev = version; - sha256 = "049bj3jg3ldi3n11nx8xvh6pll68g7dcxz51q6z1gyyfxxws1qpj"; + hash = "sha256-t0sa9ONVVfsiTy+us06vU2bMa4QmmQeYxU395g0WS6w="; }; - nativeBuildInputs = [ cmake doxygen pkg-config ]; + patches = [ + # Fixed compatibility with fmt > 9 + # Remove when version > 0.8 + (fetchpatch { + name = "0001-Fix-building-with-fmtlib-10.patch"; + url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; + hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + asciidoctor + cmake + doxygen + pkg-config + ]; buildInputs = [ fmt @@ -29,6 +77,15 @@ stdenv.mkDerivation rec { libsndfile libvorbis libxmp + mpg123 + opusfile + pcre + pixman + SDL2 + speexdsp + zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib libXcursor libXext libXi @@ -36,22 +93,43 @@ stdenv.mkDerivation rec { libXrandr libXScrnSaver libXxf86vm - mpg123 - opusfile - pcre - pixman - SDL2 - speexdsp - wildmidi - zlib libdecor + wildmidi # until packaged on Darwin + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Foundation + AudioUnit + AudioToolbox ]; + cmakeFlags = [ + "-DPLAYER_ENABLE_TESTS=${lib.boolToString doCheck}" + ]; + + makeFlags = [ + "all" + "man" + ]; + + buildFlags = lib.optionals doCheck [ + "test_runner_player" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/bin + mv Package $out/Applications + ln -s $out/{Applications/EasyRPG\ Player.app/Contents/MacOS,bin}/EasyRPG\ Player + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + enableParallelChecking = true; + meta = with lib; { description = "RPG Maker 2000/2003 and EasyRPG games interpreter"; homepage = "https://easyrpg.org/"; license = licenses.gpl3; maintainers = with maintainers; [ yana ]; - platforms = platforms.linux; + platforms = platforms.all; + mainProgram = lib.optionalString stdenv.hostPlatform.isDarwin "EasyRPG Player"; }; } diff --git a/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix b/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix index e0cd581af8..ceb3d74816 100644 --- a/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix +++ b/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix @@ -6,24 +6,28 @@ , enableDefaultMusicPack ? true }: -python3.pkgs.buildPythonApplication rec { +let pname = "endgame-singularity"; version = "1.00"; - srcs = [ - (fetchFromGitHub { - owner = "singularity"; - repo = "singularity"; - rev = "v${version}"; - sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; - }) - ] ++ lib.optional enableDefaultMusicPack ( - fetchurl { - url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; - sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; - } - ); - sourceRoot = "source"; + main_src = fetchFromGitHub { + owner = "singularity"; + repo = "singularity"; + rev = "v${version}"; + sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; + }; + + music_src = fetchurl { + url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; + sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; + }; +in + +python3.pkgs.buildPythonApplication rec { + inherit pname version; + + srcs = [ main_src ] ++ lib.optional enableDefaultMusicPack music_src; + sourceRoot = main_src.name; nativeBuildInputs = [ unzip ]; # The music is zipped propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; diff --git a/third_party/nixpkgs/pkgs/games/ezquake/default.nix b/third_party/nixpkgs/pkgs/games/ezquake/default.nix index 90ddb6d645..e9b173909a 100644 --- a/third_party/nixpkgs/pkgs/games/ezquake/default.nix +++ b/third_party/nixpkgs/pkgs/games/ezquake/default.nix @@ -1,21 +1,23 @@ { lib, stdenv, fetchFromGitHub, curl, expat -, jansson, libpng, libjpeg, libGLU, libGL, libXxf86vm, pcre -, pkg-config, SDL2, vim, speex }: +, jansson, libpng, libjpeg, libGLU, libGL +, libsndfile, libXxf86vm, pcre, pkg-config, SDL2 +, vim, speex }: stdenv.mkDerivation rec { pname = "ezquake"; - version = "3.2.3"; + version = "3.6.2"; src = fetchFromGitHub { - owner = "ezQuake"; + owner = "QW-Group"; repo = pname + "-source"; rev = version; - sha256 = "sha256-EBhKmoX11JavTG6tPfg15FY2lqOFfzSDg3058OWfcYQ="; + fetchSubmodules = true; + hash = "sha256-mi/VDSZ+ybEAaZOhBGh/cSnrRUAB/h+WQZ4Aml0UfW4="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - expat curl jansson libpng libjpeg libGLU libGL libXxf86vm pcre SDL2 vim speex + expat curl jansson libpng libjpeg libGLU libGL libsndfile libXxf86vm pcre SDL2 vim speex ]; installPhase = with lib; let @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://ezquake.github.io/"; + homepage = "https://ezquake.com/"; description = "A modern QuakeWorld client focused on competitive online play"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index b68634b80b..2016cb28dc 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.81.tar.xz", + "name": "factorio_alpha_x64-1.1.88.tar.xz", "needsAuth": true, - "sha256": "0a8wql8lqlf7jd2bgsgqvkl62jz4gym03iwccif4xc5y1f8sqh32", + "sha256": "1imqg0yqrc1wgkw6x9hdakssl6vwlw4f9fxn4k6535vjqk7fpcas", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.81/alpha/linux64", - "version": "1.1.81" + "url": "https://factorio.com/get-download/1.1.88/alpha/linux64", + "version": "1.1.88" }, "stable": { - "name": "factorio_alpha_x64-1.1.80.tar.xz", + "name": "factorio_alpha_x64-1.1.87.tar.xz", "needsAuth": true, - "sha256": "084j0vb3xp57c0i01jqfxnp8ky6c9rid5yx96l8jqg51071wai6g", + "sha256": "166mfblhxa6l3nglwwl77d1k3rkfcisp9bkps6y5zb2hmsmr00s6", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.80/alpha/linux64", - "version": "1.1.80" + "url": "https://factorio.com/get-download/1.1.87/alpha/linux64", + "version": "1.1.87" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.81.tar.xz", + "name": "factorio_demo_x64-1.1.88.tar.xz", "needsAuth": false, - "sha256": "1rj6bcir4jjs23yh07w64rygf67xkpsvgi6byxmrhcv5pi1vavgj", + "sha256": "0m1rx7khfg3p0bj8gp30cqipwqjk1sjj13mzzxh67crwcjzxps9z", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.81/demo/linux64", - "version": "1.1.81" + "url": "https://factorio.com/get-download/1.1.88/demo/linux64", + "version": "1.1.88" }, "stable": { - "name": "factorio_demo_x64-1.1.76.tar.xz", + "name": "factorio_demo_x64-1.1.87.tar.xz", "needsAuth": false, - "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", + "sha256": "1n5q4wgp2z18vpkvim8yxg4w9wc28mw9gfnqwq6fcwafz90xy9sq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.76/demo/linux64", - "version": "1.1.76" + "url": "https://factorio.com/get-download/1.1.87/demo/linux64", + "version": "1.1.87" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.81.tar.xz", + "name": "factorio_headless_x64-1.1.88.tar.xz", "needsAuth": false, - "sha256": "1ibz80bc45lasmy46657awq002gs93nzgirli7zrwcdps50d7vbl", + "sha256": "0k0c1yvlkd0bi7cz99xak0wvcpzg7zfn9nzydrd7fkxj6h41fivm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.81/headless/linux64", - "version": "1.1.81" + "url": "https://factorio.com/get-download/1.1.88/headless/linux64", + "version": "1.1.88" }, "stable": { - "name": "factorio_headless_x64-1.1.80.tar.xz", + "name": "factorio_headless_x64-1.1.87.tar.xz", "needsAuth": false, - "sha256": "0db6g50gwcq2lwlgagc7in12wag6siwcldlq367x2h0d2q0rxj36", + "sha256": "1k2pk0s2nf4xy168kzf798ha7x4zc5ijpvxp61xlq7xddm5qicv0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.80/headless/linux64", - "version": "1.1.80" + "url": "https://factorio.com/get-download/1.1.87/headless/linux64", + "version": "1.1.87" } } } diff --git a/third_party/nixpkgs/pkgs/games/ferium/default.nix b/third_party/nixpkgs/pkgs/games/ferium/default.nix index 6f602ca0de..5a8859e95e 100644 --- a/third_party/nixpkgs/pkgs/games/ferium/default.nix +++ b/third_party/nixpkgs/pkgs/games/ferium/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "Fast and multi-source CLI program for managing Minecraft mods and modpacks from Modrinth, CurseForge, and GitHub Releases"; homepage = "https://github.com/gorilla-devs/ferium"; license = licenses.mpl20; - maintainers = with maintainers; [ leo60228 imsofi ]; + maintainers = with maintainers; [ leo60228 soupglasses ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix index 77f9340b1b..8ede4b40bd 100644 --- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-h9kWeq7NgJUChqH49nJNuG/6fzAOteZlKUs6Vtbv7Ww="; + sha256 = "sha256-FTxmcRD6PlY46HuakD/7wcBa26nEHYdWYUGmOR4R58Q="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix b/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix index 32a756ce62..fbcc652d80 100644 --- a/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix +++ b/third_party/nixpkgs/pkgs/games/forge-mtg/default.nix @@ -29,7 +29,7 @@ maven.buildMavenPackage { mvnParameters = "-DskipTests"; mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw="; - nativeBuildInputs = [ maven makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -59,7 +59,6 @@ maven.buildMavenPackage { meta = with lib; { description = "Magic: the Gathering card game with rules enforcement"; homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26"; - platforms = openjdk.meta.platforms; license = licenses.gpl3Plus; maintainers = with maintainers; [ eigengrau ]; }; diff --git a/third_party/nixpkgs/pkgs/games/freeciv/default.nix b/third_party/nixpkgs/pkgs/games/freeciv/default.nix index b83b37f66a..89d38d941e 100644 --- a/third_party/nixpkgs/pkgs/games/freeciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.4"; + version = "3.0.8"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-hhX+aM/NHdqOM0qSKSJyW2FAWTsyAHrjaNhxtP2vbVA="; + hash = "sha256-6DWVou4d1oAOlhHb2A2vxR4Fy+1q7Xz9w9VK9rEzZxA="; }; postPatch = '' @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { substituteInPlace $f \ --replace '/usr/bin/env python3' ${python3.interpreter} done + for f in bootstrap/*.sh; do + patchShebangs $f + done ''; nativeBuildInputs = [ autoreconfHook pkg-config ] diff --git a/third_party/nixpkgs/pkgs/games/fteqw/default.nix b/third_party/nixpkgs/pkgs/games/fteqw/default.nix new file mode 100644 index 0000000000..984c558180 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/fteqw/default.nix @@ -0,0 +1,90 @@ +{ lib +, stdenv +, fetchsvn +, gzip +, libvorbis +, libmad +, SDL2 +, SDL2_mixer +, libpng +, alsa-lib +, gnutls +, zlib +, libjpeg +, vulkan-loader +, vulkan-headers +, speex +, libopus +, xorg +, libGL +}@attrs: +{ + fteqw = import ./generic.nix (rec { + pname = "fteqw"; + + buildFlags = [ "m-rel" ]; + + nativeBuildInputs = [ + vulkan-headers + ]; + + buildInputs = [ + gzip + libvorbis + libmad + SDL2 + SDL2_mixer + libpng + alsa-lib + gnutls + libjpeg + vulkan-loader + speex + libopus + xorg.libXrandr + xorg.libXcursor + ]; + + postFixup = '' + patchelf $out/bin/${pname} \ + --add-needed ${SDL2}/lib/libSDL2.so \ + --add-needed ${libGL}/lib/libGLX.so \ + --add-needed ${libGL}/lib/libGL.so \ + --add-needed ${lib.getLib gnutls}/lib/libgnutls.so \ + --add-needed ${vulkan-loader}/lib/libvulkan.so + ''; + + description = "A hybrid and versatile game engine"; + } // attrs); + + fteqw-dedicated = import ./generic.nix (rec { + pname = "fteqw-dedicated"; + releaseFile = "fteqw-sv"; + + buildFlags = [ "sv-rel" ]; + + buildInputs = [ + gnutls + zlib + ]; + + postFixup = '' + patchelf $out/bin/${pname} \ + --add-needed ${gnutls}/lib/libgnutls.so \ + ''; + + description = "Dedicated server for FTEQW"; + } // attrs); + + fteqcc = import ./generic.nix ({ + pname = "fteqcc"; + + buildFlags = [ "qcc-rel" ]; + + buildInputs = [ + zlib + ]; + + description = "User friendly QuakeC compiler"; + } // attrs); +} diff --git a/third_party/nixpkgs/pkgs/games/fteqw/generic.nix b/third_party/nixpkgs/pkgs/games/fteqw/generic.nix new file mode 100644 index 0000000000..a420657ea5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/fteqw/generic.nix @@ -0,0 +1,60 @@ +{ lib +, fetchsvn +, stdenv +, libopus +, xorg +, pname +, releaseFile ? pname +, buildFlags +, buildInputs +, nativeBuildInputs ? [] +, postFixup ? "" +, description +, ... }: + +stdenv.mkDerivation { + inherit pname buildFlags buildInputs nativeBuildInputs postFixup; + version = "unstable-2022-08-09"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/fteqw/code/trunk"; + rev = "6303"; + sha256 = "sha256-tSTFX59iVUvndPRdREayKpkQ+YCYKCMQe2PXZfnTgPQ="; + }; + + makeFlags = [ + "PKGCONFIG=$(PKG_CONFIG)" + "-C" "engine" + ]; + + enableParallelBuilding = true; + postPatch = '' + substituteInPlace ./engine/Makefile \ + --replace "I/usr/include/opus" "I${libopus.dev}/include/opus" + substituteInPlace ./engine/gl/gl_vidlinuxglx.c \ + --replace 'Sys_LoadLibrary("libXrandr"' 'Sys_LoadLibrary("${xorg.libXrandr}/lib/libXrandr.so"' + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 engine/release/${releaseFile} $out/bin/${pname} + + runHook postInstall + ''; + + meta = with lib; { + inherit description; + homepage = "https://fte.triptohell.info"; + longDescription = '' + FTE is a game engine baed on QuakeWorld able to + play games such as Quake 1, 2, 3, and Hexen 2. + It includes various features such as extended map + limits, vulkan and OpenGL renderers, a dedicated + server, and fteqcc, for easier QuakeC development + ''; + maintainers = with maintainers; [ necrophcodr ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/gambit/default.nix b/third_party/nixpkgs/pkgs/games/gambit/default.nix new file mode 100644 index 0000000000..4bcd329171 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/gambit/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, testers +, gambit-chess +}: + +buildGoModule rec { + pname = "gambit"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "gambit"; + rev = "v${version}"; + hash = "sha256-RLbD9JK1yJn30WWg7KWDjJoj4WXIoy3Kb8t2F8rFPuk="; + }; + + vendorHash = "sha256-d9fPlv+ZAzQA42I61B5JEzfYpfJc9vWBcLYTX/s5dhs="; + + nativeBuildInputs = [ + installShellFiles + ]; + + ldflags = [ + "-s" + "-w" + "-X=main.Version=v${version}" + "-X=main.CommitSHA=${src.rev}" + ]; + + postInstall = '' + installShellCompletion --cmd gambit \ + --bash <($out/bin/gambit completion bash) \ + --fish <($out/bin/gambit completion fish) \ + --zsh <($out/bin/gambit completion zsh) + ''; + + passthru.tests = { + version = testers.testVersion { + package = gambit-chess; + version = "v${version}"; + }; + }; + + meta = with lib; { + description = "Play chess in your terminal"; + homepage = "https://github.com/maaslalani/gambit"; + changelog = "https://github.com/maaslalani/gambit/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/gnubg/default.nix b/third_party/nixpkgs/pkgs/games/gnubg/default.nix index 7276267905..84bc7f5df8 100644 --- a/third_party/nixpkgs/pkgs/games/gnubg/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnubg/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, python2, gtk2, readline }: +{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline, + copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "gnubg"; - version = "1.06.002"; + version = "1.07.001"; src = fetchurl { - url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz"; - sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"; + url = "mirror://gnu/gnubg/gnubg-release-${version}-sources.tar.gz"; + hash = "sha256-cjmXKUGcrZ8RLDBmoS0AANpFCkVq3XsJTYkVUGnWgh4="; }; - nativeBuildInputs = [ pkg-config python2 glib ]; + nativeBuildInputs = [ copyDesktopItems pkg-config python3 glib ]; buildInputs = [ gtk2 readline ]; @@ -17,9 +18,19 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gtk" "--with--board3d" ]; + desktopItems = makeDesktopItem { + desktopName = "GNU Backgammon"; + name = pname; + genericName = "Backgammon"; + comment = meta.description; + exec = pname; + icon = pname; + categories = [ "Game" "GTK" "StrategyGame" ]; + }; + meta = with lib; { description = "World class backgammon application"; - homepage = "http://www.gnubg.org/"; + homepage = "https://www.gnu.org/software/gnubg/"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/hheretic/default.nix b/third_party/nixpkgs/pkgs/games/hheretic/default.nix new file mode 100644 index 0000000000..6e4be6bd54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/hheretic/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL +, SDL_mixer +, autoreconfHook +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hheretic"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "sezero"; + repo = "hheretic"; + rev = "hheretic-${finalAttrs.version}"; + hash = "sha256-e9N869W8STZdLUBSscxEnF2Z+SrdVv8ARDL8AMe1SJ8="; + }; + + nativeBuildInputs = [ + autoreconfHook + SDL.dev + ]; + + buildInputs = [ + SDL + SDL_mixer + ]; + + strictDeps = true; + enableParallelBuilding = true; + + configureFlags = [ "--with-audio=sdlmixer" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 hheretic-gl -t $out/bin + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "hheretic-"; + }; + + meta = { + description = "Linux port of Raven Game's Heretic"; + homepage = "https://hhexen.sourceforge.net/hhexen.html"; + license = lib.licenses.gpl2Plus; + mainProgram = "hheretic-gl"; + maintainers = with lib.maintainers; [ moody ]; + inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/games/hhexen/default.nix b/third_party/nixpkgs/pkgs/games/hhexen/default.nix index 4b978ab565..0e5345e85a 100644 --- a/third_party/nixpkgs/pkgs/games/hhexen/default.nix +++ b/third_party/nixpkgs/pkgs/games/hhexen/default.nix @@ -1,23 +1,57 @@ -{ lib, fetchurl, SDL, stdenv }: +{ lib +, stdenv +, fetchFromGitHub +, SDL +, SDL_mixer +, autoreconfHook +, gitUpdater +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hhexen"; version = "1.6.3"; - src = fetchurl { - url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz"; - sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b"; + + src = fetchFromGitHub { + owner = "sezero"; + repo = "hhexen"; + rev = "hhexen-${finalAttrs.version}"; + hash = "sha256-y3jKfU4e8R2pJQN/FN7W6KQ7D/P+7pmQkdmZug15ApI="; }; - buildInputs = [ SDL ]; + nativeBuildInputs = [ + autoreconfHook + SDL.dev + ]; + + buildInputs = [ + SDL + SDL_mixer + ]; + + strictDeps = true; + enableParallelBuilding = true; + + configureFlags = [ "--with-audio=sdlmixer" ]; + installPhase = '' + runHook preInstall + install -Dm755 hhexen-gl -t $out/bin + + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "hhexen-"; + }; + + meta = { description = "Linux port of Raven Game's Hexen"; homepage = "https://hhexen.sourceforge.net/hhexen.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ djanatyn ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ moody djanatyn ]; mainProgram = "hhexen-gl"; + inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/hmcl/default.nix b/third_party/nixpkgs/pkgs/games/hmcl/default.nix new file mode 100644 index 0000000000..f6ded13dc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/hmcl/default.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, fetchurl +, makeBinaryWrapper +, makeDesktopItem +, wrapGAppsHook +, copyDesktopItems +, imagemagick +, jre +, xorg +, libGL +, glfw +, openal +, libglvnd +, alsa-lib +, wayland +, libpulseaudio +}: + +let + version = "3.5.5"; + icon = fetchurl { + url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; + hash = "sha256-MWp78rP4b39Scz5/gpsjwaJhSu+K9q3S2B2cD/V31MA="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hmcl"; + inherit version; + + src = fetchurl { + url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; + hash = "sha256-bXZF38pd8I8cReuDNrZzDj1hp1Crk+P26JNiikUCg4g="; + }; + + dontUnpack = true; + + dontWrapGApps = true; + + desktopItems = [ + (makeDesktopItem { + name = "HMCL"; + exec = "hmcl"; + icon = "hmcl"; + comment = finalAttrs.meta.description; + desktopName = "HMCL"; + categories = [ "Game" ]; + }) + ]; + + nativeBuildInputs = [ + makeBinaryWrapper + wrapGAppsHook + copyDesktopItems + imagemagick + ]; + + installPhase = + let + libpath = lib.makeLibraryPath ([ + libGL + glfw + openal + libglvnd + ] ++ lib.optionals stdenv.isLinux [ + xorg.libX11 + xorg.libXxf86vm + xorg.libXext + xorg.libXcursor + xorg.libXrandr + xorg.libXtst + libpulseaudio + wayland + alsa-lib + ]); + in + '' + runHook preInstall + mkdir -p $out/{bin,lib/hmcl} + cp $src $out/lib/hmcl/hmcl.jar + magick ${icon} hmcl.png + install -Dm644 hmcl.png $out/share/icons/hicolor/32x32/apps/hmcl.png + makeBinaryWrapper ${jre}/bin/java $out/bin/hmcl \ + --add-flags "-jar $out/lib/hmcl/hmcl.jar" \ + --set LD_LIBRARY_PATH ${libpath} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://hmcl.huangyuhui.net"; + description = "A Minecraft Launcher which is multi-functional, cross-platform and popular"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rs0vere ]; + inherit (jre.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/games/iortcw/default.nix b/third_party/nixpkgs/pkgs/games/iortcw/default.nix index 9da055acc2..44a554b9e7 100644 --- a/third_party/nixpkgs/pkgs/games/iortcw/default.nix +++ b/third_party/nixpkgs/pkgs/games/iortcw/default.nix @@ -2,8 +2,8 @@ let sp = callPackage ./sp.nix {}; - mp = sp.overrideAttrs (oldAttrs: rec { - sourceRoot = "source/MP"; + mp = sp.overrideAttrs (oldAttrs: { + sourceRoot = "${oldAttrs.src.name}/MP"; }); in buildEnv { name = "iortcw"; diff --git a/third_party/nixpkgs/pkgs/games/iortcw/sp.nix b/third_party/nixpkgs/pkgs/games/iortcw/sp.nix index 7f78f89b03..66944c49dd 100644 --- a/third_party/nixpkgs/pkgs/games/iortcw/sp.nix +++ b/third_party/nixpkgs/pkgs/games/iortcw/sp.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - sourceRoot = "source/SP"; + sourceRoot = "${src.name}/SP"; makeFlags = [ "USE_INTERNAL_LIBS=0" diff --git a/third_party/nixpkgs/pkgs/games/jazz2/game.nix b/third_party/nixpkgs/pkgs/games/jazz2/game.nix index d29d1342fd..22ddbfe337 100644 --- a/third_party/nixpkgs/pkgs/games/jazz2/game.nix +++ b/third_party/nixpkgs/pkgs/games/jazz2/game.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "jazz2"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; rev = version; - sha256 = "IJhMxnOUam6MdT5f0JBThf/sV4WxA++gpBMB2cGqJ14="; + sha256 = "nJha7+geP2Ov7ciEDzJ+XWdiF1jzv4Oeis1DwxcpJXo="; }; patches = [ ./nocontent.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/jfsw/default.nix b/third_party/nixpkgs/pkgs/games/jfsw/default.nix new file mode 100644 index 0000000000..e170f00245 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/jfsw/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, which +, SDL2 +, perl +, pkg-config +, wrapGAppsHook +, gtk3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jfsw"; + version = "20211225"; + + src = fetchFromGitHub { + owner = "jonof"; + repo = "jfsw"; + rev = "refs/tags/${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-oRJHVsVo+KQfJyd8TcPxTMPPi993qxQb0wnD9nR4vJY="; + }; + + nativeBuildInputs = [ + which + SDL2 + perl + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + SDL2 + gtk3 + ]; + + strictDeps = true; + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + install -Dm755 sw -t $out/bin + + runHook postInstall + ''; + + meta = { + description = "Modern port the original Shadow Warrior"; + homepage = "http://www.jonof.id.au/jfsw/"; + license = lib.licenses.gpl2Plus; + mainProgram = "sw"; + maintainers = with lib.maintainers; [ moody ]; + broken = stdenv.isDarwin; + inherit (SDL2.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/games/katago/default.nix b/third_party/nixpkgs/pkgs/games/katago/default.nix index cc49d6338a..0ca0deb518 100644 --- a/third_party/nixpkgs/pkgs/games/katago/default.nix +++ b/third_party/nixpkgs/pkgs/games/katago/default.nix @@ -1,6 +1,7 @@ { stdenv , boost , cmake +, config , cudaPackages , eigen , fetchFromGitHub @@ -14,7 +15,7 @@ , openssl , writeShellScriptBin , enableAVX2 ? stdenv.hostPlatform.avx2Support -, backend ? "opencl" +, backend ? if config.cudaSupport then "cuda" else "opencl" , enableBigBoards ? false , enableContrib ? false , enableTcmalloc ? true diff --git a/third_party/nixpkgs/pkgs/games/keeperrl/default.nix b/third_party/nixpkgs/pkgs/games/keeperrl/default.nix index ba2783fb2b..8fb6d56332 100644 --- a/third_party/nixpkgs/pkgs/games/keeperrl/default.nix +++ b/third_party/nixpkgs/pkgs/games/keeperrl/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll"; } else null; - sourceRoot = "source"; + sourceRoot = free-src.name; srcs = [ free-src ] ++ lib.optional unfree_assets assets; diff --git a/third_party/nixpkgs/pkgs/games/koboredux/default.nix b/third_party/nixpkgs/pkgs/games/koboredux/default.nix index 622dd2de50..91981fc85f 100644 --- a/third_party/nixpkgs/pkgs/games/koboredux/default.nix +++ b/third_party/nixpkgs/pkgs/games/koboredux/default.nix @@ -11,36 +11,43 @@ }: with lib; -stdenv.mkDerivation rec { + +let pname = "koboredux"; version = "0.7.5.1"; - src = - [(fetchFromGitHub { - owner = "olofson"; - repo = "koboredux"; - rev = "v${version}"; - sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig"; - })] - ++ - (optional useProprietaryAssets (requireFile { - name = "koboredux-${version}-Linux.tar.bz2"; - sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav"; - message = '' - Please purchase the game on https://olofson.itch.io/kobo-redux - and download the Linux build. + main_src = fetchFromGitHub { + owner = "olofson"; + repo = pname; + rev = "v${version}"; + sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig"; + }; - Once you have downloaded the file, please use the following command - and re-run the installation: + assets_src = requireFile { + name = "koboredux-${version}-Linux.tar.bz2"; + sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav"; + message = '' + Please purchase the game on https://olofson.itch.io/kobo-redux + and download the Linux build. - nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2 + Once you have downloaded the file, please use the following command + and re-run the installation: - Alternatively, install the "koboredux-free" package, which replaces the - proprietary assets with a placeholder theme. - ''; - })); + nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2 - sourceRoot = "source"; # needed when we have the assets source + Alternatively, install the "koboredux-free" package, which replaces the + proprietary assets with a placeholder theme. + ''; + }; + +in + +stdenv.mkDerivation rec { + inherit pname version; + + src = [ main_src ] ++ optional useProprietaryAssets assets_src; + + sourceRoot = main_src.name; # Fix clang build patches = [(fetchpatch { diff --git a/third_party/nixpkgs/pkgs/games/lgames/barrage/default.nix b/third_party/nixpkgs/pkgs/games/lgames/barrage/default.nix index 343affcc90..822ec04f1d 100644 --- a/third_party/nixpkgs/pkgs/games/lgames/barrage/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgames/barrage/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "barrage"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-nFkkzT5AjcPfXsdxwvEsk4+RX9Py1mVqADvuoxE4Ha4="; + hash = "sha256-cGYrG7A4Ffh51KyR+UpeWu7A40eqxI8g4LefBIs18kg="; }; buildInputs = [ @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix b/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix index 30fbbdf4d7..aaa4a7c34e 100644 --- a/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ciil ]; inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix b/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix index 40e17f5ab8..4d09d7715a 100644 --- a/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix +++ b/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.14"; + version = "6.0.19"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-+2HwjdbjzhUQPcBMY2Km/cjGAw4TgjNpNMgtuxVUZD4="; + hash = "sha256-dFY+t6MVRdbp0z5mbnREd/t6v1D+7g/vD+K8mcJvn9E="; }; - cargoHash = "sha256-Qip+Yc/i57BOaKBOC60j7TDM1rzIEivYFjsp+vQ3hS4="; + cargoHash = "sha256-mLRD5Z/ZzfT1BFFSyYmJkY98vMY/Elt3Gy0SboCpzec="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/third_party/nixpkgs/pkgs/games/opendungeons/default.nix b/third_party/nixpkgs/pkgs/games/opendungeons/default.nix index 61f8aad304..10bcf19a53 100644 --- a/third_party/nixpkgs/pkgs/games/opendungeons/default.nix +++ b/third_party/nixpkgs/pkgs/games/opendungeons/default.nix @@ -1,14 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, ogre_13 +, cegui +, boost +, sfml +, openal +, ois +}: -stdenv.mkDerivation rec { +let + ogre' = ogre_13.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [ + "-DOGRE_RESOURCEMANAGER_STRICT=0" + ]; + }); + cegui' = cegui.override { + ogre = ogre'; + }; +in +stdenv.mkDerivation { pname = "opendungeons"; - version = "unstable-2021-11-06"; + version = "unstable-2023-03-18"; src = fetchFromGitHub { - owner = "OpenDungeons"; + owner = "paroj"; repo = "OpenDungeons"; - rev = "c180ed1864eab5fbe847d1dd5c5c936c4e45444e"; - sha256 = "0xf7gkpy8ll1h59wyaljf0hr8prg7p4ixz80mxqwcnm9cglpgn63"; + rev = "974378d75591214dccbe0fb26e6ec8a40c2156e0"; + hash = "sha256-vz9cT+rNcyKT3W9I9VRKcFol2SH1FhOhOALALjgKfIE="; }; patches = [ @@ -21,8 +42,25 @@ stdenv.mkDerivation rec { cp source/utils/StackTrace{Stub,Unix}.cpp ''; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ogre cegui boost sfml openal ois ]; + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + ogre' + cegui' + boost + sfml + openal + ois + ]; + + cmakeFlags = [ + "-DOD_TREAT_WARNINGS_AS_ERRORS=FALSE" + ]; meta = with lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius"; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix index bc813e9be8..7cbf6bc839 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.621.0"; + version = "2023.803.0"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-TM2yGr8XmovcVxSXlI+AuddGJ+Qd+slYIqTpLpmGUyo="; + sha256 = "sha256-41UvP3h7Nnmjnjr1nl35uCe6CUK54p1Ok1KhQ8F5/4M="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-8yW45ZOpvd74aY42T/apQhIDOKLdYP/5Z/YZYsByrJk="; + sha256 = "sha256-qxAgXL4igfttsPN3xr4JPBGy9FalR1JIS7OtB4iqNB8="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-21n04TSDBrsxTj/Os5lHLWiTzma5A6BAcyvrMofFj9g="; + sha256 = "sha256-fO9j7hIEhxEDWVdNAPVriHuDQyF2XgReeROBNpXM8gU="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 01c621ed97..17a42db26b 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.621.0"; + version = "2023.803.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-ejptMzhRQcYEFa5c9XurYxaFZOUgTuAfe7qlGYhNX08="; + sha256 = "sha256-q2rw44veVWpKcW/wCkBHNxaIwOXuflejIvqhGQgoh8o="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index db453a1833..816ead326b 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -8,7 +8,7 @@ (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) - (fetchNuGet { pname = "Fody"; version = "6.6.4"; sha256 = "1hhdwj0ska7dvak9hki8cnyfmmw5r8yw8w24gzsdwhqx68dnrvsx"; }) + (fetchNuGet { pname = "Fody"; version = "6.7.0"; sha256 = "0fv0zrffa296qjyi11yk31vfqh6gm1nxsx8g5zz380jcsrilnp3h"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.46"; sha256 = "0yx0xgbbzd6fdyslf7pc37bxk4hfkj1c7359ibqwmapv9aby7lm2"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) @@ -124,29 +124,28 @@ (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.4"; sha256 = "1fk0029b1183pxd6qvzkmy8byx5dhjka3f8x20sd7drbzvqpn6am"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.4"; sha256 = "0ahxg4mckzljav5y9g7c1795wgyx2banysg5l7ix3xrl4xmjfmp3"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.4"; sha256 = "1zz9afqbaif6sl7gzayl0ww9jhysi4q06jicmx4g35yk82w07vzn"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.4"; sha256 = "0lim2aqw42c1cc73fbbw0h41wcwaxa5d89srzalgg8dpi3bds1mp"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.1"; sha256 = "0ww8ib1la21x80v54w6vf5ddq0s2bv49rlzdhdg35pbw51jx1m95"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.1"; sha256 = "04cj5vp665pnja7y07i3zpw3r1ff9kr9b8iglyqjhq7bz0y2dxvy"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.1"; sha256 = "0vp3bgspczw76gh4qm61dhrrxkds4nsqarppg5rdicxpvirj66yq"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.1"; sha256 = "1ikdwfk2n9knfps15j1hrx1f02c0sksi70vjk1bml8cvmz6chjg7"; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.809.0"; sha256 = "1wpdvd9cmr4kx2hng2img89fhgrl1sg0mws8x97dd84glckqjr82"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2022.809.0"; sha256 = "051nri1cpp3h1i7z6ww3zi2vd9ck3fvs4m418sqdgicl83hs6pdi"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.712.0"; sha256 = "064qrrlhhfx18mmrxqhq06d0sdhzzpqxjgc3znpflqh5j1l4j4m1"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.712.0"; sha256 = "1zs9ky53faxqhf6hx1pvnnni79dil8m7f8w4yh9if306bnllnwl4"; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.620.0"; sha256 = "10rq2dvfrjxcq01n6ixwsanxpzp55ax8flnvnc6fr2bi4bh9ajxy"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.716.0"; sha256 = "11qzwxrmbnzrx0g3dqx9ici58kfn5b3g3riwis3fsjfyiziwzvx8"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) - (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.619.0"; sha256 = "0ilzv4c0fh2y96cm8h9d65v1dbafj2myirn8nia4f0wxafyq3cjr"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.605.0"; sha256 = "1628yh97ginvx0i1dlpkmkw9hzvri5fj11b111lqy7xirfy7i66b"; }) + (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.709.0"; sha256 = "1p7lh7583lka6awb4q3vwfhlmry69n9gfjp2h0zm2bvyn9p1928f"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.707.0"; sha256 = "1hndj38qpi7936z7dh6lyip00hvx99q8xzrmkvrp9562ys9xjdpw"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.669-alpha"; sha256 = "0frazc37k9nqzk3sqcy3jzibg9v6dp0ga95yx0rkmjm8jfbw3l9r"; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g7beb1270bf"; sha256 = "1xsdmkby36vqhhdjl11v6p1dbd5adwb2mslkv5dj934fn4lmj9sy"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g7beb1270bf"; sha256 = "0n4aj5nx81yfsfj1zn2c9ffv2807lm2npn0v7rks7972m1fhn48n"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g7beb1270bf"; sha256 = "1nwh1pnwvf4smd7f00igaa4plqf3hl2vc9wsw2mbljr04s800mpp"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g9f8aa2931a"; sha256 = "0jzjaakcfy3x85wx8smp4j7hffbynqakgqvwslr3bkbqlfdxxbil"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "120d6zjh5ss79iz44m9fc4bzhj62yyzawp1wd9knvxq322a6i82n"; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "0xn2cazwv6c6wllas4advsam1dgvqlw1k1vlrp0imswgz6zbvf4f"; }) (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g3e4b9f196a"; sha256 = "0ijainvin0v01pk282985v0mwwa1s2b683wxg23jzk69pbvpyq6g"; }) - (fetchNuGet { pname = "Realm"; version = "10.20.0"; sha256 = "0gy0l2r7726wb6i599n55dn9035h0g7k0binfiy2dy9bjwz60jqk"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.20.0"; sha256 = "0rwcbbzr41iww3k59rjgy5xy7bna1x906h5blbllpywgpc2l5afw"; }) - (fetchNuGet { pname = "Realm.SourceGenerator"; version = "10.20.0"; sha256 = "0y0bwqg87pmsld7cmawwwz2ps5lpkbyyzkb9cj0fbynsn4jdygg0"; }) + (fetchNuGet { pname = "Realm"; version = "11.1.2"; sha256 = "0kfq7knlw0njvhkqz9hjpgi1qqxsh8i1vj07zbj20jspamqrwdyd"; }) + (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.1.2"; sha256 = "01w9lbzwd0d5gc0v2jahbwlhka1fxpj5lpz0cq7v04r0y6064v23"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) diff --git a/third_party/nixpkgs/pkgs/games/papermc/default.nix b/third_party/nixpkgs/pkgs/games/papermc/default.nix index 930b4462a7..2fa4545362 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/default.nix +++ b/third_party/nixpkgs/pkgs/games/papermc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "papermc"; - version = "1.19.3.375"; + version = "1.20.1.83"; jar = let mcVersion = lib.versions.pad 3 version; buildNum = builtins.elemAt (lib.versions.splitVersion version) 3; in fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "sha256-NAl4+mCkO6xQQpIx2pd9tYX2N8VQa+2dmFwyBNbDa10="; + sha256 = "sha256-HQpc3MOXa1wkXqgm9ciQj04FUIyuupnYiu+2RZ/sXE4="; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/games/portmod/default.nix b/third_party/nixpkgs/pkgs/games/portmod/default.nix index fe8eff36f0..c67626d0b0 100644 --- a/third_party/nixpkgs/pkgs/games/portmod/default.nix +++ b/third_party/nixpkgs/pkgs/games/portmod/default.nix @@ -1,16 +1,10 @@ { lib , bubblewrap , cacert -, callPackage , fetchFromGitLab -, fetchurl -, fetchzip , git , imagemagick -, jre -, makeWrapper , openmw -, perlPackages , python3Packages , rustPlatform , tes3cmd diff --git a/third_party/nixpkgs/pkgs/games/powermanga/default.nix b/third_party/nixpkgs/pkgs/games/powermanga/default.nix index ce3f5b9bf5..25a1df5211 100644 --- a/third_party/nixpkgs/pkgs/games/powermanga/default.nix +++ b/third_party/nixpkgs/pkgs/games/powermanga/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix index 17b6f3813a..0f28a6edd4 100644 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmark +, Cocoa , ninja , jdk17 , zlib @@ -13,7 +15,8 @@ , ghc_filesystem , gamemode , msaClientID ? null -, gamemodeSupport ? true +, gamemodeSupport ? stdenv.isLinux +, }: let libnbtplusplus = fetchFromGitHub { @@ -23,31 +26,68 @@ let sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; }; in -stdenv.mkDerivation rec { + +assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; + +stdenv.mkDerivation +rec { pname = "prismlauncher-unwrapped"; - version = "7.1"; + version = "7.2"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = version; - sha256 = "sha256-ri4oaeJKmvjJapUASPX10nl4JcLPjA3SgTp2EyaEPWg="; + sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; }; + patches = lib.optionals stdenv.isDarwin [ + # https://github.com/PrismLauncher/PrismLauncher/pull/1452 + # These patches allow us to disable the Sparkle updater and cmake bundling + # TODO: remove these when updating to 8.0 + (fetchpatch { + name = "disable-sparkle-when-url-is-empty.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch"; + hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo="; + }) + (fetchpatch { + name = "make-install_bundle-cached.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch"; + hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I="; + }) + (fetchpatch { + name = "dont-include-sparkle-when-not-enabled.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch"; + hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk="; + }) + (fetchpatch { + name = "introduce-internal-updater-variable.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch"; + hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ]; - buildInputs = [ - qtbase - zlib - quazip - ghc_filesystem - tomlplusplus - cmark - ] ++ lib.optional gamemodeSupport gamemode; + buildInputs = + [ + qtbase + zlib + quazip + ghc_filesystem + tomlplusplus + cmark + ] + ++ lib.optional gamemodeSupport gamemode + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - hardeningEnable = [ "pie" ]; + hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ]; - cmakeFlags = lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] - ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ]; + cmakeFlags = [ + # downstream branding + "-DLauncher_BUILD_PLATFORM=nixpkgs" + ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] + ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ] + ++ lib.optionals stdenv.isDarwin [ "-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" ]; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -64,7 +104,7 @@ stdenv.mkDerivation rec { their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ minion3665 Scrumplex getchoo ]; diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix index 57d85f4800..63604ea1ff 100644 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix +++ b/third_party/nixpkgs/pkgs/games/prismlauncher/wrapper.nix @@ -16,7 +16,7 @@ , gamemode , msaClientID ? null -, gamemodeSupport ? true +, gamemodeSupport ? stdenv.isLinux , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] }: @@ -38,7 +38,7 @@ symlinkJoin { qtbase qtsvg ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; + ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland; postBuild = '' wrapQtAppsHook @@ -64,9 +64,9 @@ symlinkJoin { ++ additionalLibs; in - [ + [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] + ++ lib.optionals stdenv.isLinux [ "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath libs}" - "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 "--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}" ]; diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix index 8b63b546cf..50862be46b 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+8DU1QT3Lgqf1AIReVnXQ2Lq6R6eBb8VjdkJfAn/Rtc="; }; - sourceRoot = "source/Quake"; + sourceRoot = "${src.name}/Quake"; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix b/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix index 934c590138..0e9a782403 100644 --- a/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix +++ b/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { zlib ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/games/scummvm/default.nix b/third_party/nixpkgs/pkgs/games/scummvm/default.nix index e3dc9c9452..85ef0766b8 100644 --- a/third_party/nixpkgs/pkgs/games/scummvm/default.nix +++ b/third_party/nixpkgs/pkgs/games/scummvm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "scummvm"; repo = "scummvm"; rev = "v${version}"; - hash = "sha256-kyWgy5Nm8v/zbnhNMUyy/wUIq0I6nQyM9UqympYfwvg="; + hash = "sha256-GVsvLAjb7pECd7uvPT9ubDFMIkiPWdU5owOafxk5iy0="; }; nativeBuildInputs = [ nasm ]; diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index 5ecef6e7f0..e74887799e 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix @@ -12,13 +12,13 @@ let pname = "shattered-pixel-dungeon"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-eyl5bMIoVpQB4QIQdJvPw4gjMG6OeQPahx6h46YsIXs="; + hash = "sha256-WbRvsHxTYYlhJavYVGMGK25fXEfSfnIztJ6KuCgBjF8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/games/sil-q/default.nix b/third_party/nixpkgs/pkgs/games/sil-q/default.nix index 6d7fe884ed..9127d4e9af 100644 --- a/third_party/nixpkgs/pkgs/games/sil-q/default.nix +++ b/third_party/nixpkgs/pkgs/games/sil-q/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 ]; # Makefile(s) and config are not top-level - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' # allow usage of ANGBAND_PATH diff --git a/third_party/nixpkgs/pkgs/games/sil/default.nix b/third_party/nixpkgs/pkgs/games/sil/default.nix index a6bc833159..0c6a11f479 100644 --- a/third_party/nixpkgs/pkgs/games/sil/default.nix +++ b/third_party/nixpkgs/pkgs/games/sil/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ncurses libX11 libXaw libXt libXext libXmu ]; - sourceRoot = "source/Sil/src"; + sourceRoot = "${src.name}/Sil/src"; makefile = "Makefile.std"; diff --git a/third_party/nixpkgs/pkgs/games/srb2kart/default.nix b/third_party/nixpkgs/pkgs/games/srb2kart/default.nix index cb68125add..441ffd284a 100644 --- a/third_party/nixpkgs/pkgs/games/srb2kart/default.nix +++ b/third_party/nixpkgs/pkgs/games/srb2kart/default.nix @@ -16,22 +16,22 @@ let -release_tag = "v1.3"; + release_tag = "v1.6"; -installer = fetchurl { - url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/srb2kart-v13-Installer.exe"; - sha256 = "0bk36y7wf6xfdg6j0b8qvk8671hagikzdp5nlfqg478zrj0qf6cs"; -}; + assets = fetchurl { + url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/AssetsLinuxOnly.zip"; + sha256 = "sha256-ejhPuZ1C8M9B0S4+2HN1T5pbormT1eVL3nlivqOszdE="; + }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "srb2kart"; - version = "1.3.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "STJr"; repo = "Kart-Public"; rev = release_tag; - sha256 = "131g9bmc9ihvz0klsc3yzd0pnkhx3mz1vzm8y7nrrsgdz5278y49"; + sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0="; }; nativeBuildInputs = [ @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { ]; cmakeFlags = [ - #"-DSRB2_ASSET_DIRECTORY=/build/source/assets" "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" @@ -68,7 +67,7 @@ in stdenv.mkDerivation rec { preConfigure = '' mkdir assets/installer pushd assets/installer - unzip ${installer} "*.kart" srb2.srb + unzip ${assets} "*.kart" srb2.srb popd ''; diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 2487cc0ef7..bf27895c20 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -140,6 +140,7 @@ in buildFHSEnv rec { # SteamVR udev + dbus # Other things from runtime glib @@ -199,7 +200,6 @@ in buildFHSEnv rec { # screeps dependencies gtk3 - dbus zlib atk cairo diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/games/steam/steam.nix index 88e2473801..2687ee7feb 100644 --- a/third_party/nixpkgs/pkgs/games/steam/steam.nix +++ b/third_party/nixpkgs/pkgs/games/steam/steam.nix @@ -41,8 +41,14 @@ in stdenv.mkDerivation { meta = with lib; { description = "A digital distribution platform"; + longDescription = '' + Steam is a video game digital distribution service and storefront from Valve. + + To install on NixOS, please use the option `programs.steam.enable = true`. + ''; homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga jonringer ]; + mainProgram = "steam"; }; } diff --git a/third_party/nixpkgs/pkgs/games/stone-kingdoms/default.nix b/third_party/nixpkgs/pkgs/games/stone-kingdoms/default.nix new file mode 100644 index 0000000000..e49db727b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/stone-kingdoms/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenvNoCC +, fetchFromGitLab +, copyDesktopItems +, love +, makeDesktopItem +, makeWrapper +, strip-nondeterminism +, zip +}: + +stdenvNoCC.mkDerivation rec { + pname = "stone-kingdoms"; + version = "0.5.0"; + + src = fetchFromGitLab { + owner = "stone-kingdoms"; + repo = pname; + rev = version; + hash = "sha256-FQrg/1/nfFC/irCWSLbnb9GYSUv//ovvcjzvIg94oEI="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + strip-nondeterminism + zip + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = "A real-time strategy game made with LÖVE based on the original Stronghold by Firefly studios"; + desktopName = "Stone Kingdoms"; + genericName = pname; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + zip -9 -r stone-kingdoms.love ./* + strip-nondeterminism --type zip stone-kingdoms.love + install -Dm755 -t $out/share/games/lovegames/ stone-kingdoms.love + install -Dm644 assets/other/icon.png $out/share/icons/hicolor/256x256/apps/stone-kingdoms.png + makeWrapper ${love}/bin/love $out/bin/stone-kingdoms \ + --add-flags $out/share/games/lovegames/stone-kingdoms.love + runHook postInstall + ''; + + meta = with lib; { + description = "A real-time strategy game made with LÖVE based on the original Stronghold by Firefly studios"; + homepage = "https://gitlab.com/stone-kingdoms/stone-kingdoms"; + platforms = platforms.linux; + license = with licenses; [ + asl20 # engine + unfree # game assets + ]; + maintainers = with maintainers; [ hulr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/stuntrally/default.nix b/third_party/nixpkgs/pkgs/games/stuntrally/default.nix index af5535ec7a..b4b2268c33 100644 --- a/third_party/nixpkgs/pkgs/games/stuntrally/default.nix +++ b/third_party/nixpkgs/pkgs/games/stuntrally/default.nix @@ -3,7 +3,7 @@ , stdenv , cmake , boost -, ogre +, ogre_13 , mygui , ois , SDL2 @@ -19,7 +19,7 @@ }: let - stuntrally_ogre = ogre.overrideAttrs (old: { + stuntrally_ogre = ogre_13.overrideAttrs (old: { cmakeFlags = old.cmakeFlags ++ [ "-DOGRE_NODELESS_POSITIONING=ON" "-DOGRE_RESOURCEMANAGER_STRICT=0" @@ -27,7 +27,7 @@ let }); stuntrally_mygui = mygui.override { withOgre = true; - inherit ogre; + ogre = stuntrally_ogre; }; in diff --git a/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix b/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix index d13468b78e..6366e0ab06 100644 --- a/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix +++ b/third_party/nixpkgs/pkgs/games/tecnoballz/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index f9808bebb6..e0cf519acc 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.7.8-patch1"; + version = "4.7.11"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-y4mCv4bSz9hMGt/ZAAjbhF1tBy4l3r3GMi0jJr3mnVc="; + hash = "sha256-1QMfGONaw6XX3F2bo5tBghJbnii7z6RE+ZuanIGUF8Q="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix index 2b82426b57..40b3e10772 100644 --- a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix @@ -13,20 +13,39 @@ , libGLU , SDL2 , freealut +, libglvnd +, pipewire +, libpulseaudio +, experimental ? false +, dotnet-runtime_7 }: stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.18.6"; + version = if experimental then "1.18.6" else "1.18.6"; + + src = + if experimental + then + (fetchurl { + url = "https://cdn.vintagestory.at/gamefiles/net7/vs_client_linux-x64_${version}.tar.gz"; + sha256 = "sha256-h4TyMDFid3eB6oPJix92/tmS0v+Ox6CFSRyn/JRNbxg="; + }) + else + (fetchurl { + url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; + sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI="; + }); - src = fetchurl { - url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI="; - }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; - buildInputs = [ mono ]; + buildInputs = + if experimental then [ + dotnet-runtime_7 + ] else [ + mono + ]; runtimeLibs = lib.makeLibraryPath ([ gtk2 @@ -36,6 +55,9 @@ stdenv.mkDerivation rec { libGLU SDL2 freealut + libglvnd + pipewire + libpulseaudio ] ++ (with xorg; [ libX11 libXi @@ -43,7 +65,7 @@ stdenv.mkDerivation rec { desktopItems = makeDesktopItem { name = "vintagestory"; - desktopName = "Vintage Story"; + desktopName = if experimental then "Vintage Story Experimental .net 7" else "Vintage Story"; exec = "vintagestory"; icon = "vintagestory"; comment = "Innovate and explore in a sandbox world"; @@ -61,14 +83,21 @@ stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = '' + preFixup = (if experimental then '' + makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --add-flags $out/share/vintagestory/Vintagestory.dll + makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --add-flags $out/share/vintagestory/VintagestoryServer.dll + '' else '' makeWrapper ${mono}/bin/mono $out/bin/vintagestory \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --add-flags $out/share/vintagestory/Vintagestory.exe makeWrapper ${mono}/bin/mono $out/bin/vintagestory-server \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --add-flags $out/share/vintagestory/VintagestoryServer.exe - + '') + '' find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do local filename="$(basename -- "$file")" ln -sf "$filename" "''${file%/*}"/"''${filename,,}" @@ -79,6 +108,6 @@ stdenv.mkDerivation rec { description = "An in-development indie sandbox game about innovation and exploration"; homepage = "https://www.vintagestory.at/"; license = licenses.unfree; - maintainers = with maintainers; [ artturin ]; + maintainers = with maintainers; [ artturin gigglesquid ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/vvvvvv/default.nix b/third_party/nixpkgs/pkgs/games/vvvvvv/default.nix index 563ed5d7db..6fc3ab6ece 100644 --- a/third_party/nixpkgs/pkgs/games/vvvvvv/default.nix +++ b/third_party/nixpkgs/pkgs/games/vvvvvv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; }; - sourceRoot = "source/desktop_version"; + sourceRoot = "${src.name}/desktop_version"; dataZip = fetchurl { url = "https://thelettervsixtim.es/makeandplay/data.zip"; name = "data.zip"; diff --git a/third_party/nixpkgs/pkgs/misc/brightnessctl/default.nix b/third_party/nixpkgs/pkgs/misc/brightnessctl/default.nix index 2fab8b4bd6..43a37ad764 100644 --- a/third_party/nixpkgs/pkgs/misc/brightnessctl/default.nix +++ b/third_party/nixpkgs/pkgs/misc/brightnessctl/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ megheaiulian ]; platforms = platforms.linux; + mainProgram = "brightnessctl"; }; } diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix index 71c3fce905..de98f607d0 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { pname = "foomatic-db"; - version = "unstable-2023-06-30"; + version = "unstable-2023-08-02"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, # but it gets deleted quickly and would provoke 404 errors owner = "OpenPrinting"; repo = "foomatic-db"; - rev = "5b916154bcc37d9881f71110b3d5a7e624a67c95"; - hash = "sha256-mbIVtrmLT8saZga6rIMY55xCQWadV9BSlZR4669wNCs="; + rev = "a6e32fa657f3598dc87c650a9fa9cfa38dda6a60"; + hash = "sha256-lEnog9Klxny6oEm/l2HDlI0DY5aIdPjHhWCBex2vp9Y="; }; buildInputs = [ cups cups-filters ghostscript gnused perl ]; diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index 3b765b5597..261c06dd2e 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.2.2"; + version = "10.2.4"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-reHC3R6RrIDynttu2GqUfZvwMxk9rLBdIR/r9IKhba8="; + hash = "sha256-4N2Eo6InqdK5CFhHp8X3+1xKA99Wtnj2Q0/GDglWoBc="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-L8ylw05g8YkabjK5NDICjYCup+FjCz/vFLzVBNX35Dk="; + vendorHash = "sha256-IimrJZLaSkwWsqoVmNRyLhcME4y1YKw5xLayKxRj5lw="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix index ef861068fa..b9f59934ef 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2 , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm + [ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils boehmgc rsync ]; diff --git a/third_party/nixpkgs/pkgs/misc/moonfire-nvr/Cargo.lock b/third_party/nixpkgs/pkgs/misc/moonfire-nvr/Cargo.lock new file mode 100644 index 0000000000..926b5734eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/moonfire-nvr/Cargo.lock @@ -0,0 +1,2731 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +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 = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "bitstream-io" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" + +[[package]] +name = "blake3" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bpaf" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72974597bfc83173d714c0fc785a8ab64ca0f0896cb72b05f2f4c5e682543871" +dependencies = [ + "bpaf_derive", + "owo-colors", + "supports-color", +] + +[[package]] +name = "bpaf_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b7be5dcfd7bb931b9932e689c69a9b9f50a46cf0b588c90ed73ec28e8e0bf4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] + +[[package]] +name = "bstr" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +dependencies = [ + "memchr", + "once_cell", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[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 = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + +[[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cstr" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "cursive" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" +dependencies = [ + "ahash", + "cfg-if", + "crossbeam-channel", + "cursive_core", + "lazy_static", + "libc", + "log", + "maplit", + "ncurses", + "signal-hook", + "term_size", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "cursive_core" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2de434b364bcca5039553b7ae1b5994b59b679e18bcb03adbc9c8e538446b9b4" +dependencies = [ + "ahash", + "crossbeam-channel", + "enum-map", + "enumset", + "lazy_static", + "log", + "num", + "owning_ref", + "time 0.3.17", + "unicode-segmentation", + "unicode-width", + "xi-unicode", +] + +[[package]] +name = "darling" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "darling_macro" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-map" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c25992259941eb7e57b936157961b217a4fc8597829ddef0596d6c3cd86e1a" +dependencies = [ + "enum-map-derive", +] + +[[package]] +name = "enum-map-derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "enumset" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19be8061a06ab6f3a6cf21106c873578bf01bd42ad15e0311a9c76161cb1c753" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "synstructure", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "four-cc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3958af68a31b1d1384d3f39b6aa33eb14b6009065b5ca305ddd9712a4237124f" + +[[package]] +name = "futures" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h264-reader" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3c095862f1b74a6021f766321767e64fbec34fa76503debbe1da2c04ce23c2c" +dependencies = [ + "bitstream-io", + "hex-slice", + "log", + "memchr", + "rfc6381-codec", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.8.1" +source = "git+https://github.com/scottlamb/hashlink?rev=26715ca0efe3f1773a0a22bbde8e36cafcaaed52#26715ca0efe3f1773a0a22bbde8e36cafcaaed52" +dependencies = [ + "hashbrown 0.13.1", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hex-slice" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5491a308e0214554f07a81d8944abe45f552871c12e3c3c6e7e5d354039a6c4c" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-auth" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b40b39d66c28829a0cf4d09f7e139ff8201f7500a5083732848ed3b4b4d850" +dependencies = [ + "base64", + "digest", + "hex", + "md-5", + "memchr", + "rand", + "sha2", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-serve" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "496ab5f39096e4c915f167c276aea19521ed862beb50f7d2bc530578535689d7" +dependencies = [ + "bytes", + "flate2", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "httpdate", + "libc", + "memchr", + "mime", + "pin-project", + "smallvec", + "tokio", + "winapi", +] + +[[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 = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" + +[[package]] +name = "is-terminal" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +dependencies = [ + "hermit-abi 0.3.1", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "is_ci" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libsqlite3-sys" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[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 = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.42.0", +] + +[[package]] +name = "moonfire-base" +version = "0.0.1" +dependencies = [ + "chrono", + "failure", + "futures", + "libc", + "nom", + "serde", + "serde_json", + "slab", + "time 0.1.45", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "moonfire-db" +version = "0.7.6" +dependencies = [ + "base64", + "blake3", + "byteorder", + "cstr", + "diff", + "failure", + "fnv", + "futures", + "h264-reader", + "hashlink", + "itertools", + "libc", + "moonfire-base", + "nix", + "num-rational", + "odds", + "pretty-hex", + "protobuf", + "protobuf-codegen", + "ring", + "rusqlite", + "scrypt", + "serde", + "serde_json", + "smallvec", + "tempfile", + "time 0.1.45", + "tokio", + "tracing", + "ulid", + "url", + "uuid", +] + +[[package]] +name = "moonfire-nvr" +version = "0.7.6" +dependencies = [ + "base64", + "blake3", + "bpaf", + "byteorder", + "bytes", + "chrono", + "cursive", + "failure", + "fnv", + "futures", + "h264-reader", + "http", + "http-serve", + "hyper", + "itertools", + "libc", + "log", + "memchr", + "moonfire-base", + "moonfire-db", + "mp4", + "nix", + "nom", + "num-rational", + "password-hash", + "protobuf", + "reffers", + "reqwest", + "retina", + "ring", + "rusqlite", + "serde", + "serde_json", + "smallvec", + "sync_wrapper", + "tempfile", + "time 0.1.45", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "toml", + "tracing", + "tracing-core", + "tracing-futures", + "tracing-log", + "tracing-subscriber", + "tracing-test", + "ulid", + "url", + "uuid", +] + +[[package]] +name = "mp4" +version = "0.9.2" +source = "git+https://github.com/scottlamb/mp4-rust?branch=moonfire#388fb47653305fb153de4e11d8cbc6f307e02ee5" +dependencies = [ + "byteorder", + "bytes", + "num-rational", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "mp4ra-rust" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be9daf03b43bf3842962947c62ba40f411e46a58774c60838038f04a67d17626" +dependencies = [ + "four-cc", +] + +[[package]] +name = "mpeg4-audio-const" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a1fe2275b68991faded2c80aa4a33dba398b77d276038b8f50701a22e55918" + +[[package]] +name = "ncurses" +version = "5.101.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2c5d34d72657dc4b638a1c25d40aae81e4f1c699062f72f467237920752032" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "nix" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nom" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a" +dependencies = [ + "memchr", +] + +[[package]] +name = "odds" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe9f693ec5bf79b8867b34aeaa5a2500e3a90461b486b573bcad3cca42b4d9e" +dependencies = [ + "rawpointer", + "rawslice", + "unchecked-index", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owning_ref" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55bad9126f378a853655831eb7363b7b01b81d19f8cb1218861086ca4a1a61e" +dependencies = [ + "once_cell", + "protobuf-support", + "thiserror", +] + +[[package]] +name = "protobuf-codegen" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd418ac3c91caa4032d37cb80ff0d44e2ebe637b2fb243b6234bf89cdac4901" +dependencies = [ + "anyhow", + "once_cell", + "protobuf", + "protobuf-parse", + "regex", + "tempfile", + "thiserror", +] + +[[package]] +name = "protobuf-parse" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49" +dependencies = [ + "anyhow", + "indexmap", + "log", + "protobuf", + "protobuf-support", + "tempfile", + "thiserror", + "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 = "quote" +version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.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 = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "rawslice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e23c908b26a742e5e3768ea42f19225ef809d3c9e3071bfe3e01c7e9b6fd1cd" +dependencies = [ + "rawpointer", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "reffers" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162d659c5126f0981e174637accc2e8dfb5bec1908c3fd688d8cce663afed248" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "retina" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8c5ef4eec9b0c6178ac107e1a533bbc5d2ff6a90f8aabd000d71e119c42d96" +dependencies = [ + "base64", + "bitstream-io", + "bytes", + "futures", + "h264-reader", + "hex", + "http-auth", + "log", + "once_cell", + "pin-project", + "pretty-hex", + "rand", + "rtsp-types", + "sdp-types", + "smallvec", + "thiserror", + "time 0.1.45", + "tokio", + "tokio-util", + "url", +] + +[[package]] +name = "rfc6381-codec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4395f46a67f0d57c57f6a5361f3a9a0c0183a19cab3998892ecdc003de6d8037" +dependencies = [ + "four-cc", + "mp4ra-rust", + "mpeg4-audio-const", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rtsp-types" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1aec90dc5d8dec85c14032885770801439acb1651b2f166745ce482a2ddeaf" +dependencies = [ + "cookie-factory", + "nom", + "tinyvec", + "url", +] + +[[package]] +name = "rusqlite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +dependencies = [ + "bitflags 1.3.2", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustix" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "scrypt" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" +dependencies = [ + "hmac", + "password-hash", + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "sdp-types" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8db497829e222d081f7b50ac81aec4f69750071a0f76b97b950b0b62204da6e" +dependencies = [ + "bstr", + "fallible-iterator", +] + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "supports-color" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +dependencies = [ + "is-terminal", + "is_ci", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "unicode-xid", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.42.0", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +dependencies = [ + "serde", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "futures", + "futures-task", + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "tracing-test" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" +dependencies = [ + "lazy_static", + "tracing-core", + "tracing-subscriber", + "tracing-test-macro", +] + +[[package]] +name = "tracing-test-macro" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" +dependencies = [ + "lazy_static", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +dependencies = [ + "base64", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ulid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +dependencies = [ + "rand", +] + +[[package]] +name = "unchecked-index" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[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.0", + "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 0.42.0", + "windows_x86_64_msvc 0.42.0", +] + +[[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 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" diff --git a/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix b/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix new file mode 100644 index 0000000000..00aaacb108 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/moonfire-nvr/default.nix @@ -0,0 +1,81 @@ +{ lib +, rustPlatform +, buildNpmPackage +, fetchFromGitHub +, pkg-config +, ncurses +, sqlite +, testers +, moonfire-nvr +, breakpointHook +}: + +let + pname = "moonfire-nvr"; + version = "0.7.6"; + src = fetchFromGitHub { + owner = "scottlamb"; + repo = "moonfire-nvr"; + rev = "v${version}"; + hash = "sha256-hPgS4Y/dD6G8lqfsJz3aeeed6P+ngJpBOng88xUc55Q="; + }; + ui = buildNpmPackage { + inherit version src; + pname = "${pname}-ui"; + sourceRoot = "source/ui"; + npmDepsHash = "sha256-IpZWgMo6Y3vRn9h495ifMB3tQxobLeTLC0xXS1vrKLA="; + installPhase = " + runHook preInstall + + cp -r build $out + + runHook postInstall + "; + }; +in rustPlatform.buildRustPackage { + inherit pname version src; + + sourceRoot = "source/server"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "hashlink-0.8.1" = "sha256-h7DEapTVy0SSTaOV9rCkdH3em4A9+PS0k1QQh1+0P4c="; + "mp4-0.9.2" = "sha256-mJZJDzD8Ep9c+4QusyBtRoqAArHK9SLdFxG1AR7JydE="; + }; + }; + + nativeBuildInputs = [ + pkg-config + breakpointHook + ]; + + buildInputs = [ + ncurses + sqlite + ]; + + postInstall = '' + mkdir -p $out/lib/ui + ln -s ${ui} $out/lib/ui + ''; + + doCheck = false; + + passthru = { + inherit ui; + tests.version = testers.testVersion { + inherit version; + package = moonfire-nvr; + command = "moonfire-nvr --version"; + }; + }; + + meta = with lib; { + description = "Moonfire NVR, a security camera network video recorder"; + homepage = "https://github.com/scottlamb/moonfire-nvr"; + changelog = "https://github.com/scottlamb/moonfire-nvr/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ gaelreyrol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix b/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix index 2c68406075..361b2627c9 100644 --- a/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix +++ b/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix @@ -1,22 +1,32 @@ { lib -, python3 +, stdenv +, python3Packages , fetchFromGitHub , makeDesktopItem , copyDesktopItems +, desktopToDarwinBundle +, wrapQtAppsHook }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "opcua-client-gui"; version = "0.8.4"; src = fetchFromGitHub { owner = "FreeOpcUa"; - repo = pname; + repo = "opcua-client-gui"; rev = version; hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8="; }; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ copyDesktopItems wrapQtAppsHook ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + + propagatedBuildInputs = with python3Packages; [ pyqt5 asyncua opcua-widgets @@ -43,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "OPC UA GUI Client"; homepage = "https://github.com/FreeOpcUa/opcua-client-gui"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ janik ]; }; diff --git a/third_party/nixpkgs/pkgs/misc/opensbi/default.nix b/third_party/nixpkgs/pkgs/misc/opensbi/default.nix index dfd5ee9469..9178676edc 100644 --- a/third_party/nixpkgs/pkgs/misc/opensbi/default.nix +++ b/third_party/nixpkgs/pkgs/misc/opensbi/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - sha256 = "sha256-Dr16fVUGLYGnGYHkjAyqpJxt8p95F0CJIU9ESGWKGWo="; + hash = "sha256-JNkPvmKYd5xbGB2lsZKWrpI6rBIckWbkLYu98bw7+QY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index feef4e156e..a231d22d90 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -11,7 +11,7 @@ , pkg-config , flam3 , libgtop -, boost +, boost179 , tinyxml , freeglut , libGLU @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { xorg.libXrender flam3 libgtop - boost + boost179 tinyxml freeglut libGLU diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index b2f42914a7..3b771ffedc 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.71"; + version = "5.72"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-ARiy1LKDA8M1QmzWyoRLR3bktxrbHTRPLsCHtXYWwho="; + sha256 = "sha256-1RGXWWeuc1UHKs3M9rG/QU+KFr5QzMgHDxPmJGI+x3I="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 920a5709da..f34fbb62cc 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -611,12 +611,12 @@ in rec { tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; - version = "unstable-2022-08-02"; + version = "unstable-2023-07-06"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "3e261309ad367c3fe56c0ef14af00078684b1035"; - sha256 = "13wlcq3f7944v74lcnfbmabcy2c0ca83ya21s3qn3j0lw3wqj6vj"; + rev = "51081a2688579228d860b3cb410f4437e857fc6e"; + sha256 = "sha256-qElRHAbnZ+qRasvkfo+lKNahRHklvLOH0BmbQ1oyN6A="; }; postInstall = '' find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g' diff --git a/third_party/nixpkgs/pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch b/third_party/nixpkgs/pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch deleted file mode 100644 index 8c4c3eff54..0000000000 --- a/third_party/nixpkgs/pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 65d90cd17ad7cd3f9aeeb805a08be780fc5bae1a Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons -Date: Sun, 22 Aug 2021 16:36:55 +0200 -Subject: [PATCH] rpi: Copy properties from firmware dtb to the loaded dtb - -The RPI firmware adjusts several property values in the dtb it passes -to u-boot depending on the board/SoC revision. Inherit some of these -when u-boot loads a dtb itself. Specificaly copy: - -* /model: The firmware provides a more specific string -* /memreserve: The firmware defines a reserved range, better keep it -* emmc2bus and pcie0 dma-ranges: The C0T revision of the bcm2711 Soc (as - present on rpi 400 and some rpi 4B boards) has different values for - these then the B0T revision. So these need to be adjusted to boot on - these boards -* blconfig: The firmware defines the memory area where the blconfig - stored. Copy those over so it can be enabled. -* /chosen/kaslr-seed: The firmware generates a kaslr seed, take advantage - of that. - -Signed-off-by: Sjoerd Simons -Origin: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/ ---- - board/raspberrypi/rpi/rpi.c | 48 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) - -diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c -index 372b26b6f2..64b8684b68 100644 ---- a/board/raspberrypi/rpi/rpi.c -+++ b/board/raspberrypi/rpi/rpi.c -@@ -495,10 +495,58 @@ void *board_fdt_blob_setup(void) - return (void *)fw_dtb_pointer; - } - -+int copy_property(void *dst, void *src, char *path, char *property) -+{ -+ int dst_offset, src_offset; -+ const fdt32_t *prop; -+ int len; -+ -+ src_offset = fdt_path_offset(src, path); -+ dst_offset = fdt_path_offset(dst, path); -+ -+ if (src_offset < 0 || dst_offset < 0) -+ return -1; -+ -+ prop = fdt_getprop(src, src_offset, property, &len); -+ if (!prop) -+ return -1; -+ -+ return fdt_setprop(dst, dst_offset, property, prop, len); -+} -+ -+/* Copy tweaks from the firmware dtb to the loaded dtb */ -+void update_fdt_from_fw(void *fdt, void *fw_fdt) -+{ -+ /* Using dtb from firmware directly; leave it alone */ -+ if (fdt == fw_fdt) -+ return; -+ -+ /* The firmware provides a more precie model; so copy that */ -+ copy_property(fdt, fw_fdt, "/", "model"); -+ -+ /* memory reserve as suggested by the firmware */ -+ copy_property(fdt, fw_fdt, "/", "memreserve"); -+ -+ /* Adjust dma-ranges for the SD card and PCI bus as they can depend on -+ * the SoC revision -+ */ -+ copy_property(fdt, fw_fdt, "emmc2bus", "dma-ranges"); -+ copy_property(fdt, fw_fdt, "pcie0", "dma-ranges"); -+ -+ /* Bootloader configuration template exposes as nvmem */ -+ if (copy_property(fdt, fw_fdt, "blconfig", "reg") == 0) -+ copy_property(fdt, fw_fdt, "blconfig", "status"); -+ -+ /* kernel address randomisation seed as provided by the firmware */ -+ copy_property(fdt, fw_fdt, "/chosen", "kaslr-seed"); -+} -+ - int ft_board_setup(void *blob, struct bd_info *bd) - { - int node; - -+ update_fdt_from_fw(blob, (void *)fw_dtb_pointer); -+ - node = fdt_node_offset_by_compatible(blob, -1, "simple-framebuffer"); - if (node < 0) - lcd_dt_simplefb_add_node(blob); --- -2.32.0 - diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 517f9e784a..ce4e18b656 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -24,10 +24,10 @@ }: let - defaultVersion = "2023.01"; + defaultVersion = "2023.07.02"; defaultSrc = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-aUI7rTgPiaCRZjbonm3L0uRRLVhDCNki0QOdHkMxlQ8="; + url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; + hash = "sha256-a2pIWBwUq7D5W9h8GvTXQJIkBte4AQAqn5Ryf93gIdU="; }; buildUBoot = lib.makeOverridable ({ version ? null @@ -48,11 +48,6 @@ let patches = [ ./0001-configs-rpi-allow-for-bigger-kernels.patch - - # Make U-Boot forward some important settings from the firmware-provided FDT. Fixes booting on BCM2711C0 boards. - # See also: https://github.com/NixOS/nixpkgs/issues/135828 - # Source: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/ - ./0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch ] ++ extraPatches; postPatch = '' @@ -70,6 +65,7 @@ let (buildPackages.python3.withPackages (p: [ p.libfdt p.setuptools # for pkg_resources + p.pyelftools ])) swig which # for scripts/dtc-version.sh @@ -487,7 +483,6 @@ in { sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; }; in buildUBoot { - extraMakeFlags = [ "all" "u-boot.itb" ]; defconfig = "rock64-rk3328_defconfig"; extraMeta = { platforms = [ "aarch64-linux" ]; @@ -509,7 +504,6 @@ in { }; ubootRockPro64 = buildUBoot { - extraMakeFlags = [ "all" "u-boot.itb" ]; extraPatches = [ # https://patchwork.ozlabs.org/project/uboot/list/?series=237654&archive=both&state=* (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/misc/urbit/default.nix b/third_party/nixpkgs/pkgs/misc/urbit/default.nix index 865a72a782..81dd6b81ba 100644 --- a/third_party/nixpkgs/pkgs/misc/urbit/default.nix +++ b/third_party/nixpkgs/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "2.10"; + version = "2.11"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-Bf0XDuGSBq8z9zouPQJyi/ZPEE6RzXb9+HCls89MR8Q="; - aarch64-linux = "sha256-Ecmc41X4AM3xigBvJGyWkIFxXM3vy+uK9p2M93UUJiY="; - x86_64-darwin = "sha256-eQSbzcP612LxOxdj9THPzyLtJwAthygjsSSct7vk1fc="; - aarch64-darwin = "sha256-VIXD8WHwAgRCLDZg1H5KmuiIqQMziWR6/4XxvSYtmTs="; + x86_64-linux = "sha256-k2zmcjZ9NXmwZf93LIAg1jx4IRprKUgdkvwzxEOKWDY="; + aarch64-linux = "sha256-atMBXyXwavpSDTZxUnXIq+NV4moKGRWLaFTM9Kuzt94="; + x86_64-darwin = "sha256-LSJ9jVY3fETlpRAkyUWa/2vZ5xAFmmMssvbzUfIBY/4="; + aarch64-darwin = "sha256-AViUt2N+YCgMWOcv3ZI0GfdYVOiRLbhseQ7TTq4zCiQ="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix index 2e795bcdf1..89959e3fcf 100644 --- a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix +++ b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - hash = "sha256-vrWjX8WB9niZnBDIlMSj/NUuJxCkP4QoOLp+xTnvSjs="; + hash = "sha256-WEB6tzHeP7fX+KyNOqAADKHT6IE1t8af889XcHH/48Q="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-m3gxmoZVEVzqach7Oep943B4DhOUzrTB+Z6J/TvdCQ8="; + cargoHash = "sha256-pLAUwkn4w/vwg/znBtjxc+og2yJn5uABY3Au9AYkpM4="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix index 3c3dcb6d5d..b6dab0d8bd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = freebsd.ports; - sourceRoot = "source/devel/evdev-proto"; + sourceRoot = "${freebsd.ports.name}/devel/evdev-proto"; useTempPrefix = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index 6bf884d382..11d8aa2ec3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -212,7 +212,7 @@ in makeScopeWithSplicing ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # GNU objcopy produces broken .a libs which won't link into dependers. # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. - "OBJCOPY=${buildPackages.darwin.cctools}/bin/strip" + "OBJCOPY=${buildPackages.darwin.cctools-port}/bin/strip" ]; RENAME = "-D"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/airbuddy/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/airbuddy/default.nix index 1dfb5cf1c1..303311ccb1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/airbuddy/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/airbuddy/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "airbuddy"; - version = "2.7"; + version = "2.7.1"; src = fetchurl { name = "AirBuddy.dmg"; url = "https://download.airbuddy.app/WebDownload/AirBuddy_v${finalAttrs.version}.dmg"; - hash = "sha256-i/pxRG5o03jh9D46F9s8cSpf8A1aQEb+u3JiPjDlubA="; + hash = "sha256-z8iy3kIBO+1HDgmWxXmFHArLdw85CLNSMvMFZfEJAp0="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix index 27749dde10..f95932516d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix @@ -7,14 +7,15 @@ AddressBookCore = { inherit ContactsPersistence; }; AudioToolboxCore = {}; ContactsPersistence = {}; - UIFoundation = {}; GameCenterFoundation = {}; GameCenterUI = {}; GameCenterUICore = {}; - URLFormatting = {}; - SignpostMetrics = {}; + MediaRemote = {}; PassKitCore = {}; + SignpostMetrics = {}; SkyLight = {}; + UIFoundation = {}; + URLFormatting = {}; # Also expose CoreSymbolication; used by `root` package. CoreSymbolication = {}; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/grandperspective/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/grandperspective/default.nix index a1156c7cb8..0d57d4f277 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/grandperspective/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/grandperspective/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, undmg, ... }: +{ stdenv, lib, fetchurl, undmg }: -stdenv.mkDerivation rec { - version = "3.0.1"; +stdenv.mkDerivation (finalAttrs: { + version = "3.4.1"; pname = "grandperspective"; src = fetchurl { - inherit version; - url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${builtins.replaceStrings [ "." ] [ "_" ] version}.dmg"; - sha256 = "sha256-ZPqrlN9aw5q7656GmmxCnTRBw3lu9n952rIyun8MsiI="; + inherit (finalAttrs) version; + url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}.dmg"; + hash = "sha256-iTtvP6iONcfDWJ3qMh+TUJMN+3spwCQ/5S+A307BJCM="; }; sourceRoot = "GrandPerspective.app"; @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { the file's size. Files in the same folder appear together, but their placement is otherwise arbitrary. ''; homepage = "https://grandperspectiv.sourceforge.net"; - license = licenses.gpl2; + license = licenses.gpl2Only; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ eliandoran ]; - platforms = [ "x86_64-darwin" ]; + platforms = platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/hexfiend/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/hexfiend/default.nix index c35de6666f..29767a1154 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/hexfiend/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/hexfiend/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { homepage = "http://hexfiend.com/"; changelog = "https://hexfiend.github.io/HexFiend/ReleaseNotes.html"; license = licenses.bsd2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ eliandoran ]; - platforms = [ "x86_64-darwin" ]; + platforms = platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix index 79c159e063..5a72225eec 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkgsBuildBuild, cmake, python3, ncurses }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libtapi"; version = "1100.0.11"; # determined by looking at VERSION.txt @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr"; }; - sourceRoot = "source/src/llvm"; + sourceRoot = "${finalAttrs.src.name}/src/llvm"; # Backported from newer llvm, fixes configure error when cross compiling. # Also means we don't have to manually fix the result with install_name_tool. @@ -74,4 +74,4 @@ stdenv.mkDerivation { license = licenses.ncsa; maintainers = with maintainers; [ matthewbauer ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix index 4d247fa583..41f929fe90 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix @@ -3,6 +3,7 @@ , stdenv , fetchurl , fetchFromGitHub +, gitUpdater , cctools , sigtool , cereal @@ -23,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.2.3"; + version = "1.2.4"; buildInputs = [ AppKit @@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-GPOF2lyo1eDf1GrPjcj0y1OuUHI/c80L9gSQM+4wEp0="; + hash = "sha256-BL46BgZHUpk0dpzmeZ/2W0msHxFwieeGDjmVB8Nb1J4="; }; patches = [ @@ -144,8 +145,13 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib" codesign -s - -f "$out/lib/libMoltenVK.dylib" + codesign -s - -f "$bin/bin/MoltenVKShaderConverter" ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = { description = "A Vulkan Portability implementation built on top of Apple’s Metal API"; homepage = "https://github.com/KhronosGroup/MoltenVK"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix index 2f925b5fbc..2116237ad6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.55.1"; + version = "1.55.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-LklPE08OnrDQbHSYLplzVs8IkkuVrjq2fsBDCRD4dv0="; + hash = "sha256-O+9dSXmkNxeY0Rvjn7dcStk/cqmM4y+lrXa5MymYUcY="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/rewrite-tbd/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/rewrite-tbd/default.nix index 5cf63754df..7a5467dc92 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/rewrite-tbd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/rewrite-tbd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rewrite-tbd"; - version = "20201114"; + version = "unstable-2023-03-27"; src = fetchFromGitHub { owner = "thefloweringash"; repo = "rewrite-tbd"; - rev = "988f29c6ccbca9b883966225263d8d78676da6a3"; - sha256 = "08sk91zwj6n9x2ymwid2k7y0rwv5b7p6h1b25ipx1dv0i43p6v1a"; + rev = "d7852691762635028d237b7d00c3dc6a6613de79"; + hash = "sha256-syxioFiGvEv4Ypk5hlIjLQth5YmdFdr+NC+aXSXzG4k="; }; # Nix takes care of these paths. Avoiding the use of `pkg-config` prevents an infinite recursion. @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/thefloweringash/rewrite-tbd/"; description = "Rewrite filepath in .tbd to Nix applicable format"; - platforms = platforms.darwin; + platforms = platforms.unix; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix index 6d478d8ab3..b27390608a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, CoreWLAN, DisplayServices, SkyLight }: +{ lib +, stdenv +, fetchFromGitHub +, Carbon +, Cocoa +, CoreWLAN +, DisplayServices +, MediaRemote +, SkyLight +}: let inherit (stdenv.hostPlatform) system; @@ -7,34 +16,44 @@ let "x86_64-darwin" = "x86"; }.${system} or (throw "Unsupported system: ${system}"); in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.15.1"; + version = "2.15.2"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; - rev = "v${version}"; - hash = "sha256-0jCVDaFc7ZvA8apeHRoQvPhAlaGlBHzqUkS9or88PcM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-13wc+1IgplB+L0j1AbBr/MUjEo4W38ZgJwrAhbdOroE="; }; - buildInputs = [ Carbon Cocoa CoreWLAN DisplayServices SkyLight ]; + buildInputs = [ + Carbon + Cocoa + CoreWLAN + DisplayServices + MediaRemote + SkyLight + ]; makeFlags = [ target ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp ./bin/sketchybar $out/bin/sketchybar + + runHook postInstall ''; - meta = with lib; { + meta = { description = "A highly customizable macOS status bar replacement"; homepage = "https://github.com/FelixKratz/SketchyBar"; - platforms = platforms.darwin; - maintainers = [ maintainers.azuwis ]; - license = licenses.gpl3; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ azuwis khaneliman ]; + platforms = lib.platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix index ad33cf713d..2de0a8d4d5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix @@ -1,19 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, Carbon }: +{ lib +, stdenv +, fetchFromGitHub +, Carbon +, Cocoa +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "skhd"; - version = "0.3.5"; + version = "0.3.9"; src = fetchFromGitHub { owner = "koekeishiya"; - repo = pname; - rev = "v${version}"; - sha256 = "0x099979kgpim18r0vi9vd821qnv0rl3rkj0nd1nx3wljxgf7mrg"; + repo = "skhd"; + rev = "v${finalAttrs.version}"; + hash = "sha256-fnkWws/g4BdHKDRhqoCpdPFUavOHdk8R7h7H1dAdAYI="; }; - buildInputs = [ Carbon ]; + buildInputs = [ + Carbon + Cocoa + ]; - makeFlags = [ "BUILD_PATH=$(out)/bin" ]; + makeFlags = [ + "BUILD_PATH=$(out)/bin" + ]; postInstall = '' mkdir -p $out/Library/LaunchDaemons @@ -21,11 +31,11 @@ stdenv.mkDerivation rec { substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out ''; - meta = with lib; { + meta = { description = "Simple hotkey daemon for macOS"; homepage = "https://github.com/koekeishiya/skhd"; - platforms = platforms.darwin; - maintainers = with maintainers; [ cmacrae lnl7 periklis ]; - license = licenses.mit; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman]; + platforms = lib.platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/9ptls/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/9ptls/default.nix new file mode 100644 index 0000000000..20fa779ecf --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/9ptls/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, tlsclient +}: + +stdenv.mkDerivation (finalAttrs: { + inherit (tlsclient) src version enableParallelBuilding; + pname = "9ptls"; + + strictDeps = true; + + buildFlags = [ "mount.9ptls" ]; + installFlags = [ "PREFIX=$(out)" "SBIN=$(out)/bin" ]; + installTargets = "mount.9ptls.install"; + + meta = with lib; { + description = "mount.9ptls mount helper"; + longDescription = '' + mount.9ptls wraps the v9fs mount type in a dp9ik authenticated + tls tunnel using tlsclient. + ''; + homepage = "https://git.sr.ht/~moody/tlsclient"; + license = licenses.mit; + maintainers = with maintainers; [ moody ]; + mainProgram = "mount.9ptls"; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix index 6d916e0ff7..f2ea933bd5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index 1a2aa29430..b85392977c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -128,9 +128,10 @@ let meta = apparmor-meta "library"; }; - apparmor-utils = stdenv.mkDerivation { + apparmor-utils = python.pkgs.buildPythonApplication { pname = "apparmor-utils"; version = apparmor-version; + format = "other"; src = apparmor-sources; @@ -146,14 +147,25 @@ let libapparmor.python ]; + propagatedBuildInputs = [ + libapparmor.python + + # Used by aa-notify + python.pkgs.notify2 + python.pkgs.psutil + ]; + prePatch = prePatchCommon + # Do not build vim file lib.optionalString stdenv.hostPlatform.isMusl '' sed -i ./utils/Makefile -e "/\/d" '' + '' - for file in utils/apparmor/easyprof.py utils/apparmor/aa.py utils/logprof.conf; do - substituteInPlace $file --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" - done + sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' ./utils/Makefile + + sed -i utils/aa-unconfined -e "/my_env\['PATH'\]/d" + + substituteInPlace utils/aa-remove-unknown \ + --replace "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" ''; inherit patches; postPatch = "cd ./utils"; @@ -161,17 +173,6 @@ let installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" "VIM_INSTALL_PATH=$(out)/share" "PYPREFIX=" ]; postInstall = '' - sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d" - for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do - wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.sitePackages}:$PYTHONPATH" - done - - substituteInPlace $out/bin/aa-notify \ - --replace /usr/bin/notify-send ${libnotify}/bin/notify-send \ - --replace /usr/bin/perl "${perl}/bin/perl -I ${libapparmor}/${perl.libPrefix}" - - substituteInPlace $out/bin/aa-remove-unknown \ - --replace "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" wrapProgram $out/bin/aa-remove-unknown \ --prefix PATH : ${lib.makeBinPath [ gawk ]} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix index 646e9f7b7b..ac1a8220d5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/aseq2json/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "aseq2json"; version = "unstable-2018-04-28"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; }; - sourceRoot = "source/aseq2json"; + sourceRoot = "${finalAttrs.src.name}/aseq2json"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib glib json-glib ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation { maintainers = [ maintainers.queezle ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index 65aef69403..acdaa6796d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -1,13 +1,26 @@ -{ lib, stdenv, fetchFromGitHub -, makeWrapper, cmake, llvmPackages -, flex, bison, elfutils, python, luajit, netperf, iperf, libelf -, bash, libbpf, nixosTests -, audit +{ audit +, bash +, bison +, cmake +, elfutils +, fetchFromGitHub +, flex +, iperf +, lib +, libbpf +, llvmPackages +, luajit +, makeWrapper +, netperf +, nixosTests +, python3 +, stdenv +, zip }: -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.26.0"; + version = "0.28.0"; disabled = !stdenv.isLinux; @@ -15,7 +28,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-zx38tPwuuGU6px9pRNN5JtvBysK9fStOvoqe7cLo7LM="; + sha256 = "sha256-+ecSaVroDC2bWbio4JsuwEvHQdCMpxLt7hIkeREMJs8="; }; format = "other"; @@ -31,8 +44,16 @@ python.pkgs.buildPythonApplication rec { ./fix-deadlock-detector-import.patch ]; - propagatedBuildInputs = [ python.pkgs.netaddr ]; - nativeBuildInputs = [ makeWrapper cmake flex bison llvmPackages.llvm.dev ]; + propagatedBuildInputs = [ python3.pkgs.netaddr ]; + nativeBuildInputs = [ + bison + cmake + flex + llvmPackages.llvm.dev + makeWrapper + python3.pkgs.setuptools + zip + ]; cmakeFlags = [ "-DBCC_KERNEL_MODULES_DIR=/run/booted-system/kernel-modules/lib/modules" @@ -59,6 +80,10 @@ python.pkgs.buildPythonApplication rec { --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; + preInstall = '' + # required for setuptool during install + export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH + ''; postInstall = '' mkdir -p $out/bin $out/share rm -r $out/share/bcc/tools/old diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix index 2bdca0805a..0a91fd5859 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/below/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { description = "A time traveling resource monitor for modern Linux systems"; license = licenses.asl20; homepage = "https://github.com/facebookincubator/below"; + mainProgram = "below"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftune/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftune/default.nix new file mode 100644 index 0000000000..da1bd1b384 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftune/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, clang +, bpftools +, docutils +, libbpf +, libcap +, libnl +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "bpftune"; + version = "unstable-2023-07-14"; + + src = fetchFromGitHub { + owner = "oracle-samples"; + repo = "bpftune"; + rev = "66620152bf8c37ab592e9273fe87e567126801c2"; + hash = "sha256-U0O+F1DBF1xiaUKklwpZORBwF1T9wHM0SPQKUNaxKZk="; + }; + + postPatch = '' + # otherwise shrink rpath would drop $out/lib from rpath + substituteInPlace src/Makefile \ + --replace /lib64 /lib \ + --replace /sbin /bin \ + --replace ldconfig true + substituteInPlace src/bpftune.service \ + --replace /usr/sbin/bpftune "$out/bin/bpftune" + substituteInPlace include/bpftune/libbpftune.h \ + --replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \ + --replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/" + ''; + + nativeBuildInputs = [ + clang + bpftools + docutils # rst2man + ]; + + buildInputs = [ + libbpf + libcap + libnl + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + "confprefix=${placeholder "out"}/etc" + "BPFTUNE_VERSION=${version}" + "BPF_INCLUDE=${lib.getDev libbpf}/include" + "NL_INCLUDE=${lib.getDev libnl}/include/libnl3" + ]; + + hardeningDisable = [ + "stackprotector" + ]; + + passthru.tests = { + inherit (nixosTests) bpftune; + }; + + enableParallelBuilding = true; + + meta = with lib; { + description = "BPF-based auto-tuning of Linux system parameters"; + homepage = "https://github.com/oracle-samples/bpftune"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix new file mode 100644 index 0000000000..36c7e3ca68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix @@ -0,0 +1,147 @@ +{ lib +, callPackage +, gcc11Stdenv +, fetchFromGitHub +, addOpenGLRunpath +, catch2 +, cmake +, cudaPackages_10_2 +, cudaPackages_11_8 +, cudaPackages_12 +, fmt_9 +, git +, jsoncpp +, libevent +, plog +, python3 +, symlinkJoin +, tclap_1_4 +, yaml-cpp +}: +let + # Flags copied from DCGM's libevent build script + libevent-nossl = libevent.override { sslSupport = false; }; + libevent-nossl-static = libevent-nossl.overrideAttrs (super: { + CFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC"; + CXXFLAGS = "-Wno-cast-function-type -Wno-implicit-fallthrough -fPIC"; + configureFlags = super.configureFlags ++ [ "--disable-shared" "--with-pic" ]; + }); + + jsoncpp-static = jsoncpp.override { enableStatic = true; }; + + # DCGM depends on 3 different versions of CUDA at the same time. + # The runtime closure, thankfully, is quite small because most things + # are statically linked. + cudaPackageSetByVersion = [ + { + version = "10"; + # Nixpkgs cudaPackages_10 doesn't have redist packages broken out. + pkgSet = [ + cudaPackages_10_2.cudatoolkit + cudaPackages_10_2.cudatoolkit.lib + ]; + } + { + version = "11"; + pkgSet = getCudaPackages cudaPackages_11_8; + } + { + version = "12"; + pkgSet = getCudaPackages cudaPackages_12; + } + ]; + + # Select needed redist packages from cudaPackages + # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/scripts/0080_cuda.sh#L24-L39 + getCudaPackages = p: with p; [ + cuda_cccl + cuda_cudart + cuda_nvcc + cuda_nvml_dev + libcublas + libcufft + libcurand + ]; + + # Builds CMake code to add CUDA paths for include and lib. + mkAppendCudaPaths = { version, pkgSet }: + let + # The DCGM CMake assumes that the folder containing cuda.h contains all headers, so we must + # combine everything together for headers to work. + # It would be more convenient to use symlinkJoin on *just* the include subdirectories + # of each package, but not all of them have an include directory and making that work + # is more effort than it's worth for this temporary, build-time package. + combined = symlinkJoin { + name = "cuda-combined-${version}"; + paths = pkgSet; + }; + # The combined package above breaks the build for some reason so we just configure + # each package's library path. + libs = lib.concatMapStringsSep " " (x: ''"${x}/lib"'') pkgSet; + in '' + list(APPEND Cuda${version}_INCLUDE_PATHS "${combined}/include") + list(APPEND Cuda${version}_LIB_PATHS ${libs}) + ''; + +# gcc11 is required by DCGM's very particular build system +# C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22 +in gcc11Stdenv.mkDerivation rec { + pname = "dcgm"; + version = "3.1.8"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "DCGM"; + rev = "refs/tags/v${version}"; + hash = "sha256-OXqXkP2ZUNPzafGIgJ0MKa39xB84keVFFYl+JsHgnks="; + }; + + # Add our paths to the CUDA paths so FindCuda.cmake can find them. + EXTRA_CUDA_PATHS = lib.concatMapStringsSep "\n" mkAppendCudaPaths cudaPackageSetByVersion; + prePatch = '' + echo "$EXTRA_CUDA_PATHS"$'\n'"$(cat cmake/FindCuda.cmake)" > cmake/FindCuda.cmake + ''; + + hardeningDisable = [ "all" ]; + + nativeBuildInputs = [ + addOpenGLRunpath + cmake + git + python3 + + jsoncpp-static + jsoncpp-static.dev + libevent-nossl-static + libevent-nossl-static.dev + plog.dev # header-only + tclap_1_4 # header-only + ]; + + buildInputs = [ + catch2 + fmt_9 + yaml-cpp + ]; + + # libcuda.so must be found at runtime because it is supplied by the NVIDIA + # driver. autoAddOpenGLRunpathHook breaks on the statically linked exes. + postFixup = '' + find "$out/bin" "$out/lib" -type f -executable -print0 | while IFS= read -r -d "" f; do + if isELF "$f" && [[ $(patchelf --print-needed "$f" || true) == *libcuda.so* ]]; then + addOpenGLRunpath "$f" + fi + done + ''; + + disallowedReferences = lib.concatMap (x: x.pkgSet) cudaPackageSetByVersion; + + meta = with lib; { + description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs."; + homepage = "https://developer.nvidia.com/dcgm"; + license = licenses.asl20; + maintainers = teams.deshaw.members; + mainProgram = "dcgmi"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fanout/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fanout/default.nix new file mode 100644 index 0000000000..3352f59a05 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fanout/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, kernel, kmod }: + +stdenv.mkDerivation rec { + pname = "fanout"; + version = "unstable-2022-10-17-${kernel.version}"; + + src = fetchFromGitHub { + owner = "bob-linuxtoys"; + repo = "fanout"; + rev = "69b1cc69bf425d1a5f83b4e84d41272f1caa0144"; + hash = "sha256-Q19c88KDFu0A6MejZgKYei9J2693EjRkKtR9hcRcHa0="; + }; + + preBuild = '' + substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" + ''; + + patches = [ + ./remove_auto_mknod.patch + ]; + + hardeningDisable = [ "format" "pic" ]; + + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + meta = with lib; { + description = "Kernel-based publish-subscribe system"; + homepage = "https://github.com/bob-linuxtoys/fanout"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ therishidesai ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fanout/remove_auto_mknod.patch b/third_party/nixpkgs/pkgs/os-specific/linux/fanout/remove_auto_mknod.patch new file mode 100644 index 0000000000..1f62e2b463 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fanout/remove_auto_mknod.patch @@ -0,0 +1,13 @@ +diff --git a/fanout.c b/fanout.c +index f5d2a55..87125f4 100644 +--- a/fanout.c ++++ b/fanout.c +@@ -13,7 +13,7 @@ + /* Comment out to forgo the creation of /dev entries + * The companion udev rules 'fanout.rules' sets the special file mode + */ +-#define DEV_MKNOD ++// #define DEV_MKNOD + + #include + #include diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 7e0fb37910..a4bbd6d2bb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -11,7 +11,7 @@ , ipuVersion ? "ipu6" }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "${ipuVersion}-camera-bin"; version = "unstable-2023-02-08"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { hash = "sha256-QnedM2UBbGyd2wIF762Mi+VkDZYtC6MifK4XGGxlUzw="; }; - sourceRoot = "source/${ipuVersion}"; + sourceRoot = "${finalAttrs.src.name}/${ipuVersion}"; nativeBuildInputs = [ autoPatchelfHook @@ -76,4 +76,4 @@ stdenv.mkDerivation { ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index a2229a0a60..b76a77fb3a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { version = source.version; src = fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${source.revision}.tar.gz"; hash = source.sourceHash; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 01ea40a508..7cd541402b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,7 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20230625"; - sourceHash = "sha256-olRaUVnCri/sJU6ob+QgNxEZF8GzVxxEh8zdNJIZlYY="; - outputHash = "sha256-zSlMpAPbW7ewEBzDre47/7NJyy2pC0GSbkyOVVi+4gU="; + version = "unstable-2023-07-24"; + revision = "59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c"; + sourceHash = "sha256-WyO/+fxQljfo6OXLC8/BomGmKtUQaJ1Lt9V5Fdv172g="; + outputHash = "sha256-wHWPSyqxP+MGmerbc2v/hclFFJ7qKCDsupK5GASjp8s="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/update.sh b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/update.sh index 1fccc03e86..4b28d6e137 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/update.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/update.sh @@ -5,14 +5,20 @@ cd "$(dirname "$(readlink -f "$0")")" || exit repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" # step 1: figure out the latest version from the tags -if [ -z "$1" ]; then - version="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" +if [ -z "${1:-}" ]; then + revision="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" + version=$revision else - version=$1 + revision=$1 + if [ -z "${2:-}" ]; then + version="unstable-$(date "+%Y-%m-%d")" + else + version=$2 + fi fi # step 2: prefetch the source tarball -snapshotUrl="$repo/snapshot/linux-firmware-$version.tar.gz" +snapshotUrl="$repo/snapshot/linux-firmware-$revision.tar.gz" hash="$(nix-prefetch-url --unpack "$snapshotUrl")" sriHash="$(nix --experimental-features nix-command hash to-sri "sha256:$hash")" @@ -20,6 +26,7 @@ sriHash="$(nix --experimental-features nix-command hash to-sri "sha256:$hash")" cat > source.nix << EOF { version = "$version"; + revision = "$revision"; sourceHash = "$sriHash"; outputHash = null; } @@ -33,6 +40,7 @@ cat > source.nix << EOF # This file is autogenerated! Run ./update.sh to regenerate. { version = "$version"; + revision = "$revision"; sourceHash = "$sriHash"; outputHash = "$outHash"; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 60fa6dea9e..2f33a139c9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz"; - sha256 = "sha256-V39FCHW9gzr5uLcW42jYc6rJE6Nd2ZbHqg9Srd3vku4="; + sha256 = "sha256-kyLCp2NtAoRcOyaYTVirj3jWP/THZtCEwxlqWF4ACQU="; }; dontFixup = true; # binaries must not be stripped or patchelfed diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/module.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/module.nix index 72f25aa800..a4083d2754 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/module.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/module.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (fwts) src; - sourceRoot = "source/efi_runtime"; + sourceRoot = "${src.name}/efi_runtime"; postPatch = '' substituteInPlace Makefile --replace \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix index 1f9d60ad7b..c0790ae6a2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix index e227b6b6bc..85897b7258 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix @@ -2,7 +2,7 @@ , asciidoc , libusbgx }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gt"; version = "unstable-2022-05-08"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "sha256-km4U+t4Id2AZx6GpH24p2WNmvV5RVjJ14sy8tWLCQsk="; }; - sourceRoot = "source/source"; + sourceRoot = "${finalAttrs.src.name}/source"; preConfigure = '' cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions") @@ -29,4 +29,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ lheckemann ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index 08b0cd5e5c..af8cbf0aa8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.371"; + version = "0.372"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "sha256-bK61nvuzm8LTotVSBtGyBMELZPqoENkPM4NKtgEx9qw="; + hash = "sha256-XC0U5UsOjTveRj1b0e1TBlYv/tKebSOu/YEGt/rmAHw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index d2dd660560..05fd82401a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,51 +1,58 @@ -{ lib, stdenv, fetchFromGitLab, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }: +{ lib +, stdenv +, fetchFromGitLab +, cmake +, libxml2 +, meson +, ninja +, pkg-config +, libgudev +, systemd +, polkit +}: stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; - version = "3.0"; + version = "3.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "hadess"; - repo = pname; - rev = version; - sha256 = "0ngbz1vkbjci3ml6p47jh6c6caipvbkm8mxrc8ayr6vc2p9l1g49"; + owner = "hadess"; + repo = pname; + rev = version; + hash = "sha256-pFu+nJzj45s7yIKoLWLeiv2AT5vLf6JpdWWQ0JZfnvY="; }; - configurePhase = '' - runHook preConfigure - - ./autogen.sh --prefix=$out \ - --with-udevrulesdir=$out/lib/udev/rules.d \ - --with-systemdsystemunitdir=$out/lib/systemd/system - - runHook postConfigure + postPatch = '' + # upstream meson.build currently doesn't have an option to change the default polkit dir + substituteInPlace data/meson.build \ + --replace 'polkit_policy_directory' "'$out/share/polkit-1/actions'" ''; buildInputs = [ - glib - gtk3 - gtk-doc libgudev systemd + polkit ]; nativeBuildInputs = [ - autoconf - autoconf-archive - automake - gettext - intltool - libtool + meson + cmake + libxml2 + ninja pkg-config ]; + mesonFlags = [ + (lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d") + (lib.mesonOption "systemdsystemunitdir" "${placeholder "out"}/lib/systemd/system") + ]; + meta = with lib; { description = "Proxy for sending IIO sensor data to D-Bus"; homepage = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"; - license = licenses.gpl3 ; - maintainers = with maintainers; [ peterhoeg ]; + license = licenses.gpl3; + maintainers = with maintainers; [ _999eagle ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 5be94f22f5..1615ae39f7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.17.26241.24"; + version = "23.22.26516.18"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-FcI9bBJc23UlPP7qSBUc+t4e1X3UEJTYiy86N3KVWrs="; + sha256 = "sha256-SeNmCXqoUqTo1F3ia+4fAMHWJgdEz/PsNFEkrqM+0k4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index dccecb6217..3240fe93de 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -170,6 +170,7 @@ let NET = yes; IP_ADVANCED_ROUTER = yes; IP_PNP = no; + IP_ROUTE_MULTIPATH = yes; IP_VS_PROTO_TCP = yes; IP_VS_PROTO_UDP = yes; IP_VS_PROTO_ESP = yes; @@ -281,18 +282,30 @@ let }; wireless = { - CFG80211_WEXT = option yes; # Without it, ipw2200 drivers don't build - IPW2100_MONITOR = option yes; # support promiscuous mode - IPW2200_MONITOR = option yes; # support promiscuous mode - HOSTAP_FIRMWARE = option yes; # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM = option yes; - ATH9K_PCI = option yes; # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB = option yes; # Ditto, AHB bus - B43_PHY_HT = option yes; - BCMA_HOST_PCI = option yes; - RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; - RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + CFG80211_WEXT = option yes; # Without it, ipw2200 drivers don't build + IPW2100_MONITOR = option yes; # support promiscuous mode + IPW2200_MONITOR = option yes; # support promiscuous mode + HOSTAP_FIRMWARE = option yes; # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM = option yes; + ATH9K_PCI = option yes; # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB = option yes; # Ditto, AHB bus + # The description of this option makes it sound dangerous or even illegal + # But OpenWRT enables it by default: https://github.com/openwrt/openwrt/blob/master/package/kernel/mac80211/Makefile#L55 + # At the time of writing (25-06-2023): this is only used in a "correct" way by ath drivers for initiating DFS radiation + # for "certified devices" + EXPERT = option yes; # this is needed for offering the certification option + CFG80211_CERTIFICATION_ONUS = option yes; + # DFS: "Dynamic Frequency Selection" is a spectrum-sharing mechanism that allows + # you to use certain interesting frequency when your local regulatory domain mandates it. + # ATH drivers hides the feature behind this option and makes hostapd works with DFS frequencies. + # OpenWRT enables it too: https://github.com/openwrt/openwrt/blob/master/package/kernel/mac80211/ath.mk#L42 + ATH9K_DFS_CERTIFIED = option yes; + ATH10K_DFS_CERTIFIED = option yes; + B43_PHY_HT = option yes; + BCMA_HOST_PCI = option yes; + RTW88 = whenAtLeast "5.2" module; + RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { @@ -702,7 +715,7 @@ let MEDIA_PCI_SUPPORT = yes; MEDIA_USB_SUPPORT = yes; MEDIA_ANALOG_TV_SUPPORT = yes; - VIDEO_STK1160_COMMON = module; + VIDEO_STK1160_COMMON = whenOlder "6.5" module; }; "9p" = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index d61e13b25a..01d761a6ee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,71 +12,61 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.288-hardened1.patch", - "sha256": "0iw70vp9m7ldq85jfycfaihq2974giwi1d9fdd1yrhljlwzf9y6p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.288-hardened1/linux-hardened-4.19.288-hardened1.patch" + "name": "linux-hardened-4.19.289-hardened1.patch", + "sha256": "1bi0cf15nqbk5hkhy76cd1xbb3fsnrgz705lry19v467hn3c0fx3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.289-hardened1/linux-hardened-4.19.289-hardened1.patch" }, - "sha256": "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk", - "version": "4.19.288" + "sha256": "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi", + "version": "4.19.289" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.186-hardened1.patch", - "sha256": "0k6f2sxk2gy601w0132i5glznhi35wbdpxkqsfgxlr2gi2w021wr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.186-hardened1/linux-hardened-5.10.186-hardened1.patch" + "name": "linux-hardened-5.10.188-hardened1.patch", + "sha256": "10mnrnzg3b5iirvn9x241zxwlysrnv7i65hiil2h8f7lswwgb6ar", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.188-hardened1/linux-hardened-5.10.188-hardened1.patch" }, - "sha256": "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y", - "version": "5.10.186" + "sha256": "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9", + "version": "5.10.188" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.120-hardened1.patch", - "sha256": "0wqnwjww062ykh1y2yrbsy75b0fz8xlkazijgvj3rl14wvccf39x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.120-hardened1/linux-hardened-5.15.120-hardened1.patch" + "name": "linux-hardened-5.15.123-hardened1.patch", + "sha256": "0q942jcz22yq7lbhmbwpg12p75zb0ky36zp2waz30cixw7lmyx6b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.123-hardened1/linux-hardened-5.15.123-hardened1.patch" }, - "sha256": "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4", - "version": "5.15.120" + "sha256": "14xzk4rn7fwgdysnd763rbl25krvq40wk3y5cf8hasifl529brid", + "version": "5.15.123" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.249-hardened1.patch", - "sha256": "11rwyr68wrhjl0cdkvbgcpxwz4bwx3hii9k6xmai7hpds6rb3nsx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.249-hardened1/linux-hardened-5.4.249-hardened1.patch" + "name": "linux-hardened-5.4.251-hardened1.patch", + "sha256": "148qyspyj4a6yrl45f358z64iqxf40zb71ccj5kvwbrn395xiwgs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.251-hardened1/linux-hardened-5.4.251-hardened1.patch" }, - "sha256": "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w", - "version": "5.4.249" + "sha256": "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w", + "version": "5.4.251" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.38-hardened1.patch", - "sha256": "0sv8i26xwgw3a36yga79n36a5xbrs3ajn8wdkqn40ydbzp24i0qc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.38-hardened1/linux-hardened-6.1.38-hardened1.patch" + "name": "linux-hardened-6.1.42-hardened1.patch", + "sha256": "0v5ja4q8wq3gwds0m8bzrxhx6vagg97lvcxrw3glm1d5sv1v94l6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.42-hardened1/linux-hardened-6.1.42-hardened1.patch" }, - "sha256": "0hrdh1w9z8bgy4cxqsxfkwa01yincfw1mq1bbwm36zczc0dzk97r", - "version": "6.1.38" - }, - "6.3": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.3.12-hardened1.patch", - "sha256": "12dqdn2prr0mczwcy48907wpp235n87pl22gwyfilsxcj94x2wrx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.3.12-hardened1/linux-hardened-6.3.12-hardened1.patch" - }, - "sha256": "1mvcirkhqnf03cci3jiq077fs9b42a3xdk3zjkpyim3x43ydwzyb", - "version": "6.3.12" + "sha256": "1lqy72yvsbcv7an1gr8sam6ym3788ss811xb3sw7d2qwaldjdy5a", + "version": "6.1.42" }, "6.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.4.3-hardened1.patch", - "sha256": "1xwy9088f8qy7algv1gad90gd6sv03diz16jvfnk2yb01k4f87wv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.3-hardened1/linux-hardened-6.4.3-hardened1.patch" + "name": "linux-hardened-6.4.7-hardened1.patch", + "sha256": "1kzkx0i3hkq25rywl8xsf5i8716ycjspblk1hrkaq6a02ci0697b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.7-hardened1/linux-hardened-6.4.7-hardened1.patch" }, - "sha256": "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i", - "version": "6.4.3" + "sha256": "1n57qijg0m27wcrqll8rb1hi1n0n8ca3bzsnbz05d9ya3nv3q56y", + "version": "6.4.7" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix index ef2abefb37..ba641347c8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation { homepage = "https://www.kernel.org/doc/htmldocs/"; platforms = platforms.linux; inherit (linux_latest.meta) license; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 47c8cc9cbe..e71cdee98d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.288"; + version = "4.19.289"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk"; + sha256 = "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index f550778eac..a6baeaac89 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.186"; + version = "5.10.188"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y"; + sha256 = "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index 2d0caf1613..c7117f8808 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.120"; + version = "5.15.123"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4"; + sha256 = "14xzk4rn7fwgdysnd763rbl25krvq40wk3y5cf8hasifl529brid"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 99205ad339..5f3afdab8c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.249"; + version = "5.4.251"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w"; + sha256 = "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix index 31345c7866..51c7bac8f1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.38"; + version = "6.1.42"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0hrdh1w9z8bgy4cxqsxfkwa01yincfw1mq1bbwm36zczc0dzk97r"; + sha256 = "1lqy72yvsbcv7an1gr8sam6ym3788ss811xb3sw7d2qwaldjdy5a"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.3.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.3.nix deleted file mode 100644 index 4580c8054d..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, fetchurl, buildLinux, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.3.12"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1mvcirkhqnf03cci3jiq077fs9b42a3xdk3zjkpyim3x43ydwzyb"; - }; -} // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.4.nix index 19aa95a1a1..ae38cdfa66 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4.3"; + version = "6.4.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i"; + sha256 = "1n57qijg0m27wcrqll8rb1hi1n0n8ca3bzsnbz05d9ya3nv3q56y"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 4e1c34d6ae..0851a72e01 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4-rc7"; + version = "6.5-rc3"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchzip { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-UDhLrKe8yMvmWbS19Xt1G3SQpAUWyKrfV3v1MJ5Vep8="; + hash = "sha256-z4y4eNkY458rxebey3eCG0CUDLJP9oQETVlH8Av3Lhs="; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 1c24466497..07325f0e10 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -232,7 +232,10 @@ stdenv.mkDerivation ({ # replicated here to apply to older versions. # Makes __FILE__ relative to the build directory. "KCPPFLAGS=-fmacro-prefix-map=$(sourceRoot)/=" - ] ++ extraMakeFlags; + kernelConf.target + ] ++ optional isModular "modules" + ++ optional buildDTBs "dtbs" + ++ extraMakeFlags; installFlags = [ "INSTALL_PATH=$(out)" @@ -373,11 +376,20 @@ stdenv.mkDerivation ({ # Remove reference to kmod sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|' + '' + # unfortunately linux/arch/mips/Makefile does not understand installkernel + # and simply copies to $(INSTALL_PATH)/vmlinux-$(KERNELRELEASE) + + lib.optionalString stdenv.hostPlatform.isMips '' + mv $out/vmlinux-* $out/vmlinux || true + mv $out/vmlinuz-* $out/vmlinuz || true + mv $out/System.map-* $out/System.map ''; preFixup = '' # Don't strip $dev/lib/modules/*/vmlinux stripDebugList="$(cd $dev && echo lib/modules/*/build/*/)" + '' + lib.optionalString (stdenv.hostPlatform.isMips) '' + $STRIP -s $out/vmlinux || true ''; enableParallelBuilding = true; @@ -397,10 +409,11 @@ stdenv.mkDerivation ({ meta = { description = "The Linux kernel" + - (if kernelPatches == [] then "" else + (lib.optionalString (kernelPatches != []) ( " (with patches: " + lib.concatStringsSep ", " (map (x: x.name) kernelPatches) - + ")"); + + ")" + )); license = lib.licenses.gpl2Only; homepage = "https://www.kernel.org/"; maintainers = lib.teams.linux-kernel.members ++ [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index 972235c7f8..f941ca9f00 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -57,13 +57,4 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; - - CVE-2023-32233 = rec { - name = "CVE-2023-32233"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=c1592a89942e9678f7d9c8030efa777c0d57edab"; - hash = "sha256-DYPWgraXPNeFkjtuDYkFXHnCJ4yDewrukM2CCAqC2BE="; - }; - }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3fbdcd2171..4412bd56fa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.37"; - hash = "sha256-g8cmAhsM03jBu7UZoNOLBX7cGg8rz70/xhF7sJj9nCY="; + version = "6.1.42"; + hash = "sha256-mOydloX5bff9wrFh40wf12GW+sION9SoGK2mAC1yNOw="; variant = "lts"; }; mainVariant = { - version = "6.4.1"; - hash = "sha256-WPnINDkOj0IoUDLBG/2LOrppVi9o9XSSgMrs/NBbqdA="; + version = "6.4.7"; + hash = "sha256-0yOVCMqhoiWz8IlYRR0wXytAzjv81Cf5NoFa9qxGMm4="; variant = "main"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9455f887dd..7c32a5dae5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.4.2"; #zen + version = "6.4.7"; #zen suffix = "zen1"; #zen - sha256 = "1swd3y97w55wh9vl6k1bsrx6fqi6b6ssbw306h87nxn36xwzx8cd"; #zen + sha256 = "1xxznqkgn17sh134c4szjhk8im342zh7z6200k3csnqd9fink2r7"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.4.2"; #lqx + version = "6.4.7"; #lqx suffix = "lqx1"; #lqx - sha256 = "14hr88lbwm2pz3knw6nxlahdk4pwwb4ya63mrd7zg7g1x2xhfb59"; #lqx + sha256 = "055l8l83368858ap1pslxcs76hkms8ik627v7d7wczm9f1vldbln"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix index 2376dddbb3..6813e773a9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.8"; + version = "3.4.9"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-R/OWZekAGtDxE71MrzjWsdpaWGBu0c+VP0VkPro6GEo="; + sha256 = "sha256-GZccOlp9zZMqtv3+u8JnKFfIe8sjwbZBLkDk8lt3CGk="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix index 67d4d8af2e..a77d1290ca 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kvmfr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = looking-glass-client.version; src = looking-glass-client.src; - sourceRoot = "source/module"; + sourceRoot = "${looking-glass-client.src.name}/module"; patches = lib.optional (kernel.kernelAtLeast "6.4") [ ./linux-6-4-compat.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix index ba189767bc..4f4c3c9372 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA="; }; - sourceRoot = "source/python/legion_linux"; + sourceRoot = "${src.name}/python/legion_linux"; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/default.nix index 375b835ac4..527f1852f1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "lenovo-legion-module"; inherit (lenovo-legion) version src; - sourceRoot = "source/kernel_module"; + sourceRoot = "${lenovo-legion.src.name}/kernel_module"; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index be1a1453e8..51f6ea471a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-NimK4pdYcai21hZHdP1mBX1MOlNY61iDJ+PDYwpRuVE="; + sha256 = "sha256-SDDdz2HKEfzHloLkb0sv5ldTo+1yJDVc9O7nj4Cjznk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix index f7b5b3fd1f..89b49068d4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.8"; + version = "2.13.10"; src = fetchFromGitHub { owner = "lttng"; repo = "lttng-modules"; rev = "v${version}"; - hash = "sha256-6ohWsGUGFz7QlHkKWyW5edpSsBTE9DFS3v6EsH9wNZo="; + hash = "sha256-R5qwB1ayw0KueMBSSxm0TwINt78N6w356kY7WGBX0zM="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix index 04a89ad038..3add5eb227 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "mba6x_bl"; - version = "unstable-2016-12-08"; + version = "unstable-2017-12-30"; src = fetchFromGitHub { owner = "patjak"; repo = "mba6x_bl"; - rev = "b96aafd30c18200b4ad1f6eb995bc19200f60c47"; - sha256 = "10payvfxahazdxisch4wm29fhl8y07ki72q4c78sl4rn73sj6yjq"; + rev = "639719f516b664051929c2c0c1140ea4bf30ce81"; + sha256 = "sha256-QwxBpNa5FitKO+2ne54IIcRgwVYeNSQWI4f2hPPB8ls="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix new file mode 100644 index 0000000000..9c9682fdf9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix @@ -0,0 +1,98 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bootBash +, gnumake +, gnused +, gnugrep +, gnutar +, gawk +, gzip +, gcc +, glibc +, binutils +, linux-headers +, derivationWithMeta +, bash +, coreutils +}: +let + pname = "bash"; + version = "5.2.15"; + + src = fetchurl { + url = "mirror://gnu/bash/bash-${version}.tar.gz"; + sha256 = "132qng0jy600mv1fs95ylnlisx2wavkkgpb19c6kmz7lnmjhjwhk"; + }; +in +bootBash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + gcc + binutils + gnumake + gnused + gnugrep + gnutar + gawk + gzip + ]; + + passthru.runCommand = name: env: buildCommand: + derivationWithMeta ({ + inherit name buildCommand; + builder = "${bash}/bin/bash"; + args = [ + "-e" + (builtins.toFile "bash-builder.sh" '' + export CONFIG_SHELL=$SHELL + bash -eux $buildCommandPath + '') + ]; + passAsFile = [ "buildCommand" ]; + + SHELL = "${bash}/bin/bash"; + PATH = lib.makeBinPath ((env.nativeBuildInputs or []) ++ [ + bash + coreutils + ]); + } // (builtins.removeAttrs env [ "nativeBuildInputs" ])); + + passthru.tests.get-version = result: + bootBash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/bash --version + mkdir $out + ''; + + meta = with lib; { + description = "GNU Bourne-Again Shell, the de facto standard shell on Linux"; + homepage = "https://www.gnu.org/software/bash"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.unix; + }; +} '' + # Unpack + tar xzf ${src} + cd bash-${version} + + # Configure + export CC="gcc -I${glibc}/include -I${linux-headers}/include" + export LIBRARY_PATH="${glibc}/lib" + export LIBS="-lc -lnss_files -lnss_dns -lresolv" + export ac_cv_func_dlopen=no + bash ./configure \ + --prefix=$out \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} \ + --disable-nls \ + --disable-net-redirections + + # Build + make SHELL=bash + + # Install + make install +'' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 45175b987c..1c286e73aa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -15,6 +15,12 @@ lib.makeScope bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; }; + bash = callPackage ./bash { + bootBash = bash_2_05; + gcc = gcc2; + glibc = glibc22; + }; + binutils = callPackage ./binutils { bash = bash_2_05; gcc = gcc2; @@ -36,9 +42,16 @@ lib.makeScope coreutils = callPackage ./coreutils { tinycc = tinycc-mes; }; + diffutils = callPackage ./diffutils { + bash = bash_2_05; + gcc = gcc2; + glibc = glibc22; + }; + gawk = callPackage ./gawk { bash = bash_2_05; tinycc = tinycc-mes; + gnused = gnused-mes; }; gcc2 = callPackage ./gcc/2.nix { @@ -56,6 +69,7 @@ lib.makeScope inherit (callPackage ./glibc { bash = bash_2_05; + gnused = gnused-mes; }) glibc22; gnugrep = callPackage ./gnugrep { @@ -68,18 +82,27 @@ lib.makeScope gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; gnused = callPackage ./gnused { + bash = bash_2_05; + gcc = gcc2; + glibc = glibc22; + gnused = gnused-mes; + }; + gnused-mes = callPackage ./gnused { bash = bash_2_05; tinycc = tinycc-mes; + mesBootstrap = true; }; gnutar = callPackage ./gnutar { bash = bash_2_05; tinycc = tinycc-mes; + gnused = gnused-mes; }; gzip = callPackage ./gzip { bash = bash_2_05; tinycc = tinycc-mes; + gnused = gnused-mes; }; heirloom = callPackage ./heirloom { @@ -112,15 +135,18 @@ lib.makeScope inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText; test = kaem.runCommand "minimal-bootstrap-test" {} '' + echo ${bash.tests.get-version} echo ${bash_2_05.tests.get-version} echo ${binutils.tests.get-version} echo ${binutils-mes.tests.get-version} echo ${bzip2.tests.get-version} + echo ${diffutils.tests.get-version} echo ${gawk.tests.get-version} echo ${gcc2.tests.get-version} echo ${gcc2-mes.tests.get-version} echo ${gnugrep.tests.get-version} echo ${gnused.tests.get-version} + echo ${gnused-mes.tests.get-version} echo ${gnutar.tests.get-version} echo ${gzip.tests.get-version} echo ${heirloom.tests.get-version} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix new file mode 100644 index 0000000000..7545a52524 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, gcc +, glibc +, binutils +, linux-headers +, gnumake +, gnugrep +, gnused +, gawk +, gnutar +, gzip +}: +let + pname = "diffutils"; + version = "2.8.1"; + + src = fetchurl { + url = "mirror://gnu/diffutils/diffutils-${version}.tar.gz"; + sha256 = "0nizs9r76aiymzasmj1jngl7s71jfzl9xfziigcls8k9n141f065"; + }; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + gcc + binutils + gnumake + gnused + gnugrep + gawk + gnutar + gzip + ]; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/diff --version + mkdir $out + ''; + + meta = with lib; { + description = "Commands for showing the differences between files (diff, cmp, etc.)"; + homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.unix; + }; +} '' + # Unpack + tar xzf ${src} + cd diffutils-${version} + + # Configure + export C_INCLUDE_PATH="${glibc}/include:${linux-headers}/include" + export LIBRARY_PATH="${glibc}/lib" + export LIBS="-lc -lnss_files -lnss_dns -lresolv" + bash ./configure \ + --prefix=$out \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} + + # Build + make + + # Install + make install +'' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix index 0a79c97e75..c879fd30aa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix @@ -131,8 +131,8 @@ bash.runCommand "${pname}-${version}" { ${lib.optionalString mesBootstrap "ar x ${tinycc.libs}/lib/libtcc1.a"} ar r $out/lib/gcc-lib/${hostPlatform.config}/${version}/libgcc.a *.o cd .. + cp gcc/libgcc2.a $out/lib/libgcc2.a ${lib.optionalString mesBootstrap '' - cp gcc/libgcc2.a $out/lib/libgcc2.a ar x ${tinycc.libs}/lib/libtcc1.a ar x ${tinycc.libs}/lib/libc.a ar r $out/lib/gcc-lib/${hostPlatform.config}/${version}/libc.a libc.o libtcc1.o diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix index b6b1f9f198..b5647b96ee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix @@ -1,11 +1,16 @@ { lib +, buildPlatform +, hostPlatform , fetchurl , bash -, tinycc , gnumake +, mesBootstrap ? false, tinycc ? null +, gcc ? null, glibc ? null, binutils ? null, gnused ? null, linux-headers, gnugrep }: +assert mesBootstrap -> tinycc != null; +assert !mesBootstrap -> gcc != null && glibc != null && binutils != null && gnused != null; let - pname = "gnused"; + pname = "gnused" + lib.optionalString mesBootstrap "-mes"; # last version that can be compiled with mes-libc version = "4.0.9"; @@ -25,8 +30,15 @@ bash.runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ - tinycc.compiler gnumake + ] ++ lib.optionals mesBootstrap [ + tinycc.compiler + ] ++ lib.optionals (!mesBootstrap) [ + gcc + glibc + binutils + gnused + gnugrep ]; passthru.tests.get-version = result: @@ -43,13 +55,14 @@ bash.runCommand "${pname}-${version}" { mainProgram = "sed"; platforms = platforms.unix; }; -} '' +} ('' # Unpack ungz --file ${src} --output sed.tar untar --file sed.tar rm sed.tar cd sed-${version} +'' + lib.optionalString mesBootstrap '' # Configure cp ${makefile} Makefile catm config.h @@ -59,6 +72,25 @@ bash.runCommand "${pname}-${version}" { CC="tcc -B ${tinycc.libs}/lib" \ LIBC=mes +'' + lib.optionalString (!mesBootstrap) '' + # Configure + export CC="gcc -I${glibc}/include -I${linux-headers}/include" + export LIBRARY_PATH="${glibc}/lib" + export LIBS="-lc -lnss_files -lnss_dns -lresolv" + chmod +x configure + ./configure \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} \ + --disable-shared \ + --disable-nls \ + --disable-dependency-tracking \ + --without-included-regex \ + --prefix=$out + + # Build + make + +'' + '' # Install make install PREFIX=$out -'' +'') diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix index e0d20c772e..9f7867065e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix @@ -152,8 +152,8 @@ stdenv.mkDerivation rec { platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "x86_64-linux" "m68k-linux" - "microblaze-linux" "microblazeel-linux" "mipsel-linux" - "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" + "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" + "mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" ]; maintainers = with maintainers; [ thoughtpolice dtzWill ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index 26c7b6a9ea..f91dc84d21 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -4,17 +4,18 @@ , gmp, jansson, libedit , autoreconfHook , withDebugSymbols ? false -, withPython ? false , python3 -, withXtables ? true , iptables +, withPython ? false, python3 +, withXtables ? true, iptables +, nixosTests }: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.0.8"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-wSrJQf/5ra7fFzZ9XOITeJuYoNMUJ3vCKz1x4QiR9BI="; + hash = "sha256-k3N0DeQagtvJiBjgpGoHP664qNBon6T6GnQ5nDK/PVA="; }; nativeBuildInputs = [ @@ -27,7 +28,10 @@ stdenv.mkDerivation rec { libmnl libnftnl libpcap gmp jansson libedit ] ++ lib.optional withXtables iptables - ++ lib.optional withPython python3; + ++ lib.optionals withPython [ + python3 + python3.pkgs.setuptools + ]; configureFlags = [ "--with-json" @@ -37,6 +41,11 @@ stdenv.mkDerivation rec { ++ lib.optional withPython "--enable-python" ++ lib.optional withXtables "--with-xtables"; + passthru.tests = { + inherit (nixosTests) firewall-nftables lxd-nftables; + nat = { inherit (nixosTests.nat.nftables) firewall standalone; }; + }; + meta = with lib; { description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; homepage = "https://netfilter.org/projects/nftables/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 6d0b54088e..8f1ca40aa9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -18,6 +18,8 @@ let else a; in rec { + mkDriver = generic; + # Official Unix Drivers - https://www.nvidia.com/en-us/drivers/unix/ # Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt @@ -25,12 +27,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.54.03"; - sha256_64bit = "sha256-RUdk9X6hueGRZqNw94vhDnHwYmQ4+xl/cm3DyvBbQII="; - sha256_aarch64 = "sha256-SUxW/Z8sJJ7bc/yhozTh8Wd2gKLsniJwKmXh1tJwUm8="; - openSha256 = "sha256-dp74UiiZfsQbZbAKHgFkLdRNyYbRlVMF3tIXcxok7FU"; - settingsSha256 = "sha256-5yIdOAaYQCQ2CmCayD/a5opoQppjK56s9cDqLmm17ww="; - persistencedSha256 = "sha256-R5WCh09BSPjfifui0ODkCsdIXTowceNjLDq5XHwda08="; + version = "535.86.05"; + sha256_64bit = "sha256-QH3wyjZjLr2Fj8YtpbixJP/DvM7VAzgXusnCcaI69ts="; + sha256_aarch64 = "sha256-ON++eWPDWHnm/NuJmDSYkR4sKKvCdX+kwxS7oA2M5zU="; + openSha256 = "sha256-qCYEQP54cT7G+VrLmuMT+RWIwuGdBhlbYTrCDcztfNs="; + settingsSha256 = "sha256-0NAxQosC+zPz5STpELuRKDMap4KudoPGWKL4QlFWjLQ="; + persistencedSha256 = "sha256-Ak4Wf59w9by08QJ0x15Zs5fHOhiIatiJfjBQfnY65Mg="; }; latest = selectHighestVersion production (generic { @@ -63,11 +65,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.31"; + version = "525.47.35"; persistencedVersion = "525.116.04"; settingsVersion = "525.116.04"; - sha256_64bit = "sha256-NA+n7MK3K4MMmR3IoVrvVeB48+9qCR3YvZTBMLpF1c0="; - openSha256 = "sha256-0ERYghSnkfSqRbkt2SxGTq+jwsvU140bdlDJtfwxiNA="; + sha256_64bit = "sha256-HnjCHsHHH/fqqyc8dXDx/wQhVkXWoH5Z9jJ+/zQWNFc="; + openSha256 = "sha256-/qkCMybr8sC/Da9zi2KbSkLBeQcSbVURnAg1IbjZiBk="; settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4="; persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; @@ -79,23 +81,18 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.182.03"; - sha256_64bit = "sha256-PbwUCPxIuGXT3azvxF9KP8E7kLg6Yo7lRrAIKrLD/Hk="; - sha256_aarch64 = "sha256-FEoWikgQjZKkHvAHgtkxnDhB41GdYplZTttEUBit4QQ="; - settingsSha256 = "sha256-TRKQ4brLnCbBZt1smGSIHTfwW+wEFPWWPEwDxjVXN7s="; - persistencedSha256 = "sha256-fSJMx49z9trdNxx0iPI45oG57smvvhaqVNxsRnfXKCI="; + version = "470.199.02"; + sha256_64bit = "sha256-/fggDt8RzjLDW0JiGjr4aV4RGnfEKL8MTTQ4tCjXaP0="; + sha256_aarch64 = "sha256-UmF7LszdrO2d+bOaoQYrTVKXUwDqzMy1UDBW5SPuZy4="; + settingsSha256 = "sha256-FkKPE4QV5IiVizGYUNUYoEXRpEhojt/cbH/I8iCn3hw="; + persistencedSha256 = "sha256-JP71wt3uCNOgheLNlQbW3DqVFQNTC5vj4y4COWKQzAs="; patchFlags = [ "-p1" "-d" "kernel" ]; patches = [ - # source: https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf + # source: https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba (fetchpatch { - url = "https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf/raw/f5d5238bdbaa16cd4008658a0f82b9dd84f1b38f/nvidia-470xx-fix-linux-6.3.patch"; - hash = "sha256-mR+vXDHgVhWC0JeLgGlbNVCH8XTs7XnhEJS6BV75tI8="; - }) - # source: https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c - (fetchpatch { - url = "https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c/raw/688b612624945926676de28059fe749203b4b549/nvidia-470xx-fix-linux-6.4.patch"; - hash = "sha256-OyRmezyzqAi7mSJHDjsWQVocSsgJPTW5DvHDFVNX7Dk="; + url = "https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba/raw/37ff2b5ccf99f295ff958c9a44ca4ed4f42503b4/nvidia-470xx-fix-linux-6.5.patch"; + hash = "sha256-s5r7nwuMva0BLy2qJBVKqNtnUN9am5+PptnVwNdzdbk="; }) ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oddjob/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/oddjob/default.nix new file mode 100644 index 0000000000..bcbea90864 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/oddjob/default.nix @@ -0,0 +1,60 @@ +{ lib +, fetchurl +, stdenv +, autoreconfHook +, dbus +, libxml2 +, pam +, pkg-config +, systemd +}: + +stdenv.mkDerivation rec { + pname = "oddjob"; + version = "0.34.7"; + + src = fetchurl { + url = "https://pagure.io/oddjob/archive/${pname}-${version}/oddjob-${pname}-${version}.tar.gz"; + hash = "sha256-SUOsMH55HtEsk5rX0CXK0apDObTj738FGOaL5xZRnIM="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs =[ + libxml2 + dbus + pam + systemd + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace 'SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd 2> /dev/null`' "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}" \ + --replace 'SYSTEMDSYSTEMUNITDIR=`pkg-config --variable=systemdsystemunitdir systemd`' "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}" + ''; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--sysconfdir=${placeholder "out"}/etc" + "--with-selinux-acls=no" + "--with-selinux-labels=no" + "--disable-systemd" + ]; + + postConfigure = '' + substituteInPlace src/oddjobd.c \ + --replace "globals.selinux_enabled" "FALSE" + ''; + + meta = with lib; { + description = "Odd Job Daemon"; + homepage = "https://pagure.io/oddjob"; + changelog = "https://pagure.io/oddjob/blob/oddjob-${version}/f/ChangeLog"; + license = licenses.bsd0; + platforms = platforms.linux; + maintainers = with maintainers; [ SohamG ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix index 38912e0aa2..9306099213 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - hash = "sha256-JzSyX9zvUkhCEpNwTMneTZpCRgaYxHZ1wP215YnMI78="; + hash = "sha256-y0NIb/KsKpCd8byr/SXI7nwTKXP2/bSSoW8QgeL5xdc="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "-Ddbroot=/etc/iscsi" ]; - passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; }; + passthru.tests = { inherit (nixosTests) iscsi-root; }; meta = with lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_dp9ik/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_dp9ik/default.nix index 382a3ca7b1..bd097caee4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_dp9ik/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_dp9ik/default.nix @@ -14,10 +14,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pam ]; - makeFlags = [ "pam_p9.so" ]; - installPhase = '' - install -Dm755 -t $out/lib/security/ pam_p9.so - ''; + buildFlags = [ "pam_p9.so" ]; + installFlags = [ "PREFIX=$(out)" ]; + installTargets = "pam.install"; meta = with lib; { description = "dp9ik pam module"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix index d9b93eafdb..fc5902e719 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202302"; + version = "202307"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - hash = "sha256-69wdA6/bRN5gYl02GgA8mXnXxVZlHIGkhtC8vFKZVcA="; + hash = "sha256-GeLiJT5AwsMWw0ErdwD6C1jtUZjUxGw5GRSvenu3W18="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index d6d67d4d1d..d793e87c6f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,22 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils -, pandoc, ethtool, iproute2, libnl, udev, python3, perl +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, docutils +, pandoc +, ethtool +, iproute2 +, libnl +, udev +, python3 +, perl } : - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rdma-core"; - version = "46.0"; + version = "46.1"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; - rev = "v${version}"; - sha256 = "sha256-/mhaEACBAtKdjn5hIj7YnuzrwraiuA4sR9eHg3w0YZM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-pVPWoLnWCGP+CZtG5bnOKUtjiuOa6Qic9wlGeY68w/8="; }; strictDeps = true; - nativeBuildInputs = [ cmake pkg-config pandoc docutils python3 ]; - buildInputs = [ libnl ethtool iproute2 udev perl ]; + + nativeBuildInputs = [ + cmake + docutils + pandoc + pkg-config + python3 + ]; + + buildInputs = [ + ethtool + iproute2 + libnl + perl + udev + ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" @@ -42,11 +66,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "RDMA Core Userspace Libraries and Daemons"; homepage = "https://github.com/linux-rdma/rdma-core"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ markuskowa ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix index 786bcab86c..9646886a6d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2023-05-11"; + version = "${kernel.version}-unstable-2023-07-22"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "765d4e4bd5970f4c1c79e63bbe301667e5e029c9"; - hash = "sha256-FF2LVfOpITMJ5LiwsGAudrWStlkKsZUlHvzZs03gb9g="; + rev = "b5f4e6e894eca8fea38661e2fc22a2570e0274ad"; + hash = "sha256-3uPowesJVh/cnagMz/Uadb+U5rDUAWfU39tZaDNCoqg="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix index 37494d9c37..b89cddbfc7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl8821au"; - version = "${kernel.version}-unstable-2023-03-22"; + version = "${kernel.version}-unstable-2023-07-23"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821au-20210708"; - rev = "a133274b0532c17318e8790b771566f4a6b12b7c"; - hash = "sha256-xn2cmbtqQhLM9qLCEvVhCuoCa7y8LM4sevPqv3a6pBw="; + rev = "0dc022287b0ab534efa885881eaa65c5503291be"; + hash = "sha256-pLRBWdqlv9A39VbCS8dymTCJHcwJooqD8v6mTbOsBz0="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix index eb5a795c93..2775b18018 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2023-03-17"; + version = "${kernel.version}-unstable-2023-07-23"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "f0a2c9c74045cf2c3701084f389e358f9236fc8c"; - sha256 = "sha256-hquLmEOzdBQ6rJld5kkzVw+hXBFb/ZwpBI0eL0rUrkM="; + rev = "83db18e610845df9434a628ca3feb9004296b307"; + sha256 = "sha256-as3S7WQkug3suJ5ovUbRu/UzO5GDrGLdgkiWrCrvztk="; }; hardeningDisable = [ "pic" ]; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/morrownr/88x2bu-20210702"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ otavio ralith ]; + maintainers = with maintainers; [ otavio ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix index 5d78a3b302..d8f8c1bc02 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smemstat"; - version = "0.02.11"; + version = "0.02.12"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-RvHBrcyNB/zqxEY27twgMsjHNg8kzJryqnIAM7+vpg8="; + hash = "sha256-5gO26F80nZvZ6RIqX8o7bDSNo38EL8XywR8wMPFqHA8="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 53244a5a91..ed4204b9d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -82,6 +82,9 @@ , bpftools , libbpf + # Needed to produce a ukify that works for cross compiling UKIs. +, targetPackages + , withAcl ? true , withAnalyze ? true , withApparmor ? true @@ -145,7 +148,7 @@ assert withUkify -> withEfi; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "253.5"; + version = "253.6"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -162,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-B3A9AvpfZ8SYsiZvHnWO4RHs1/6EdczWF2NmrSqxQ7c="; + hash = "sha256-LZs6QuBe23W643bTuz+MD2pzHiapsBJBHoFXi/QjzG4="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -190,13 +193,6 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch - - # https://github.com/systemd/systemd/pull/28000 - (fetchpatch { - name = "fix-service-exit"; - url = "https://github.com/systemd/systemd/commit/5f7f82ba625ee48d662c1f0286f44b8b0918d05d.patch"; - sha256 = "sha256-pFRXpZjeVl5ZG/mOjHEuMg9zXq4Orwvdp+/LYTbR09I="; - }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -216,7 +212,6 @@ stdenv.mkDerivation (finalAttrs: { (musl-patches + "/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch") (musl-patches + "/0013-add-missing-FTW_-macros-for-musl.patch") (musl-patches + "/0014-Use-uintmax_t-for-handling-rlim_t.patch") - (musl-patches + "/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch") (musl-patches + "/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch") (musl-patches + "/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch") (musl-patches + "/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch") @@ -242,6 +237,16 @@ stdenv.mkDerivation (finalAttrs: { # BPF does not work with stack protector substituteInPlace src/core/bpf/meson.build \ --replace "clang_flags = [" "clang_flags = [ '-fno-stack-protector'," + '' + lib.optionalString withUkify '' + substituteInPlace src/ukify/ukify.py \ + --replace \ + "'readelf'" \ + "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" + # The objcopy dependency is removed in v254 + substituteInPlace src/ukify/ukify.py \ + --replace \ + "'objcopy'" \ + "'${targetPackages.stdenv.cc.bintools.targetPrefix}objcopy'" '' + ( let # The following patches references to dynamic libraries to ensure that @@ -517,8 +522,8 @@ stdenv.mkDerivation (finalAttrs: { "-Dsulogin-path=${util-linux.login}/bin/sulogin" "-Dnologin-path=${util-linux.login}/bin/nologin" - "-Dmount-path=${util-linux.mount}/bin/mount" - "-Dumount-path=${util-linux.mount}/bin/umount" + "-Dmount-path=${lib.getOutput "mount" util-linux}/bin/mount" + "-Dumount-path=${lib.getOutput "mount" util-linux}/bin/umount" "-Dcreate-log-dirs=false" # Use cgroupsv2. This is already the upstream default, but better be explicit. @@ -569,8 +574,8 @@ stdenv.mkDerivation (finalAttrs: { "man/systemd-makefs@.service.xml" ]; } - { search = "/sbin/swapon"; replacement = "${util-linux.swap}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; } - { search = "/sbin/swapoff"; replacement = "${util-linux.swap}/sbin/swapoff"; where = [ "src/core/swap.c" ]; } + { search = "/sbin/swapon"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; } + { search = "/sbin/swapoff"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; where = [ "src/core/swap.c" ]; } { search = "/bin/echo"; replacement = "${coreutils}/bin/echo"; @@ -731,6 +736,11 @@ stdenv.mkDerivation (finalAttrs: { done '' + lib.optionalString withEfi '' mv $out/dont-strip-me $out/lib/systemd/boot/efi + '' + lib.optionalString withUkify '' + # To cross compile a derivation that builds a UKI with ukify, we need to wrap + # ukify with the correct binutils. When wrapping, no splicing happens so we + # have to explicitly pull binutils from targetPackages. + wrapProgram $out/lib/systemd/ukify --set PATH ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] } ''; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tp_smapi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tp_smapi/default.nix index d9b4333d24..d9c5921d46 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tp_smapi/default.nix @@ -1,4 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, runtimeShell +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, kernel +, writeScript +, coreutils +, gnugrep +, jq +, curl +, common-updater-scripts +, runtimeShell }: stdenv.mkDerivation rec { @@ -6,13 +17,21 @@ stdenv.mkDerivation rec { version = "0.43"; src = fetchFromGitHub { - owner = "evgeni"; + owner = "linux-thinkpad"; repo = "tp_smapi"; rev = "tp-smapi/${version}"; sha256 = "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g"; - name = "tp-smapi-${version}"; }; + patches = [ + # update DEFINE_SEMAPHORE usage for linux 6.4+ + # https://github.com/linux-thinkpad/tp_smapi/pull/45 + (fetchpatch { + url = "https://github.com/linux-thinkpad/tp_smapi/commit/0c3398b1acf2a2cabd9cee91dc3fe3d35805fa8b.patch"; + hash = "sha256-J/WvijrpHGwFOZMMxnHdNin5eh8vViTcNb4nwsCqsLs="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -39,7 +58,7 @@ stdenv.mkDerivation rec { meta = { description = "IBM ThinkPad hardware functions driver"; - homepage = "https://github.com/evgeni/tp_smapi"; + homepage = "https://github.com/linux-thinkpad/tp_smapi"; license = lib.licenses.gpl2; maintainers = [ ]; # driver is only ment for linux thinkpads i think bellow platforms should cover it. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix index 36f0963935..07a9ceaa51 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/udisks/2-default.nix @@ -83,7 +83,10 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests.vm = nixosTests.udisks2; + passthru = { + inherit libblockdev; + tests.vm = nixosTests.udisks2; + }; meta = with lib; { description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix index 74c4972f85..4353188420 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix @@ -1,11 +1,11 @@ { appimageTools, lib, fetchurl }: let pname = "uhk-agent"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-oRdV2pbUlXHqBED51ThLdS4kyLuSAXxFmeSLoCbCGUI="; + sha256 = "sha256-TX7mL6BWAZHZ2W9/BneOt1vxt2slC2Lv6eFWPAgS2a8="; }; appimageContents = appimageTools.extract { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ulogd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ulogd/default.nix index cb48d20043..a79a38389e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ulogd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ulogd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, gnumake, libnetfilter_acct, libnetfilter_conntrack , libnetfilter_log, libmnl, libnfnetlink, automake, autoconf, autogen, libtool +, postgresql, libmysqlclient, sqlite , pkg-config, libpcap, linuxdoc-tools, autoreconfHook, nixosTests }: stdenv.mkDerivation rec { @@ -37,6 +38,9 @@ stdenv.mkDerivation rec { libmnl libnfnetlink libpcap + postgresql + libmysqlclient + sqlite ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ultrablue-server/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ultrablue-server/default.nix index 74a7fe9cfb..620189af36 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ultrablue-server/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ultrablue-server/default.nix @@ -3,7 +3,7 @@ , buildGoModule }: -buildGoModule { +buildGoModule rec { pname = "ultrablue-server"; version = "unstable-fosdem2023"; @@ -16,7 +16,7 @@ buildGoModule { # rev = "6de04af6e353e38c030539c5678e5918f64be37e"; }; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; vendorSha256 = "sha256-249LWguTHIF0HNIo8CsE/HWpAtBw4P46VPvlTARLTpw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix index 7856456a3c..ee82679de4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/unstick/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libseccomp ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix index 9973b1ac5a..8772c081e0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitLab , fetchpatch +, makeWrapper , pkg-config , rsync , libxslt @@ -23,27 +24,31 @@ , useIMobileDevice ? true , libimobiledevice , withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform) +, nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "upower"; - version = "1.90.0"; + version = "1.90.2"; - outputs = [ "out" "dev" ] + outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "upower"; repo = "upower"; - rev = "v${version}"; - hash = "sha256-+C/4dDg6WTLpBgkpNyxjthSdqYdaTLC8vG6jG1LNJ7w="; + rev = "v${finalAttrs.version}"; + hash = "sha256-7WzMAJuf1czU8ZalsEU/NwCXYqTGvcqEqxFt5ocgt48="; }; - # Remove when this is fixed upstream: - # https://gitlab.freedesktop.org/upower/upower/-/issues/214 - patches = lib.optional (stdenv.hostPlatform.system == "i686-linux") - ./i686-test-remove-battery-check.patch; + patches = lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ + # Remove when this is fixed upstream: + # https://gitlab.freedesktop.org/upower/upower/-/issues/214 + ./i686-test-remove-battery-check.patch + ] ++ [ + ./installed-tests-path.patch + ]; strictDeps = true; @@ -60,6 +65,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection libxslt + makeWrapper pkg-config rsync ]; @@ -71,6 +77,14 @@ stdenv.mkDerivation rec { systemd # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev + + # For installed tests. + (python3.withPackages (pp: [ + pp.dbus-python + pp.python-dbusmock + pp.pygobject3 + pp.packaging + ])) ] ++ lib.optionals useIMobileDevice [ libimobiledevice ]; @@ -98,6 +112,7 @@ stdenv.mkDerivation rec { "-Dudevhwdbdir=${placeholder "out"}/lib/udev/hwdb.d" "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "auto" else "disabled"}" "-Dgtk-doc=${lib.boolToString withDocs}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; doCheck = true; @@ -105,6 +120,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs src/linux/integration-test.py patchShebangs src/linux/unittest_inspector.py + + substituteInPlace src/linux/integration-test.py \ + --replace "/usr/share/dbus-1" "$out/share/dbus-1" ''; preCheck = '' @@ -126,35 +144,62 @@ stdenv.mkDerivation rec { runHook postCheck ''; + postCheck = '' + # Undo patchShebangs from postPatch so that it can be replaced with runtime shebang + # unittest_inspector.py intentionally not reverted because it would trigger + # meson rebuild during install and it is not used at runtime anyway. + sed -Ei 's~#!.+/bin/python3~#!/usr/bin/python3~' \ + ../src/linux/integration-test.py + ''; + postInstall = '' # Move stuff from DESTDIR to proper location. # We use rsync to merge the directories. for dir in etc var; do - rsync --archive "${DESTDIR}/$dir" "$out" - rm --recursive "${DESTDIR}/$dir" + rsync --archive "$DESTDIR/$dir" "$out" + rm --recursive "$DESTDIR/$dir" done - for o in out dev; do - rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" - rm --recursive "${DESTDIR}/''${!o}" + for o in out dev installedTests; do + rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")" + rm --recursive "$DESTDIR/''${!o}" done # Ensure the DESTDIR is removed. - rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}" + rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR" ''; - # HACK: We want to install configuration files to $out/etc - # but upower should read them from /etc on a NixOS system. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; + postFixup = '' + wrapProgram "$installedTests/libexec/upower/integration-test.py" \ + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ + "$out" + umockdev.out + ]}" \ + --prefix PATH : "${lib.makeBinPath [ + umockdev + ]}" + ''; + + env = { + # HACK: We want to install configuration files to $out/etc + # but upower should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "${placeholder "out"}/dest"; + }; + + passthru = { + tests = { + installedTests = nixosTests.installed-tests.upower; + }; + }; meta = with lib; { homepage = "https://upower.freedesktop.org/"; - changelog = "https://gitlab.freedesktop.org/upower/upower/-/blob/v${version}/NEWS"; + changelog = "https://gitlab.freedesktop.org/upower/upower/-/blob/v${finalAttrs.version}/NEWS"; description = "A D-Bus service for power management"; maintainers = teams.freedesktop.members; platforms = platforms.linux; license = licenses.gpl2Plus; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/installed-tests-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/upower/installed-tests-path.patch new file mode 100644 index 0000000000..367f3eab09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/upower/installed-tests-path.patch @@ -0,0 +1,56 @@ +diff --git a/meson_options.txt b/meson_options.txt +index eec3659..f064a1b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -6,6 +6,10 @@ option('gtk-doc', + type : 'boolean', + value : 'true', + description : 'Build developer documentation') ++option('installed_test_prefix', ++ type: 'string', ++ value: '', ++ description: 'Prefix for installed tests') + option('introspection', + type : 'feature', + value : 'auto', +diff --git a/src/meson.build b/src/meson.build +index a2352ac..c1f25ac 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -85,6 +85,7 @@ install_subdir('does-not-exist', install_dir: historydir, strip_directory : true + + cdata = configuration_data() + cdata.set('libexecdir', get_option('prefix') / get_option('libexecdir')) ++cdata.set('installed_test_bindir', get_option('installed_test_prefix') / 'libexec' / 'upower') + cdata.set('historydir', historydir) + + configure_file( +@@ -147,16 +148,16 @@ if os_backend == 'linux' and gobject_introspection.found() + 'linux/integration-test.py', + 'linux/output_checker.py', + ], +- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' ++ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' + ) + install_subdir('linux/tests/', +- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower' ++ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower' + ) + + configure_file( + input: 'upower-integration.test.in', + output: 'upower-integration.test', +- install_dir: get_option('datadir') / 'installed-tests' / 'upower', ++ install_dir: get_option('installed_test_prefix') / 'share' / 'installed-tests' / 'upower', + configuration: cdata + ) + endif +diff --git a/src/upower-integration.test.in b/src/upower-integration.test.in +index 151ded0..b0a9bec 100644 +--- a/src/upower-integration.test.in ++++ b/src/upower-integration.test.in +@@ -1,3 +1,3 @@ + [Test] + Type=session +-Exec=@libexecdir@/upower/integration-test.py ++Exec=@installed_test_bindir@/integration-test.py diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index bd87c07879..9a335010c8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # the greater util-linux toolset. # Compatibility is maintained by symlinking the binaries from the # smaller outputs in the bin output. - outputs = [ "bin" "dev" "out" "lib" "man" "mount" "login" "swap" ]; + outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optionals stdenv.isLinux [ "mount" ] ++ [ "login" ] ++ lib.optionals stdenv.isLinux [ "swap" ]; separateDebugInfo = true; postPatch = '' @@ -110,20 +110,23 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' moveToOutput bin/mount "$mount" moveToOutput bin/umount "$mount" ln -svf "$mount/bin/"* $bin/bin/ + '' + '' moveToOutput sbin/nologin "$login" moveToOutput sbin/sulogin "$login" prefix=$login _moveSbin ln -svf "$login/bin/"* $bin/bin/ + '' + lib.optionalString stdenv.isLinux '' moveToOutput sbin/swapon "$swap" moveToOutput sbin/swapoff "$swap" prefix=$swap _moveSbin ln -svf "$swap/bin/"* $bin/bin/ + '' + '' installShellCompletion --bash bash-completion/* ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix index eed71188eb..e2412b37aa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wiringpi/default.nix @@ -18,7 +18,7 @@ let }: stdenv.mkDerivation rec { pname = "wiringpi-${subprj}"; inherit version src; - sourceRoot = "source/${subprj}"; + sourceRoot = "${src.name}/${subprj}"; inherit buildInputs; # Remove (meant for other OSs) lines from Makefiles preInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix index f34e106727..8231e3e3ea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { pname = "wooting-udev-rules"; - version = "20210525"; + version = "unstable-2023-03-31"; - # Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules + # Source: https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/ src = [ ./wooting.rules ]; dontUnpack = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://wooting.helpscoutdocs.com/article/34-linux-udev-rules"; + homepage = "https://help.wooting.io/en/article/wootility-configuring-device-access-for-wootility-under-linux-udev-rules-r6lb2o/"; description = "udev rules that give NixOS permission to communicate with Wooting keyboards"; platforms = platforms.linux; license = "unknown"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules index a243f68ed1..365627fa1a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules @@ -20,7 +20,6 @@ SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1101", MODE:="0660 SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input" SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1102", MODE:="0660", GROUP="input" - # Wooting Two SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input" SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1200", MODE:="0660", GROUP="input" @@ -57,6 +56,19 @@ SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1222", MODE:="0660 # Wooting Two HE update mode SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="122f", MODE:="0660", GROUP="input" +# Wooting Two HE (ARM) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1230", MODE:="0660", GROUP="input" +# Wooting Two HE Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1231", MODE:="0660", GROUP="input" +# Wooting Two HE 2nd Alt-gamepad mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0660", GROUP="input" +SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1232", MODE:="0660", GROUP="input" + +# Wooting Two HE (ARM) update mode +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="123f", MODE:="0660", GROUP="input" + # Wooting 60HE SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input" SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1300", MODE:="0660", GROUP="input" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix index e208bcba9c..5680f93e21 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix @@ -15,10 +15,7 @@ callPackage ./generic.nix args { if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.4" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then - linuxKernel.packages.linux_6_3 - else - linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; # this package should point to the latest release. version = "2.1.12"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix index f262f77970..832eb66c02 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix @@ -11,17 +11,11 @@ let in callPackage ./generic.nix args { # check the release notes for compatible kernels - # NOTE: - # zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2 - # for future releases, please delete this condition. kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.4" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then - linuxKernel.packages.linux_6_3 - else - linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix index ec63e7e3a8..bacb2eebb9 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-DM/EhbKp2sM5OnvFrb2GcjhgMN+9kuVW33wHVSxcoLo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-7GoW0Re4NZa31mmNPto9fCVzKCl5ymUYQCwmDfuAnIc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-rzGFcWou9+rDJuxqY6utnT54jAVLG2oj3Og8Fr8pibU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-A3EGk+dsh1/m4rAWKNq6va75pA4OFLo9kSLb0b/1uZA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-JkDQ9kmXuwcFXcfyDYwgI/NHqJYZj/PbhZfqlL0jvnw="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-8OIxMXjCZEurxInuDRAzEZ/Vjn1ixzZRMqXiSKgx7GE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-YBE4yL63Ee1UmkE7pIbLKOLLhiY5DpN1t8i/ovQOKXo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-japMeJETDPy0RaxJOs6dDktQfTZ1sLB4jotxLYZhxfc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-Lj4eCcMgpy2AlGHKA/xRxZc2HV3llykWwVeTUlHXvyI="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-E1MsoM3ZDaEPFLvXWt/+0hv8CVu2v9xlX0rvh4vmj6Y="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-vAP/xc3IYMCtDbog2qB3kK5ftbsrk8meLD0IGx9tNa8="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-LovoihsVGtDif7sSqS3CE3QXNv2v2aSLr/x9sq2j78E="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-XiWExZZbtCdl/1Koi1dTKsiLl5xSwpI8LiGxjX2yT+A="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-ArTTEWD0yYLRrX8jytkMtKWLbEfr90O4i73dMjA+sdE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index 5322c342d3..7a3c9bd04f 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.32"; + version = "0.107.35"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - schema_version = 20; + schema_version = 24; tests.adguardhome = nixosTests.adguardhome; }; diff --git a/third_party/nixpkgs/pkgs/servers/apache-airflow/default.nix b/third_party/nixpkgs/pkgs/servers/apache-airflow/default.nix index 20a5a85838..e3b3f0ddc2 100644 --- a/third_party/nixpkgs/pkgs/servers/apache-airflow/default.nix +++ b/third_party/nixpkgs/pkgs/servers/apache-airflow/default.nix @@ -31,6 +31,10 @@ let rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-qyD3uoxEnD2pdVvwpUlSqHB3drD4Zg/+ov4CzLFIlLs="; }; + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; }); apache-airflow = pySelf.callPackage ./python-package.nix { }; diff --git a/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix b/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix index f44019bf7c..748800f52e 100644 --- a/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_18, tone, ffmpeg-full, util-linux, libwebp }: +{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_18, tone, ffmpeg-full, util-linux, python3 }: let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.2.23"; + version = "2.3.3"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dmeqxXrVKXFIYI5/CBvGN5wAssY2DC6fIRDr2+0EL+I="; + sha256 = "sha256-wSIA2KKDKf3DNgYNNIyYNT8xyPWCZvwLcWuDhWOZpLs="; }; client = buildNpmPackage { @@ -24,7 +24,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-W4S8+4V4CrU9b+nbuH3+kKQKlIkOT9i72+YAWO/3gCQ="; + npmDepsHash = "sha256-s3CwGFK87podBJwAqh7JoMA28vnmf77iexrAbbwZlFk="; }; wrapper = import ./wrapper.nix { @@ -35,10 +35,11 @@ in buildNpmPackage { inherit pname version src; buildInputs = [ util-linux ]; + nativeBuildInputs = [ python3 ]; dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-XBQNLcFHq6U/yknlXiIEGulTDTw1wLBnhEi3h5dtBuE="; + npmDepsHash = "sha256-gueSlQh4tRTjIWvpNG2cj1np/zUGbjsnv3fA2owtiQY="; installPhase = '' mkdir -p $out/opt/client diff --git a/third_party/nixpkgs/pkgs/servers/authelia/update.sh b/third_party/nixpkgs/pkgs/servers/authelia/update.sh index dd2435453c..c51272ea91 100755 --- a/third_party/nixpkgs/pkgs/servers/authelia/update.sh +++ b/third_party/nixpkgs/pkgs/servers/authelia/update.sh @@ -80,6 +80,6 @@ clean_up OLD_GO_VENDOR_HASH="$(instantiateClean authelia.vendorHash)" echo "Old go vendor hash $OLD_GO_VENDOR_HASH" replace "$OLD_GO_VENDOR_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_GO_VENDOR_HASH="$(fetchNewSha authelia.go-modules)" +NEW_GO_VENDOR_HASH="$(fetchNewSha authelia.goModules)" echo "New go vendor hash $NEW_GO_VENDOR_HASH" replace "$TMP_HASH" "$NEW_GO_VENDOR_HASH" "$DRV_DIR/sources.nix" diff --git a/third_party/nixpkgs/pkgs/servers/authelia/web.nix b/third_party/nixpkgs/pkgs/servers/authelia/web.nix index e28df798fd..0153358ea0 100644 --- a/third_party/nixpkgs/pkgs/servers/authelia/web.nix +++ b/third_party/nixpkgs/pkgs/servers/authelia/web.nix @@ -7,7 +7,7 @@ buildNpmPackage { pname = "${pname}-web"; inherit src version npmDepsHash; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; patches = [ ./change-web-out-dir.patch diff --git a/third_party/nixpkgs/pkgs/servers/baserow/default.nix b/third_party/nixpkgs/pkgs/servers/baserow/default.nix index 92007bd6ee..702676dfc9 100644 --- a/third_party/nixpkgs/pkgs/servers/baserow/default.nix +++ b/third_party/nixpkgs/pkgs/servers/baserow/default.nix @@ -25,7 +25,7 @@ let hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q="; }; - sourceRoot = "source/premium/backend"; + sourceRoot = "${src.name}/premium/backend"; doCheck = false; }; @@ -45,7 +45,7 @@ with python.pkgs; buildPythonApplication rec { hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q="; }; - sourceRoot = "source/backend"; + sourceRoot = "${src.name}/backend"; postPatch = '' # remove dependency constraints diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index a08c2246ce..601fc49e4d 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.2.3"; + version = "1.2.4"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-6yLXsdw3wdxrCqNsNrbcjqfqgRR1Nuyyxw6osYQl8uY="; + sha256 = "sha256-TdBazeY/w9vSEbs/OgRtdoi/riAUai1zrmM/A8ecaWA="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix index 5a078f3c3e..8ba198873f 100644 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -15,6 +15,10 @@ let inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; }); }; }; diff --git a/third_party/nixpkgs/pkgs/servers/code-server/default.nix b/third_party/nixpkgs/pkgs/servers/code-server/default.nix index b5fe5a0675..0c5cb23108 100644 --- a/third_party/nixpkgs/pkgs/servers/code-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/code-server/default.nix @@ -70,19 +70,19 @@ let # # To compute the commit when upgrading this derivation, do: # `$ git rev-parse ` where is the git revision of the `src` - # Example: `$ git rev-parse v4.14.1` - commit = "5c199629305a0b935b4388b7db549f77eae82b5a"; + # Example: `$ git rev-parse v4.16.1` + commit = "94ef3776ad7bebfb5780dfc9632e04d20d5c9a6c"; in stdenv.mkDerivation (finalAttrs: { pname = "code-server"; - version = "4.14.1"; + version = "4.16.1"; src = fetchFromGitHub { owner = "coder"; repo = "code-server"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-j7pFh731C8HUGT+M/JvnJoDZoPH9AdfA9TxxSx1vuBM="; + hash = "sha256-h4AooHHKV/EfN2S1z7CQKqnYW3uA3sKhSW4senlzjxI="; }; yarnCache = stdenv.mkDerivation { @@ -92,6 +92,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn' git cacert ]; buildPhase = '' + runHook preBuild + export HOME=$PWD export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" @@ -106,11 +108,13 @@ stdenv.mkDerivation (finalAttrs: { find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ xargs -I {} yarn --cwd {} \ --ignore-scripts --ignore-engines + + runHook postBuild ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-J5ME9Nc7GWVoKeV908BR9ib9yH5KNmBOtltRvJcpZIY="; + outputHash = "sha256-vkju+oxEYrEXFAnjz/Mf1g0ZhxBALLAaRuWE0swSWwM="; }; nativeBuildInputs = [ @@ -318,5 +322,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ offline henkery code-asher ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + mainProgram = "code-server"; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index 1f9b680603..6f14513756 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -42,5 +42,6 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick]; + mainProgram = "consul"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dns/acme-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/acme-dns/default.nix index 08cd511f18..db6ea4bbea 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/acme-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/acme-dns/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { changelog = "https://github.com/joohoi/acme-dns/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilylange ]; + mainProgram = "acme-dns"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 6d13c600a7..fcda25cabf 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.16"; + version = "9.18.17"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yII0/gfudcPIqeWRUv7mS3FGQ96OIs+Y2j200LV+B3U="; + hash = "sha256-veHFAXuB0decaeuPU38uUDL9NiOs3V7oMNT3S8JINFg="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index ba39442992..492ab61316 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.8"; + version = "3.2.9"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e"; + sha256 = "bc1f9eb8c9f67f52805f3acfa2d0153190245fa145b007fafa9068d2da292506"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix index 5af71a9a41..85c9dddf16 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix @@ -37,7 +37,7 @@ buildGoModule { vendorSha256 = "sha256-ENtTnDsz5WhRz1kiqnWQ5vyEpZtgi7ZeYvksffgW78k="; - # Override the go-modules fetcher derivation to apply + # Override the goModules fetcher derivation to apply # upstream's patch of the crypto/x509 library. modBuildPhase = '' go mod init github.com/namecoin/x509-compressed diff --git a/third_party/nixpkgs/pkgs/servers/ebusd/default.nix b/third_party/nixpkgs/pkgs/servers/ebusd/default.nix new file mode 100644 index 0000000000..318c274cf2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/ebusd/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, pkgs, fetchFromGitHub, argparse, mosquitto, cmake, autoconf, automake, libtool, pkg-config, openssl }: + +stdenv.mkDerivation rec { + pname = "ebusd"; + version = "23.2"; + + src = fetchFromGitHub { + owner = "john30"; + repo = "ebusd"; + rev = version; + sha256 = "2CkcTTxEzVrEPtUVVDxXPPkYqZT6+gsCcfTrt83sFv8="; + }; + + nativeBuildInputs = [ + cmake + autoconf + automake + libtool + pkg-config + ]; + + buildInputs = [ + argparse + mosquitto + openssl + ]; + + patches = [ + ./patches/ebusd-cmake.patch + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_LOCALSTATEDIR=${placeholder "TMPDIR"}" + ]; + + postInstall = '' + mv $out/usr/bin $out + rmdir $out/usr + ''; + + meta = with lib; { + description = "ebusd"; + homepage = "https://github.com/john30/ebusd"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nathan-gs ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/ebusd/patches/ebusd-cmake.patch b/third_party/nixpkgs/pkgs/servers/ebusd/patches/ebusd-cmake.patch new file mode 100644 index 0000000000..347caa88a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/ebusd/patches/ebusd-cmake.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,16 +184,11 @@ + add_subdirectory(src/lib/knx) + add_subdirectory(src/tools) + +-if(EXISTS "${ROOT}/etc/debian_version") +- install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/default/ebusd DESTINATION /etc/default/) +- install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/init.d/ebusd DESTINATION /etc/init.d/) +- install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/systemd/ebusd.service DESTINATION /lib/systemd/system/) +-endif() + if(HAVE_MQTT) + FILE(GLOB MQTT_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg") +- install(FILES ${MQTT_CFG_FILES} DESTINATION /etc/ebusd/) ++ install(FILES ${MQTT_CFG_FILES} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ebusd/) + endif(HAVE_MQTT) + if(HAVE_KNX) + FILE(GLOB KNX_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/knx*.cfg") +- install(FILES ${KNX_CFG_FILES} DESTINATION /etc/ebusd/) ++ install(FILES ${KNX_CFG_FILES} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ebusd/) + endif(HAVE_KNX) diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix index 5cd8466f97..93afa6746a 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix @@ -1,17 +1,27 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, fetchpatch, buildGoModule }: buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "CrunchyData"; - repo = pname; + repo = "pg_tileserv"; rev = "v${version}"; - sha256 = "sha256-pNm802DJu5t+Y9QZU6wDUcAVpJTZ4SxDK0J61wzuuRE="; + hash = "sha256-Y8GAmWpnXQGmFcy44wFUQGpA8OvT7u1rY1ZGNg1Qwgs="; }; - vendorSha256 = "sha256-iw9bIh1Ngj5IGhrZwmSPciyaAR73msZ283TB0ibwt+c="; + patches = [ + # Without this, we get error messages like: + # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) + # The patch was generated by changing "go 1.15" to "go 1.17" and executing `go mod tidy`. + (fetchpatch { + url = "https://github.com/CrunchyData/pg_tileserv/commit/d8e01469344895267ead9fa35ee7bdb8f966a710.patch"; + hash = "sha256-1P3dV8h51X+MEH2u1n6RxZvBPXBpQWrZBBCTOoCEWQU="; + }) + ]; + + vendorHash = "sha256-gXJFuvJ2d/e91TAtBzV3p2MwriJtUlIuNRw1+3iXJBA="; ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/gobetween/default.nix b/third_party/nixpkgs/pkgs/servers/gobetween/default.nix index 224eca352b..290d1db260 100644 --- a/third_party/nixpkgs/pkgs/servers/gobetween/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gobetween/default.nix @@ -35,6 +35,6 @@ buildGoModule rec { homepage = "https://gobetween.io"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix b/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix index f0c104f619..f264f8ac78 100644 --- a/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotosocial/default.nix @@ -9,9 +9,9 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.9.0"; - source-hash = "sha256-UZRIQTdVESCYv2KW7HUS2c4bS5qnB7wdwiYAgEJ60fU="; - web-assets-hash = "sha256-OvgAr3obsK1JndLKmnjNY06dEbQKyP4xG/viBjCivvs="; + version = "0.10.0"; + source-hash = "sha256-SE+u89xAV6jJulU8XETlzTrqtwBYeMdNGyjk648b7h8="; + web-assets-hash = "sha256-tYqnGqII8gf+aVd/J5lvhurhCrH8ihWYn7noBJbEgqA="; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix index 8d1e0c340a..c2e75335f1 100644 --- a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -1,43 +1,28 @@ -{ lib, fetchFromGitHub, fetchpatch, python3 }: +{ lib, fetchFromGitHub, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.16.10"; - src = fetchFromGitHub { - owner = "mautrix"; - repo = "python"; - rev = "v${version}"; - hash = "sha256-YQsQ7M+mHcRdGUZp+mo46AlBmKSdmlgRdGieEG0Hu9k="; - }; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.14.2"; + version = "1.14.4"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qp0LVcmWf5lZ52h0V58S6FoIM8RLOd6Y3FRb85j7KRg="; + sha256 = "sha256-4poHHwJ9WcOTTwOtPfANMqusaLltaoLryxNMQE1Parc="; }; postPatch = '' echo "${version}" > heisenbridge/version.txt ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ irc ruamel-yaml mautrix python-socks ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 31dfa15c5d..521f73dbb7 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.7.2"; + version = "2023.8.1"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -62,6 +62,7 @@ aioruuvigateway aioshelly airthings-ble + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -205,6 +206,7 @@ aioruuvigateway aioshelly aranet4 + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -265,6 +267,8 @@ "aten_pe" = ps: with ps; [ atenpdu ]; + "atlanticcityelectric" = ps: with ps; [ + ]; "atome" = ps: with ps; [ pyatome ]; @@ -336,6 +340,8 @@ ]; # missing inputs: pybbox "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi-smartclim + "bge" = ps: with ps; [ + ]; "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ @@ -369,6 +375,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluemaestro-ble @@ -413,6 +420,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -437,6 +445,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -511,6 +520,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -623,6 +633,8 @@ "color_extractor" = ps: with ps; [ colorthief ]; + "comed" = ps: with ps; [ + ]; "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ @@ -710,7 +722,6 @@ aiodiscover aiohttp-cors async-upnp-client - av bleak bleak-retry-connector bluetooth-adapters @@ -718,6 +729,7 @@ bluetooth-data-tools dbus-fast fnv-hash-fast + ha-av hass-nabucasa hassil home-assistant-frontend @@ -741,6 +753,8 @@ "delijn" = ps: with ps; [ pydelijn ]; + "delmarva" = ps: with ps; [ + ]; "deluge" = ps: with ps; [ deluge-client ]; @@ -807,15 +821,6 @@ ]; "discovergy" = ps: with ps; [ ]; # missing inputs: pydiscovergy - "discovery" = ps: with ps; [ - aiohttp-cors - fnv-hash-fast - ifaddr - netdisco - psutil-home-assistant - sqlalchemy - zeroconf - ]; "dlib_face_detect" = ps: with ps; [ face-recognition ]; @@ -864,6 +869,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -908,6 +914,8 @@ "dunehd" = ps: with ps; [ pdunehd ]; + "duotecno" = ps: with ps; [ + ]; # missing inputs: pyduotecno "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; @@ -967,6 +975,12 @@ ]; "electrasmart" = ps: with ps; [ ]; # missing inputs: pyElectra + "electric_kiwi" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; # missing inputs: electrickiwi-api "elgato" = ps: with ps; [ elgato ]; @@ -1057,6 +1071,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1085,6 +1100,7 @@ "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1114,6 +1130,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1134,6 +1151,10 @@ webrtcvad zeroconf ]; + "event" = ps: with ps; [ + ]; + "evergy" = ps: with ps; [ + ]; "everlights" = ps: with ps; [ pyeverlights ]; @@ -1221,6 +1242,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1355,6 +1377,31 @@ "garages_amsterdam" = ps: with ps; [ odp-amsterdam ]; + "gardena_bluetooth" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtcvad + zeroconf + ]; # missing inputs: gardena_bluetooth "gaviota" = ps: with ps; [ ]; "gc100" = ps: with ps; [ @@ -1364,7 +1411,7 @@ ]; "generic" = ps: with ps; [ aiohttp-cors - av + ha-av pillow ]; "generic_hygrostat" = ps: with ps; [ @@ -1487,6 +1534,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1699,6 +1747,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1769,8 +1818,7 @@ pygti ]; "hydrawise" = ps: with ps; [ - hydrawiser - ]; + ]; # missing inputs: pydrawise "hyperion" = ps: with ps; [ hyperion-py ]; @@ -1789,6 +1837,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1857,6 +1906,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1996,6 +2046,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2027,6 +2078,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2134,6 +2186,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2159,6 +2212,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2277,6 +2331,12 @@ ]; "loqed" = ps: with ps; [ aiohttp-cors + hass-nabucasa + hassil + home-assistant-intents + mutagen + pyturbojpeg + webrtcvad ]; # missing inputs: loqedAPI "lovelace" = ps: with ps; [ ]; @@ -2380,6 +2440,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2439,8 +2500,6 @@ aiohttp-cors pyturbojpeg ]; - "miflora" = ps: with ps; [ - ]; "mijndomein_energie" = ps: with ps; [ ]; "mikrotik" = ps: with ps; [ @@ -2460,8 +2519,6 @@ "minio" = ps: with ps; [ minio ]; - "mitemp_bt" = ps: with ps; [ - ]; "mjpeg" = ps: with ps; [ ]; "moat" = ps: with ps; [ @@ -2469,6 +2526,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2535,6 +2593,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2663,7 +2722,6 @@ google-nest-sdm ha-ffmpeg psutil-home-assistant - python-nest sqlalchemy ]; "netatmo" = ps: with ps; [ @@ -2889,6 +2947,12 @@ "opnsense" = ps: with ps; [ pyopnsense ]; + "opower" = ps: with ps; [ + fnv-hash-fast + opower + psutil-home-assistant + sqlalchemy + ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio-legacy "oralb" = ps: with ps; [ @@ -2896,6 +2960,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3001,15 +3066,23 @@ "peco" = ps: with ps; [ peco ]; + "peco_opower" = ps: with ps; [ + ]; + "pegel_online" = ps: with ps; [ + ]; # missing inputs: aiopegelonline "pencom" = ps: with ps; [ pencompy ]; + "pepco" = ps: with ps; [ + ]; "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ aiohttp-cors pillow ]; + "pge" = ps: with ps; [ + ]; "philips_js" = ps: with ps; [ ha-philipsjs ]; @@ -3102,6 +3175,8 @@ ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen + "pse" = ps: with ps; [ + ]; "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; @@ -3140,6 +3215,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3223,6 +3299,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3389,6 +3466,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3496,6 +3574,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3528,6 +3607,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3553,6 +3633,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3736,6 +3817,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3882,7 +3964,7 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ aiohttp-cors - av + ha-av numpy pyturbojpeg ]; @@ -3926,6 +4008,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4056,6 +4139,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4083,6 +4167,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4142,6 +4227,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4293,8 +4379,6 @@ "ukraine_alarm" = ps: with ps; [ uasiren ]; - "ultraloq" = ps: with ps; [ - ]; "unifi" = ps: with ps; [ aiounifi ]; @@ -4549,20 +4633,14 @@ ha-ffmpeg ]; "xiaomi_aqara" = ps: with ps; [ - aiohttp-cors - fnv-hash-fast - ifaddr - netdisco - psutil-home-assistant pyxiaomigateway - sqlalchemy - zeroconf ]; "xiaomi_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4606,6 +4684,7 @@ aiohttp-cors aioruuvigateway aioshelly + async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4673,10 +4752,9 @@ "youtube" = ps: with ps; [ aiohttp-cors fnv-hash-fast - google-api-python-client psutil-home-assistant sqlalchemy - ]; + ]; # missing inputs: youtubeaio "zabbix" = ps: with ps; [ py-zabbix ]; @@ -4878,7 +4956,6 @@ "dialogflow" "directv" "discord" - "discovery" "dlna_dmr" "dlna_dms" "dnsip" @@ -4915,6 +4992,7 @@ "escea" "esphome" "eufylife_ble" + "event" "everlights" "evil_genius_labs" "ezviz" @@ -5200,10 +5278,12 @@ "opengarage" "openhardwaremonitor" "openhome" + "opensky" "opentherm_gw" "openuv" "openweathermap" "opnsense" + "opower" "oralb" "otbr" "overkiz" @@ -5487,7 +5567,6 @@ "yeelight" "yolink" "youless" - "youtube" "zamg" "zeroconf" "zerproc" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 74aad1b6a2..9c074cf090 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -76,6 +76,16 @@ let doCheck = false; }); + ha-av = super.av.overridePythonAttrs (oldAttrs: rec { + pname = "ha-av"; + version = "10.1.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-QaMFVvglipN0kG1+ZQNKk7WTydSyIPn2qa32UtvLidw="; + }; + }); + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { @@ -85,17 +95,6 @@ let }; }); - # Pinned due to API changes in 10.0 - mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec { - version = "9.3.0"; - src = fetchFromGitHub { - owner = "py-mine"; - repo = "mcstatus"; - rev = "refs/tags/v${version}"; - hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0="; - }; - }); - # moto tests are a nuissance moto = super.moto.overridePythonAttrs (_: { doCheck = false; @@ -163,6 +162,15 @@ let }; }); + pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { + version = "0.4.8"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-rvd8n7lKOsWI6HhBIIvexGRHHZhxvVBQoofMmkdc0Lo="; + }; + }); + # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; @@ -287,7 +295,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.7.2"; + hassVersion = "2023.8.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -303,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-fESzpOOEGFOJJ0ldI/VaVN0kH/zbCCq25s8vNnCUOFs="; + hash = "sha256-u20hEdVoxp2MzLo6OonQZnkoxqK+myt4LwqB+mz3ipE="; }; # Secondary source is git for tests @@ -311,7 +319,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-HW+XO84enAA3BH4nppkXvAERT74y5m5jvz0uHWkkS6k="; + hash = "sha256-CrfVokUk3KnkavM+/ci70ela7aJ60TSNymoCzZdxaIY="; }; nativeBuildInputs = with python.pkgs; [ @@ -347,8 +355,9 @@ in python.pkgs.buildPythonApplication rec { "pip" "PyJWT" "pyOpenSSL" + "PyYAML" "requests" - "typing_extensions" + "typing-extensions" "voluptuous-serialize" "yarl" ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 5e405401c1..172d9f7c96 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230705.1"; + version = "20230802.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-VC+yrU5RRAj4qe1MhQLMl9RfW6NmAl5NhXZDACfFlmo="; + hash = "sha256-fggFSpcdHRgqHKruWvGJ97DkhdgRTSu0V3YmzVNCm4A="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix index 35e5853cfa..0255d97da6 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix @@ -19,25 +19,19 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.6.28"; + version = "2023.8.2"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant"; - repo = "intents"; + repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-K441nrwoQ7zzle4iC679oGxU6iZn/yTJOElvDblHB7U="; + hash = "sha256-pNLH3GGfY8upKi7uYGZ466cIQkpdA16tR1tjwuiQ3JI="; + fetchSubmodules = true; }; - sourceRoot = "source/package"; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "2023.4.26" "${version}" - ''; - nativeBuildInputs = [ hassil jinja2 @@ -48,7 +42,7 @@ buildPythonPackage rec { ]; postInstall = '' - pushd .. + pushd intents # https://github.com/home-assistant/intents/blob/main/script/package#L18 ${python.pythonForBuild.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data popd @@ -60,7 +54,12 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "../tests" + "intents/tests" + ]; + + disabledTests = [ + # AssertionError: Recognition failed for 'put apples on the list' + "test_shopping_list_HassShoppingListAddItem" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index aca9237df2..1df4d98fb4 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -40,7 +40,6 @@ PKG_SET = "home-assistant.python.pkgs" # following can be used to choose the correct one PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 - "ha-av": "av", "HAP-python": "hap-python", "tensorflow": "tensorflow", "yt-dlp": "yt-dlp", diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix index 8c492c3470..0f06de8f7d 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.7.1"; + version = "2023.8.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-RRfORjC1YC9z9oYY1GGCnWUlK1N0EaG89hlrMn8Qmh8="; + hash = "sha256-znnNWQpoJ+omYt7keW14Nc7FDqiCpZNsEWL0hEijtsI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 5b058ffb92..154f8dc2f2 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -58,6 +58,12 @@ let # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" ]; + jellyfin = [ + # AssertionError: assert 'audio/x-flac' == 'audio/flac' + "--deselect tests/components/jellyfin/test_media_source.py::test_resolve" + # AssertionError: assert [+ received] == [- snapshot] + "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" + ]; modbus = [ # homeassistant.components.modbus.modbus:modbus.py:317 Pymodbus: modbusTest: Modbus Error: test connect exception "--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail" @@ -75,6 +81,10 @@ let # "TypeError: object Mock can't be used in 'await' expression "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" ]; + xiaomi_ble = [ + # assert 0 == 1" + "--deselect tests/components/xiaomi_ble/test_sensor.py::test_xiaomi_consumable" + ]; zha = [ "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp" "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp" diff --git a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix index c59c91bac5..c28aafad38 100644 --- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.118.8"; + version = "0.118.10"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-VEXmPqvWAXS39USXqJi8wWsqFa3HphB6zYgFeMA9s2g="; + hash = "sha256-A79l8tA73EeRp+BlJnIz/qtiBk33D4KvbJegqrgNvbg="; }; vendorHash = "sha256-0NTOit1nhX/zxQjHwU7ZOY1GsoIu959/KICCEWyfIQ4="; diff --git a/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix b/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix index 1c8c283e9c..7004baa50f 100644 --- a/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix +++ b/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix @@ -2,6 +2,9 @@ , fetchFromGitHub , nodePackages , python3 +, stdenv +, cctools +, IOKit , lib , fetchpatch , makeBinaryWrapper @@ -10,24 +13,16 @@ buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.6.21"; + version = "0.6.27"; src = fetchFromGitHub { owner = "benphelps"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-kjxA02hJj/GAQ0fM1xTtXAnZSQgVyE+EMRrXis1Vr+o="; + hash = "sha256-VD6JxhEUpvPXYfXQIx9sbojPNds+s2aVF3DW4Fru/DQ="; }; - npmDepsHash = "sha256-O6SQYx5vxscMsbWv0ynUYqdUkOp/nMtdvlZ/Mp95sBY="; - - patches = [ - (fetchpatch { - name = "env-config-dir.patch"; - url = "https://github.com/benphelps/homepage/commit/ca396ce96bce52f6c06a321f292aa94a66ceeb97.patch"; - hash = "sha256-eNnW/ce4ytoKR6jH1Ztc4UTWOmL0uGRdY6nYBIVYM6k="; - }) - ]; + npmDepsHash = "sha256-3sjMWQ40FqdTfx1QkMoIwpIGWRQKPOqOKfPVDWzjz3w="; preBuild = '' mkdir -p config @@ -39,8 +34,14 @@ buildNpmPackage rec { patchShebangs .next/standalone/server.js ''; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + cctools + ]; + buildInputs = [ nodePackages.node-gyp-build + ] ++ lib.optionals stdenv.isDarwin [ + IOKit ]; env.PYTHON = "${python3}/bin/python"; @@ -68,7 +69,7 @@ buildNpmPackage rec { doDist = false; passthru.tests = { - inherit (nixosTests) homepage; + inherit (nixosTests) homepage-dashboard; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix index 5fbaeb5e23..f9cc5591cc 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix @@ -24,8 +24,8 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.26.1"; - rev = "c7e8e7356d3a969c1b8e4e1f2687699acd91c6a1"; + version = "1.26.3"; + rev = "ea9d25e93cef74b023c95ca1a3f79449cdf7fa9a"; }; in buildBazelPackage rec { @@ -36,7 +36,7 @@ buildBazelPackage rec { owner = "envoyproxy"; repo = "envoy"; inherit (srcVer) rev; - sha256 = "sha256-WHedup6z/9t/Jg6CBrwtDy9xv6IwO3gUuBqos4h+k2s="; + sha256 = "sha256-ZZAVuelcPzFQRqh9SwRxt+odEjF0jTNh/KkLWHKiZ3o="; postFetch = '' chmod -R +w $out @@ -80,8 +80,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-mw3k2r4heoAcBdcc7uYdnotUBrF1nM5Vmqbay+2DkjI="; - aarch64-linux = "sha256-2gSxzm7SXvrGEgwZnp5KdEpbV/+zdosf8Z5lrkK3QiI="; + x86_64-linux = "sha256-7CB6mRe+q1LMryh50dEjgR+RWU//tbaedgipuB4B+S4="; + aarch64-linux = "sha256-kdc1vMPueONOaT8w0Gbkz7OUOcPMMHHdwQ+ABTIL8xs="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix index 63ce7f7590..3db19396be 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation { passthru = { inherit modules; tests = { - inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso nginx-proxyprotocol; + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sandbox nginx-sso nginx-status-page; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; acme-integration = nixosTests.acme; } // passthru.tests; @@ -190,6 +190,6 @@ stdenv.mkDerivation { license = [ licenses.bsd2 ] ++ concatMap (m: m.meta.license) modules; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ajs124 ]; + maintainers = with maintainers; [ fpletz ajs124 raitobezarius ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix index 5b1edb5a2d..e80185ac5c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "2.4.1"; + version = "3.0.0"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - hash = "sha256-h9PFzJc/29WFe4mW+xpJAL1Z2XqBxMEtQeN5DMgOVBA="; + hash = "sha256-nUwPT7374dfE/T6yuCUynObq6LxBHDp90Dj2JGwJ4+M="; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix b/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix index 48bb698fc3..011d612f9c 100644 --- a/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/trafficserver/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchzip -, fetchpatch , makeWrapper , nixosTests , pkg-config @@ -50,22 +49,13 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.1.4"; + version = "9.2.1"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "sha256-+iq+z+1JE6JE6OLcUwRRAe2/EISqb6Ax6pNm8GcB7bc="; + hash = "sha256-Uq6CmbEJfN8ajpVmIutkDy2b8fZcT4wtprcWbMkaNkQ="; }; - patches = [ - # Adds support for NixOS - # https://github.com/apache/trafficserver/pull/7697 - (fetchpatch { - url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; - sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; - }) - ]; - # NOTE: The upstream README indicates that flex is needed for some features, # but it actually seems to be unnecessary as of this commit[1]. The detection # logic for bison and flex is still present in the build script[2], but no diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index 02e16a1b0f..88dacb7398 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.18.1"; + version = "3.18.2"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-gtCDeWQLXdhNc5Gn9020ib0IZxjVkHnOUHNf1vqsc0k="; + hash = "sha256-iMzaeB086VohyzUJqYxdnGi0grosrJD1H0AgK5A75XM="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 98444d7ba0..1f3a492475 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.462"; + version = "0.21.547"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-45R+vOo/aJR0WotL2VlynlTSZbN9UqOh6SngDciOrKtj1mctGI9NmfXcKyWMXiDNQniCkNi9suIupuY8nVcbsg=="; + hash = "sha512-pjtEGLfrBldukGsrYuUF+pO/qE2+WfDnaLkqKGyPJHSYClDJEoT9hEy2LyV1Vk8VqvLAkMSQmmLIwSxr0FjX8g=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix b/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix index 80dffed68e..3f35cdebab 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/default.nix @@ -23,7 +23,7 @@ mkYarnPackage rec { owner = "Fallenbagel"; repo = "jellyseerr"; rev = "v${version}"; - sha256 = pin.srcSha256; + hash = pin.srcHash; }; packageJSON = ./package.json; diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json b/third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json index 3681e3df68..0c658a506c 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/pin.json @@ -1,5 +1,5 @@ { "version": "1.4.1", - "srcSha256": "LDqlQfy1bm2xMNn1oulImfanQmJX57P48VaZn0Jxwpk=", + "srcHash": "sha256-LDqlQfy1bm2xMNn1oulImfanQmJX57P48VaZn0Jxwpk=", "yarnSha256": "162aip7r5vcpfj1sn42qwwdlwnaii32bd2k0gp9py1z0zmw0lwlf" } diff --git a/third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh b/third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh index b1561bae21..ec1dd0879e 100755 --- a/third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh +++ b/third_party/nixpkgs/pkgs/servers/jellyseerr/update.sh @@ -19,7 +19,7 @@ if [ -z "$tag" ]; then fi src="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/$tag" -src_sha256=$(nix-prefetch-github Fallenbagel jellyseerr --rev ${tag} | jq -r .sha256) +src_hash=$(nix-prefetch-github Fallenbagel jellyseerr --rev ${tag} | jq -r .hash) tmpdir=$(mktemp -d) trap 'rm -rf "$tmpdir"' EXIT @@ -33,7 +33,7 @@ curl -O "$src/package.json" cat > pin.json << EOF { "version": "$(echo $tag | grep -P '(\d|\.)+' -o)", - "srcSha256": "$src_sha256", + "srcHash": "$src_hash", "yarnSha256": "$yarn_sha256" } EOF diff --git a/third_party/nixpkgs/pkgs/servers/kanidm/default.nix b/third_party/nixpkgs/pkgs/servers/kanidm/default.nix index d5ae310dd5..e6c49b846f 100644 --- a/third_party/nixpkgs/pkgs/servers/kanidm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/kanidm/default.nix @@ -4,13 +4,13 @@ , nixosTests , rustPlatform , fetchFromGitHub -, fetchpatch , installShellFiles , pkg-config , udev , openssl , sqlite , pam +, bashInteractive }: let @@ -18,45 +18,35 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.1.0-alpha.12"; + version = "1.1.0-beta.13"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "f5924443f08e462067937a5dd0e2c19e5e1255da"; - hash = "sha256-kJUxVrGpczIdOqKQbgRp1xERfKP6C0SDQgWdjtSuvZ8="; + # Latest 1.1.0-beta.13 tip + rev = "5d1e2f90e6901017ab3ef9b5fbc10e25a5451fd2"; + hash = "sha256-70yeHVOrCuC+H96UC84kly3CCQ+y1RGzF5K/2FIag/o="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tracing-forest-0.1.5" = "sha256-L6auSKB4DCnZBZpx7spiikhSOD6i1W3erc3zjn+26Ao="; - }; - }; + cargoHash = "sha256-Qdc+E5+k9NNE4s6eAnpkam56pc2JJPahkuT4lB328cY="; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; - patches = [ - (fetchpatch { - # Bring back x86_64-v1 microarchitecture level - name = "cpu-opt-level.patch"; - url = "https://github.com/kanidm/kanidm/commit/59c6723f7dfb2266eae45c3b2ddd377872a7a113.patch"; - hash = "sha256-8rVEYitxvdVduQ/+AD/UG3v+mgT/VxkLoxNIXczUfCQ="; - }) - ]; - postPatch = let format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; profile = { - web_ui_pkg_path = "@web_ui_pkg_path@"; + admin_bind_path = "/run/kanidmd/sock"; cpu_flags = if stdenv.isx86_64 then "x86_64_legacy" else "none"; + default_config_path = "/etc/kanidm/server.toml"; + default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; + web_ui_pkg_path = "@web_ui_pkg_path@"; }; in '' cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \ - --replace '@web_ui_pkg_path@' "$out/ui" + --replace '@web_ui_pkg_path@' "${placeholder "out"}/ui" ''; nativeBuildInputs = [ @@ -92,6 +82,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) kanidm; }; meta = with lib; { + changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}"; description = "A simple, secure and fast identity management platform"; homepage = "https://github.com/kanidm/kanidm"; license = licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 33271a80ee..b2bd54c56b 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "21.1.2"; + version = "22.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-yux9LyGkdwQekNWKAx3Oara0D5Qca8g7fgPGeTiF2n4="; + hash = "sha256-I0tmCcXqS1nfA7ZQd0qUsSWEUYvNa/caCZU8AYWSO7Y="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 28eaec2d5f..7a7442d894 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -1,26 +1,27 @@ -{ stdenv, lib, fetchurl }: +{ maven, lib, fetchFromGitHub }: -stdenv.mkDerivation rec { +maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "3.0.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://github.com/aerogear/keycloak-metrics-spi/releases/download/${version}/keycloak-metrics-spi-${version}.jar"; - sha256 = "1r06xjnvd7wxl64jqpms6jnl4csfwigb9n9lxcjpkgh2jzfs43sp"; + src = fetchFromGitHub { + owner = "aerogear"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc="; }; - dontUnpack = true; - dontBuild = true; + mvnHash = "sha256-rwAc2KtKo4vJ0JWwPquMyt+FHVNTmMpzBPbo8lWDN/A="; installPhase = '' - mkdir -p $out - install "$src" "$out" + runHook preInstall + install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/aerogear/keycloak-metrics-spi"; description = "Keycloak Service Provider that adds a metrics endpoint"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ benley ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix index ee3f3ffd7a..e192f38fcb 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -16,10 +16,6 @@ maven.buildMavenPackage rec { mvnHash = "sha256-MWxm2q6tx8YcdEsleC2h+s+lp9whi11VQ1yFr8AZUyQ="; - nativeBuildInputs = [ - maven - ]; - installPhase = '' EAR=$(find -iname "*.ear") install -D "$EAR" "$out/$(basename $EAR)" diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix index b1d7634336..cc6e41aa81 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix @@ -5,20 +5,16 @@ maven.buildMavenPackage { pname = "scim-keycloak-user-storage-spi"; - version = "unstable-2023-04-12"; + version = "unstable-2023-07-10"; src = fetchFromGitHub { owner = "justin-stephenson"; repo = "scim-keycloak-user-storage-spi"; - rev = "e2a78d9dddbb21a42a9aaeb5c72b5ed1ef76d2a0"; - hash = "sha256-xFEXMZw575hONMG9ZNQ+5xKEVeKvGyzurqbAW48Mrg8="; + rev = "54a3fd77b05079c9ebd931e8b6a3725310a1f7b7"; + hash = "sha256-rQR8+LevFHTFLoyCPSu50jdSXu4YgBibjVB804rEsFs="; }; - mvnHash = "sha256-kV3hjwEQ0jAhFm9EB9O0l87gCZGsRQ/9cazlSjHrY74="; - - nativeBuildInputs = [ - maven - ]; + mvnHash = "sha256-vNPSNoOmtD1UMfWvLm8CH7RRatyeu3fnX9zteZpkay0="; installPhase = '' install -D "target/scim-user-spi-0.0.1-SNAPSHOT.jar" "$out/scim-user-spi-0.0.1-SNAPSHOT.jar" diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index 26c66a0b21..224d02cf7f 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-bGJSeWq2TN7ukStu+oiYboGnm/RHbO6N0NdZC81IQ8k="; }; - sourceRoot = "source/klippy"; + sourceRoot = "${src.name}/klippy"; # NB: This is needed for the postBuild step nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/komga/default.nix b/third_party/nixpkgs/pkgs/servers/komga/default.nix index ffbd7cc805..7b1f3c9c7e 100644 --- a/third_party/nixpkgs/pkgs/servers/komga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/komga/default.nix @@ -2,17 +2,17 @@ , stdenvNoCC , fetchurl , makeWrapper -, jdk11_headless +, jdk17_headless , nixosTests }: stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.165.0"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-J8dpw7GzLJnLiiFSFVCoqZFQ6mI2z0zBZHdbmxMgmf8="; + sha256 = "sha256-+4At5of/jaol4c1eElpw/D9hDnWSkc8x4gCmqqg88as="; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { ]; buildCommand = '' - makeWrapper ${jdk11_headless}/bin/java $out/bin/komga --add-flags "-jar $src" + makeWrapper ${jdk17_headless}/bin/java $out/bin/komga --add-flags "-jar $src" ''; passthru.tests = { @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec { description = "Free and open source comics/mangas server"; homepage = "https://komga.org/"; license = licenses.mit; - platforms = jdk11_headless.meta.platforms; + platforms = jdk17_headless.meta.platforms; maintainers = with maintainers; [ govanify ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix index a6fa16ebef..c25d402d9c 100644 --- a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix @@ -37,20 +37,20 @@ stdenv.mkDerivation rec { pname = "389-ds-base"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "389ds"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-LoM2iztWC/HEq0jBKzzi+T6euXcNIDqsEzAeWfQSr90="; + hash = "sha256-3wePHYA2z4qwW0KTECTDN8X9yJuUB0n14KjKbWN0Knk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; name = "${pname}-${version}"; - hash = "sha256-+eJgWeLVoJ8j8J2QNM91EY3DBy4zicTwKAU1rcLr8R4="; + hash = "sha256-972tJ8aKNxC3O8VxbAau7OSej873IBXsP3isMXAXKcU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/ldap/lldap/default.nix b/third_party/nixpkgs/pkgs/servers/ldap/lldap/default.nix index 1948ca015d..44678a71db 100644 --- a/third_party/nixpkgs/pkgs/servers/ldap/lldap/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ldap/lldap/default.nix @@ -32,6 +32,12 @@ let configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"]; }); + wasm-bindgen-84 = wasm-bindgen-cli.override { + version = "0.2.84"; + hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; + cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; + }; + commonDerivationAttrs = rec { pname = "lldap"; version = "0.4.3"; @@ -65,7 +71,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld + wasm-pack wasm-bindgen-84 binaryen which rustc-wasm rustc-wasm.llvmPackages.lld ]; buildPhase = '' @@ -110,5 +116,6 @@ in rustPlatform.buildRustPackage (commonDerivationAttrs // { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ emilylange bendlas ]; + mainProgram = "lldap"; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix index 0644c18ddf..c92e7a2e39 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { passlib requests sqlalchemy - zope_component + zope-component zope_configuration ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix new file mode 100644 index 0000000000..2dd7712c2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mox"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "mjl-"; + repo = "mox"; + rev = "v${version}"; + hash = "sha256-f5/K6cPqJJkbdiVCNGOTd9Fjx2/gvSZCxeR6nnEaeJw="; + }; + + # set the version during buildtime + patches = [ ./version.patch ]; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X github.com/mjl-/mox/moxvar.Version=${version}" + ]; + + meta = { + description = "Modern full-featured open source secure mail server for low-maintenance self-hosted email"; + homepage = "https://github.com/mjl-/mox"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mail/mox/version.patch b/third_party/nixpkgs/pkgs/servers/mail/mox/version.patch new file mode 100644 index 0000000000..c842275ac9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mail/mox/version.patch @@ -0,0 +1,45 @@ +diff --git a/moxvar/version.go b/moxvar/version.go +index 8c6bac8..69b5f7c 100644 +--- a/moxvar/version.go ++++ b/moxvar/version.go +@@ -1,38 +1,5 @@ + // Package moxvar provides the version number of a mox build. + package moxvar + +-import ( +- "runtime/debug" +-) +- +-// Version is set at runtime based on the Go module used to build. +-var Version = "(devel)" +- +-func init() { +- buildInfo, ok := debug.ReadBuildInfo() +- if !ok { +- return +- } +- Version = buildInfo.Main.Version +- if Version == "(devel)" { +- var vcsRev, vcsMod string +- for _, setting := range buildInfo.Settings { +- if setting.Key == "vcs.revision" { +- vcsRev = setting.Value +- } else if setting.Key == "vcs.modified" { +- vcsMod = setting.Value +- } +- } +- if vcsRev == "" { +- return +- } +- Version = vcsRev +- switch vcsMod { +- case "false": +- case "true": +- Version += "+modifications" +- default: +- Version += "+unknown" +- } +- } +-} ++// Version is set via a build flag ++var Version string; diff --git a/third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock b/third_party/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock similarity index 61% rename from third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock rename to third_party/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock index 8ffa5ae63e..73d43bda98 100644 --- a/third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -10,56 +19,52 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.3.2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "generic-array 0.14.7", + "crypto-common", + "generic-array", ] [[package]] name = "aes" -version = "0.6.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "aes-soft", - "aesni", - "cipher", + "cfg-if", + "cipher 0.4.4", + "cpufeatures", ] [[package]] name = "aes-gcm" -version = "0.8.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" dependencies = [ "aead", "aes", - "cipher", + "cipher 0.4.4", "ctr", "ghash", "subtle", ] [[package]] -name = "aes-soft" -version = "0.6.4" +name = "aes-gcm-siv" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ - "cipher", - "opaque-debug 0.3.0", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher", - "opaque-debug 0.3.0", + "aead", + "aes", + "cipher 0.4.4", + "ctr", + "polyval", + "subtle", + "zeroize", ] [[package]] @@ -68,7 +73,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.9", + "getrandom", "once_cell", "version_check", ] @@ -79,20 +84,34 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "getrandom", "once_cell", + "serde", "version_check", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -103,22 +122,71 @@ dependencies = [ ] [[package]] -name = "anes" -version = "0.1.6" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 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" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] -name = "anymap2" -version = "0.13.0" +name = "argon2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" +checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash 0.5.0", +] [[package]] name = "arrayref" @@ -128,15 +196,15 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1-rs" -version = "0.3.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -145,14 +213,14 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.21", + "time 0.3.23", ] [[package]] name = "asn1-rs-derive" -version = "0.1.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", @@ -172,279 +240,72 @@ dependencies = [ ] [[package]] -name = "async-channel" -version = "1.8.0" +name = "async-recursion" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "flate2", - "futures-core", - "futures-io", - "memchr", - "pin-project-lite 0.2.9", -] - -[[package]] -name = "async-compression" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite 0.2.9", - "tokio", -] - -[[package]] -name = "async-dup" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" -dependencies = [ - "futures-io", - "simple-mutex", -] - -[[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-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-h1" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" -dependencies = [ - "async-channel", - "async-dup", - "async-std", - "futures-core", - "http-types", - "httparse", - "log", - "pin-project", -] - -[[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 1.0.0", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "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", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-session" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345022a2eed092cd105cc1b26fd61c341e100bd5fcbbd792df4baf31c2cc631f" -dependencies = [ - "anyhow", - "async-std", - "async-trait", - "base64 0.12.3", - "bincode", - "blake3", - "chrono", - "hmac 0.8.1", - "kv-log-macro", - "rand 0.7.3", - "serde", - "serde_json", - "sha2 0.9.9", -] - -[[package]] -name = "async-sse" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bba003996b8fd22245cd0c59b869ba764188ed435392cf2796d03b805ade10" -dependencies = [ - "async-channel", - "async-std", - "http-types", - "log", - "memchr", - "pin-project-lite 0.1.12", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite 0.2.9", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-std-openssl" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "408a76b00fc49b11fe78f1f7a90557a3c887af1d4570fb33e15a70eb7e6b95ee" -dependencies = [ - "async-dup", - "async-std", - "futures-util", - "openssl", - "openssl-sys", -] - -[[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" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] -name = "atomic-waker" -version = "1.1.1" +name = "async-stream" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "async-stream-impl", + "futures-core", + "pin-project-lite", ] [[package]] -name = "authenticator-ctap2-2021" -version = "0.3.2-dev.1" +name = "async-stream-impl" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06c690e5e2800f70c0cf8773a9fe7680d66e719dae9b4cabedd13ef4885d056" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "base64 0.13.1", - "bitflags", - "cfg-if 1.0.0", - "core-foundation", - "devd-rs", - "libc", - "libudev", + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "async-trait" +version = "0.1.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "attohttpc" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" +dependencies = [ + "http", "log", - "memoffset 0.6.5", - "nom", - "openssl", - "openssl-sys", - "rand 0.8.5", - "runloop", + "rustls 0.20.8", "serde", - "serde_bytes", - "serde_cbor", "serde_json", - "sha2 0.10.6", - "winapi", + "url", + "webpki", + "webpki-roots 0.22.6", ] [[package]] @@ -454,22 +315,96 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "base-x" -version = "0.2.11" +name = "aws-creds" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" +checksum = "3776743bb68d4ad02ba30ba8f64373f1be4e082fe47651767171ce75bb2f6cf5" +dependencies = [ + "attohttpc", + "dirs", + "log", + "quick-xml 0.26.0", + "rust-ini", + "serde", + "thiserror", + "time 0.3.23", + "url", +] [[package]] -name = "base32" -version = "0.4.0" +name = "aws-region" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" +checksum = "056557a61427d0e5ba29dd931031c8ffed4ee7a550e7cd55692a9d8deb0a9dba" +dependencies = [ + "thiserror", +] [[package]] -name = "base64" -version = "0.12.3" +name = "axum" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body 0.4.5", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" @@ -479,19 +414,33 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] -name = "base64urlsafedata" -version = "0.1.3" +name = "base64" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b3d30abb74120a9d5267463b9e0045fdccc4dd152e7249d966612dc1721384" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bb8" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" dependencies = [ - "base64 0.21.1", - "serde", - "serde_json", + "async-trait", + "futures-channel", + "futures-util", + "parking_lot", + "tokio", ] [[package]] @@ -504,19 +453,47 @@ dependencies = [ ] [[package]] -name = "bit-set" -version = "0.5.3" +name = "bindgen" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bit-vec", + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", ] [[package]] -name = "bit-vec" -version = "0.6.3" +name = "bindgen" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease 0.2.12", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.27", + "which", +] [[package]] name = "bitflags" @@ -525,30 +502,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake3" -version = "0.3.8" +name = "bitflags" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] + +[[package]] +name = "bitpacking" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +dependencies = [ + "crunchy", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "blake3" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", "cc", - "cfg-if 0.1.10", - "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", + "cfg-if", + "constant_time_eq 0.3.0", + "digest 0.10.7", ] [[package]] @@ -557,7 +548,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -566,51 +557,26 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] -name = "block-padding" -version = "0.1.5" +name = "blowfish" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +checksum = "32fa6a061124e37baba002e496d203e23ba3d7b73750be82dbfbc92913048a5b" dependencies = [ - "byte-tools", + "byteorder", + "cipher 0.2.5", + "opaque-debug", ] -[[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 = "boolinator" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" - [[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytemuck" version = "1.13.1" @@ -630,10 +596,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] -name = "cast" -version = "0.3.0" +name = "bzip2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +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 = "cc" @@ -645,10 +626,22 @@ dependencies = [ ] [[package]] -name = "cfg-if" -version = "0.1.10" +name = "cedarwood" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] [[package]] name = "cfg-if" @@ -656,21 +649,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", @@ -678,138 +665,82 @@ dependencies = [ "winapi", ] -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - [[package]] name = "cipher" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.7", + "generic-array", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", ] [[package]] name = "clap" -version = "3.2.25" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ - "atty", - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "indexmap", "once_cell", - "strsim", - "termcolor", - "textwrap", ] [[package]] -name = "clap_complete" -version = "3.2.5" +name = "clap_builder" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ - "clap", + "anstream", + "anstyle", + "clap_lex", + "strsim", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.27", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "color_quant" -version = "1.1.0" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "compact_jwt" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f9032b96a89dd79ffc5f62523d5351ebb40680cbdfc4029393b511b9e971aa" -dependencies = [ - "base64 0.13.1", - "base64urlsafedata", - "hex", - "openssl", - "serde", - "serde_json", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "concread" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d825450e64aece76bdcf5c6d115c454ebb284c892da3e4cc7ff1e62e72069" -dependencies = [ - "ahash 0.7.6", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", - "lru 0.7.8", - "smallvec", - "sptr", - "tokio", - "tracing", -] - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "console" @@ -817,7 +748,7 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ - "encode_unicode", + "encode_unicode 0.3.6", "lazy_static", "libc", "unicode-width", @@ -825,20 +756,10 @@ dependencies = [ ] [[package]] -name = "console_error_panic_hook" -version = "0.1.7" +name = "const-oid" +version = "0.9.4" 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" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" [[package]] name = "constant_time_eq" @@ -847,48 +768,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "cookie" -version = "0.14.4" +name = "constant_time_eq" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "aes-gcm", - "base64 0.13.1", - "hkdf", - "hmac 0.10.1", - "percent-encoding", - "rand 0.8.5", - "sha2 0.9.9", - "time 0.2.27", - "version_check", -] - -[[package]] -name = "cookie" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" -dependencies = [ - "percent-encoding", - "time 0.3.21", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4b6aa369f41f5faa04bb80c9b1f4216ea81646ed6124d76ba5c49a7aafd9cd" -dependencies = [ - "cookie 0.16.2", - "idna 0.2.3", - "log", - "publicsuffix", - "serde", - "serde_json", - "time 0.3.21", - "url", -] +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -908,18 +791,27 @@ 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", ] [[package]] -name = "cpuid-bool" -version = "0.2.0" +name = "crc" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +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" @@ -927,68 +819,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap", - "criterion-plot", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "cron" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", + "cfg-if", ] [[package]] @@ -997,7 +828,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1007,21 +838,21 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] @@ -1031,17 +862,35 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[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 1.0.0", + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", ] [[package]] @@ -1050,35 +899,26 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", + "generic-array", + "rand_core", "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.7", - "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.7", + "generic-array", "subtle", ] [[package]] name = "csv" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" dependencies = [ "csv-core", "itoa", @@ -1095,79 +935,26 @@ dependencies = [ "memchr", ] -[[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" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] -name = "daemon" -version = "1.1.0-alpha.12" -dependencies = [ - "clap", - "clap_complete", - "fs2", - "kanidm_lib_file_permissions", - "kanidm_proto", - "kanidmd_core", - "profiles", - "reqwest", - "serde", - "sketching", - "tikv-jemallocator", - "tokio", - "toml", - "users", - "whoami", -] - -[[package]] -name = "darling" -version = "0.14.4" +name = "dashmap" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "cfg-if", + "hashbrown 0.14.0", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -1177,10 +964,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] -name = "der-parser" -version = "7.0.0" +name = "der" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ "asn1-rs", "displaydoc", @@ -1190,47 +988,6 @@ dependencies = [ "rusticata-macros", ] -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] -name = "devd-rs" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9313f104b590510b46fc01c0a324fc76505c13871454d3c48490468d04c8d395" -dependencies = [ - "libc", - "nom", -] - [[package]] name = "dialoguer" version = "0.10.4" @@ -1243,22 +1000,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.7", + "generic-array", ] [[package]] @@ -1268,7 +1016,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", + "subtle", +] + +[[package]] +name = "directory" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "argon2", + "async-trait", + "bb8", + "futures", + "ldap3", + "lru-cache", + "mail-builder", + "mail-parser", + "mail-send", + "md5", + "parking_lot", + "password-hash 0.5.0", + "pbkdf2 0.12.2", + "pwhash", + "regex", + "rustls 0.21.5", + "scrypt", + "sha1", + "sha2 0.10.7", + "smtp-proto", + "sqlx", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", ] [[package]] @@ -1280,6 +1062,16 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -1292,10 +1084,15 @@ dependencies = [ ] [[package]] -name = "discard" -version = "1.0.4" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] [[package]] name = "displaydoc" @@ -1305,20 +1102,82 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] -name = "dyn-clone" -version = "1.0.11" +name = "dlv-list" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "ecdsa" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +dependencies = [ + "der", + "digest 0.10.7", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ece" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd5463ffecc0677adcd786c4481f73b215714d4757edf2eb37a573c03d00459" +dependencies = [ + "base64 0.13.1", + "byteorder", + "hex", + "hkdf", + "lazy_static", + "once_cell", + "openssl", + "serde", + "sha2 0.10.7", + "thiserror", +] [[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 = "elliptic-curve" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] [[package]] name = "encode_unicode" @@ -1326,24 +1185,39 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + [[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", + "cfg-if", ] [[package]] -name = "erased-serde" -version = "0.3.25" +name = "enum-as-inner" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "serde", + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -1365,18 +1239,23 @@ dependencies = [ "libc", ] +[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -1390,51 +1269,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] -name = "fancy-regex" -version = "0.11.0" +name = "farmhash" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] +checksum = "f35ce9c8fb9891c75ceadbc330752951a4e369b50af10775955aeb9af3eee34b" + +[[package]] +name = "fast-float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[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 = "femme" -version = "2.2.1" +name = "ff" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc04871e5ae3aa2952d552dae6b291b3099723bf779a8054281c1366a54613ef" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "fernet" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3364d69f691f3903b1a71605fa04f40a7c2d259f0f0512347e36d19a63debf1f" -dependencies = [ - "base64 0.21.1", - "byteorder", - "getrandom 0.2.9", - "openssl", - "zeroize", + "rand_core", + "subtle", ] [[package]] @@ -1443,12 +1302,18 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.2.16", "windows-sys 0.48.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" version = "1.0.26" @@ -1456,9 +1321,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", + "libz-sys", "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1481,22 +1359,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "form_urlencoded" -version = "1.1.0" +name = "form-data" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "0322eefcd026820bbb430b427f0e9b22fc3952f163df23b74a3c5639bae32f0f" +dependencies = [ + "bytes", + "http", + "httparse", + "memchr", + "mime", + "serde", + "thiserror", + "tracing", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] [[package]] -name = "fs2" -version = "0.4.3" +name = "foundationdb" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +checksum = "8696fd1be198f101eb58aeecf0f504fc02b28c7afcc008b4e4a998a91b305108" dependencies = [ - "libc", - "winapi", + "async-recursion", + "async-trait", + "foundationdb-gen", + "foundationdb-macros", + "foundationdb-sys", + "futures", + "memchr", + "rand", + "serde", + "serde_bytes", + "serde_json", + "static_assertions", + "uuid", +] + +[[package]] +name = "foundationdb-gen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62239700f01b041b6372aaeb847c52f960e1a69fd2b1025dc995ea3dd90e3308" +dependencies = [ + "xml-rs", +] + +[[package]] +name = "foundationdb-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", + "try_map", +] + +[[package]] +name = "foundationdb-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98e49545f5393d276b7b888c77e3f9519fd33727435f8244344be72c3284256f" +dependencies = [ + "bindgen 0.65.1", ] [[package]] @@ -1524,17 +1459,6 @@ dependencies = [ "futures-sink", ] -[[package]] -name = "futures-concurrency" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "113411b30b3a4fd9aba3eb9654f436976b71bc7f709318aeae7f8e90f74a71d6" -dependencies = [ - "async-trait", - "futures-core", - "pin-project", -] - [[package]] name = "futures-core" version = "0.3.28" @@ -1552,27 +1476,23 @@ 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" 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 0.2.9", - "waker-fn", -] - [[package]] name = "futures-macro" version = "0.3.28" @@ -1581,7 +1501,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] @@ -1609,18 +1529,18 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", "slab", ] [[package]] -name = "generic-array" -version = "0.12.4" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" dependencies = [ - "typenum", + "byteorder", ] [[package]] @@ -1631,230 +1551,68 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] -name = "getrandom" -version = "0.1.16" +name = "gethostname" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ - "cfg-if 1.0.0", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "windows-targets 0.48.1", ] [[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 1.0.0", - "js-sys", + "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] name = "ghash" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ - "opaque-debug 0.3.0", + "opaque-debug", "polyval", ] [[package]] -name = "git2" -version = "0.13.25" +name = "gimli" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] -name = "gloo" -version = "0.8.0" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4bef6b277b3ab073253d4bca60761240cf8d6998f4bd142211957b69a61b20" -dependencies = [ - "gloo-console", - "gloo-dialogs", - "gloo-events", - "gloo-file", - "gloo-history", - "gloo-net", - "gloo-render", - "gloo-storage", - "gloo-timers", - "gloo-utils", - "gloo-worker", -] +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "gloo-console" -version = "0.2.3" +name = "group" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "gloo-utils", - "js-sys", - "serde", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-dialogs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-events" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-file" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" -dependencies = [ - "futures-channel", - "gloo-events", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-history" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd451019e0b7a2b8a7a7b23e74916601abf1135c54664e57ff71dcc26dfcdeb7" -dependencies = [ - "gloo-events", - "gloo-utils", - "serde", - "serde-wasm-bindgen", - "serde_urlencoded", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-net" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-render" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-storage" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" -dependencies = [ - "gloo-utils", - "js-sys", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-worker" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" -dependencies = [ - "anymap2", - "bincode", - "gloo-console", - "gloo-utils", - "js-sys", - "serde", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "ff", + "rand_core", + "subtle", ] [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1862,19 +1620,13 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - [[package]] name = "hashbrown" version = "0.12.3" @@ -1882,25 +1634,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ "ahash 0.7.6", - "serde", ] [[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]] name = "hashlink" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.0", ] [[package]] @@ -1908,30 +1660,15 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "libc", + "unicode-segmentation", ] [[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" @@ -1941,22 +1678,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" dependencies = [ - "digest 0.9.0", - "hmac 0.10.1", -] - -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", + "hmac 0.12.1", ] [[package]] @@ -1965,10 +1691,39 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ - "crypto-mac 0.10.1", + "crypto-mac", "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + +[[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 = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + [[package]] name = "http" version = "0.2.9" @@ -1988,41 +1743,30 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] -name = "http-client" -version = "6.5.3" +name = "http-body" +version = "1.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" +checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "http-types", - "log", + "bytes", + "http", ] [[package]] -name = "http-types" -version = "2.12.0" +name = "http-body-util" +version = "0.1.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +checksum = "08ef12f041acdd397010e5fb6433270c147d3b8b2d0a840cd7fff8e531dca5c8" dependencies = [ - "anyhow", - "async-channel", - "async-std", - "base64 0.13.1", - "cookie 0.14.4", - "futures-lite", - "infer", - "pin-project-lite 0.2.9", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", + "bytes", + "futures-util", + "http", + "http-body 1.0.0-rc.2", + "pin-project-lite", ] [[package]] @@ -2038,10 +1782,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] -name = "hyper" -version = "0.14.26" +name = "human-size" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "9994b79e8c1a39b3166c63ae7823bb2b00831e2a96a31399c50fe69df408eaeb" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -2049,12 +1799,12 @@ dependencies = [ "futures-util", "h2", "http", - "http-body", + "http-body 0.4.5", "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", - "socket2", + "pin-project-lite", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -2062,30 +1812,82 @@ dependencies = [ ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper" +version = "1.0.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "d280a71f348bcc670fc55b02b63c53a04ac0bf2daff2980795aeaf53edae10e6" dependencies = [ "bytes", - "hyper", - "native-tls", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body 1.0.0-rc.2", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", "tokio", - "tokio-native-tls", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper 0.14.27", + "rustls 0.21.5", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper 0.14.27", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyper-util" +version = "0.0.0" +source = "git+https://github.com/hyperium/hyper-util#f898015fc9eca9f459ddac521db278d904099e89" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "hyper 1.0.0-rc.4", + "once_cell", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower", + "tower-service", + "tracing", ] [[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", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows", ] [[package]] @@ -2097,23 +1899,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idlset" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340756d15be4b22d5e501bad90a9f68fcdc6b9b7d2f6d6afe350645e9839dac6" -dependencies = [ - "serde", - "serde_derive", - "smallvec", -] - [[package]] name = "idna" version = "0.2.3" @@ -2127,35 +1912,46 @@ 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", ] [[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +name = "imap" +version = "0.3.2" dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-iter", - "num-rational", - "num-traits", + "ahash 0.8.3", + "dashmap", + "directory", + "imap_proto", + "jmap", + "jmap_proto", + "mail-parser", + "mail-send", + "md5", + "parking_lot", + "rustls 0.21.5", + "rustls-pemfile", + "store", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", ] [[package]] -name = "implicit-clone" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fc102e70475c320b185cd18c1e48bba2d7210b63970a4d581ef903e4368ef7" +name = "imap_proto" +version = "0.1.0" dependencies = [ - "indexmap", + "ahash 0.8.3", + "chrono", + "jmap_proto", + "mail-parser", + "tokio", ] [[package]] @@ -2169,10 +1965,36 @@ dependencies = [ ] [[package]] -name = "infer" -version = "0.2.3" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "indicatif" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] [[package]] name = "instant" @@ -2180,25 +2002,37 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "ipconfig" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "hermit-abi 0.3.1", - "libc", + "socket2 0.5.3", + "widestring", "windows-sys 0.48.0", + "winreg 0.50.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.48.0", +] [[package]] name = "itertools" @@ -2211,9 +2045,121 @@ 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 = "jemalloc-sys" +version = "0.5.3+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "jemallocator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16c2514137880c52b0b4822b563fadd38257c1f380858addb74a400889696ea6" +dependencies = [ + "jemalloc-sys", + "libc", +] + +[[package]] +name = "jieba-rs" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" +dependencies = [ + "cedarwood", + "fxhash", + "hashbrown 0.14.0", + "lazy_static", + "phf", + "phf_codegen", + "regex", +] + +[[package]] +name = "jmap" +version = "0.3.2" +dependencies = [ + "aes-gcm", + "aes-gcm-siv", + "async-stream", + "base64 0.21.2", + "bincode", + "chrono", + "dashmap", + "directory", + "ece", + "form-data", + "form_urlencoded", + "futures-util", + "hkdf", + "http-body-util", + "hyper 1.0.0-rc.4", + "hyper-util", + "jmap_proto", + "mail-builder", + "mail-parser", + "mail-send", + "mime", + "p256", + "reqwest", + "serde", + "serde_json", + "sha2 0.10.7", + "sieve-rs", + "smtp", + "smtp-proto", + "sqlx", + "store", + "tokio", + "tokio-tungstenite", + "tracing", + "tungstenite", + "utils", +] + +[[package]] +name = "jmap-client" +version = "0.3.0" +source = "git+https://github.com/stalwartlabs/jmap-client#a55af189d41a21cf5a51c1c69852cf6143cc8102" +dependencies = [ + "ahash 0.8.3", + "async-stream", + "base64 0.13.1", + "chrono", + "futures-util", + "maybe-async 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot", + "reqwest", + "rustls 0.21.5", + "serde", + "serde_json", + "tokio", + "tokio-tungstenite", +] + +[[package]] +name = "jmap_proto" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "fast-float", + "mail-parser", + "serde", + "serde_json", + "store", + "tokio", + "tracing", + "utils", +] [[package]] name = "jobserver" @@ -2226,473 +2172,142 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kanidm-ipa-sync" -version = "1.1.0-alpha.12" -dependencies = [ - "base64urlsafedata", - "chrono", - "clap", - "clap_complete", - "cron", - "kanidm_client", - "kanidm_proto", - "kanidmd_lib", - "ldap3_client", - "serde", - "serde_json", - "tokio", - "toml", - "tracing", - "tracing-subscriber", - "url", - "users", - "uuid", -] - -[[package]] -name = "kanidm_client" -version = "1.1.0-alpha.12" -dependencies = [ - "kanidm_proto", - "reqwest", - "serde", - "serde_json", - "time 0.2.27", - "tokio", - "toml", - "tracing", - "url", - "uuid", - "webauthn-rs-proto", -] - -[[package]] -name = "kanidm_lib_crypto" -version = "0.1.0" -dependencies = [ - "base64 0.21.1", - "base64urlsafedata", - "hex", - "kanidm_proto", - "openssl", - "openssl-sys", - "rand 0.8.5", - "serde", - "sketching", - "tracing", -] - -[[package]] -name = "kanidm_lib_file_permissions" -version = "0.1.0" -dependencies = [ - "users", - "whoami", -] - -[[package]] -name = "kanidm_proto" -version = "1.1.0-alpha.12" -dependencies = [ - "base32", - "base64urlsafedata", - "last-git-commit", - "num_enum", - "scim_proto", - "serde", - "serde_json", - "time 0.2.27", - "tracing", - "url", - "urlencoding", - "uuid", - "webauthn-rs-proto", -] - -[[package]] -name = "kanidm_tools" -version = "1.1.0-alpha.12" -dependencies = [ - "clap", - "clap_complete", - "compact_jwt", - "dialoguer", - "futures-concurrency", - "kanidm_client", - "kanidm_proto", - "libc", - "qrcode", - "rpassword 7.2.0", - "serde", - "serde_json", - "shellexpand", - "time 0.2.27", - "tokio", - "tracing", - "tracing-subscriber", - "url", - "uuid", - "webauthn-authenticator-rs", - "zxcvbn", -] - -[[package]] -name = "kanidm_unix_int" -version = "1.1.0-alpha.12" -dependencies = [ - "bytes", - "clap", - "clap_complete", - "futures", - "kanidm_client", - "kanidm_lib_crypto", - "kanidm_lib_file_permissions", - "kanidm_proto", - "kanidmd_core", - "libc", - "libsqlite3-sys", - "lru 0.8.1", - "profiles", - "r2d2", - "r2d2_sqlite", - "reqwest", - "rpassword 7.2.0", - "rusqlite", - "serde", - "serde_json", - "sketching", - "tokio", - "tokio-util", - "toml", - "tracing", - "users", - "walkdir", -] - -[[package]] -name = "kanidmd_core" -version = "1.1.0-alpha.12" -dependencies = [ - "async-trait", - "chrono", - "compact_jwt", - "cron", - "futures-util", - "http-types", - "kanidm_proto", - "kanidmd_lib", - "ldap3_proto", - "libc", - "openssl", - "profiles", - "rand 0.8.5", - "regex", - "serde", - "serde_json", - "sketching", - "tide", - "tide-compress", - "tide-openssl", - "time 0.2.27", - "tokio", - "tokio-openssl", - "tokio-util", - "toml", - "tracing", - "uuid", -] - -[[package]] -name = "kanidmd_lib" -version = "1.1.0-alpha.12" -dependencies = [ - "async-trait", - "base64 0.21.1", - "base64urlsafedata", - "compact_jwt", - "concread", - "criterion", - "dyn-clone", - "fernet", - "filetime", - "futures", - "futures-util", - "hashbrown 0.12.3", - "idlset", - "kanidm_lib_crypto", - "kanidm_proto", - "kanidmd_lib_macros", - "lazy_static", - "ldap3_proto", - "libc", - "libsqlite3-sys", - "nonempty", - "num_enum", - "openssl", - "openssl-sys", - "profiles", - "r2d2", - "r2d2_sqlite", - "rand 0.8.5", - "regex", - "rusqlite", - "serde", - "serde_cbor_2", - "serde_json", - "sketching", - "smartstring", - "smolset", - "sshkeys", - "tide", - "time 0.2.27", - "tokio", - "tokio-util", - "toml", - "touch", - "tracing", - "url", - "urlencoding", - "users", - "uuid", - "webauthn-authenticator-rs", - "webauthn-rs", - "webauthn-rs-core", - "whoami", - "zxcvbn", -] - -[[package]] -name = "kanidmd_lib_macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", -] - -[[package]] -name = "kanidmd_testkit" -version = "1.1.0-alpha.12" -dependencies = [ - "compact_jwt", - "futures", - "kanidm_client", - "kanidm_proto", - "kanidmd_core", - "kanidmd_lib", - "oauth2", - "profiles", - "reqwest", - "serde_json", - "sketching", - "testkit-macros", - "time 0.2.27", - "tokio", - "tracing", - "url", - "webauthn-authenticator-rs", -] - -[[package]] -name = "kanidmd_web_ui" -version = "1.1.0-alpha.12" -dependencies = [ - "compact_jwt", - "gloo", - "gloo-net", - "js-sys", - "kanidm_proto", - "qrcode", - "serde", - "serde-wasm-bindgen", - "serde_json", - "time 0.2.27", - "url", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "web-sys", - "yew", - "yew-router", -] - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[package]] -name = "last-git-commit" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2e5243385b2ea0443d79fd6f5ea97b0509f2571e8f39e99d1ead2bcc1c89c0" -dependencies = [ - "git2", -] - [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lber" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d85f5e00e12cb50c70c3b1c1f0daff6546eb4c608b44d0a990e38a539e0446" +checksum = "2df7f9fd9f64cf8f59e1a4a0753fe7d575a5b38d3d7ac5758dcee9357d83ef0a" dependencies = [ "bytes", "nom", ] [[package]] -name = "ldap3_client" -version = "0.3.2" +name = "ldap3" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0236f3aac28f4f79929664cd635f310fa7469f17b67d45c85848a0f3ca516d53" +checksum = "6dceb52eac140c8679326f619b963577ccf5a4ab025fe5e6db424d2fd3e4f400" dependencies = [ - "base64 0.13.1", - "base64urlsafedata", + "async-trait", + "bytes", + "futures", "futures-util", - "ldap3_proto", - "openssl", - "serde", - "tokio", - "tokio-openssl", - "tokio-util", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "ldap3_proto" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ea4b099d9f84c8424a56e9b361f5f9aeae9d87ca9bd683c54a6a27c8676597" -dependencies = [ - "bytes", + "lazy_static", "lber", + "log", "nom", - "peg", + "percent-encoding", + "ring", + "rustls 0.21.5", + "rustls-native-certs", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tokio-stream", "tokio-util", - "tracing", - "uuid", + "url", + "x509-parser", ] [[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 = "libgit2-sys" -version = "0.12.26+1.3.0" +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", + "cfg-if", + "winapi", ] [[package]] -name = "libnss" -version = "0.4.0" +name = "libm" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b67ef5ebef2a035ac8106c9b71176b6246be2a580ff4ee94bb80919e55b34c" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "librocksdb-sys" +version = "0.10.0+7.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" dependencies = [ - "lazy_static", + "bindgen 0.64.0", + "bzip2-sys", + "cc", + "glob", "libc", - "paste 0.1.18", + "libz-sys", + "lz4-sys", + "zstd-sys", ] [[package]] name = "libsqlite3-sys" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", "vcpkg", ] -[[package]] -name = "libssh2-sys" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libudev" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea626d3bdf40a1c5aee3bcd4f40826970cae8d80a8fec934c82a63840094dcfe" -dependencies = [ - "libc", - "libudev-sys", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", - "libc", "pkg-config", "vcpkg", ] [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[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", @@ -2700,40 +2315,142 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" dependencies = [ - "cfg-if 1.0.0", + "linked-hash-map", +] + +[[package]] +name = "lz4-sys" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "mail-auth" +version = "0.3.2" +source = "git+https://github.com/stalwartlabs/mail-auth#a6cd1d6cc0a79943903e8154eecc29f2de003e2a" +dependencies = [ + "ahash 0.8.3", + "flate2", + "lru-cache", + "mail-builder", + "mail-parser", + "parking_lot", + "quick-xml 0.28.2", + "ring", + "rustls-pemfile", "serde", - "value-bag", + "serde_json", + "trust-dns-resolver", + "zip", ] [[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +name = "mail-builder" +version = "0.3.0" +source = "git+https://github.com/stalwartlabs/mail-builder#e771643f2f4ff8ea86f91f7985b1efa6ffa8aa85" dependencies = [ - "hashbrown 0.12.3", + "gethostname", ] [[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +name = "mail-parser" +version = "0.8.2" +source = "git+https://github.com/stalwartlabs/mail-parser#da62659eb609a8222edf7d1f57b28550a853921e" dependencies = [ - "hashbrown 0.12.3", + "encoding_rs", + "serde", ] +[[package]] +name = "mail-send" +version = "0.4.0" +source = "git+https://github.com/stalwartlabs/mail-send#d5ac9b328308fd95709cb8ee1c3ce37716e210ef" +dependencies = [ + "base64 0.20.0", + "gethostname", + "md5", + "rustls 0.21.5", + "smtp-proto", + "tokio", + "tokio-rustls 0.24.1", + "webpki-roots 0.23.1", +] + +[[package]] +name = "mail-server" +version = "0.3.2" +dependencies = [ + "directory", + "imap", + "jemallocator", + "jmap", + "jmap_proto", + "managesieve", + "smtp", + "store", + "tokio", + "tracing", + "utils", +] + +[[package]] +name = "managesieve" +version = "0.1.0" +dependencies = [ + "ahash 0.8.3", + "bincode", + "directory", + "imap", + "imap_proto", + "jmap", + "jmap_proto", + "mail-parser", + "mail-send", + "md5", + "parking_lot", + "rustls 0.21.5", + "rustls-pemfile", + "sieve-rs", + "store", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + [[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -2743,14 +2460,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] -name = "mathru" -version = "0.13.0" +name = "matchit" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a42bf938e4c9a6ad581cf528d5606eb50c5458ac759ca23719291e2f6499bec" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "maybe-async" +version = "0.2.7" dependencies = [ - "rand 0.8.5", + "proc-macro2", + "quote", + "syn 1.0.109", ] +[[package]] +name = "maybe-async" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "md-5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +dependencies = [ + "block-buffer 0.9.0", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + [[package]] name = "memchr" version = "2.5.0" @@ -2759,18 +2519,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -2798,32 +2558,33 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] -name = "native-tls" -version = "0.2.11" +name = "multimap" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "lazy_static", + "bitflags 1.3.2", + "cfg-if", "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", ] [[package]] @@ -2836,26 +2597,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonempty" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeaf4ad7403de93e699c191202f017118df734d3850b01e13a3a8b2e6953d3c9" -dependencies = [ - "serde", -] - -[[package]] -name = "nss_kanidm" -version = "1.1.0-alpha.12" -dependencies = [ - "kanidm_unix_int", - "lazy_static", - "libc", - "libnss", - "paste 1.0.12", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2877,6 +2618,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -2898,102 +2656,55 @@ 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-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", + "libm", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] -name = "num_enum" -version = "0.5.11" +name = "number_prefix" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] -name = "num_enum_derive" -version = "0.5.11" +name = "object" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "oauth2" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50df55a3cc0374df91ef8da8741542d9e0b9e6581481ed1cffe84f64d2f5fc3d" -dependencies = [ - "base64 0.13.1", - "chrono", - "getrandom 0.2.9", - "http", - "rand 0.8.5", - "serde", - "serde_json", - "serde_path_to_error", - "sha2 0.10.6", - "thiserror", - "url", + "memchr", ] [[package]] name = "oid-registry" -version = "0.4.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ "asn1-rs", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -3003,12 +2714,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 1.3.2", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -3024,7 +2735,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] @@ -3034,50 +2745,140 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "openssl-sys" -version = "0.9.87" +name = "openssl-src" +version = "111.26.0+1.1.1u" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] [[package]] -name = "orca" -version = "1.1.0-alpha.12" +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" dependencies = [ - "clap", - "crossbeam", - "csv", - "dialoguer", - "futures-util", - "kanidm_client", - "kanidm_proto", - "ldap3_proto", - "mathru", - "openssl", - "profiles", - "rand 0.8.5", - "serde", - "serde_json", - "tikv-jemallocator", - "tokio", - "tokio-openssl", - "tokio-util", - "toml", - "tracing", - "tracing-subscriber", - "uuid", + "opentelemetry_api", + "opentelemetry_sdk", ] [[package]] -name = "os_str_bytes" -version = "6.5.0" +name = "opentelemetry-http" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry_api", + "reqwest", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +dependencies = [ + "async-trait", + "futures", + "futures-util", + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "prost", + "reqwest", + "thiserror", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +dependencies = [ + "futures", + "futures-util", + "opentelemetry", + "prost", + "tonic", + "tonic-build", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[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 = "overload" @@ -3086,19 +2887,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "pam_kanidm" -version = "1.1.0-alpha.12" -dependencies = [ - "kanidm_unix_int", - "libc", - "pkg-config", -] - -[[package]] -name = "parking" -version = "2.1.0" +name = "p256" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2 0.10.7", +] [[package]] name = "parking_lot" @@ -3112,106 +2910,177 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.1", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", ] [[package]] name = "paste" -version = "0.1.18" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "paste-impl", - "proc-macro-hack", + "digest 0.10.7", + "hmac 0.12.1", + "password-hash 0.4.2", + "sha2 0.10.7", ] [[package]] -name = "paste" -version = "1.0.12" +name = "pbkdf2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "proc-macro-hack", + "digest 0.10.7", + "hmac 0.12.1", + "password-hash 0.5.0", + "sha2 0.10.7", ] [[package]] -name = "peg" -version = "0.8.1" +name = "peeking_take_while" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" -dependencies = [ - "peg-macros", - "peg-runtime", -] +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "peg-macros" -version = "0.8.1" +name = "pem-rfc7468" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", + "base64ct", ] -[[package]] -name = "peg-runtime" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - [[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 = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] name = "pin-project-lite" -version = "0.1.12" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -3220,14 +3089,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pinned" -version = "0.1.0" +name = "pkcs1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "futures", - "rustversion", - "thiserror", + "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]] @@ -3236,61 +3115,24 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "plotters" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" - -[[package]] -name = "plotters-svg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if 1.0.0", - "concurrent-queue", - "libc", - "log", - "pin-project-lite 0.2.9", - "windows-sys 0.48.0", -] - [[package]] name = "polyval" -version = "0.4.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" dependencies = [ - "cpuid-bool", - "opaque-debug 0.3.0", + "cfg-if", + "cpufeatures", + "opaque-debug", "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3308,117 +3150,156 @@ dependencies = [ ] [[package]] -name = "proc-macro-crate" -version = "1.3.1" +name = "prettyplease" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "quote", - "version_check", + "syn 2.0.27", ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" +name = "prettytable-rs" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "csv", + "encode_unicode 1.0.0", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "primeorder" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "privdrop" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bc12de3935536ed9b69488faea4450a298dac44179b54f71806e63f55034bf9" +dependencies = [ + "libc", + "nix", +] [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] -name = "profiles" -version = "1.1.0-alpha.12" +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "base64 0.21.1", - "serde", - "toml", + "bytes", + "prost-derive", ] [[package]] -name = "prokio" -version = "0.1.0" +name = "prost-build" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "futures", - "gloo", - "num_cpus", - "once_cell", - "pin-project", - "pinned", - "tokio", - "tokio-stream", - "wasm-bindgen-futures", + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease 0.1.25", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", ] [[package]] -name = "psl-types" -version = "2.0.11" +name = "prost-derive" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "publicsuffix" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ - "idna 0.3.0", - "psl-types", + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "qrcode" -version = "0.12.0" +name = "prost-types" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "checked_int_cast", - "image", + "prost", +] + +[[package]] +name = "pwhash" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419a3ad8fa9f9d445e69d9b185a24878ae6e6f55c96e4512f4a0e28cd3bc5c56" +dependencies = [ + "blowfish", + "byteorder", + "hmac 0.10.1", + "md-5 0.9.1", + "rand", + "sha-1", + "sha2 0.9.9", ] [[package]] name = "quick-error" -version = "2.0.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +dependencies = [ + "memchr", + "serde", +] + +[[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.27" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3434,29 +3315,6 @@ dependencies = [ "scheduled-thread-pool", ] -[[package]] -name = "r2d2_sqlite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f5d0337e99cd5cacd91ffc326c6cc9d8078def459df560c4f9bf9ba4a51034" -dependencies = [ - "r2d2", - "rusqlite", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -3464,18 +3322,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3485,16 +3333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3503,16 +3342,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -3543,7 +3373,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3552,7 +3382,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3561,20 +3391,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.9", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", ] [[package]] @@ -3586,6 +3417,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -3594,9 +3436,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -3604,61 +3446,101 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "async-compression 0.4.0", - "base64 0.21.1", + "base64 0.21.2", "bytes", - "cookie 0.16.2", - "cookie_store", "encoding_rs", "futures-core", "futures-util", "h2", "http", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", + "rustls 0.21.5", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", - "winreg", + "webpki-roots 0.22.6", + "winreg 0.10.1", ] [[package]] -name = "route-recognizer" -version = "0.2.0" +name = "resolv-conf" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56770675ebc04927ded3e60633437841581c285dc6236109ea25fbf3beb7b59e" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] [[package]] -name = "route-recognizer" -version = "0.3.1" +name = "retain_mut" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" +checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" [[package]] -name = "rpassword" -version = "5.0.1" +name = "rfc6979" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "roaring" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" +dependencies = [ + "bytemuck", + "byteorder", + "retain_mut", +] + +[[package]] +name = "rocksdb" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" dependencies = [ "libc", - "winapi", + "librocksdb-sys", ] [[package]] @@ -3672,6 +3554,28 @@ dependencies = [ "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 0.10.7", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rtoolbox" version = "0.0.1" @@ -3682,19 +3586,13 @@ dependencies = [ "winapi", ] -[[package]] -name = "runloop" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d79b4b604167921892e84afbbaad9d5ad74e091bf6c511d9dbfb0593f09fabd" - [[package]] name = "rusqlite" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags", + "bitflags 2.3.3", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -3703,14 +3601,69 @@ dependencies = [ ] [[package]] -name = "rustc_version" -version = "0.2.3" +name = "rust-ini" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" dependencies = [ - "semver", + "cfg-if", + "ordered-multimap", ] +[[package]] +name = "rust-s3" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b2ac5ff6acfbe74226fa701b5ef793aaa054055c13ebb7060ad36942956e027" +dependencies = [ + "async-trait", + "aws-creds", + "aws-region", + "base64 0.13.1", + "bytes", + "cfg-if", + "futures", + "hex", + "hmac 0.12.1", + "http", + "log", + "maybe-async 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "md5", + "percent-encoding", + "quick-xml 0.26.0", + "reqwest", + "serde", + "serde_derive", + "sha2 0.10.7", + "thiserror", + "time 0.3.23", + "tokio", + "tokio-stream", + "url", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rusticata-macros" version = "4.1.0" @@ -3722,46 +3675,110 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0", ] [[package]] -name = "rustversion" -version = "1.0.12" +name = "rustls" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.2", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] -name = "same-file" -version = "1.0.6" +name = "salsa20" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" dependencies = [ - "winapi-util", + "cipher 0.4.4", ] [[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 0.48.0", ] [[package]] @@ -3774,41 +3791,54 @@ dependencies = [ ] [[package]] -name = "scim_proto" -version = "0.1.1" +name = "scopeguard" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5abc672c8241e5bd368c0a73bf24727e98b0000a8636a44b8eb42a1e22835ef" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ - "base64urlsafedata", - "peg", - "serde", - "serde_json", - "time 0.2.27", - "tracing", - "tracing-subscriber", - "url", - "uuid", + "password-hash 0.5.0", + "pbkdf2 0.12.2", + "salsa20", + "sha2 0.10.7", ] [[package]] -name = "scoped-tls" -version = "1.0.1" +name = "sct" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] [[package]] -name = "scopeguard" -version = "1.1.0" +name = "sec1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] [[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", @@ -3817,129 +3847,54 @@ 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", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" -version = "1.0.163" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - -[[package]] -name = "serde_cbor_2" -version = "0.12.0-dev" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46d75f449e01f1eddbe9b00f432d616fbbd899b809c837d0fbc380496a0dd55" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", -] - -[[package]] -name = "serde_fmt" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" -dependencies = [ - "serde", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3953,30 +3908,52 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.6.1" +name = "serial_test" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" dependencies = [ - "sha1_smol", + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive", ] [[package]] -name = "sha1_smol" -version = "1.0.0" +name = "serial_test_derive" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] [[package]] -name = "sha2" -version = "0.8.2" +name = "sha-1" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[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]] @@ -3986,19 +3963,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[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 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -4019,22 +3996,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] -name = "shellexpand" -version = "2.1.2" +name = "shlex" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs", -] +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +name = "sieve-rs" +version = "0.3.1" +source = "git+https://github.com/stalwartlabs/sieve#f9c01ba6947d73855fdd645b17c9a5d347724ee3" dependencies = [ - "libc", - "signal-hook-registry", + "ahash 0.8.3", + "bincode", + "mail-builder", + "mail-parser", + "phf", + "regex", + "serde", ] [[package]] @@ -4047,25 +4025,20 @@ dependencies = [ ] [[package]] -name = "simple-mutex" -version = "1.1.5" +name = "signature" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ - "event-listener", + "digest 0.10.7", + "rand_core", ] [[package]] -name = "sketching" -version = "1.1.0-alpha.12" -dependencies = [ - "async-trait", - "num_enum", - "tide", - "tracing", - "tracing-forest", - "tracing-subscriber", -] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" @@ -4078,33 +4051,55 @@ 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 = "smtp" +version = "0.3.2" dependencies = [ + "ahash 0.8.3", + "blake3", + "dashmap", + "directory", + "form_urlencoded", + "http-body-util", + "hyper 1.0.0-rc.4", + "hyper-util", + "lazy_static", + "lru-cache", + "mail-auth", + "mail-builder", + "mail-parser", + "mail-send", + "num_cpus", + "parking_lot", + "rand", + "rayon", + "regex", + "reqwest", + "rustls 0.21.5", + "rustls-pemfile", "serde", + "serde_json", + "sha1", + "sha2 0.10.7", + "sieve-rs", + "smtp-proto", + "sqlx", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "utils", + "webpki-roots 0.23.1", + "x509-parser", ] [[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "serde", - "static_assertions", - "version_check", -] - -[[package]] -name = "smolset" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d372e8fe15dc5229e7d6c65f5810849385e79e24f9d9d64263e132879c7be0" -dependencies = [ - "smallvec", -] +name = "smtp-proto" +version = "0.1.1" +source = "git+https://github.com/stalwartlabs/smtp-proto#434ede72159b5f9ea588b9ee8c361a3247aa2f35" [[package]] name = "socket2" @@ -4117,29 +4112,289 @@ dependencies = [ ] [[package]] -name = "sptr" -version = "0.3.2" +name = "socket2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - -[[package]] -name = "sshkeys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926cb006a77964474a13a86aa0135ea82c9fd43e6793a1151cc54143db6637c" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ - "base64 0.12.3", - "byteorder", - "sha2 0.8.2", + "libc", + "windows-sys 0.48.0", ] [[package]] -name = "standback" -version = "0.2.17" +name = "spin" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "version_check", + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +dependencies = [ + "itertools", + "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 0.8.3", + "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 0.21.5", + "rustls-pemfile", + "serde", + "serde_json", + "sha2 0.10.7", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.24.0", +] + +[[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", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2 0.10.7", + "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.2", + "bitflags 2.3.3", + "byteorder", + "bytes", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac 0.12.1", + "itoa", + "log", + "md-5 0.10.5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2 0.10.7", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "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.2", + "bitflags 2.3.3", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5 0.10.5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha1", + "sha2 0.10.7", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "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", + "tracing", + "url", +] + +[[package]] +name = "stalwart-cli" +version = "0.3.2" +dependencies = [ + "clap", + "console", + "csv", + "form_urlencoded", + "futures", + "human-size", + "indicatif", + "jmap-client", + "mail-parser", + "num_cpus", + "prettytable-rs", + "reqwest", + "rpassword", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "stalwart-install" +version = "0.3.2" +dependencies = [ + "base64 0.21.2", + "clap", + "dialoguer", + "flate2", + "indicatif", + "libc", + "openssl", + "pwhash", + "rand", + "reqwest", + "rpassword", + "rusqlite", + "tar", + "zip-extract", ] [[package]] @@ -4149,54 +4404,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +name = "store" +version = "0.1.0" dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", + "ahash 0.8.3", + "bitpacking", + "blake3", + "farmhash", + "foundationdb", + "futures", + "jieba-rs", + "lazy_static", + "lru-cache", + "maybe-async 0.2.7", + "num_cpus", + "parking_lot", + "r2d2", + "rand", + "rayon", + "roaring", + "rocksdb", + "rusqlite", + "rust-s3", + "rust-stemmers", "serde", - "serde_derive", - "syn 1.0.109", + "siphasher", + "tinysegmenter", + "tokio", + "tracing", + "utils", + "whatlang", + "xxhash-rust", ] [[package]] -name = "stdweb-internal-macros" -version = "0.2.9" +name = "stringprep" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.109", + "unicode-bidi", + "unicode-normalization", ] -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" version = "0.10.0" @@ -4209,15 +4459,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "sval" -version = "1.0.0-alpha.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" -dependencies = [ - "serde", -] - [[package]] name = "syn" version = "1.0.109" @@ -4231,15 +4472,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -4253,60 +4500,106 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.5.0" +name = "tar" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" dependencies = [ - "cfg-if 1.0.0", + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +dependencies = [ + "cfg-if", "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "term" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "winapi-util", + "dirs-next", + "rustversion", + "winapi", ] [[package]] -name = "testkit-macros" +name = "tests" version = "0.1.0" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", + "ahash 0.8.3", + "async-trait", + "base64 0.21.2", + "bytes", + "chrono", + "csv", + "dashmap", + "directory", + "ece", + "flate2", + "futures", + "http-body-util", + "hyper 1.0.0-rc.4", + "hyper-util", + "imap", + "imap_proto", + "jemallocator", + "jmap", + "jmap-client", + "jmap_proto", + "mail-auth", + "mail-parser", + "mail-send", + "managesieve", + "num_cpus", + "rayon", + "reqwest", + "rustls 0.21.5", + "rustls-pemfile", + "serde", + "serde_json", + "serial_test", + "sieve-rs", + "smtp", + "smtp-proto", + "sqlx", + "store", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "tracing-subscriber", + "utils", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] @@ -4315,82 +4608,10 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] -[[package]] -name = "tide" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c459573f0dd2cc734b539047f57489ea875af8ee950860ded20cf93a79a1dee0" -dependencies = [ - "async-h1", - "async-session", - "async-sse", - "async-std", - "async-trait", - "femme", - "futures-util", - "http-client", - "http-types", - "kv-log-macro", - "log", - "pin-project-lite 0.2.9", - "route-recognizer 0.2.0", - "serde", - "serde_json", -] - -[[package]] -name = "tide-compress" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a55e754f247bb04c6ea1c2ec46f1a4e8a91dabca9dc7a38c67aa3a9df6b359" -dependencies = [ - "async-compression 0.3.15", - "futures-lite", - "http-types", - "regex", - "tide", -] - -[[package]] -name = "tide-openssl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca37203863763d3faf05b22d32a0c2da7a2d429b8fb22345e19e45ec2ad1071" -dependencies = [ - "async-dup", - "async-h1", - "async-std", - "async-std-openssl", - "futures-util", - "openssl", - "openssl-sys", - "tide", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.3+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "time" version = "0.1.45" @@ -4404,30 +4625,14 @@ dependencies = [ [[package]] name = "time" -version = "0.2.27" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "serde", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "serde", "time-core", - "time-macros 0.2.9", + "time-macros", ] [[package]] @@ -4438,44 +4643,21 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.1.1" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] [[package]] -name = "time-macros-impl" -version = "0.1.2" +name = "tinysegmenter" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +checksum = "1755695d17d470baf2d937a59ab4e86de3034b056fc8700e21411b0efca36497" dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", + "lazy_static", + "maplit", ] [[package]] @@ -4495,22 +4677,34 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", - "pin-project-lite 0.2.9", + "parking_lot", + "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.4.9", "tokio-macros", "windows-sys 0.48.0", ] +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-macros" version = "2.1.0" @@ -4519,28 +4713,27 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.27", ] [[package]] -name = "tokio-native-tls" -version = "0.3.1" +name = "tokio-rustls" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "native-tls", + "rustls 0.20.8", "tokio", + "webpki", ] [[package]] -name = "tokio-openssl" -version = "0.6.3" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "futures-util", - "openssl", - "openssl-sys", + "rustls 0.21.5", "tokio", ] @@ -4551,10 +4744,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite", "tokio", ] +[[package]] +name = "tokio-tungstenite" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +dependencies = [ + "futures-util", + "log", + "rustls 0.21.5", + "tokio", + "tokio-rustls 0.24.1", + "tungstenite", + "webpki-roots 0.23.1", +] + [[package]] name = "tokio-util" version = "0.7.8" @@ -4564,46 +4772,82 @@ dependencies = [ "bytes", "futures-core", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite", "tokio", "tracing", ] [[package]] -name = "toml" -version = "0.5.11" +name = "tonic" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ - "serde", + "async-stream", + "async-trait", + "axum", + "base64 0.13.1", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", ] [[package]] -name = "toml_datetime" -version = "0.6.2" +name = "tonic-build" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" - -[[package]] -name = "toml_edit" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" dependencies = [ - "indexmap", - "toml_datetime", - "winnow", + "prettyplease 0.1.25", + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", ] [[package]] -name = "touch" -version = "0.0.1" +name = "tower" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff985ccaedc537018a1b6c7f377d25e16d08aa1fcc5f8f4fba984c7e69cf09" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ - "log", + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", ] +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -4616,21 +4860,33 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite 0.2.9", + "cfg-if", + "log", + "pin-project-lite", "tracing-attributes", "tracing-core", ] [[package]] -name = "tracing-attributes" -version = "0.1.24" +name = "tracing-appender" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +dependencies = [ + "crossbeam-channel", + "time 0.3.23", + "tracing-subscriber", +] + +[[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.16", + "syn 2.0.27", ] [[package]] @@ -4644,16 +4900,13 @@ dependencies = [ ] [[package]] -name = "tracing-forest" -version = "0.1.5" -source = "git+https://github.com/QnnOkabayashi/tracing-forest.git?rev=77daf8c8abf010b87d45ece2bf656983c6f8cecb#77daf8c8abf010b87d45ece2bf656983c6f8cecb" +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "smallvec", - "thiserror", - "tokio", + "pin-project", "tracing", - "tracing-subscriber", - "uuid", ] [[package]] @@ -4667,6 +4920,20 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + [[package]] name = "tracing-subscriber" version = "0.3.17" @@ -4685,12 +4952,92 @@ dependencies = [ "tracing-log", ] +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "ring", + "rustls 0.20.8", + "rustls-pemfile", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tokio-rustls 0.23.4", + "tracing", + "url", + "webpki", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot", + "resolv-conf", + "rustls 0.20.8", + "smallvec", + "thiserror", + "tokio", + "tokio-rustls 0.23.4", + "tracing", + "trust-dns-proto", + "webpki-roots 0.22.6", +] + [[package]] name = "try-lock" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "try_map" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580" + +[[package]] +name = "tungstenite" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls 0.21.5", + "sha1", + "thiserror", + "url", + "utf-8", + "webpki", +] + [[package]] name = "typenum" version = "1.16.0" @@ -4705,9 +5052,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" @@ -4718,6 +5065,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + [[package]] name = "unicode-width" version = "0.1.10" @@ -4731,52 +5084,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] -name = "universal-hash" -version = "0.4.1" +name = "unicode_categories" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array 0.14.7", + "crypto-common", "subtle", ] [[package]] -name = "url" -version = "2.3.1" +name = "untrusted" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", - "serde", ] [[package]] -name = "urlencoding" -version = "2.1.2" +name = "utf-8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "users" -version = "0.11.0" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "utils" +version = "0.1.0" dependencies = [ - "libc", - "log", + "ahash 0.8.3", + "dashmap", + "mail-auth", + "mail-send", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry-semantic-conventions", + "privdrop", + "rustls 0.21.5", + "rustls-pemfile", + "serde", + "smtp-proto", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "tracing-appender", + "tracing-opentelemetry", + "tracing-subscriber", ] [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" -dependencies = [ - "getrandom 0.2.9", - "serde", -] +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" [[package]] name = "valuable" @@ -4784,20 +5164,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "value-bag" -version = "1.0.0-alpha.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "erased-serde", - "serde", - "serde_fmt", - "sval", - "version_check", -] - [[package]] name = "vcpkg" version = "0.2.15" @@ -4810,38 +5176,15 @@ 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 = "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" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" @@ -4856,38 +5199,36 @@ 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 1.0.0", - "serde", - "serde_json", + "cfg-if", "wasm-bindgen-macro", ] [[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.16", + "syn 2.0.27", "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 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4895,9 +5236,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", @@ -4905,141 +5246,115 @@ 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.16", + "syn 2.0.27", "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 = "wasm-bindgen-test" -version = "0.3.36" +name = "wasm-streams" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e636f3a428ff62b3742ebc3c70e254dfe12b8c2b469d688ea59cdd4abcf502" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" dependencies = [ - "console_error_panic_hook", + "futures-util", "js-sys", - "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18c1fad2f7c4958e7bcce014fa212f59a65d5e3721d0f77e6c0b27ede936ba3" -dependencies = [ - "proc-macro2", - "quote", + "web-sys", ] [[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", ] [[package]] -name = "webauthn-authenticator-rs" -version = "0.4.9" +name = "webpki" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603b8602cae2d6c3706b6195765ff582389494d10c442d84a1de2ed5a25679ef" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "authenticator-ctap2-2021", - "base64urlsafedata", - "nom", - "openssl", - "rpassword 5.0.1", - "serde", - "serde_cbor_2", - "serde_json", - "tracing", - "url", - "uuid", - "webauthn-rs-proto", - "windows 0.41.0", + "ring", + "untrusted", ] [[package]] -name = "webauthn-rs" -version = "0.4.8" +name = "webpki-roots" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2db00711c712414e93b019c4596315085792215bc2ac2d5872f9e8913b0a6316" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "base64urlsafedata", - "serde", - "tracing", - "url", - "uuid", - "webauthn-rs-core", + "webpki", ] [[package]] -name = "webauthn-rs-core" -version = "0.4.9" +name = "webpki-roots" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "294c78c83f12153a51e1cf1e6970b5da1397645dada39033a9c3173a8fc4fc2b" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "base64 0.13.1", - "base64urlsafedata", - "compact_jwt", - "der-parser", - "nom", - "openssl", - "rand 0.8.5", - "serde", - "serde_cbor_2", - "serde_json", - "thiserror", - "tracing", - "url", - "uuid", - "webauthn-rs-proto", - "x509-parser", + "rustls-webpki 0.100.1", ] [[package]] -name = "webauthn-rs-proto" -version = "0.4.9" +name = "webpki-roots" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24e638361a63ba5c0a0be6a60229490fcdf33740ed63df5bb6bdb627b52a138" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "base64urlsafedata", - "js-sys", - "serde", - "serde-wasm-bindgen", - "serde_json", - "url", - "wasm-bindgen", - "web-sys", + "rustls-webpki 0.101.2", +] + +[[package]] +name = "whatlang" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" +dependencies = [ + "hashbrown 0.12.3", + "once_cell", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", ] [[package]] name = "whoami" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" -dependencies = [ - "wasm-bindgen", - "web-sys", -] +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -5057,58 +5372,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3ed69de2c1f8d0524a8a3417a80a85dd316a071745fbfdf5eb028b310058ab" -dependencies = [ - "windows_aarch64_gnullvm 0.41.0", - "windows_aarch64_msvc 0.41.0", - "windows_i686_gnu 0.41.0", - "windows_i686_msvc 0.41.0", - "windows_x86_64_gnu 0.41.0", - "windows_x86_64_gnullvm 0.41.0", - "windows_x86_64_msvc 0.41.0", -] - [[package]] name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.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", + "windows-targets 0.48.1", ] [[package]] @@ -5126,7 +5402,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.1", ] [[package]] @@ -5146,9 +5422,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -5159,12 +5435,6 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "163d2761774f2278ecb4e6719e80b2b5e92e5a2be73a7bcd3ef624dd5e3091fd" - [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -5177,12 +5447,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef005ff2bceb00d3b84166a359cc19084f9459754fd3fe5a504dee3dddcd0a0c" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -5195,12 +5459,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4df2d51e32f03f8b4b228e487828c03bcb36d97b216fc5463bcea5bb1440b" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -5213,12 +5471,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a966834571f2f3267f07dd72b4d8507381f25e53d056808483b2637385ef7" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -5231,12 +5483,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc395dac1adf444e276d096d933ae7961361c8cda3245cffef7a9b3a70a8f994" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -5249,12 +5495,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e8ec22b715d5b436e1d59c8adad6c744dc20cd984710121d5836b4e8dbb5e0" - [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -5267,12 +5507,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9761f0216b669019df1512f6e25e5ee779bf61c5cdc43c7293858e7efd7926" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -5285,15 +5519,6 @@ 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" version = "0.10.1" @@ -5304,13 +5529,22 @@ dependencies = [ ] [[package]] -name = "x509-parser" -version = "0.13.2" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "x509-parser" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab0c2f54ae1d92f4fcb99c0b7ccf0b1e3451cbd395e5f115ccbdbcb18d4f634" dependencies = [ "asn1-rs", - "base64 0.13.1", "data-encoding", "der-parser", "lazy_static", @@ -5318,110 +5552,93 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.21", + "time 0.3.23", ] [[package]] -name = "yew" -version = "0.20.0" +name = "xattr" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dbecfe44343b70cc2932c3eb445425969ae21754a8ab3a0966981c1cf7af1cc" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ - "console_error_panic_hook", - "futures", - "gloo", - "implicit-clone", - "indexmap", - "js-sys", - "prokio", - "rustversion", - "serde", - "slab", - "thiserror", - "tokio", - "tracing", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "yew-macro", + "libc", ] [[package]] -name = "yew-macro" -version = "0.20.0" +name = "xml-rs" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64c253c1d401f1ea868ca9988db63958cfa15a69f739101f338d6f05eea8301" -dependencies = [ - "boolinator", - "once_cell", - "prettyplease", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] -name = "yew-router" -version = "0.17.0" +name = "xxhash-rust" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426ee0486d2572a6c5e39fbdbc48b58d59bb555f3326f54631025266cf04146e" -dependencies = [ - "gloo", - "js-sys", - "route-recognizer 0.3.1", - "serde", - "serde_urlencoded", - "tracing", - "wasm-bindgen", - "web-sys", - "yew", - "yew-router-macro", -] - -[[package]] -name = "yew-router-macro" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b249cdb39e0cddaf0644dedc781854524374664793479fdc01e6a65d6e6ae3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" [[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 = [ - "zeroize_derive", + "aes", + "byteorder", + "bzip2", + "constant_time_eq 0.1.5", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac 0.12.1", + "pbkdf2 0.11.0", + "sha1", + "time 0.3.23", + "zstd", ] [[package]] -name = "zeroize_derive" -version = "1.4.2" +name = "zip-extract" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "bb654964c003959ed64cbd0d7b329bcdcbd9690facd50c8617748d3622543972" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.16", + "log", + "thiserror", + "zip", ] [[package]] -name = "zxcvbn" -version = "2.2.2" +name = "zstd" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103fa851fff70ea29af380e87c25c48ff7faac5c530c70bd0e65366d4e0c94e4" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "derive_builder", - "fancy-regex", - "itertools", - "js-sys", - "lazy_static", - "quick-error", - "regex", - "time 0.3.21", + "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", ] diff --git a/third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix b/third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix new file mode 100644 index 0000000000..66b0e2bdeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix @@ -0,0 +1,77 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, protobuf +, bzip2 +, openssl +, sqlite +, zstd +, stdenv +, darwin +, nix-update-script +}: + +let + version = "0.3.2"; +in +rustPlatform.buildRustPackage { + pname = "stalwart-mail"; + inherit version; + + src = fetchFromGitHub { + owner = "stalwartlabs"; + repo = "mail-server"; + rev = "v${version}"; + hash = "sha256-5+r1xWpxIwyvRUPw2X4vIvbvqUe6lBcYurbxwNySXAY="; + fetchSubmodules = true; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "hyper-util-0.0.0" = "sha256-wGtB6hUjIOKR7UZJrX9ve4x4/7TDQuSPG0Sq9VyW7iI="; + "jmap-client-0.3.0" = "sha256-GNqSPygiVq5Z9y8Kfhzacq3lTIEg2o4UxzOMDbBO7xY="; + "mail-auth-0.3.2" = "sha256-CTafQCXPo91ZUlfS9JUqU+RfUf4+6EbdG97+nIqQtNw="; + "mail-builder-0.3.0" = "sha256-0o/fV7ZKiRKeitBBt8yOM/2nXIEgOGSMEMaBj+3i7Kw="; + "mail-parser-0.8.2" = "sha256-XvKEgzQ+HDoLI16CmqE/RRgApg0q9Au9sqOOEpZz6W0="; + "mail-send-0.4.0" = "sha256-bMPI871hBj/RvrW4kESGS9XzfnkSo8r2/9uUwgE12EU="; + "sieve-rs-0.3.1" = "sha256-FJBQorFRXQYhiCzprAqiv69Qae9YI5OAipjayooFDAw="; + "smtp-proto-0.1.1" = "sha256-HhKZQHQv3tMEfRZgCoAtyxVzwHbcB4FSjKlMoU1PkHg="; + }; + }; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + + buildInputs = [ + bzip2 + openssl + sqlite + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + # Tests require reading to /etc/resolv.conf + doCheck = false; + + passthru.update-script = nix-update-script { }; + + meta = with lib; { + description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)"; + homepage = "https://github.com/stalwartlabs/mail-server"; + changelog = "https://github.com/stalwartlabs/mail-server/blob/${version}/CHANGELOG"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix index 422b3e2be5..1547485a03 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix @@ -156,7 +156,8 @@ stdenv.mkDerivation rec { passthru = { tests.mastodon = nixosTests.mastodon; - updateScript = callPackage ./update.nix {}; + # run with: nix-shell ./maintainers/scripts/update.nix --argstr package mastodon + updateScript = ./update.sh; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix index 5184af2170..4456dff25b 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix @@ -3,8 +3,8 @@ src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; - rev = "v4.1.4"; - sha256 = "8ULBO8IdwBzC5dgX3netTHbbRrODX4CropWZWtqWHZw="; + rev = "v4.1.6"; + hash = "sha256-UjTN9vEuZX9tDeHnW41TEZtnchNu2IOleHPisrv18Qk="; }; in applyPatches { inherit src; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/update.nix b/third_party/nixpkgs/pkgs/servers/mastodon/update.nix deleted file mode 100644 index f9dc8db398..0000000000 --- a/third_party/nixpkgs/pkgs/servers/mastodon/update.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ runCommand -, lib -, makeWrapper -, yarn2nix -, bundix -, coreutils -, diffutils -, nix-prefetch-github -, gnused -, jq -}: -let - binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; -in -runCommand "mastodon-update-script" -{ - nativeBuildInputs = [ makeWrapper ]; - - meta = { - maintainers = with lib.maintainers; [ happy-river ]; - description = "Utility to generate Nix expressions for Mastodon's dependencies"; - platforms = lib.platforms.unix; - }; -} '' - mkdir -p $out/bin - cp ${./update.sh} $out/bin/update.sh - patchShebangs $out/bin/update.sh - wrapProgram $out/bin/update.sh --prefix PATH : ${binPath} -'' diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/update.sh b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh index 7b4d97fd13..babc062048 100755 --- a/third_party/nixpkgs/pkgs/servers/mastodon/update.sh +++ b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh @@ -1,4 +1,5 @@ -#!/usr/bin/env bash +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq set -e OWNER=mastodon @@ -41,22 +42,22 @@ while [[ $# -gt 0 ]]; do esac done -if [[ -z "$VERSION" || -n "$POSITIONAL" ]]; then - echo "Usage: update.sh [--owner OWNER] [--repo REPO] --ver VERSION [--rev REVISION] [--patches PATCHES]" - echo "OWNER and repo must be paths on github." - echo "If VERSION is not a revision acceptable to 'git checkout', you must provide one in REVISION." +if [[ -n "$POSITIONAL" ]]; then + echo "Usage: update.sh [--owner OWNER] [--repo REPO] [--ver VERSION] [--rev REVISION] [--patches PATCHES]" + echo "OWNER and REPO must be paths on github." + echo "If REVISION is not provided, the latest tag from github.com/mastodon/mastodon is fetched and VERSION is calculated from it." echo "If OWNER and REPO are not provided, it defaults they default to mastodon and mastodon." echo "PATCHES, if provided, should be one or more Nix expressions separated by spaces." exit 1 fi if [[ -z "$REVISION" ]]; then - REVISION="$VERSION" + REVISION="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/$OWNER/$REPO/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" + VERSION="$(echo "$REVISION" | cut -c2-)" fi rm -f gemset.nix version.nix source.nix -TARGET_DIR="$PWD" - +cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 WORK_DIR=$(mktemp -d) @@ -75,8 +76,8 @@ function cleanup { trap cleanup EXIT echo "Fetching source code $REVISION" -JSON=$(nix-prefetch-github "$OWNER" "$REPO" --rev "$REVISION" 2> $WORK_DIR/nix-prefetch-git.out) -SHA=$(echo "$JSON" | jq -r .sha256) +JSON=$(nix-prefetch-github "$OWNER" "$REPO" --rev "$REVISION" 2> $WORK_DIR/nix-prefetch-git.out) +HASH=$(echo "$JSON" | jq -r .hash) echo "Creating version.nix" echo "\"$VERSION\"" | sed 's/^"v/"/' > version.nix @@ -85,10 +86,10 @@ cat > source.nix << EOF # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches }: let src = fetchFromGitHub { - owner = "mastodon"; - repo = "mastodon"; + owner = "$OWNER"; + repo = "$REPO"; rev = "$REVISION"; - sha256 = "$SHA"; + hash = "$HASH"; }; in applyPatches { inherit src; @@ -99,4 +100,4 @@ SOURCE_DIR="$(nix-build --no-out-link -E '(import {}).callPackage ./so echo "Creating gemset.nix" bundix --lockfile="$SOURCE_DIR/Gemfile.lock" --gemfile="$SOURCE_DIR/Gemfile" -echo "" >> "$TARGET_DIR/gemset.nix" # Create trailing newline to please EditorConfig checks +echo "" >> gemset.nix # Create trailing newline to please EditorConfig checks diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/version.nix b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix index 6ee44f9ea9..9b1e0114f7 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/version.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"4.1.4" +"4.1.6" diff --git a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/default.nix index f8563ab57d..b1d1431963 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/default.nix @@ -22,7 +22,7 @@ in mkYarnPackage rec { owner = "matrix-org"; repo = "matrix-appservice-discord"; rev = "v${version}"; - sha256 = pin.srcSha256; + hash = pin.srcHash; }; packageJSON = ./package.json; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/pin.json b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/pin.json index 57b7ffd28a..901864ef44 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/pin.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/pin.json @@ -1,5 +1,5 @@ { "version": "3.1.1", - "srcSha256": "g681w7RD96/xKP+WnIyY4bcVHVQhysgDPZo4TgCRiuY=", + "srcHash": "sha256-g681w7RD96/xKP+WnIyY4bcVHVQhysgDPZo4TgCRiuY=", "yarnSha256": "0cm9yprj0ajmrdpap3p2lx3xrrkar6gghlxnj9127ks6p5c1ji3r" } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/update.sh b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/update.sh index 4ffdc4b34d..ec089d7a21 100755 --- a/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/update.sh +++ b/third_party/nixpkgs/pkgs/servers/matrix-appservice-discord/update.sh @@ -22,7 +22,7 @@ if [ -z "$tag" ]; then fi src="https://raw.githubusercontent.com/$ORG/$PROJ/$tag" -src_sha256=$(nix-prefetch-github $ORG $PROJ --rev ${tag} | jq -r .sha256) +src_hash=$(nix-prefetch-github $ORG $PROJ --rev ${tag} | jq -r .hash) tmpdir=$(mktemp -d) trap 'rm -rf "$tmpdir"' EXIT @@ -36,7 +36,7 @@ curl -O "$src/package.json" cat > pin.json << EOF { "version": "$(echo $tag | grep -P '(\d|\.)+' -o)", - "srcSha256": "$src_sha256", + "srcSha256": "$src_hash", "yarnSha256": "$yarn_sha256" } EOF diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 37629d90e0..56650531a6 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.87.0"; + version = "1.89.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-QBg0aIYIncKDCcgjj1cSAugNtLMb83F7MCijTCcn8YM="; + hash = "sha256-ywDXjwYYCR0ojemRnShDmeoeUlDkpFH/ajFxV2DrR70="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-+QFa3NrzDrCniHpbP+pFWImMh9FHERFTRzbEiP4p/7Y="; + hash = "sha256-Atwa7yIA9kPsle0/DKQD30PJljVNArqWgau4Ueqzo94="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 69696cbf91..753118528b 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -1,32 +1,82 @@ { lib -, buildNpmPackage +, stdenv , fetchFromGitHub -, python3 +, fetchYarnDeps +, prefetch-yarn-deps +, nodejs +, nodejs-slim , matrix-sdk-crypto-nodejs , nixosTests , nix-update-script }: -buildNpmPackage rec { +let pname = "matrix-appservice-irc"; - version = "0.38.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "matrix-org"; - repo = "matrix-appservice-irc"; + repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rV4B9OQl1Ht26X4e7sqCe1PR5RpzIcjj4OvWG6udJWo="; + hash = "sha256-wUbWvCa9xvot73nXZjF3/RawM98ffBCW5YR2+ZKzmEo="; }; - npmDepsHash = "sha256-iZuPr3a1BPtRfkEoxOs4oRL/nCfy3PLx5T9dX49/B0s="; + yarnOfflineCache = fetchYarnDeps { + name = "${pname}-${version}-offline-cache"; + yarnLock = "${src}/yarn.lock"; + hash = "sha256-P9u5sK9rIHWRE8kFMj05fVjv26jwsawvHBZgSn7j5BE="; + }; + +in +stdenv.mkDerivation { + inherit pname version src yarnOfflineCache; + + strictDeps = true; nativeBuildInputs = [ - python3 + prefetch-yarn-deps + nodejs-slim + nodejs.pkgs.yarn + nodejs.pkgs.node-gyp-build ]; - postInstall = '' - rm -rv $out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/matrix-sdk-crypto-nodejs - ln -sv ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs $out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/ + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup-yarn-lock yarn.lock + yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts + patchShebangs node_modules/ bin/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp package.json $out + cp app.js config.schema.yml $out + cp -r bin lib public $out + + # prune dependencies to production only + yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts --production + cp -r node_modules $out + + # replace matrix-sdk-crypto-nodejs with nixos package + rm -rv $out/node_modules/@matrix-org/matrix-sdk-crypto-nodejs + ln -sv ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs $out/node_modules/@matrix-org/ + + runHook postInstall ''; passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 21e49c9b1e..1fc99bb203 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -19,7 +19,7 @@ mkYarnPackage rec { owner = "matrix-org"; repo = "matrix-appservice-slack"; rev = data.version; - sha256 = data.srcHash; + hash = data.srcHash; }; offlineCache = fetchYarnDeps { diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index aa3225725d..d4a27436ae 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "2.1.1", + "version": "2.1.2", "description": "A Matrix <--> Slack bridge", "engines": { "node": ">=16 <=18" @@ -42,12 +42,13 @@ "axios": "^0.27.2", "classnames": "^2.3.2", "escape-string-regexp": "^4.0.0", - "matrix-appservice-bridge": "^8.1.1", + "https-proxy-agent": "^5.0.1", + "matrix-appservice-bridge": "^8.1.2", "matrix-widget-api": "^1.1.1", "minimist": "^1.2.6", "nedb": "^1.8.0", "node-emoji": "^1.10.0", - "nunjucks": "^3.2.3", + "nunjucks": "^3.2.4", "p-queue": "^6.0.0", "pg-promise": "^10.11.1", "randomstring": "^1.2.1", diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json index 7a9f4b44e2..3adfcbabae 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json @@ -1,5 +1,5 @@ { - "version": "2.1.1", - "srcHash": "+NO/V3EyqdxavnSTBU7weJnueL6+aCH3UWkqclpsId0=", - "yarnHash": "1pqv7g3xbfs4zhmyxy5p216kq2jwjfjzxw2dv2a7hl0qwk6igyki" + "version": "2.1.2", + "srcHash": "sha256-e9k+5xvgHkVt/fKAr0XhYjbEzHYwdGRdqiPWWbT0T5M=", + "yarnHash": "0266rrfx0fnrhn64ivy4iygf6nl5vc5i08j6h72k2zrh3rg203kz" } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh index 92494a3c8b..dc3bab3311 100755 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/update.sh @@ -16,7 +16,7 @@ if [ -z "$version" ]; then fi src="https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/$version" -src_hash=$(nix-prefetch-github matrix-org matrix-appservice-slack --rev ${version} | jq -r .sha256) +src_hash=$(nix-prefetch-github matrix-org matrix-appservice-slack --rev ${version} | jq -r .hash) tmpdir=$(mktemp -d) trap 'rm -rf "$tmpdir"' EXIT diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index d6d42472ba..99b28a4def 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -26,7 +26,7 @@ mkYarnPackage rec { owner = "matrix-org"; repo = "matrix-hookshot"; rev = data.version; - sha256 = data.srcHash; + hash = data.srcHash; }; packageJSON = ./package.json; @@ -39,7 +39,7 @@ mkYarnPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = data.cargoHash; + hash = data.cargoHash; }; packageResolutions = { diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 2ae23cb09a..744f593caf 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "4.4.0", + "version": "4.4.1", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -56,7 +56,7 @@ "ioredis": "^5.2.3", "jira-client": "^8.0.0", "markdown-it": "^12.3.2", - "matrix-appservice-bridge": "^9.0.0", + "matrix-appservice-bridge": "^9.0.1", "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1", "matrix-widget-api": "^1.0.0", "micromatch": "^4.0.4", diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index 008bbe5ab5..503d692256 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "4.4.0", - "srcHash": "mPLDdAVIMb5d2LPGtIfm/ofRs42081S3+QTsvqkfp3s=", - "yarnHash": "0qd3h870mk3a2lzm0r7kyh07ykw86h9xwai9h205gnv1w0d59z6i", - "cargoHash": "NGcnRKasYE4dleQLq+E4cM6C04Rfu4AsenDznGyC2Nk=" + "version": "4.4.1", + "srcHash": "sha256-pQSivF/90BvvqtBGTi8eSssPzJdkUNW9cXztG+V+Joo=", + "yarnHash": "1adcl20d5nis8w3amwkcxddybikn5whgx9ixv78lm9h2mc45y6jw", + "cargoHash": "sha256-c5hZroZ3A9dhviSuqVfNMSr5KL/FEXecuyMfZwMD9kc=" } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh index 1ffde25917..4092abf9bc 100755 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh @@ -15,7 +15,7 @@ if [ -z "$version" ]; then fi src="https://raw.githubusercontent.com/matrix-org/matrix-hookshot/$version" -src_hash=$(nix-prefetch-github matrix-org matrix-hookshot --rev ${version} | jq -r .sha256) +src_hash=$(nix-prefetch-github matrix-org matrix-hookshot --rev ${version} | jq -r .hash) tmpdir=$(mktemp -d) trap 'rm -rf "$tmpdir"' EXIT @@ -32,6 +32,6 @@ cat > pin.json << EOF "version": "$version", "srcHash": "$src_hash", "yarnHash": "$yarn_hash", - "cargoHash": "0000000000000000000000000000000000000000000000000000" + "cargoHash": "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" } EOF diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix index 7c77bf933c..1f35ae0502 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/default.nix @@ -5,5 +5,6 @@ matrix-synapse-ldap3 = callPackage ./ldap3.nix { }; matrix-synapse-mjolnir-antispam = callPackage ./mjolnir-antispam.nix { }; matrix-synapse-pam = callPackage ./pam.nix { }; + matrix-synapse-s3-storage-provider = callPackage ./s3-storage-provider.nix { }; matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix new file mode 100644 index 0000000000..646dfc3728 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted, humanize, boto3, tqdm }: + +buildPythonPackage rec { + pname = "matrix-synapse-s3-storage-provider"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "synapse-s3-storage-provider"; + rev = "v${version}"; + sha256 = "sha256-92Xkq54jrUE2I9uVOxI72V9imLNU6K4JqDdOZb+4f+Y="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "humanize>=0.5.1,<0.6" "humanize>=0.5.1" + ''; + + doCheck = false; + pythonImportsCheck = [ "s3_storage_provider" ]; + + buildInputs = [ matrix-synapse ]; + propagatedBuildInputs = [ twisted humanize boto3 tqdm ] + # for the s3_media_upload script + ++ matrix-synapse.propagatedBuildInputs; + + meta = with lib; { + description = "Synapse storage provider to fetch and store media in Amazon S3"; + homepage = "https://github.com/matrix-org/synapse-s3-storage-provider"; + license = licenses.asl20; + maintainers = with maintainers; [ yuka ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix index a83846e6a0..bd1f7358b1 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.4"; + version = "0.99.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "v${version}"; - hash = "sha256-s7hQ4qCOhkNS8Mc2HZjFqedtj0KqXMAxVMZRIjPyvOA="; + hash = "sha256-L2cWKPVclurOCpyQezHPB+5zYD91EREBXjRYBzjxkII="; }; vendorHash = "sha256-447P2TbBUEHmHubHiiZCrFVCj2/tmEuYFzLo27UyCk4="; @@ -31,7 +31,7 @@ buildGoModule rec { description = "A sliding sync implementation of MSC3575 for matrix"; homepage = "https://github.com/matrix-org/sliding-sync"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ SuperSandro2000 emilylange ]; + maintainers = with maintainers; [ emilylange ]; mainProgram = "syncv3"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index 489f015c5b..136cf1c755 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -1,28 +1,39 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch , fetchurl , nixosTests }: buildGoModule rec { pname = "mattermost"; - version = "7.10.2"; + version = "7.10.3"; src = fetchFromGitHub { owner = "mattermost"; - repo = "mattermost-server"; + repo = "mattermost"; rev = "v${version}"; - hash = "sha256-gccWFcG+Jc/77nN9hiV/2gUcY5w0IzOktykbGgafBD0="; + hash = "sha256-nzQUkcCFEZYvqMLRv1d81pfoz/MDYjWetGLtFXf8H/Q="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-T2lyg4BtArx813kk6edQ7AX3ZmA7cTsrJuWs7k6WYPU="; + hash = "sha256-oD67sTyTvB0DVcw3e6x79Y4K8xlX75YreRwnc9olTy4="; }; vendorHash = "sha256-7YxbBmkKeb20a3BNllB3RtvjAJLZzoC2OBK4l1Ud1bw="; + patches = [ + (fetchpatch { + # Current version was set to 7.10.4 in the v7.10.3 tag, reverting it so `mattermost version` exposes the correct version + # and to make smoke tests happy + url = "https://github.com/mattermost/mattermost/commit/fbdadeacc85ae47145f69ffb766d4105aede69d5.patch"; + hash = "sha256-9BNEc5VefRuPKb3/rQNiekNbAIBRsjAtdCKUVrh9BuY="; + revert = true; + }) + ]; + subPackages = [ "cmd/mattermost" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix index 178da1e6ad..e638886bc2 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix @@ -1,20 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , python3 , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd }: python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "0.4.1"; + version = "unstable-2023-07-16"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; - rev = "v${version}"; - hash = "sha256-MlT8jNUpJMgaUO9ZIYjpv8l3evdFjfEOSvdAdSlOUvg="; + rev = "543b50e73918918d1fabac67891dd80d97080942"; + hash = "sha256-Y6nwryPenNQa68Rh2KPUHQrv6rnapj8x19FdgLXutm8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix index e9431215b3..b522dc0636 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix @@ -7,13 +7,13 @@ , enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "unstable-2023-01-25"; + version = "unstable-2023-07-16"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "e2eb528745466468f059c506c22e500e0cd832aa"; - sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM="; + rev = "f4cddafd474b12be09efd15c6652c04d0650458e"; + sha256 = "sha256-WMJVAX5oUdYYuXoJKk7OoERR0LJM0Er5444xwqIUTm8="; }; patches = [ @@ -54,7 +54,7 @@ ruamel-yaml commonmark python-magic - protobuf3 + protobuf mautrix ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix index c1dbb84930..fb18bfff35 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UbetU1n9zD/mVFaJc9FECDq/Zell1TI/aYPsGXGB8Js="; + sha256 = "sha256-QShyuwHiWRcP1hGkvCQfixvoUQ/FXr2DYC5VrcMKX48="; }; postPatch = '' @@ -28,6 +28,7 @@ python3.pkgs.buildPythonPackage rec { propagatedBuildInputs = with python3.pkgs; [ commonmark aiohttp + aiosqlite asyncpg attrs commonmark diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index f2ef7060ea..6caff9c3e3 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -17,14 +17,6 @@ let }; doCheck = false; }); - mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.20.0"; - src = oldAttrs.src.override { - rev = "refs/tags/v${version}"; - hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; - }; - doCheck = false; - }); }; }; in diff --git a/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix b/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix index b573de68ea..c51c2775c5 100644 --- a/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "0.23.7"; + version = "0.23.8"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-kkB4OuBBz9kdymUmXSkr3alE62O1T0woK5BNAwRBN4o="; + hash = "sha256-ICH102Z18dbabXVYgxCX4JTQ75v0A9wx2pIsZHIXDFg="; }; - vendorHash = "sha256-LCdMSyCbndus+VviT4Zp3mZ4ZzpF0F+ONroJsayb5lo="; + vendorHash = "sha256-uqcv05AHwwPxrix+FWSWpV8vKFqKQsMn8qEgD71zgo8="; # Tests need docker doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/memos/default.nix b/third_party/nixpkgs/pkgs/servers/memos/default.nix index 1c2a17fd63..191db93583 100644 --- a/third_party/nixpkgs/pkgs/servers/memos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memos/default.nix @@ -1,12 +1,12 @@ { fetchFromGitHub, buildGoModule, jq, buildNpmPackage, lib, makeWrapper }: let - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "usememos"; repo = "memos"; rev = "v${version}"; - sha256 = "VUY81ir7cPtuHodJhkSz3bmnoIeQH20kbg+duDcjfwM="; + hash = "sha256-lcOZg5mlFPp04ZCm5GDhQfSwE2ahSmGhmdAw+pygK0A="; }; frontend = buildNpmPackage { @@ -32,7 +32,7 @@ buildGoModule rec { # check will unable to access network in sandbox doCheck = false; - vendorSha256 = "sha256-OztHMpOj7Ewmxu+pzPmzmtHBDe1sbzj805In37mFjzU="; + vendorHash = "sha256-UM/xeRvfvlq+jGzWpc3EU5GJ6Dt7RmTbSt9h3da6f8w="; # Inject frontend assets into go embed prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/memos/update.sh b/third_party/nixpkgs/pkgs/servers/memos/update.sh index f925f75bcd..e9f83576cd 100755 --- a/third_party/nixpkgs/pkgs/servers/memos/update.sh +++ b/third_party/nixpkgs/pkgs/servers/memos/update.sh @@ -13,7 +13,7 @@ fi extractVendorHash() { original="${1?original hash missing}" - result="$(nix-build -A memos.go-modules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + result="$(nix-build -A memos.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } } @@ -34,12 +34,12 @@ sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \ # update hash SRC_HASH="$(nix-instantiate --eval -A memos.src.outputHash | tr -d '"')" -NEW_HASH="$(nix-prefetch-github usememos memos --rev v$TARGET_VERSION | jq -r .sha256)" +NEW_HASH="$(nix-prefetch-github usememos memos --rev v$TARGET_VERSION | jq -r .hash)" replaceHash "$SRC_HASH" "$NEW_HASH" -GO_HASH="$(nix-instantiate --eval -A memos.vendorSha256 | tr -d '"')" -EMPTY_HASH="$(nix-instantiate --eval -A lib.fakeSha256 | tr -d '"')" +GO_HASH="$(nix-instantiate --eval -A memos.vendorHash | tr -d '"')" +EMPTY_HASH="$(nix-instantiate --eval -A lib.fakeHash | tr -d '"')" replaceHash "$GO_HASH" "$EMPTY_HASH" replaceHash "$EMPTY_HASH" "$(extractVendorHash "$GO_HASH")" diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index 63dfb8b79b..84d6351379 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.46.6"; + version = "0.46.6.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-hREGkZDlTQjN012/iTM8IDHrW722N+4gVGtsVH6R5ko="; + hash = "sha256-EtJnv1FaI4lEu2X87tHvg/WuY0UcEa1bf3rb6vYS5cY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index a206f7b77e..c89b4f15ad 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.45"; + version = "2.0.46"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-/d5+Qc2kXZZkKe80+879YdxYt+zy/Y1sf2dwSjGw0EM="; + sha256 = "sha256-a27eKOhW2vHmPktLgqHKqiwtC9T6GRwnOeNReeMsaeM="; }; - vendorHash = "sha256-nwKo4Sjg8HjuxeDUgwQYZ2LOHxkRSlyaBlQwSjOuJ7U="; + vendorHash = "sha256-Oe7el4tE/gwI6qL/fjJgnv1jbNSKrCnq1nBq+dD7Gik="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/misc/irrd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/irrd/default.nix new file mode 100644 index 0000000000..1ba0c15833 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/misc/irrd/default.nix @@ -0,0 +1,159 @@ +{ lib +, python3 +, fetchPypi +, git +, postgresql +, postgresqlTestHook +, redis +}: + +let + py = python3.override { + packageOverrides = final: prev: { + sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; + }; + doCheck = false; + }); + starlette = prev.starlette.overridePythonAttrs (oldAttrs: rec { + version = "0.20.4"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-QvzzEi+Zj+/OPixa1+Xtvw8Cz2hdZGqDoI1ARyavUIQ="; + }; + nativeBuildInputs = with final; [ + setuptools + ]; + doCheck = false; + }); + ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec { + version = "0.17.1"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-B98wl/NkNOyq99AKsVQem9TZ0meOnvg7IdWIEAI2vy8="; + }; + nativeBuildInputs = with final; [ + setuptools + ]; + doCheck = false; + }); + alembic = prev.alembic.overridePythonAttrs (lib.const { + doCheck = false; + }); + beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec { + version = "0.8.0"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-1E2VUbvte/qIZ1Mk+E77mqhXOE1E6fsh61MPCgutuBU="; + }; + doCheck = false; + }); + }; + }; +in + +py.pkgs.buildPythonPackage rec { + pname = "irrd"; + version = "4.3.0.post1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hayfdcYAgIopfUiAR/AUWMuTzwpXvXuq6iPp9uhWN1M="; + }; + + patches = [ + ./irrd-asgiref-3.8.0.diff + ]; + + pythonRelaxDeps = true; + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + postPatch = '' + substituteInPlace setup.py --replace psycopg2-binary psycopg2 + ''; + + nativeCheckInputs = [ + git + redis + postgresql + postgresqlTestHook + ] ++ (with py.pkgs; [ + pytest-asyncio + pytest-freezegun + pytestCheckHook + ]); + + propagatedBuildInputs = with py.pkgs; [ + python-gnupg + passlib + bcrypt + ipy + ordered-set + beautifultable + pyyaml + datrie + setproctitle + python-daemon + pid + py.pkgs.redis + hiredis + coredis + requests + pytz + ariadne + uvicorn + starlette + psutil + asgiref + pydantic + typing-extensions + py-radix-sr + psycopg2 + sqlalchemy + alembic + ujson + wheel + websockets + ] ++ py.pkgs.uvicorn.optional-dependencies.standard; + + preCheck = '' + redis-server & + REDIS_PID=$! + + while ! redis-cli --scan ; do + echo waiting for redis + sleep 1 + done + + export IRRD_DATABASE_URL="postgres:///$PGDATABASE" + export IRRD_REDIS_URL="redis://localhost/1" + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + # skip tests that require internet access + disabledTests = [ + "test_020_dash_o_noop" + "test_050_non_json_response" + ]; + + meta = with lib; { + changelog = "https://irrd.readthedocs.io/en/v${version}/releases/"; + description = "An Internet Routing Registry database server, processing IRR objects in the RPSL format"; + license = licenses.mit; + homepage = "https://github.com/irrdnet/irrd"; + maintainers = with maintainers; [ netali yuka ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff b/third_party/nixpkgs/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff new file mode 100644 index 0000000000..0b81cbc661 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff @@ -0,0 +1,51 @@ +diff --git a/irrd/server/graphql/schema_builder.py b/irrd/server/graphql/schema_builder.py +index 65ddf5d..b3b385a 100644 +--- a/irrd/server/graphql/schema_builder.py ++++ b/irrd/server/graphql/schema_builder.py +@@ -31,32 +31,32 @@ def build_executable_schema(): + """ + schema = SchemaGenerator() + +- schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) +- schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) ++ schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) ++ schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) + +- schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, False)) +- schema.query_type.set_field("databaseStatus", sta(resolve_database_status, False)) +- schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, False)) +- schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, False)) +- schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, False)) ++ schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, thread_sensitive=False)) ++ schema.query_type.set_field("databaseStatus", sta(resolve_database_status, thread_sensitive=False)) ++ schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, thread_sensitive=False)) ++ schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, thread_sensitive=False)) ++ schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, thread_sensitive=False)) + +- schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, False)) +- schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, False)) ++ schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, thread_sensitive=False)) ++ schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, thread_sensitive=False)) + for object_type in schema.object_types: + if "adminCObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, False)) ++ object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "techCObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, False)) ++ object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "mbrsByRefObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, False)) ++ object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "memberOfObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, False)) ++ object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, thread_sensitive=False)) + for object_type in schema.object_types: + if "membersObjs" in schema.graphql_types[object_type.name]: +- object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, False)) ++ object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, thread_sensitive=False)) + + @schema.asn_scalar_type.value_parser + def parse_asn_scalar(value): diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index 412f76aaec..732f145cc5 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { npmDeps = fetchNpmDeps { inherit src; - sourceRoot = "source/ui"; + sourceRoot = "${src.name}/ui"; hash = "sha256-qxwTiXLmZnTnmTSBmWPjeFCP7qzvTFN0xXp5lFkWFog="; }; diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix index 5bfaeb8e04..cd9e12377f 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.15.13"; + version = "0.15.14"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-CwWQg27i5CNbfFPhFx1bxS2XGH33OVq4sMhYIHgBHnQ="; + sha256 = "sha256-pLLnk0FXJ6gb0WSdWGEzJSEbKdOpjdWECIRzrHvi8HQ="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; makeFlags = [ "release" "CONFIG_LIBRARY_PATHS=" "CONFIG_PKG_PATHS=" "GLOBAL_CC=$(CC)" "GLOBAL_CXX=$(CXX)" "GLOBAL_LD=$(CXX)" "SHELL=${stdenv.shell}" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix index de12c0336c..beb2bf08d4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -30,6 +30,6 @@ buildGoModule rec { homepage = "https://github.com/metalmatze/alertmanager-bot"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index acd6d91801..79780d39d8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "0.46.0"; + version = "unstable-2023-07-28"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; - rev = "v${version}"; - sha256 = "sha256-ciGj8SK7OgK3x8Njih4aIQ0vvNV9s5/w2i+DF/vw1O8="; + rev = "fdd3d9182bea6f7f11e4f934631c4abef3aa0584"; + hash = "sha256-U6oZ80EYx56FJ7VsDKzCXH4TvFEH+oPmgK/Nd8T/Zp4="; }; modRoot = "./cmd"; - vendorSha256 = "sha256-dg+osxsxdJ8Tg++wdd4L6FMjiPLLFQj0NXb2aSC7vQg="; + vendorHash = "sha256-hvgObwmNKk6yTJSyEHuHZ5abuXGPwPC42xUSAAF8UA0="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; @@ -22,10 +22,6 @@ buildGoModule rec { rm $out/bin/example ''; - preCheck = '' - rm internal/container/mesos/handler_test.go - ''; - meta = with lib; { description = "Analyzes resource usage and performance characteristics of running docker containers"; homepage = "https://github.com/google/cadvisor"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index 03758872ed..e07621e821 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.34.3"; + version = "0.35.2"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-llHMTuNWGipL732L+uCupILvomhwZMFT8tJaFkBs+AQ="; + hash = "sha256-jotJe7DIPYNekAxiMdghdykEXVD7Pk/MPWSH2XjhkL8="; }; - vendorHash = "sha256-x9c6xRk1Ska+kqoFhAJ9ei35Lg8wsgDpZpfxJ3UExfg="; + vendorHash = "sha256-MqUkGKOzx8Qo9xbD9GdUryVwKjpVUOXFo2x0/2uz8Uk="; proxyVendor = true; # darwin/linux hash mismatch ldflags = let @@ -73,5 +73,6 @@ buildGoModule rec { homepage = "https://grafana.com/products/cloud"; changelog = "https://github.com/grafana/agent/blob/${src.rev}/CHANGELOG.md"; maintainers = with lib.maintainers; [ flokli emilylange ]; + mainProgram = "grafana-agent"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index e5305dbe73..2433f92b1c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "10.0.2"; + version = "10.0.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - hash = "sha256-Db2j6D2Ds75qDUawOSe5jhtePrbxGq7nWnFooWa2vTI="; + hash = "sha256-2LHCG2x4SJzUgBfYZFQCTlrUGule9j+1x3R1vDmBlAs="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-Mkn9KhyJmOKCuO3gDL+mgKijvResB/4mRAff6grOpuo="; + hash = "sha256-2ut+7hMnttQHzarxojTsnY4q5abQheD9PYxgYhTrYDI="; }; - vendorHash = "sha256-hN4hHJhjlCdQUvxYKHItez9H7/WqCK5Nlog5INO4m/g="; + vendorHash = "sha256-VMy7RGp5F5cc1nBpt5Fm1LbY6IK1/JHLEEGIoYzUvdw="; nativeBuildInputs = [ wire ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/update.sh b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/update.sh index 8fce843338..9a19485e37 100755 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/update.sh +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/update.sh @@ -16,7 +16,7 @@ replaceHash() { } extractVendorHash() { original="${1?original hash missing}" - result="$(nix-build -A grafana.go-modules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + result="$(nix-build -A grafana.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix index 76d66cd763..f1381f954c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.7"; + version = "2.14.0"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-YLNzXdR54DA9araC7pxZmopAZB90j9sx4gb3hOVsu0I="; + sha256 = "sha256-MrNfkbbmID27Ht2sDSklrPvRvCmewOuOOBIFnHJz1zE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix index 416e388d8f..5bc19740d8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/karma/default.nix @@ -1,39 +1,42 @@ -{ pkgs -, lib +{ lib , stdenv , buildGoModule -, callPackage , fetchFromGitHub +, fetchNpmDeps , nixosTests -, nodejs_18 +, nodejs +, npmHooks }: -let - uiNodeDependencies = (import ./node-composition.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - # pin nodejs version - nodejs = nodejs_18; - }).nodeDependencies; -in - buildGoModule rec { pname = "karma"; - version = "0.114"; + version = "0.115"; src = fetchFromGitHub { owner = "prymitive"; repo = "karma"; rev = "v${version}"; - hash = "sha256-ZstBumK2ywwdr1ksMN7P8mHdYUiMOpfpYnvt0v0Io4w="; + hash = "sha256-SW/nmJcSk/LmoKLuD5stsSaRGaJctl6hVSODNCT9i64="; }; - vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg="; + vendorHash = "sha256-Y55AaB8KRV+Tq/Trg1BOOwziyt+yJ2b3iVYA6bDebQY="; + + npmDeps = fetchNpmDeps { + src = "${src}/ui"; + hash = "sha256-/L+eU0xwaopL2im9epiZiZ23dUqJ+3OwhWw/rIZC6hI="; + }; + + npmRoot = "ui"; nativeBuildInputs = [ - nodejs_18 + nodejs + npmHooks.npmConfigHook ]; + overrideModAttrs = oldAttrs: { + nativeBuildInputs = lib.filter (drv: drv != npmHooks.npmConfigHook) oldAttrs.nativeBuildInputs; + }; + postPatch = '' # Since we're using node2nix packages, the NODE_INSTALL hook isn't needed in the makefile sed -i \ @@ -43,32 +46,11 @@ buildGoModule rec { ''; buildPhase = '' - # node will fail without this - export HOME=$(mktemp -d) + runHook preBuild - # build requires a writable .cache directory, so we'll create a - # temporary writable node_modules dir and link every package to it - - # simply linking the node_modules directory would increase the closure size for uiNodeDependencies to >700MB - cp -r ${uiNodeDependencies}/lib/node_modules ./ui/ - chmod -R +w ./ui/node_modules - mkdir -p ./ui/node_modules/.bin - - pushd ./ui/node_modules/.bin - - for x in ${uiNodeDependencies}/lib/node_modules/.bin/*; do - ln -sfv ./$(readlink "$x") ./$(basename "$x") - done - - popd - - mkdir -p ./ui/node_modules/.cache - - # build package VERSION="v${version}" make -j$NIX_BUILD_CORES - # clean up - rm -rf ./ui/node_modules + runHook postBuild ''; installPhase = '' @@ -78,6 +60,7 @@ buildGoModule rec { passthru.tests.karma = nixosTests.karma; meta = with lib; { + changelog = "https://github.com/prymitive/karma/blob/${src.rev}/CHANGELOG.md"; description = "Alert dashboard for Prometheus Alertmanager"; homepage = "https://karma-dashboard.io/"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/karma/generate-dependencies.sh b/third_party/nixpkgs/pkgs/servers/monitoring/karma/generate-dependencies.sh deleted file mode 100755 index 15354c7182..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/karma/generate-dependencies.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix nodejs_18 gnused wget - -# Usage: ./generate-dependencies.sh -# Use the same version format as in ./default.nix (without the 'v') - -set -eou pipefail - -version=$1 - - -echo "Karma version: $version" -cd "$(dirname $(readlink -f $0))" - -wget -O ./package-lock.json https://raw.githubusercontent.com/prymitive/karma/v$version/ui/package-lock.json -wget -O ./package.json https://raw.githubusercontent.com/prymitive/karma/v$version/ui/package.json - -sed -i -e 's/"name": "ui",/"name": "karma-ui",/g' ./package.json -sed -i -e 's/"name": "ui",/"name": "karma-ui",/g' ./package-lock.json - -node2nix \ - --nodejs-18 \ - --development \ - -l ./package-lock.json \ - -i ./package.json \ - -o ./node-packages.nix \ - -c ./node-composition.nix \ - -e ./node-env.nix - -rm package-lock.json diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/karma/node-composition.nix b/third_party/nixpkgs/pkgs/servers/monitoring/karma/node-composition.nix deleted file mode 100644 index d9c0daef78..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/karma/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/karma/node-env.nix b/third_party/nixpkgs/pkgs/servers/monitoring/karma/node-env.nix deleted file mode 100644 index 5dad9ec63d..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/karma/node-env.nix +++ /dev/null @@ -1,686 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Patch the shebang lines of all the executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - patchShebangs "$file" - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <=8.3 <9.0", - "node": "18.8.0" - }, - "dependencies": { - "@floating-ui/react-dom": "1.0.0", - "@fortawesome/fontawesome-svg-core": "6.2.0", - "@fortawesome/free-regular-svg-icons": "6.2.0", - "@fortawesome/free-solid-svg-icons": "6.2.0", - "@fortawesome/react-fontawesome": "0.2.0", - "@juggle/resize-observer": "3.4.0", - "body-scroll-lock": "3.1.5", - "bootstrap": "5.2.0", - "bootswatch": "5.2.0", - "bricks.js": "1.8.0", - "copy-to-clipboard": "3.3.2", - "csshake": "1.7.0", - "date-fns": "2.29.2", - "downshift": "6.1.9", - "favico.js": "0.3.10", - "fontfaceobserver": "2.3.0", - "intersection-observer": "0.12.2", - "lodash.debounce": "4.0.8", - "lodash.merge": "4.6.2", - "lodash.throttle": "4.1.1", - "lodash.uniqueid": "4.0.1", - "mobx": "6.6.1", - "mobx-react-lite": "3.4.0", - "mobx-stored": "1.1.0", - "promise-retry": "2.0.1", - "qs": "6.11.0", - "react": "17.0.2", - "react-app-polyfill": "3.0.0", - "react-cool-dimensions": "2.0.7", - "react-day-picker": "8.2.0", - "react-dom": "17.0.2", - "react-hotkeys-hook": "3.4.7", - "react-idle-timer": "4.6.4", - "react-intersection-observer": "9.4.0", - "react-json-pretty": "2.2.0", - "react-linkify": "0.2.2", - "react-media-hook": "0.4.9", - "react-range": "1.8.14", - "react-select": "5.4.0", - "react-transition-group": "4.4.5", - "typeface-open-sans": "1.1.13" - }, - "devDependencies": { - "@percy/cli": "1.10.1", - "@percy/storybook": "4.3.3", - "@storybook/builder-webpack5": "6.5.10", - "@storybook/manager-webpack5": "6.5.10", - "@storybook/preset-create-react-app": "4.1.2", - "@storybook/react": "6.5.10", - "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "12.1.5", - "@testing-library/react-hooks": "8.0.1", - "@testing-library/user-event": "14.4.3", - "@types/body-scroll-lock": "3.1.0", - "@types/bricks.js": "1.8.2", - "@types/enzyme": "3.10.12", - "@types/fontfaceobserver": "2.1.0", - "@types/jest": "29.0.0", - "@types/lodash.debounce": "4.0.7", - "@types/lodash.merge": "4.6.7", - "@types/lodash.throttle": "4.1.7", - "@types/lodash.uniqueid": "4.0.7", - "@types/node": "16.11.56", - "@types/promise-retry": "1.1.3", - "@types/qs": "6.9.7", - "@types/react": "17.0.49", - "@types/react-dom": "17.0.17", - "@wojtekmaj/enzyme-adapter-react-17": "0.6.7", - "diffable-html": "5.0.0", - "enzyme": "3.11.0", - "eslint-config-prettier": "8.5.0", - "eslint-config-react-app": "7.0.1", - "eslint-plugin-jest": "27.0.1", - "eslint-plugin-prettier": "4.2.1", - "fetch-mock": "9.11.0", - "prettier": "2.7.1", - "purgecss": "4.1.3", - "react-scripts": "5.0.1", - "sass": "1.54.8", - "timemachine": "0.3.2", - "typescript": "4.8.2" - }, - "overrides": { - "react-scripts@5.0.1": { - "autoprefixer": "10.4.5" - } - }, - "scripts": { - "start": "REACT_APP_BACKEND_URI=http://localhost:8080 react-scripts start", - "build": "react-scripts build", - "postbuild": "make backup-css && purgecss -c purgecss.config.js -o build/static/css", - "test": "react-scripts test", - "storybook": "start-storybook", - "snapshot": "build-storybook --quiet && percy storybook --verbose ./storybook-static", - "analyze": "npx source-map-explorer 'build/static/js/*.js'" - }, - "jest": { - "collectCoverageFrom": [ - "src/**/*.{js,ts,tsx}", - "!src/**/*.stories.{js,ts,tsx}", - "!src/__fixtures__/Stories.{js,ts,tsx}", - "!src/react-app-env.d.ts", - "!src/Models/*.ts" - ] - }, - "browserslist": [ - ">= 1%", - "last 1 major version", - "not dead", - "Chrome >= 49", - "Firefox >= 52", - "Edge >= 12", - "iOS >= 9", - "Safari >= 10", - "Android >= 4.4" - ], - "percy": { - "version": 2, - "snapshot": { - "widths": [ - 700, - 1280 - ], - "min-height": 200, - "enable-javascript": true - } - } -} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/laurel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/laurel/default.nix index 0d1422cb74..c6761f4138 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/laurel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/laurel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "threathunters-io"; repo = pname; rev = "v${version}"; - hash = "sha256-MT3Zcuztb2QUwWR3HFViJQtygI0oIUE3TlMu+vWzbMI="; + hash = "sha256-4SOnBIi45g2hYo+nFLI5soS+qRPzjkSYwmyMfVZCyVo="; }; - cargoHash = "sha256-hX2nSBgXctAHGqvP/ZmMjGJf7C/wPJ/gL+gV7uI8gco="; + cargoHash = "sha256-yrk3frsR8AQGDVFgP2fCIWmhw+dTZwvga1hF0IAwzjQ="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 3dbd03e2f9..b47603c66d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.8.2"; + version = "2.8.3"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-29cpDLIwKw0CaYaNGv31E7sNTaRepymjvAZ8TL4RpxY="; + hash = "sha256-Ceuxaxl4KHOlS51MbpYYox6r/SfbGcLrmKbst+xQk74="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index f95c4555f6..ba061dbd93 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.77.0"; + version = "0.77.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OlrV1mcqDE4Ck7iBg0SrPza+ZGVwqIIYjUPo3XVkJmc="; + sha256 = "sha256-BPLAAl4V3LN0I+ReiQX3hJcgdZZ6/7lLfBdwl9HzTHc="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-3HWb+fXJO8dn9TrtC8NzagO3I0uwsPINXqJhWZhbDhk="; + vendorHash = "sha256-K+T6DxOvVotvTZE8WhWZ0v/T6UqJ5N6xxsdJrr8DQt4="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix new file mode 100644 index 0000000000..173a978cf2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, cudaPackages +, dcgm +, linuxPackages +}: +buildGoModule rec { + pname = "dcgm-exporter"; + version = "3.1.8-3.1.5"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-Jzv3cU3gmGIXV+DV3wV/1zSWwz18s3Jax6JC7WZW7Z4="; + }; + + # Upgrade to go 1.17 during the vendoring FOD build because it fails otherwise. + overrideModAttrs = _: { + preBuild = '' + substituteInPlace go.mod --replace 'go 1.16' 'go 1.17' + go mod tidy + ''; + postInstall = '' + cp go.mod "$out/go.mod" + ''; + }; + + CGO_LDFLAGS = "-ldcgm"; + + buildInputs = [ + dcgm + ]; + + # gonvml and go-dcgm do not work with ELF BIND_NOW hardening because not all + # symbols are available on startup. + hardeningDisable = [ "bindnow" ]; + + # Copy the modified go.mod we got from the vendoring process. + preBuild = '' + cp vendor/go.mod go.mod + ''; + + vendorHash = "sha256-KMCV79kUY1sNYysH0MmB7pVU98r7v+DpLIoYHxyyG4U="; + + nativeBuildInputs = [ + cudaPackages.autoAddOpenGLRunpathHook + ]; + + # Tests try to interact with running DCGM service. + doCheck = false; + + postFixup = '' + patchelf --add-needed libnvidia-ml.so "$out/bin/dcgm-exporter" + ''; + + meta = with lib; { + description = "NVIDIA GPU metrics exporter for Prometheus leveraging DCGM"; + homepage = "https://github.com/NVIDIA/dcgm-exporter"; + license = licenses.asl20; + maintainers = teams.deshaw.members; + mainProgram = "dcgm-exporter"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 5a3d365705..e5bb3678a1 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.45.0"; + version = "2.46.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-xfIxq1cFkLjSxjPPdCjgv+FOvbUGdeZpRecbSIFUAXo="; + hash = "sha256-H6RRyemawt9NRLTVG0iH4vNFNiuvdPZz7u43Zop0vVI="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-smc51YrWW8jPzmIkOi0kKaAGUS3TUXpzGDLyslhRVUE="; + hash = "sha256-TB4N5aAfNw34HJ1HSt6rHTETTyAgpGA8B5VOFHisZFU="; }; - vendorHash = "sha256-W958ODhmRL4GAM6hZd71BgEmrwrzR2XHoDrc+rBo4TI="; + vendorHash = "sha256-jeGtna7IeKAOiu4FFA2xRv+fwpzCpnqwI5nj641dlM4="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 1df5529621..8c8964ec09 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginxlog_exporter"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "martin-helmich"; repo = "prometheus-nginxlog-exporter"; rev = "v${version}"; - sha256 = "sha256-W+cLJUsg49Fwo2IsJjo0QZ0NLNy/H7E35Yjr7bsHAkQ="; + sha256 = "sha256-UkXrVHHHZ9mEgsMUcHu+wI6NZFw4h3X4atDBjpBcz8E="; }; - vendorSha256 = "sha256-Bdyk+yNVcxPDzxJQSE34HJCryWQSXa8748gJ5Fu+gP4="; + vendorHash = "sha256-RzqfmP1d3zqageiGSr+CxSJQxAXmOKRCwj/7KO2f3EE="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix index f493937086..83e6d38c82 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.6.0"; + version = "1.6.1"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "sha256-Aw1tdaiyr3wv3Ti3CFn2T80WRjEZaACwotKKJGY9I6Y="; + sha256 = "sha256-BCZLMSJP/63N+pZsK8er87Zem7IFGdkyruDs6UVDZSM="; }; vendorHash = "sha256-hn2cMKhLl5qsm4sZErs6PXTs8yajowxw9a9vtHe5cAk="; @@ -39,6 +39,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for machine metrics"; homepage = "https://github.com/prometheus/node_exporter"; + changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin Frostman ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pihole-exporter.nix index f5ed425432..2ceddeb8a4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pihole-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pihole-exporter.nix @@ -17,6 +17,6 @@ buildGoModule rec { description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker"; homepage = "https://github.com/eko/pihole-exporter"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sachet.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sachet.nix index 7bf7b4dc26..20dda30554 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sachet.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sachet.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sachet"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "messagebird"; repo = pname; rev = version; - sha256 = "sha256-zcFViE1/B+wrkxZ3YIyfy2IBbxLvXOf8iK/6eqZb1ZQ="; + hash = "sha256-zcFViE1/B+wrkxZ3YIyfy2IBbxLvXOf8iK/6eqZb1ZQ="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "An SMS alerting tool for Prometheus's Alertmanager"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index bb1b8db62e..c61302603d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smokeping_prober"; - version = "0.6.1"; + version = "0.7.1"; ldflags = let setVars = rec { @@ -20,9 +20,9 @@ buildGoModule rec { owner = "SuperQ"; repo = "smokeping_prober"; rev = "v${version}"; - sha256 = "sha256-tph9TZwMWKlJC/YweO9BU3+QRIugqc3ob5rqXThyR1c="; + sha256 = "sha256-kpg4oUDv1C5NQuxfFNLmRIMkc8hbMkjiKL16HkYrUyU="; }; - vendorHash = "sha256-emabuOm5tuPNZWmPHJWUWzFVjuLrY7biv8V/3ru73aU="; + vendorHash = "sha256-TgieqjE23gwyKLuKSqc5pkxRpou8lg+yVnVoINZDkGU="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index d62d1dcdab..3f8206b14e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { description = "Prometheus exporter for Unbound DNS resolver"; homepage = "https://github.com/svartalf/unbound-telemetry"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 8f9e5884ae..a6fb147e75 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -26,6 +26,6 @@ buildGoModule rec { homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; + maintainers = with lib.maintainers; [ MostAwesomeDude ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix index 65d8b96078..973ed9535c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.7.14"; + version = "2.7.20"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-rIAqR13TKHv4i7n8s7QehFlU4C3z/Cgw8lQaKFZcCt0="; + hash = "sha256-6uH437q3a77c+7tH7VdYmdON+M7z4gqY/Wvj1XyT9c8="; }; - vendorHash = "sha256-fPUwMQQK8D0FA/X4E0yFEIP2ZO0iwyVapYctGCKyMjk="; + vendorHash = "sha256-XclpyB1IBKD/ALn0nbmTugiVlf5GCca+NF2/7uVTHKs="; ldflags = [ "-w" "-s" diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index f241f48ac5..152332538f 100644 --- a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -17,9 +17,14 @@ let # Mosquitto needs external poll enabled in libwebsockets. - libwebsockets' = libwebsockets.override { + libwebsockets' = (libwebsockets.override { withExternalPoll = true; - }; + }).overrideAttrs (old: { + # Avoid bug in firefox preventing websockets being created over http/2 connections + # https://github.com/eclipse/mosquitto/issues/1211#issuecomment-958137569 + cmakeFlags = old.cmakeFlags ++ [ "-DLWS_WITH_HTTP2=OFF" ]; + }); + in stdenv.mkDerivation rec { pname = "mosquitto"; diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index e20b36a5a1..7225f8d11e 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.19"; + version = "2.9.20"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-CiDvDnnUR/jaEWU+bceH6uIr9QBtsAz+6vnQjT3sNQQ="; + hash = "sha256-RRWn1xPvYkDL+81/JOAW+K8I2ezq+z65KiJPYMrF7Sw="; }; - vendorHash = "sha256-m/15F0BHCAEcNlRf71jJP5bjrrqRgX/CQm8SddpTkYw="; + vendorHash = "sha256-INzCHNr469LajEggVpVZ0Kj0zpe7GwX26af2C/7zx7o="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 5455fb2a8c..5c2ef84eb5 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -60,20 +60,20 @@ in { ''; nextcloud25 = generic { - version = "25.0.8"; - sha256 = "sha256-Ia6afooDCNDZsGSoh5dddZvLUE3fU+jU6sy6MrxUMVs="; + version = "25.0.9"; + sha256 = "sha256-k5XVM0ABRtAiCNoPNvkpYxq16Nb9Xd/VXNpqIDWg/nA="; packages = nextcloud25Packages; }; nextcloud26 = generic { - version = "26.0.3"; - sha256 = "sha256-pagQy818Pc/yXyKAkyHy7UHtfMBgEgRImskOJYBgtck="; + version = "26.0.4"; + sha256 = "sha256-gBya6RLPYmS+csFB5BjT2H1OZxx6ndZDAI9dfWmR6i4="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.0.0"; - sha256 = "sha256-PTEqCbk0WsBYdY3XtAWb888LHw8ddHJRtvrDWFumUz8="; + version = "27.0.1"; + sha256 = "sha256-OXa16PWPk03b63zEmsM7Ea0629f21dCQig/DahYMJ70="; packages = nextcloud27Packages; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json index 89d9cd82c8..a951e2127d 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1j4n5l80xa3c0ai8vjwhhixyq8vq5hk0k2asy3nn8bpdi2ip9gzj", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.2/calendar-v4.4.2.tar.gz", - "version": "4.4.2", + "sha256": "00m00jm6x6kkwbn8v7v0yjmr7m5isizsyll4nqy409c1jvmhq2rq", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz", + "version": "4.4.3", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "07bnq5hfw9br2xa1j77vydwdaxnc0jyzpacd9hh4f5hvgxmbg6ag", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/V5.3.1/contacts-V5.3.1.tar.gz", - "version": "5.3.1", + "sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", + "version": "5.3.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -60,9 +60,9 @@ ] }, "files_texteditor": { - "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", - "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", - "version": "2.15.0", + "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", + "version": "2.15.1", "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", "homepage": "https://github.com/nextcloud/files_texteditor", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "sha256": "0jfnidmx93k0z923m3p3bi8qv46j875cpnc60hlpxvcl35zbb2rl", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.0/forms-v3.3.0.tar.gz", - "version": "3.3.0", + "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", + "version": "3.3.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "19lahgbi26lkyy3hlrhq5jj8y7rk0ybwfpv6icni7m9h6z18sl2r", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.3/groupfolders-v13.1.3.tar.gz", - "version": "13.1.3", + "sha256": "1mcb3dw1kx7fd35hm30af88wkfwc5q6jfqph2vmf1a0k5nkjg7vc", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.4/groupfolders-v13.1.4.tar.gz", + "version": "13.1.4", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -100,9 +100,9 @@ ] }, "keeweb": { - "sha256": "19wzp588p3a87bi7ajn2r8jmsjjzzc1g8bkpwkidv66gi87gv9sr", - "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.12/keeweb-0.6.12.tar.gz", - "version": "0.6.12", + "sha256": "11q15ajg1357y5y5a640dvsy6hhvvar7wp34zfsb07n7hqlmyci0", + "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz", + "version": "0.6.13", "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", "homepage": "https://github.com/jhass/nextcloud-keeweb", "licenses": [ @@ -110,25 +110,35 @@ ] }, "mail": { - "sha256": "1k4sj04spx5x2d2xk1cg50v6090yfdkm3bnynxx5vxqbxx8r1rby", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.6/mail-v2.2.6.tar.gz", - "version": "2.2.6", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", + "sha256": "1i05dbdhbsg6pmzs7w9dh0wmfd4irv4d44v1gwsfmr00w4mwn9v1", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.7/mail-v2.2.7.tar.gz", + "version": "2.2.7", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, "maps": { - "sha256": "04mgk4g2262m3xkyrskq66vq8784pvv183ff1h3d6yilpy4ysjfy", - "url": "https://github.com/nextcloud/maps/releases/download/v1.0.2/maps-1.0.2.tar.gz", - "version": "1.0.2", + "sha256": "0517kakkk7lr7ays6rrnl276709kcm5yvkp8g6cwjnfih7pmnkn9", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0-2a-nightly/maps-1.1.0-2a-nightly.tar.gz", + "version": "1.1.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ "agpl" ] }, + "memories": { + "sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", + "url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", + "version": "5.2.1", + "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", + "homepage": "https://memories.gallery", + "licenses": [ + "agpl" + ] + }, "news": { "sha256": "0fr72j4al8mi6fr7cdsyvvnp5cc39mphaaf3bcpkxy4a2v2hn2k0", "url": "https://github.com/nextcloud/news/releases/download/21.2.0/news.tar.gz", @@ -140,9 +150,9 @@ ] }, "notes": { - "sha256": "1l1f9gjbx6mlvl92vw9gxmz9xar6l533m3g5vx9n9n0bn9x9zl56", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.0/notes.tar.gz", - "version": "4.8.0", + "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", + "version": "4.8.1", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -170,9 +180,9 @@ ] }, "polls": { - "sha256": "10906dzlswi352gbshvh86h6yyhwm8b54nkzqgwzpbg9h6yqp1w9", - "url": "https://github.com/nextcloud/polls/releases/download/v5.0.5/polls.tar.gz", - "version": "5.0.5", + "sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", + "url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", + "version": "5.2.0", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -200,9 +210,9 @@ ] }, "registration": { - "sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz", - "version": "2.1.0", + "sha256": "0x1x5mk83qh5lffcs7h0gjjihzsphc6iqmbch1ni76h9pw4zxrw1", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.2.0/registration-v2.2.0.tar.gz", + "version": "2.2.0", "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", "homepage": "https://github.com/nextcloud/registration", "licenses": [ @@ -210,9 +220,9 @@ ] }, "spreed": { - "sha256": "1b6v7jfvrkpyarz4zg1lvw938wv3hx6g0nhpdvsfnjqr03rrgywk", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.6/spreed-v15.0.6.tar.gz", - "version": "15.0.6", + "sha256": "0az92qmc24n91zh2vq4qs99zppph6bchknv5akw6c7iqpg8d12gk", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.7/spreed-v15.0.7.tar.gz", + "version": "15.0.7", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -260,9 +270,9 @@ ] }, "unsplash": { - "sha256": "0zakbrgjc3i6rl0nqwxfsfwybbqpr50c8c10d6s7r9m4gck0y2bm", - "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.0/unsplash.tar.gz", - "version": "2.2.0", + "sha256": "1ya1h4nb9cyj1hdgb5l5isx7a43a7ri92cm0h8nwih20hi6a9wzx", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.1/unsplash.tar.gz", + "version": "2.2.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ @@ -270,9 +280,9 @@ ] }, "user_saml": { - "sha256": "0ba6nmxl5lmwgn6sxb6ak2lzxknaw40db4zh2b6syy5k6klb8x4k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.0/user_saml-v5.2.0.tar.gz", - "version": "5.2.0", + "sha256": "0kf8h6z32x2gr87lm0l2cc7lghs8s222553lczxlfgj1xbi7486n", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.1/user_saml-v5.2.1.tar.gz", + "version": "5.2.1", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json index 76588ece19..6da303e423 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1j4n5l80xa3c0ai8vjwhhixyq8vq5hk0k2asy3nn8bpdi2ip9gzj", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.2/calendar-v4.4.2.tar.gz", - "version": "4.4.2", + "sha256": "00m00jm6x6kkwbn8v7v0yjmr7m5isizsyll4nqy409c1jvmhq2rq", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz", + "version": "4.4.3", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "07bnq5hfw9br2xa1j77vydwdaxnc0jyzpacd9hh4f5hvgxmbg6ag", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/V5.3.1/contacts-V5.3.1.tar.gz", - "version": "5.3.1", + "sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", + "version": "5.3.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -60,9 +60,9 @@ ] }, "files_texteditor": { - "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", - "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", - "version": "2.15.0", + "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", + "version": "2.15.1", "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", "homepage": "https://github.com/nextcloud/files_texteditor", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "sha256": "0jfnidmx93k0z923m3p3bi8qv46j875cpnc60hlpxvcl35zbb2rl", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.0/forms-v3.3.0.tar.gz", - "version": "3.3.0", + "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", + "version": "3.3.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "1ick4llzbsp3i4aiml203851xcm1c6jhnma4d5nmpp995a459axq", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.2/groupfolders-v14.0.2.tar.gz", - "version": "14.0.2", + "sha256": "1nmc6b4bv66b3dp1qfgw19qml70b81gb2bql5ff33jhamd8ihdh0", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.3/groupfolders-v14.0.3.tar.gz", + "version": "14.0.3", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -100,9 +100,9 @@ ] }, "keeweb": { - "sha256": "19wzp588p3a87bi7ajn2r8jmsjjzzc1g8bkpwkidv66gi87gv9sr", - "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.12/keeweb-0.6.12.tar.gz", - "version": "0.6.12", + "sha256": "11q15ajg1357y5y5a640dvsy6hhvvar7wp34zfsb07n7hqlmyci0", + "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz", + "version": "0.6.13", "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", "homepage": "https://github.com/jhass/nextcloud-keeweb", "licenses": [ @@ -110,25 +110,35 @@ ] }, "mail": { - "sha256": "1i149w2c2nlk3yn0bh872ijkaqxqbnlvsr558fn8gml0z9vwdfav", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.1/mail-v3.2.1.tar.gz", - "version": "3.2.1", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", + "sha256": "1scx48g1h209pp4flq837njdgcdh4dxwh2n9jzv48zax8i9yz961", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.4/mail-v3.2.4.tar.gz", + "version": "3.2.4", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, "maps": { - "sha256": "04mgk4g2262m3xkyrskq66vq8784pvv183ff1h3d6yilpy4ysjfy", - "url": "https://github.com/nextcloud/maps/releases/download/v1.0.2/maps-1.0.2.tar.gz", - "version": "1.0.2", + "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", + "version": "1.1.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ "agpl" ] }, + "memories": { + "sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", + "url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", + "version": "5.2.1", + "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", + "homepage": "https://memories.gallery", + "licenses": [ + "agpl" + ] + }, "news": { "sha256": "0fr72j4al8mi6fr7cdsyvvnp5cc39mphaaf3bcpkxy4a2v2hn2k0", "url": "https://github.com/nextcloud/news/releases/download/21.2.0/news.tar.gz", @@ -140,9 +150,9 @@ ] }, "notes": { - "sha256": "1l1f9gjbx6mlvl92vw9gxmz9xar6l533m3g5vx9n9n0bn9x9zl56", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.0/notes.tar.gz", - "version": "4.8.0", + "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", + "version": "4.8.1", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -170,9 +180,9 @@ ] }, "polls": { - "sha256": "10906dzlswi352gbshvh86h6yyhwm8b54nkzqgwzpbg9h6yqp1w9", - "url": "https://github.com/nextcloud/polls/releases/download/v5.0.5/polls.tar.gz", - "version": "5.0.5", + "sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", + "url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", + "version": "5.2.0", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -200,9 +210,9 @@ ] }, "registration": { - "sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz", - "version": "2.1.0", + "sha256": "0x1x5mk83qh5lffcs7h0gjjihzsphc6iqmbch1ni76h9pw4zxrw1", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.2.0/registration-v2.2.0.tar.gz", + "version": "2.2.0", "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", "homepage": "https://github.com/nextcloud/registration", "licenses": [ @@ -210,9 +220,9 @@ ] }, "spreed": { - "sha256": "1khnbxifvs2w0xabc7ivsfzx845601f3dq5jg0nxbmrbigcdj7x2", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.4/spreed-v16.0.4.tar.gz", - "version": "16.0.4", + "sha256": "09jkq0fiw5h60qvjhld0nrralf2yrdcnpr9q4chw5hq0q710526n", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.5/spreed-v16.0.5.tar.gz", + "version": "16.0.5", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -250,9 +260,9 @@ ] }, "unsplash": { - "sha256": "0zakbrgjc3i6rl0nqwxfsfwybbqpr50c8c10d6s7r9m4gck0y2bm", - "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.0/unsplash.tar.gz", - "version": "2.2.0", + "sha256": "1ya1h4nb9cyj1hdgb5l5isx7a43a7ri92cm0h8nwih20hi6a9wzx", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.1/unsplash.tar.gz", + "version": "2.2.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ @@ -260,9 +270,9 @@ ] }, "user_saml": { - "sha256": "0ba6nmxl5lmwgn6sxb6ak2lzxknaw40db4zh2b6syy5k6klb8x4k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.0/user_saml-v5.2.0.tar.gz", - "version": "5.2.0", + "sha256": "0kf8h6z32x2gr87lm0l2cc7lghs8s222553lczxlfgj1xbi7486n", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.1/user_saml-v5.2.1.tar.gz", + "version": "5.2.1", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json index 1a13160d44..a00e459d85 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1j4n5l80xa3c0ai8vjwhhixyq8vq5hk0k2asy3nn8bpdi2ip9gzj", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.2/calendar-v4.4.2.tar.gz", - "version": "4.4.2", + "sha256": "00m00jm6x6kkwbn8v7v0yjmr7m5isizsyll4nqy409c1jvmhq2rq", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.3/calendar-v4.4.3.tar.gz", + "version": "4.4.3", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "07bnq5hfw9br2xa1j77vydwdaxnc0jyzpacd9hh4f5hvgxmbg6ag", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/V5.3.1/contacts-V5.3.1.tar.gz", - "version": "5.3.1", + "sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", + "version": "5.3.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -59,10 +59,20 @@ "agpl" ] }, + "files_texteditor": { + "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", + "version": "2.15.1", + "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", + "homepage": "https://github.com/nextcloud/files_texteditor", + "licenses": [ + "agpl" + ] + }, "forms": { - "sha256": "0jfnidmx93k0z923m3p3bi8qv46j875cpnc60hlpxvcl35zbb2rl", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.0/forms-v3.3.0.tar.gz", - "version": "3.3.0", + "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", + "version": "3.3.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -70,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "0hp5is3g09kc871lgcx92y88054v4cjg1zfld9l84sv962imq5rk", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.0.0/groupfolders-v15.0.0.tar.gz", - "version": "15.0.0", + "sha256": "13d4zqlfg2sq8j1jrq6lvsn8vx17825h3i3r88wi66ndsijz11dq", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.0.1/groupfolders-v15.0.1.tar.gz", + "version": "15.0.1", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -89,28 +99,50 @@ "agpl" ] }, + "keeweb": { + "sha256": "11q15ajg1357y5y5a640dvsy6hhvvar7wp34zfsb07n7hqlmyci0", + "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz", + "version": "0.6.13", + "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", + "homepage": "https://github.com/jhass/nextcloud-keeweb", + "licenses": [ + "agpl" + ] + }, "mail": { - "sha256": "1i149w2c2nlk3yn0bh872ijkaqxqbnlvsr558fn8gml0z9vwdfav", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.1/mail-v3.2.1.tar.gz", - "version": "3.2.1", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", + "sha256": "1scx48g1h209pp4flq837njdgcdh4dxwh2n9jzv48zax8i9yz961", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.4/mail-v3.2.4.tar.gz", + "version": "3.2.4", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, - "news": { - "sha256": "", - "url": "", - "version": "", - "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", - "homepage": "https://github.com/nextcloud/news", - "licenses": null + "maps": { + "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", + "version": "1.1.0", + "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", + "homepage": "https://github.com/nextcloud/maps", + "licenses": [ + "agpl" + ] + }, + "memories": { + "sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", + "url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", + "version": "5.2.1", + "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", + "homepage": "https://memories.gallery", + "licenses": [ + "agpl" + ] }, "notes": { - "sha256": "1l1f9gjbx6mlvl92vw9gxmz9xar6l533m3g5vx9n9n0bn9x9zl56", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.0/notes.tar.gz", - "version": "4.8.0", + "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", + "version": "4.8.1", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -128,9 +160,9 @@ ] }, "onlyoffice": { - "sha256": "01h5ry6m8y25jgzkd4pfwbyakls264sqqjqkadvf1vdyirs6sm1r", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.0.0/onlyoffice.tar.gz", - "version": "8.0.0", + "sha256": "16vdbpylicdb8gz76j9sr8p15frwhdk0sd7sp0s3g6f49lb7fdrz", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.1.0/onlyoffice.tar.gz", + "version": "8.1.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ @@ -138,9 +170,9 @@ ] }, "polls": { - "sha256": "10906dzlswi352gbshvh86h6yyhwm8b54nkzqgwzpbg9h6yqp1w9", - "url": "https://github.com/nextcloud/polls/releases/download/v5.0.5/polls.tar.gz", - "version": "5.0.5", + "sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", + "url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", + "version": "5.2.0", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -167,10 +199,20 @@ "agpl" ] }, + "registration": { + "sha256": "0x1x5mk83qh5lffcs7h0gjjihzsphc6iqmbch1ni76h9pw4zxrw1", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.2.0/registration-v2.2.0.tar.gz", + "version": "2.2.0", + "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", + "homepage": "https://github.com/nextcloud/registration", + "licenses": [ + "agpl" + ] + }, "spreed": { - "sha256": "1s0p1048qygp47dhjgm2nf97qvr865c7p4rymvic0anyff8l014g", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.0/spreed-v17.0.0.tar.gz", - "version": "17.0.0", + "sha256": "07bf6vmz957m2myazkvw63q40lisi14kyb42w4gpg3860ihr16sc", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.2/spreed-v17.0.2.tar.gz", + "version": "17.0.2", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -207,10 +249,20 @@ "agpl" ] }, + "unsplash": { + "sha256": "1ya1h4nb9cyj1hdgb5l5isx7a43a7ri92cm0h8nwih20hi6a9wzx", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.1/unsplash.tar.gz", + "version": "2.2.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + }, "user_saml": { - "sha256": "0ba6nmxl5lmwgn6sxb6ak2lzxknaw40db4zh2b6syy5k6klb8x4k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.0/user_saml-v5.2.0.tar.gz", - "version": "5.2.0", + "sha256": "0kf8h6z32x2gr87lm0l2cc7lghs8s222553lczxlfgj1xbi7486n", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.1/user_saml-v5.2.1.tar.gz", + "version": "5.2.1", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 022a4f14f2..26b57eba06 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -12,6 +12,7 @@ , "keeweb" , "mail" , "maps" +, "memories" , "news" , "notes" , "notify_push" diff --git a/third_party/nixpkgs/pkgs/servers/nfd/default.nix b/third_party/nixpkgs/pkgs/servers/nfd/default.nix index 87ce4ce188..30f1140ab5 100644 --- a/third_party/nixpkgs/pkgs/servers/nfd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nfd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost +, boost179 # probably needs to match the one from ndn-cxx , fetchFromGitHub , libpcap , ndn-cxx @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; wafConfigureFlags = [ - "--boost-includes=${boost.dev}/include" - "--boost-libs=${boost.out}/lib" + "--boost-includes=${boost179.dev}/include" + "--boost-libs=${boost179.out}/lib" "--with-tests" ] ++ lib.optional (!withWebSocket) "--without-websocket"; diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 87b03a9c5a..e203bc209b 100644 --- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.2"; + version = "5.4"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-xUZ8HZb+QEw1t72dyE8rfp666w6rh8yMGYL4H2vJIwE="; + sha256 = "sha256-zKIFjplZtxOEPIH9PUw1gGPS4VSdgv2Zj1oOp3If9W0="; }; preConfigure = "cd src"; diff --git a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix index 8928234f96..3b3dd52be6 100644 --- a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; maintainers = with maintainers; [ delroth ]; + mainProgram = "nginx-sso"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nitter/default.nix b/third_party/nixpkgs/pkgs/servers/nitter/default.nix index 2be39b7c2f..fb0f797457 100644 --- a/third_party/nixpkgs/pkgs/servers/nitter/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nitter/default.nix @@ -3,17 +3,18 @@ , nimPackages , nixosTests , substituteAll +, unstableGitUpdater }: nimPackages.buildNimPackage rec { pname = "nitter"; - version = "unstable-2023-07-10"; + version = "unstable-2023-07-21"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "0bc3c153d9b38a3c02f321fb64a375fef6b97e8e"; - hash = "sha256-msx14FZl2uRZvZjTlF7c3Va742HhiU6R2jdh4neIEV4="; + rev = "cc5841df308506356d329662d0f0c2ec4713a35c"; + hash = "sha256-QuWLoKy7suUCTYK79ghdf3o/FGFIDNyN1Iu69DFp6wg="; }; patches = [ @@ -52,6 +53,11 @@ nimPackages.buildNimPackage rec { cp -r public $out/share/nitter/public ''; + passthru = { + tests = { inherit (nixosTests) nitter; }; + updateScript = unstableGitUpdater {}; + }; + meta = with lib; { homepage = "https://github.com/zedeus/nitter"; description = "Alternative Twitter front-end"; @@ -59,6 +65,4 @@ nimPackages.buildNimPackage rec { maintainers = with maintainers; [ erdnaxe infinidoge ]; mainProgram = "nitter"; }; - - passthru.tests = { inherit (nixosTests) nitter; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix index 504f970e90..2277c997b7 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-kAbhH0E2C1ToxDQgFUqWxvknCeFZbtqFhOmiSJ//ciU="; + hash = "sha256-kUsEdEKwYjyM5G8YKTt90fWzX21hiulRj3W5jK45Keg="; }; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 9e911721a3..ac82f7659d 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -1,11 +1,20 @@ -{ lib, stdenv, fetchurl, java, makeWrapper }: +{ lib +, stdenv +, fetchurl +, java +, coreutils +, which +, makeWrapper + # For the test +, pkgs +}: stdenv.mkDerivation rec { pname = "apache-jena-fuseki"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - hash = "sha256-rJCY8vG1vfEGGA0gsIqNFXKl75O2Zp4zUIWSDfplpVE="; + hash = "sha256-t25Q0lb+ecR12cDD1p6eZnzLxW0kZpPOFGvo5YK7AlI="; }; nativeBuildInputs = [ makeWrapper @@ -16,11 +25,16 @@ stdenv.mkDerivation rec { ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin" for i in "$out"/bin/*; do wrapProgram "$i" \ - --prefix "PATH" : "${java}/bin/" \ + --prefix "PATH" : "${java}/bin/:${coreutils}/bin:${which}/bin" \ --set-default "FUSEKI_HOME" "$out" \ ; done ''; + passthru = { + tests = { + basic-test = pkgs.callPackage ./fuseki-test.nix { }; + }; + }; meta = with lib; { description = "SPARQL server"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-test.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-test.nix new file mode 100644 index 0000000000..cdf1c2d7a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-test.nix @@ -0,0 +1,18 @@ +{ lib, runCommandNoCC, apache-jena-fuseki, curl }: +runCommandNoCC "fuseki-test-${apache-jena-fuseki.name}" +{ nativeBuildInputs = [ curl apache-jena-fuseki ]; } '' + export FUSEKI_BASE="$PWD/fuseki-base" + mkdir -p "$FUSEKI_BASE/db" + FUSEKI_ARGS="--update --loc=$FUSEKI_BASE/db /dataset" fuseki start + fuseki status + for i in $(seq 120); do + if curl http://127.0.0.1:3030/dataset/data; then + break; + fi + sleep 1 + done + curl -d 'update=insert+data+{++++}' http://127.0.0.1:3030/dataset/update > /dev/null + curl http://127.0.0.1:3030/dataset/data | grep -C999 'test://predicate' + curl -d 'query=select+?s+?p+?o+where+{+?s+?p+?o+.+}' http://127.0.0.1:3030/dataset/query | grep -C999 'test://predicate' + touch $out +'' diff --git a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix index 1c3b649351..e5b8bf0f79 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-PBxpb6lXLtOM9nxw2rNlMoevyWbmuTZMIjzr4y3UCMc="; + hash = "sha256-DRI05dGEzaQtI9+SEbFqK5i/8b4hmaoJubDI/6K8vUc="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-AsjKqlUwP+IgTErsGhBrELhVHMJ88twU3U4E9U/rP24="; + vendorSha256 = "sha256-mkUV8CGVCfGetkU1DO1F6c17C4xFVEVWxQkYMmfo2cM="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index 85cc8b9760..b63ac095d2 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -4,7 +4,7 @@ let libflux_version = "0.170.1"; # This is copied from influxdb2 with flux version matching the needed by thi - flux = rustPlatform.buildRustPackage { + flux = rustPlatform.buildRustPackage rec { pname = "libflux"; version = "v${libflux_version}"; src = fetchFromGitHub { @@ -23,7 +23,7 @@ let sha256 = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; }) ]; - sourceRoot = "source/libflux"; + sourceRoot = "${src.name}/libflux"; cargoSha256 = "sha256-kYiZ5ZRiFHRf1RQeeUGjIhnEkTvhNSZ0t4tidpRIDyk="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix index b5352909ca..a5cfa5ee55 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix @@ -39,7 +39,7 @@ let rev = "v${libflux_version}"; sha256 = "sha256-Xmh7V/o1Gje62kcnTeB9h/fySljhfu+tjbyvryvIGRc="; }; - sourceRoot = "source/libflux"; + sourceRoot = "${src.name}/libflux"; cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix index ea4ac699d4..ff82755d8c 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix @@ -149,6 +149,9 @@ in stdenv.mkDerivation rec { ] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ] ++ map (lib: "--use-system-${lib}") system-libraries; + # This seems to fix mongodb not able to find OpenSSL's crypto.h during build + hardeningDisable = [ "fortify3" ]; + preBuild = '' sconsFlags+=" CC=$CC" sconsFlags+=" CXX=$CXX" diff --git a/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix index a76dac6681..995053da9b 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "questdb"; - version = "7.2"; + version = "7.2.1"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${version}/questdb-${version}-no-jre-bin.tar.gz"; - sha256 = "sha256-37pmNeN02sHt2Cpyjk3FpBFscBw2Zqm4nNmOlyiX6H0="; + sha256 = "sha256-PtVY1cZl/2RQ3YaEBVXpAoZrMRQbv7d1BDFdTwXI+Uk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index c7a93f8d24..a1344969de 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,31 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.91.0"; + version = "1.92.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZGUJfziqQCCv/9p+z8UJpvHkg6fKOIMv1tJ679f9NTo="; + hash = "sha256-s4OxOyOfPd98ZTdn/VYr9Z12zrQM5ZCsoJBx6nwz1Ww="; }; vendorHash = null; - patches = [ - (fetchpatch { - name = "vmctl-fix-tests.patch"; - url = "https://github.com/VictoriaMetrics/VictoriaMetrics/commit/4060f3f261cb41d97df719e6c60b71be19829301.patch"; - hash = "sha256-SCeSdSLzZZodMiL7Kts0L8R5XD7TbOc5+/oidmithCY="; - }) - (fetchpatch { - name = "graphite-fixes-tests-for-arm.patch"; - url = "https://github.com/VictoriaMetrics/VictoriaMetrics/commit/228ea03bda0eda3507d782cb627d946843f29c30.patch"; - hash = "sha256-FnN5O9H1tNtBs5Fr4tXrnyted8SZwX82ZdBmeHlIQ2Y="; - }) - ]; - postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web @@ -47,6 +34,8 @@ buildGoModule rec { export ldflags=''${ldflags//=${version}/=} ''; + __darwinAllowLocalNetworking = true; + passthru.tests = { inherit (nixosTests) victoriametrics; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix index 8ce4b7676e..43f9d7a7fe 100644 --- a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix @@ -219,5 +219,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dguenther ghuntley emilytrau ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "openvscode-server"; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/osrm-backend/default.nix b/third_party/nixpkgs/pkgs/servers/osrm-backend/default.nix index b76db692a7..454cb7abc1 100644 --- a/third_party/nixpkgs/pkgs/servers/osrm-backend/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osrm-backend/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: +{lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libxml2, libzip, boost179, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { pname = "osrm-backend"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; + buildInputs = [ bzip2 libxml2 libzip boost179 lua luabind tbb expat ]; patches = [ ./darwin.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/owncast/default.nix b/third_party/nixpkgs/pkgs/servers/owncast/default.nix index 428b0253e8..e5c0a8fbaf 100644 --- a/third_party/nixpkgs/pkgs/servers/owncast/default.nix +++ b/third_party/nixpkgs/pkgs/servers/owncast/default.nix @@ -1,42 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, bash, which, ffmpeg, makeWrapper, coreutils, ... }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +, bash +, which +, ffmpeg +, makeBinaryWrapper +}: -buildGoModule rec { +let + version = "0.1.1"; +in buildGoModule { pname = "owncast"; - version = "0.0.13"; - + inherit version; src = fetchFromGitHub { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - sha256 = "sha256-hbZtdJbCB+67KXtApSRAO7Srye+UO0FbilKftQH6ESE="; + hash = "sha256-nBTuvVVnFlC75p8bRCN+lNl9fExBZrsLEesvXWwNlAQ="; }; - - vendorSha256 = "sha256-sQRNf+eT9JUbYne/3E9LoY0K+c7MlxtIbGmTa3VkHvI="; + vendorHash = "sha256-yjy5bDJjWk7UotBVqvVFiGx8mpfhpqMTxoQm/eWHcw4="; propagatedBuildInputs = [ ffmpeg ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - preInstall = '' - mkdir -p $out - cp -r $src/{static,webroot} $out - ''; - - postInstall = let - - setupScript = '' - [ ! -d "$PWD/webroot" ] && ( - ${coreutils}/bin/cp --no-preserve=mode -r "${placeholder "out"}/webroot" "$PWD" - ) - - [ ! -d "$PWD/static" ] && ( - [ -L "$PWD/static" ] && ${coreutils}/bin/rm "$PWD/static" - ${coreutils}/bin/ln -s "${placeholder "out"}/static" "$PWD" - ) - ''; - in '' + postInstall = '' wrapProgram $out/bin/owncast \ - --run '${setupScript}' \ --prefix PATH : ${lib.makeBinPath [ bash which ffmpeg ]} ''; diff --git a/third_party/nixpkgs/pkgs/servers/photofield/default.nix b/third_party/nixpkgs/pkgs/servers/photofield/default.nix index d5862cd38a..ca7dd95882 100644 --- a/third_party/nixpkgs/pkgs/servers/photofield/default.nix +++ b/third_party/nixpkgs/pkgs/servers/photofield/default.nix @@ -22,7 +22,7 @@ let inherit src version; pname = "photofield-ui"; - sourceRoot = "source/ui"; + sourceRoot = "${src.name}/ui"; npmDepsHash = "sha256-YVyaZsFh5bolDzMd5rXWrbbXQZBeEIV6Fh/kwN+rvPk="; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 558da4176b..f85e29af19 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.4.7195-7c8f9d3b6"; + version = "1.32.5.7349-8f4248874"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-Qb684Mm080QudeLG111cLCSRh1CAJ31IjNOO62XkFTs="; + sha256 = "18j98za5498v02asyyz2sakbl4inyxd6jsa4bjz8zm2jb1knk236"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-lnkhjzBW9DENCVJNP+4h8fVVUh4LhnJ1XjrCjF3ngKE="; + sha256 = "0gm9i752fbplw1l0xlrhzpif5fjiwx471hv55bwbs3ywz3hp0jnb"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix index f65d83c088..4e5079206b 100644 --- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.16.8"; + version = "0.16.10"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wZp7WfSdKN9oF6mZsT4QsKvY53MsggbEmBS8TkCFkuU="; + sha256 = "sha256-BH3hJ+5xAJkGj2HoKpee+ZNgMmyQoHEVI0wsXRwIdGw="; }; vendorHash = "sha256-h3lkmpHEMr/aueP+lJpa9HJCidEpm7xSKws28+ZSeQA="; diff --git a/third_party/nixpkgs/pkgs/servers/polaris/Cargo.lock b/third_party/nixpkgs/pkgs/servers/polaris/Cargo.lock new file mode 100644 index 0000000000..556faca98e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/polaris/Cargo.lock @@ -0,0 +1,2497 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "actix-codec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-sink", + "log", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "actix-files" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d832782fac6ca7369a70c9ee9a20554623c5e51c76e190ad151780ebea1cf689" +dependencies = [ + "actix-http", + "actix-service", + "actix-utils", + "actix-web", + "askama_escape", + "bitflags", + "bytes", + "derive_more", + "futures-core", + "http-range", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", +] + +[[package]] +name = "actix-http" +version = "3.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "ahash", + "base64", + "bitflags", + "brotli", + "bytes", + "bytestring", + "derive_more", + "encoding_rs", + "flate2", + "futures-core", + "h2", + "http", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "sha1 0.10.5", + "smallvec", + "tracing", + "zstd", +] + +[[package]] +name = "actix-http-test" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40511826540d084fbcd68ee65b75b1849961c1760a193b09180a4851f20075b" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-server", + "actix-service", + "actix-tls", + "actix-utils", + "awc", + "base64", + "bytes", + "futures-core", + "http", + "log", + "serde", + "serde_json", + "serde_urlencoded", + "slab", + "socket2", + "tokio", +] + +[[package]] +name = "actix-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "actix-router" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +dependencies = [ + "bytestring", + "http", + "regex", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" +dependencies = [ + "actix-macros", + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio", + "num_cpus", + "socket2", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" +dependencies = [ + "futures-core", + "paste", + "pin-project-lite", +] + +[[package]] +name = "actix-test" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546b075f2ee13e081a040b60b95a08f0eceaac6bc759309026611234dc80abfe" +dependencies = [ + "actix-codec", + "actix-http", + "actix-http-test", + "actix-rt", + "actix-service", + "actix-utils", + "actix-web", + "awc", + "futures-core", + "futures-util", + "log", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", +] + +[[package]] +name = "actix-tls" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "http", + "log", + "pin-project-lite", + "tokio-util", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite", +] + +[[package]] +name = "actix-web" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9" +dependencies = [ + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", + "ahash", + "bytes", + "bytestring", + "cfg-if", + "cookie 0.16.1", + "derive_more", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2", + "time 0.3.17", + "url", +] + +[[package]] +name = "actix-web-codegen" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13" +dependencies = [ + "actix-router", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "actix-web-httpauth" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dda62cf04bc3a9ad2ea8f314f721951cfdb4cdacec4e984d20e77c7bb170991" +dependencies = [ + "actix-utils", + "actix-web", + "base64", + "futures-core", + "futures-util", + "log", + "pin-project-lite", +] + +[[package]] +name = "adler" +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 = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "ape" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b10e5fe31529dbfc2d339c781d9951c94e97a791077273676ccc3041a01d4a" +dependencies = [ + "byteorder", +] + +[[package]] +name = "askama_escape" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "awc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80ca7ff88063086d2e2c70b9f3b29b2fcd999bac68ac21731e66781970d68519" +dependencies = [ + "actix-codec", + "actix-http", + "actix-rt", + "actix-service", + "actix-tls", + "actix-utils", + "ahash", + "base64", + "bytes", + "cfg-if", + "cookie 0.16.1", + "derive_more", + "futures-core", + "futures-util", + "h2", + "http", + "itoa", + "log", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", +] + +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "boxfnonce" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" + +[[package]] +name = "branca" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04de6ca7d864c7bdf6da0d4f33c9c447794856070d89e697ce87fd43d75f5f3f" +dependencies = [ + "base-x", + "byteorder", + "orion", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "bytemuck" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "bytestring" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7f83e57d9154148e355404702e2694463241880b939570d7c97c014da7a69a1" +dependencies = [ + "bytes", +] + +[[package]] +name = "cc" +version = "1.0.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chunked_transfer" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "percent-encoding", + "time 0.2.27", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" +dependencies = [ + "percent-encoding", + "time 0.3.17", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" +dependencies = [ + "cookie 0.14.4", + "idna 0.2.3", + "log", + "publicsuffix", + "serde", + "serde_json", + "time 0.2.27", + "url", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ct-codecs" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" + +[[package]] +name = "daemonize" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70c24513e34f53b640819f0ac9f705b673fcf4006d7aab8778bee72ebfc89815" +dependencies = [ + "boxfnonce", + "libc", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn", +] + +[[package]] +name = "diesel" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68c186a7418a2aac330bb76cde82f16c36b03a66fb91db32d20214311f9f6545" +dependencies = [ + "diesel_derives", + "libsqlite3-sys", + "r2d2", +] + +[[package]] +name = "diesel_derives" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b758c91dbc3fe1fdcb0dba5bd13276c6a66422f2ef5795b58488248a310aa" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "diesel_migrations" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9ae22beef5e9d6fab9225ddb073c1c6c1a7a6ded5019d5da11d1e5c5adc34e2" +dependencies = [ + "diesel", + "migrations_internals", + "migrations_macros", +] + +[[package]] +name = "digest" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + +[[package]] +name = "flate2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ + "crc32fast", + "miniz_oxide 0.5.4", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-core", + "futures-macro", + "futures-sink", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64", + "bitflags", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1 0.10.5", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[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 = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "id3" +version = "1.4.0" +source = "git+https://github.com/polyfloyd/rust-id3.git?rev=f3b5e3a#f3b5e3ac324c07c2cd5364469734ffb7a0228f77" +dependencies = [ + "bitflags", + "byteorder", + "flate2", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "jobserver" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libsqlite3-sys" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "local-channel" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c" +dependencies = [ + "futures-core", + "futures-sink", + "futures-util", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metaflac" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1470d3cc1bb0d692af5eb3afb594330b8ba09fd91c32c4e1c6322172a5ba750" +dependencies = [ + "byteorder", + "hex", + "log", +] + +[[package]] +name = "migrations_internals" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c493c09323068c01e54c685f7da41a9ccf9219735c3766fbfd6099806ea08fbc" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "migrations_macros" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a8ff27a350511de30cdabb77147501c36ef02e0451d957abea2f30caffb2b58" +dependencies = [ + "migrations_internals", + "proc-macro2", + "quote", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + +[[package]] +name = "mp3-duration" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" +dependencies = [ + "thiserror", +] + +[[package]] +name = "mp4ameta" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb23d62e8eb5299a3f79657c70ea9269eac8f6239a76952689bcd06a74057e81" +dependencies = [ + "lazy_static", + "mp4ameta_proc", +] + +[[package]] +name = "mp4ameta_proc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07dcca13d1740c0a665f77104803360da0bdb3323ecce2e93fa2c959a6d52806" + +[[package]] +name = "native-windows-derive" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76134ae81020d89d154f619fd2495a2cecad204276b1dc21174b55e4d0975edd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "native-windows-gui" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7003a669f68deb6b7c57d74fff4f8e533c44a3f0b297492440ef4ff5a28454" +dependencies = [ + "bitflags", + "lazy_static", + "winapi", + "winapi-build", +] + +[[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-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "opus_headers" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb993947f111397c2bc536944f8dac7f54a4e73383d478efe1990b56404b60" + +[[package]] +name = "orion" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6b8920e5d7662ee0578a19b322ff34ff56009e4c3730e2f90d75760002bfc9" +dependencies = [ + "ct-codecs", + "fiat-crypto", + "getrandom", + "subtle", + "zeroize", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" + +[[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 = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "png" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +dependencies = [ + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide 0.6.2", +] + +[[package]] +name = "polaris" +version = "0.14.0" +dependencies = [ + "actix-files", + "actix-test", + "actix-web", + "actix-web-httpauth", + "ape", + "base64", + "branca", + "crossbeam-channel", + "daemonize", + "diesel", + "diesel_migrations", + "fs_extra", + "futures-util", + "getopts", + "headers", + "http", + "id3", + "image", + "lewton", + "libsqlite3-sys", + "log", + "metaflac", + "mp3-duration", + "mp4ameta", + "native-windows-derive", + "native-windows-gui", + "num_cpus", + "opus_headers", + "pbkdf2", + "percent-encoding", + "rand", + "rayon", + "regex", + "rustfm-scrobble", + "sd-notify", + "serde", + "serde_derive", + "serde_json", + "simplelog", + "thiserror", + "tokio", + "toml", + "ureq", + "url", + "winres", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "publicsuffix" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +dependencies = [ + "idna 0.2.3", + "url", +] + +[[package]] +name = "qstring" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r2d2" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +dependencies = [ + "log", + "parking_lot", + "scheduled-thread-pool", +] + +[[package]] +name = "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 = "rayon" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +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", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[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.14", +] + +[[package]] +name = "rustfm-scrobble" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c46a75fb6409a528f7e0d8e99826684f88461d1b0d0edeec60d82e3f554dad5" +dependencies = [ + "md5", + "serde", + "serde_json", + "ureq", + "wrapped-vec", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64", + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "scheduled-thread-pool" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sd-notify" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "simplelog" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786" +dependencies = [ + "log", + "termcolor", + "time 0.3.17", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1 0.6.1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros 0.1.1", + "version_check", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros 0.2.6", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "winapi", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b8b063c2d59218ae09f22b53c42eaad0d53516457905f5235ca4bc9e99daa71" +dependencies = [ + "base64", + "chunked_transfer", + "cookie 0.14.4", + "cookie_store", + "log", + "once_cell", + "qstring", + "rustls", + "url", + "webpki", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna 0.3.0", + "percent-encoding", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +dependencies = [ + "webpki", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[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-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml", +] + +[[package]] +name = "wrapped-vec" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85e08702c1e919669e1e90213c9c75ea4bb689d0f3970347e2b37c04600b4e5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" + +[[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.1+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +dependencies = [ + "cc", + "libc", +] diff --git a/third_party/nixpkgs/pkgs/servers/polaris/default.nix b/third_party/nixpkgs/pkgs/servers/polaris/default.nix index 683d3c43fa..647b278e39 100644 --- a/third_party/nixpkgs/pkgs/servers/polaris/default.nix +++ b/third_party/nixpkgs/pkgs/servers/polaris/default.nix @@ -1,18 +1,21 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform +, nix-update-script , polaris-web +, darwin }: rustPlatform.buildRustPackage rec { pname = "polaris"; - version = "0.13.5"; + version = "0.14.0"; src = fetchFromGitHub { owner = "agersant"; repo = "polaris"; rev = version; - sha256 = "sp1KDTzKvcGtuqL37fFnVgcnkIsmj5ZQji72BeyiFQE="; + hash = "sha256-mLugPi3Xp46Lh48JQVeyOEGiovSF26gUt25MGBPFfkM="; # The polaris version upstream in Cargo.lock is "0.0.0". # We're unable to simply patch it in the patch phase due to @@ -26,11 +29,22 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-0VHrlUoyYu+UTUQUioftBDlQJfLd/axz6bGJs+YXSmE="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "id3-1.4.0" = "sha256-0j2iOd/GkMqLu18Eu8nttmqez0G6fu2m19gsHWMmLds="; + }; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.Security + ]; # Compile-time environment variables for where to find assets needed at runtime - POLARIS_WEB_DIR = "${polaris-web}/share/polaris-web"; - POLARIS_SWAGGER_DIR = "${placeholder "out"}/share/polaris-swagger"; + env = { + POLARIS_WEB_DIR = "${polaris-web}/share/polaris-web"; + POLARIS_SWAGGER_DIR = "${placeholder "out"}/share/polaris-swagger"; + }; postInstall = '' mkdir -p $out/share @@ -42,7 +56,11 @@ rustPlatform.buildRustPackage rec { ulimit -n 4096 ''; - passthru.updateScript = ./update.sh; + __darwinAllowLocalNetworking = true; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; meta = with lib; { description = "Self-host your music collection, and access it from any computer and mobile device"; diff --git a/third_party/nixpkgs/pkgs/servers/polaris/node-composition.nix b/third_party/nixpkgs/pkgs/servers/polaris/node-composition.nix deleted file mode 100644 index cc96551dc9..0000000000 --- a/third_party/nixpkgs/pkgs/servers/polaris/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_12"}: - -let - nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix b/third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix deleted file mode 100644 index 07dbc6fb74..0000000000 --- a/third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix +++ /dev/null @@ -1,4301 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@babel/code-frame-7.16.7" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; - }; - }; - "@babel/helper-validator-identifier-7.16.7" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; - }; - }; - "@babel/highlight-7.16.10" = { - name = "_at_babel_slash_highlight"; - packageName = "@babel/highlight"; - version = "7.16.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; - sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; - }; - }; - "@babel/parser-7.17.8" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.17.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; - sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; - }; - }; - "@cypress/listr-verbose-renderer-0.4.1" = { - name = "_at_cypress_slash_listr-verbose-renderer"; - packageName = "@cypress/listr-verbose-renderer"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz"; - sha1 = "a77492f4b11dcc7c446a34b3e28721afd33c642a"; - }; - }; - "@cypress/request-2.88.10" = { - name = "_at_cypress_slash_request"; - packageName = "@cypress/request"; - version = "2.88.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz"; - sha512 = "Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg=="; - }; - }; - "@cypress/xvfb-1.2.4" = { - name = "_at_cypress_slash_xvfb"; - packageName = "@cypress/xvfb"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz"; - sha512 = "skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q=="; - }; - }; - "@parcel/bundler-default-2.3.2" = { - name = "_at_parcel_slash_bundler-default"; - packageName = "@parcel/bundler-default"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.3.2.tgz"; - sha512 = "JUrto4mjSD0ic9dEqRp0loL5o3HVYHja1ZIYSq+rBl2UWRV6/9cGTb07lXOCqqm0BWE+hQ4krUxB76qWaF0Lqw=="; - }; - }; - "@parcel/cache-2.3.2" = { - name = "_at_parcel_slash_cache"; - packageName = "@parcel/cache"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.3.2.tgz"; - sha512 = "Xxq+ekgcFEme6Fn1v7rEOBkyMOUOUu7eNqQw0l6HQS+INZ2Q7YzzfdW7pI8rEOAAICVg5BWKpmBQZpgJlT+HxQ=="; - }; - }; - "@parcel/codeframe-2.3.2" = { - name = "_at_parcel_slash_codeframe"; - packageName = "@parcel/codeframe"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.3.2.tgz"; - sha512 = "ireQALcxxrTdIEpzTOoMo/GpfbFm1qlyezeGl3Hce3PMvHLg3a5S6u/Vcy7SAjdld5GfhHEqVY+blME6Z4CyXQ=="; - }; - }; - "@parcel/compressor-raw-2.3.2" = { - name = "_at_parcel_slash_compressor-raw"; - packageName = "@parcel/compressor-raw"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.3.2.tgz"; - sha512 = "8dIoFwinYK6bOTpnZOAwwIv0v73y0ezsctPmfMnIqVQPn7wJwfhw/gbKVcmK5AkgQMkyid98hlLZoaZtGF1Mdg=="; - }; - }; - "@parcel/config-default-2.3.2" = { - name = "_at_parcel_slash_config-default"; - packageName = "@parcel/config-default"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.3.2.tgz"; - sha512 = "E7/iA7fGCYvXU3u6zF9nxjeDVsgjCN6MVvDjymjaxYMoDWTIsPV245SBEXqzgtmzbMAV+VAl4rVWLMB4pzMt9g=="; - }; - }; - "@parcel/core-2.3.2" = { - name = "_at_parcel_slash_core"; - packageName = "@parcel/core"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.3.2.tgz"; - sha512 = "gdJzpsgeUhv9H8T0UKVmyuptiXdduEfKIUx0ci+/PGhq8cCoiFnlnuhW6H7oLr79OUc+YJStabDJuG4U2A6ysw=="; - }; - }; - "@parcel/diagnostic-2.3.2" = { - name = "_at_parcel_slash_diagnostic"; - packageName = "@parcel/diagnostic"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.3.2.tgz"; - sha512 = "/xW93Az4AOiifuYW/c4CDbUcu3lx5FcUDAj9AGiR9NSTsF/ROC/RqnxvQ3AGtqa14R7vido4MXEpY3JEp6FsqA=="; - }; - }; - "@parcel/events-2.3.2" = { - name = "_at_parcel_slash_events"; - packageName = "@parcel/events"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.3.2.tgz"; - sha512 = "WiYIwXMo4Vd+pi58vRoHkul8TPE5VEfMY+3FYwVCKPl/LYqSD+vz6wMx9uG18mEbB1d/ofefv5ZFQNtPGKO4tQ=="; - }; - }; - "@parcel/fs-2.3.2" = { - name = "_at_parcel_slash_fs"; - packageName = "@parcel/fs"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.3.2.tgz"; - sha512 = "XV+OsnRpN01QKU37lBN0TFKvv7uPKfQGbqFqYOrMbXH++Ae8rBU0Ykz+Yu4tv2h7shMlde+AMKgRnRTAJZpWEQ=="; - }; - }; - "@parcel/fs-search-2.3.2" = { - name = "_at_parcel_slash_fs-search"; - packageName = "@parcel/fs-search"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.3.2.tgz"; - sha512 = "u3DTEFnPtKuZvEtgGzfVjQUytegSSn3POi7WfwMwPIaeDPfYcyyhfl+c96z7VL9Gk/pqQ99/cGyAwFdFsnxxXA=="; - }; - }; - "@parcel/graph-2.3.2" = { - name = "_at_parcel_slash_graph"; - packageName = "@parcel/graph"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.3.2.tgz"; - sha512 = "ltTBM3IEqumgmy4ABBFETT8NtAwSsjD9mY3WCyJ5P8rUshfVCg093rvBPbpuJYMaH/TV1AHVaWfZqaZ4JQDIQQ=="; - }; - }; - "@parcel/hash-2.3.2" = { - name = "_at_parcel_slash_hash"; - packageName = "@parcel/hash"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.3.2.tgz"; - sha512 = "SMtYTsHihws/wqdVnOr0QAGyGYsW9rJSJkkoRujUxo8l2ctnBN1ztv89eOUrdtgHsmcnj/oz1yw6sN38X+BUng=="; - }; - }; - "@parcel/logger-2.3.2" = { - name = "_at_parcel_slash_logger"; - packageName = "@parcel/logger"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.3.2.tgz"; - sha512 = "jIWd8TXDQf+EnNWSa7Q10lSQ6C1LSH8OZkTlaINrfVIw7s+3tVxO3I4pjp7/ARw7RX2gdNPlw6fH4Gn/HvvYbw=="; - }; - }; - "@parcel/markdown-ansi-2.3.2" = { - name = "_at_parcel_slash_markdown-ansi"; - packageName = "@parcel/markdown-ansi"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.3.2.tgz"; - sha512 = "l01ggmag5QScCk9mYA0xHh5TWSffR84uPFP2KvaAMQQ9NLNufcFiU0mn/Mtr3pCb5L5dSzmJ+Oo9s7P1Kh/Fmg=="; - }; - }; - "@parcel/namer-default-2.3.2" = { - name = "_at_parcel_slash_namer-default"; - packageName = "@parcel/namer-default"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.3.2.tgz"; - sha512 = "3QUMC0+5+3KMKfoAxYAbpZtuRqTgyZKsGDWzOpuqwemqp6P8ahAvNPwSCi6QSkGcTmvtYwBu9/NHPSONxIFOfg=="; - }; - }; - "@parcel/node-resolver-core-2.3.2" = { - name = "_at_parcel_slash_node-resolver-core"; - packageName = "@parcel/node-resolver-core"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.3.2.tgz"; - sha512 = "wmrnMNzJN4GuHw2Ftho+BWgSWR6UCkW3XoMdphqcxpw/ieAdS2a+xYSosYkZgQZ6lGutSvLyJ1CkVvP6RLIdQQ=="; - }; - }; - "@parcel/optimizer-cssnano-2.3.2" = { - name = "_at_parcel_slash_optimizer-cssnano"; - packageName = "@parcel/optimizer-cssnano"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-cssnano/-/optimizer-cssnano-2.3.2.tgz"; - sha512 = "wTBOxMiBI38NAB9XIlQZRCjS59+EWjWR9M04D3TWyxl+dL5gYMc1cl4GNynUnmcPdz+3s1UbOdo5/8V90wjiiw=="; - }; - }; - "@parcel/optimizer-htmlnano-2.3.2" = { - name = "_at_parcel_slash_optimizer-htmlnano"; - packageName = "@parcel/optimizer-htmlnano"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.3.2.tgz"; - sha512 = "U8C0TDSxsx8HmHaLW0Zc7ha1fXQynzhvBjCRMGYnOiLiw0MOfLQxzQ2WKVSeCotmdlF63ayCwxWsd6BuqStiKQ=="; - }; - }; - "@parcel/optimizer-image-2.3.2" = { - name = "_at_parcel_slash_optimizer-image"; - packageName = "@parcel/optimizer-image"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.3.2.tgz"; - sha512 = "HOk3r5qdvY/PmI7Q3i2qEgFH3kP2QWG4Wq3wmC4suaF1+c2gpiQc+HKHWp4QvfbH3jhT00c5NxQyqPhbXeNI9Q=="; - }; - }; - "@parcel/optimizer-svgo-2.3.2" = { - name = "_at_parcel_slash_optimizer-svgo"; - packageName = "@parcel/optimizer-svgo"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.3.2.tgz"; - sha512 = "l7WvZ5+e7D1mVmLUxMVaSb29cviXzuvSY2OpQs0ukdPACDqag+C65hWMzwTiOSSRGPMIu96kQKpeVru2YjibhA=="; - }; - }; - "@parcel/optimizer-terser-2.3.2" = { - name = "_at_parcel_slash_optimizer-terser"; - packageName = "@parcel/optimizer-terser"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.3.2.tgz"; - sha512 = "dOapHhfy0xiNZa2IoEyHGkhhla07xsja79NPem14e5jCqY6Oi40jKNV4ab5uu5u1elWUjJuw69tiYbkDZWbKQw=="; - }; - }; - "@parcel/package-manager-2.3.2" = { - name = "_at_parcel_slash_package-manager"; - packageName = "@parcel/package-manager"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.3.2.tgz"; - sha512 = "pAQfywKVORY8Ee+NHAyKzzQrKbnz8otWRejps7urwhDaTVLfAd5C/1ZV64ATZ9ALYP9jyoQ8bTaxVd4opcSuwg=="; - }; - }; - "@parcel/packager-css-2.3.2" = { - name = "_at_parcel_slash_packager-css"; - packageName = "@parcel/packager-css"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.3.2.tgz"; - sha512 = "ByuF9xDnQnpVL1Hdu9aY6SpxOuZowd3TH7joh1qdRPLeMHTEvUywHBXoiAyNdrhnLGum8uPEdY8Ra5Xuo1U7kg=="; - }; - }; - "@parcel/packager-html-2.3.2" = { - name = "_at_parcel_slash_packager-html"; - packageName = "@parcel/packager-html"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.3.2.tgz"; - sha512 = "YqAptdU+uqfgwSii76mRGcA/3TpuC6yHr8xG+11brqj/tEFLsurmX0naombzd7FgmrTE9w+kb0HUIMl2vRBn0A=="; - }; - }; - "@parcel/packager-js-2.3.2" = { - name = "_at_parcel_slash_packager-js"; - packageName = "@parcel/packager-js"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.3.2.tgz"; - sha512 = "3OP0Ro9M1J+PIKZK4Ec2N5hjIPiqk++B2kMFeiUqvaNZjJgKrPPEICBhjS52rma4IE/NgmIMB3aI5pWqE/KwNA=="; - }; - }; - "@parcel/packager-raw-2.3.2" = { - name = "_at_parcel_slash_packager-raw"; - packageName = "@parcel/packager-raw"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.3.2.tgz"; - sha512 = "RnoZ7WgNAFWkEPrEefvyDqus7xfv9XGprHyTbfLittPaVAZpl+4eAv43nXyMfzk77Cgds6KcNpkosj3acEpNIQ=="; - }; - }; - "@parcel/packager-svg-2.3.2" = { - name = "_at_parcel_slash_packager-svg"; - packageName = "@parcel/packager-svg"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.3.2.tgz"; - sha512 = "iIC0VeczOXynS7M5jCi3naMBRyAznBVJ3iMg92/GaI9duxPlUMGAlHzLAKNtoXkc00HMXDH7rrmMb04VX6FYSg=="; - }; - }; - "@parcel/plugin-2.0.0-beta.2" = { - name = "_at_parcel_slash_plugin"; - packageName = "@parcel/plugin"; - version = "2.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.0.0-beta.2.tgz"; - sha512 = "I89k7uc+yeSe6LrREajkvR6HnfcZzMDoz/TjnfG0W+iQYdKKaAuggf9zlQ6aOr8moGM1orcVSx5X+77u/tX0gg=="; - }; - }; - "@parcel/plugin-2.3.2" = { - name = "_at_parcel_slash_plugin"; - packageName = "@parcel/plugin"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.3.2.tgz"; - sha512 = "SaLZAJX4KH+mrAmqmcy9KJN+V7L+6YNTlgyqYmfKlNiHu7aIjLL+3prX8QRcgGtjAYziCxvPj0cl1CCJssaiGg=="; - }; - }; - "@parcel/reporter-cli-2.3.2" = { - name = "_at_parcel_slash_reporter-cli"; - packageName = "@parcel/reporter-cli"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.3.2.tgz"; - sha512 = "VYetmTXqW83npsvVvqlQZTbF3yVL3k/FCCl3kSWvOr9LZA0lmyqJWPjMHq37yIIOszQN/p5guLtgCjsP0UQw1Q=="; - }; - }; - "@parcel/reporter-dev-server-2.3.2" = { - name = "_at_parcel_slash_reporter-dev-server"; - packageName = "@parcel/reporter-dev-server"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.3.2.tgz"; - sha512 = "E7LtnjAX4iiWMw2qKUyFBi3+bDz0UGjqgHoPQylUYYLi6opXjJz/oC+cCcCy4e3RZlkrl187XonvagS59YjDxA=="; - }; - }; - "@parcel/resolver-default-2.3.2" = { - name = "_at_parcel_slash_resolver-default"; - packageName = "@parcel/resolver-default"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.3.2.tgz"; - sha512 = "y3r+xOwWsATrNGUWuZ6soA7q24f8E5tY1AZ9lHCufnkK2cdKZJ5O1cyd7ohkAiKZx2/pMd+FgmVZ/J3oxetXkA=="; - }; - }; - "@parcel/runtime-browser-hmr-2.3.2" = { - name = "_at_parcel_slash_runtime-browser-hmr"; - packageName = "@parcel/runtime-browser-hmr"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.3.2.tgz"; - sha512 = "nRD6uOyF1+HGylP9GASbYmvUDOsDaNwvaxuGTSh8+5M0mmCgib+hVBiPEKbwdmKjGbUPt9wRFPyMa/JpeQZsIQ=="; - }; - }; - "@parcel/runtime-js-2.3.2" = { - name = "_at_parcel_slash_runtime-js"; - packageName = "@parcel/runtime-js"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.3.2.tgz"; - sha512 = "SJepcHvYO/7CEe/Q85sngk+smcJ6TypuPh4D2R8kN+cAJPi5WvbQEe7+x5BEgbN+5Jumi/Uo3FfOOE5mYh+F6g=="; - }; - }; - "@parcel/runtime-react-refresh-2.3.2" = { - name = "_at_parcel_slash_runtime-react-refresh"; - packageName = "@parcel/runtime-react-refresh"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.3.2.tgz"; - sha512 = "P+GRPO2XVDSBQ4HmRSj2xfbHSQvL9+ahTE/AB74IJExLTITv5l4SHAV3VsiKohuHYUAYHW3A/Oe7tEFCAb6Cug=="; - }; - }; - "@parcel/runtime-service-worker-2.3.2" = { - name = "_at_parcel_slash_runtime-service-worker"; - packageName = "@parcel/runtime-service-worker"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.3.2.tgz"; - sha512 = "iREHj/eapphC4uS/zGUkiTJvG57q+CVbTrfE42kB8ECtf/RYNo5YC9htdvPZjRSXDPrEPc5NCoKp4X09ENNikw=="; - }; - }; - "@parcel/source-map-2.0.2" = { - name = "_at_parcel_slash_source-map"; - packageName = "@parcel/source-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.2.tgz"; - sha512 = "NnUrPYLpYB6qyx2v6bcRPn/gVigmGG6M6xL8wIg/i0dP1GLkuY1nf+Hqdf63FzPTqqT7K3k6eE5yHPQVMO5jcA=="; - }; - }; - "@parcel/transformer-babel-2.3.2" = { - name = "_at_parcel_slash_transformer-babel"; - packageName = "@parcel/transformer-babel"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.3.2.tgz"; - sha512 = "QpWfH2V6jJ+kcUBIMM/uBBG8dGFvNaOGS+8jD6b+eTP+1owzm83RoWgqhRV2D/hhv2qMXEQzIljoc/wg2y+X4g=="; - }; - }; - "@parcel/transformer-css-2.3.2" = { - name = "_at_parcel_slash_transformer-css"; - packageName = "@parcel/transformer-css"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.3.2.tgz"; - sha512 = "8lzvDny+78DIAqhcXam2Bf9FyaUoqzHdUQdNFn+PuXTHroG/QGPvln1kvqngJjn4/cpJS9vYmAPVXe+nai3P8g=="; - }; - }; - "@parcel/transformer-html-2.3.2" = { - name = "_at_parcel_slash_transformer-html"; - packageName = "@parcel/transformer-html"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.3.2.tgz"; - sha512 = "idT1I/8WM65IFYBqzRwpwT7sf0xGur4EDQDHhuPX1w+pIVZnh0lkLMAnEqs6ar1SPRMys4chzkuDNnqh0d76hg=="; - }; - }; - "@parcel/transformer-image-2.3.2" = { - name = "_at_parcel_slash_transformer-image"; - packageName = "@parcel/transformer-image"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.3.2.tgz"; - sha512 = "0K7cJHXysli6hZsUz/zVGO7WCoaaIeVdzAxKpLA1Yl3LKw/ODiMyXKt08LiV/ljQ2xT5qb9EsXUWDRvcZ0b96A=="; - }; - }; - "@parcel/transformer-js-2.3.2" = { - name = "_at_parcel_slash_transformer-js"; - packageName = "@parcel/transformer-js"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.3.2.tgz"; - sha512 = "U1fbIoAoqR5P49S+DMhH8BUd9IHRPwrTTv6ARYGsYnhuNsjTFhNYE0kkfRYboe/e0z7vEbeJICZXjnZ7eQDw5A=="; - }; - }; - "@parcel/transformer-json-2.3.2" = { - name = "_at_parcel_slash_transformer-json"; - packageName = "@parcel/transformer-json"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.3.2.tgz"; - sha512 = "Pv2iPaxKINtFwOk5fDbHjQlSm2Vza/NLimQY896FLxiXPNAJxWGvMwdutgOPEBKksxRx9LZPyIOHiRVZ0KcA3w=="; - }; - }; - "@parcel/transformer-postcss-2.3.2" = { - name = "_at_parcel_slash_transformer-postcss"; - packageName = "@parcel/transformer-postcss"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.3.2.tgz"; - sha512 = "Rpdxc1rt2aJFCh/y/ccaBc9J1crDjNY5o44xYoOemBoUNDMREsmg5sR5iO81qKKO5GxfoosGb2zh59aeTmywcg=="; - }; - }; - "@parcel/transformer-posthtml-2.3.2" = { - name = "_at_parcel_slash_transformer-posthtml"; - packageName = "@parcel/transformer-posthtml"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.3.2.tgz"; - sha512 = "tMdVExfdM+1G8A9KSHDsjg+S9xEGbhH5mApF2NslPnNZ4ciLKRNuHU2sSV/v8i0a6kacKvDTrwQXYBQJGOodBw=="; - }; - }; - "@parcel/transformer-raw-2.3.2" = { - name = "_at_parcel_slash_transformer-raw"; - packageName = "@parcel/transformer-raw"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.3.2.tgz"; - sha512 = "lY7eOCaALZ90+GH+4PZRmAPGQRXoZ66NakSdhEtH6JSSAYOmZKDvNLGTMRo/vK1oELzWMuAHGdqvbcPDtNLLVw=="; - }; - }; - "@parcel/transformer-react-refresh-wrap-2.3.2" = { - name = "_at_parcel_slash_transformer-react-refresh-wrap"; - packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.3.2.tgz"; - sha512 = "FZaderyCExn0SBZ6D+zHPWc8JSn9YDcbfibv0wkCl+D7sYfeWZ22i7MRp5NwCe/TZ21WuxDWySCggEp/Waz2xg=="; - }; - }; - "@parcel/transformer-svg-2.3.2" = { - name = "_at_parcel_slash_transformer-svg"; - packageName = "@parcel/transformer-svg"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.3.2.tgz"; - sha512 = "k9My6bePsaGgUh+tidDjFbbVgKPTzwCAQfoloZRMt7y396KgUbvCfqDruk04k6k+cJn7Jl1o/5lUpTEruBze7g=="; - }; - }; - "@parcel/transformer-vue-2.3.2" = { - name = "_at_parcel_slash_transformer-vue"; - packageName = "@parcel/transformer-vue"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-vue/-/transformer-vue-2.3.2.tgz"; - sha512 = "6s72rpAropKkGctrAj+ILay7c87Fm9QecZIUeLHfHE+d/3ka6Cw256Ol3/kjRAlRskddbPA+/rfpDpcGEtLziw=="; - }; - }; - "@parcel/types-2.0.0-beta.2" = { - name = "_at_parcel_slash_types"; - packageName = "@parcel/types"; - version = "2.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.0.0-beta.2.tgz"; - sha512 = "ri2BPGAFDntQbA5p3m/4QgnEqWYToUMkAtLelXSPbwnTM0KARavTAwSRqz1xwTdXa8gQyv4SSV7xURwaPaZ3GA=="; - }; - }; - "@parcel/types-2.3.2" = { - name = "_at_parcel_slash_types"; - packageName = "@parcel/types"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.3.2.tgz"; - sha512 = "C77Ct1xNM7LWjPTfe/dQ/9rq1efdsX5VJu2o8/TVi6qoFh64Wp/c5/vCHwKInOTBZUTchVO6z4PGJNIZoUVJuA=="; - }; - }; - "@parcel/utils-2.3.2" = { - name = "_at_parcel_slash_utils"; - packageName = "@parcel/utils"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.3.2.tgz"; - sha512 = "xzZ+0vWhrXlLzGoz7WlANaO5IPtyWGeCZruGtepUL3yheRWb1UU4zFN9xz7Z+j++Dmf1Fgkc3qdk/t4O8u9HLQ=="; - }; - }; - "@parcel/watcher-2.0.5" = { - name = "_at_parcel_slash_watcher"; - packageName = "@parcel/watcher"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.5.tgz"; - sha512 = "x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw=="; - }; - }; - "@parcel/workers-2.3.2" = { - name = "_at_parcel_slash_workers"; - packageName = "@parcel/workers"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.3.2.tgz"; - sha512 = "JbOm+Ceuyymd1SuKGgodC2EXAiPuFRpaNUSJpz3NAsS3lVIt2TDAPMOWBivS7sML/KltspUfl/Q9YwO0TPUFNw=="; - }; - }; - "@samverschueren/stream-to-observable-0.3.1" = { - name = "_at_samverschueren_slash_stream-to-observable"; - packageName = "@samverschueren/stream-to-observable"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; - sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; - }; - }; - "@swc/helpers-0.2.14" = { - name = "_at_swc_slash_helpers"; - packageName = "@swc/helpers"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.2.14.tgz"; - sha512 = "wpCQMhf5p5GhNg2MmGKXzUNwxe7zRiCsmqYsamez2beP7mKPCSiu+BjZcdN95yYSzO857kr0VfQewmGpS77nqA=="; - }; - }; - "@trysound/sax-0.2.0" = { - name = "_at_trysound_slash_sax"; - packageName = "@trysound/sax"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"; - sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; - }; - }; - "@types/parse-json-4.0.0" = { - name = "_at_types_slash_parse-json"; - packageName = "@types/parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - }; - "@types/sinonjs__fake-timers-6.0.4" = { - name = "_at_types_slash_sinonjs__fake-timers"; - packageName = "@types/sinonjs__fake-timers"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz"; - sha512 = "IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A=="; - }; - }; - "@types/sizzle-2.3.3" = { - name = "_at_types_slash_sizzle"; - packageName = "@types/sizzle"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; - sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; - }; - }; - "@vue/compiler-core-3.2.31" = { - name = "_at_vue_slash_compiler-core"; - packageName = "@vue/compiler-core"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz"; - sha512 = "aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ=="; - }; - }; - "@vue/compiler-dom-3.2.31" = { - name = "_at_vue_slash_compiler-dom"; - packageName = "@vue/compiler-dom"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz"; - sha512 = "60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg=="; - }; - }; - "@vue/compiler-sfc-3.2.31" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz"; - sha512 = "748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ=="; - }; - }; - "@vue/compiler-ssr-3.2.31" = { - name = "_at_vue_slash_compiler-ssr"; - packageName = "@vue/compiler-ssr"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz"; - sha512 = "mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw=="; - }; - }; - "@vue/devtools-api-6.1.3" = { - name = "_at_vue_slash_devtools-api"; - packageName = "@vue/devtools-api"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.1.3.tgz"; - sha512 = "79InfO2xHv+WHIrH1bHXQUiQD/wMls9qBk6WVwGCbdwP7/3zINtvqPNMtmSHXsIKjvUAHc8L0ouOj6ZQQRmcXg=="; - }; - }; - "@vue/reactivity-3.2.31" = { - name = "_at_vue_slash_reactivity"; - packageName = "@vue/reactivity"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.31.tgz"; - sha512 = "HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw=="; - }; - }; - "@vue/reactivity-transform-3.2.31" = { - name = "_at_vue_slash_reactivity-transform"; - packageName = "@vue/reactivity-transform"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz"; - sha512 = "uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA=="; - }; - }; - "@vue/runtime-core-3.2.31" = { - name = "_at_vue_slash_runtime-core"; - packageName = "@vue/runtime-core"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.31.tgz"; - sha512 = "Kcog5XmSY7VHFEMuk4+Gap8gUssYMZ2+w+cmGI6OpZWYOEIcbE0TPzzPHi+8XTzAgx1w/ZxDFcXhZeXN5eKWsA=="; - }; - }; - "@vue/runtime-dom-3.2.31" = { - name = "_at_vue_slash_runtime-dom"; - packageName = "@vue/runtime-dom"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz"; - sha512 = "N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g=="; - }; - }; - "@vue/server-renderer-3.2.31" = { - name = "_at_vue_slash_server-renderer"; - packageName = "@vue/server-renderer"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.31.tgz"; - sha512 = "8CN3Zj2HyR2LQQBHZ61HexF5NReqngLT3oahyiVRfSSvak+oAvVmu8iNLSu6XR77Ili2AOpnAt1y8ywjjqtmkg=="; - }; - }; - "@vue/shared-3.2.31" = { - name = "_at_vue_slash_shared"; - packageName = "@vue/shared"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz"; - sha512 = "ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="; - }; - }; - "abortcontroller-polyfill-1.7.3" = { - name = "abortcontroller-polyfill"; - packageName = "abortcontroller-polyfill"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; - sha512 = "zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q=="; - }; - }; - "acorn-8.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "8.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; - }; - }; - "ansi-escapes-3.2.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - }; - "ansi-styles-4.3.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - }; - "any-observable-0.3.0" = { - name = "any-observable"; - packageName = "any-observable"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz"; - sha512 = "/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog=="; - }; - }; - "arch-2.2.0" = { - name = "arch"; - packageName = "arch"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"; - sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; - }; - }; - "asn1-0.2.4" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "async-3.2.3" = { - name = "async"; - packageName = "async"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; - sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.9.1" = { - name = "aws4"; - packageName = "aws4"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "base-x-3.0.9" = { - name = "base-x"; - packageName = "base-x"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz"; - sha512 = "H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ=="; - }; - }; - "bcrypt-pbkdf-1.0.2" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; - }; - }; - "bluebird-3.7.2" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "browserslist-4.20.2" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz"; - sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; - }; - }; - "buffer-crc32-0.2.13" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; - }; - }; - "buffer-from-1.1.1" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; - }; - }; - "cachedir-2.3.0" = { - name = "cachedir"; - packageName = "cachedir"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz"; - sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; - }; - }; - "callsites-3.1.0" = { - name = "callsites"; - packageName = "callsites"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - }; - "caniuse-api-3.0.0" = { - name = "caniuse-api"; - packageName = "caniuse-api"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; - }; - }; - "caniuse-lite-1.0.30001319" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001319"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz"; - sha512 = "xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw=="; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "chalk-2.4.2" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "check-more-types-2.24.0" = { - name = "check-more-types"; - packageName = "check-more-types"; - version = "2.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz"; - sha1 = "1420ffb10fd444dcfc79b43891bbfffd32a84600"; - }; - }; - "chrome-trace-event-1.0.2" = { - name = "chrome-trace-event"; - packageName = "chrome-trace-event"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; - }; - }; - "ci-info-2.0.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - }; - "cli-cursor-1.0.2" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; - sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; - }; - }; - "cli-table3-0.5.1" = { - name = "cli-table3"; - packageName = "cli-table3"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz"; - sha512 = "7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw=="; - }; - }; - "cli-truncate-0.2.1" = { - name = "cli-truncate"; - packageName = "cli-truncate"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz"; - sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; - }; - }; - "clone-2.1.2" = { - name = "clone"; - packageName = "clone"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; - sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - }; - "color-convert-2.0.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; - }; - }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - }; - "colord-2.9.2" = { - name = "colord"; - packageName = "colord"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz"; - sha512 = "Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="; - }; - }; - "colorette-1.2.2" = { - name = "colorette"; - packageName = "colorette"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; - sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; - }; - }; - "colors-1.4.0" = { - name = "colors"; - packageName = "colors"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; - }; - }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; - "commander-4.1.1" = { - name = "commander"; - packageName = "commander"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; - sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; - }; - }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; - "common-tags-1.8.2" = { - name = "common-tags"; - packageName = "common-tags"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"; - sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "concat-stream-1.6.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; - }; - }; - "consolidate-0.16.0" = { - name = "consolidate"; - packageName = "consolidate"; - version = "0.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz"; - sha512 = "Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ=="; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "cosmiconfig-7.0.1" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; - }; - }; - "cross-spawn-6.0.5" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "6.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; - }; - }; - "css-declaration-sorter-6.1.4" = { - name = "css-declaration-sorter"; - packageName = "css-declaration-sorter"; - version = "6.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz"; - sha512 = "lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw=="; - }; - }; - "css-select-4.2.1" = { - name = "css-select"; - packageName = "css-select"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz"; - sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ=="; - }; - }; - "css-tree-1.1.3" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"; - sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; - }; - }; - "css-what-5.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz"; - sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; - }; - }; - "cssesc-3.0.0" = { - name = "cssesc"; - packageName = "cssesc"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; - }; - }; - "cssnano-5.1.5" = { - name = "cssnano"; - packageName = "cssnano"; - version = "5.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.5.tgz"; - sha512 = "VZO1e+bRRVixMeia1zKagrv0lLN1B/r/u12STGNNUFxnp97LIFgZHQa0JxqlwEkvzUyA9Oz/WnCTAFkdEbONmg=="; - }; - }; - "cssnano-preset-default-5.2.5" = { - name = "cssnano-preset-default"; - packageName = "cssnano-preset-default"; - version = "5.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.5.tgz"; - sha512 = "WopL7PzN7sos3X8B54/QGl+CZUh1f0qN4ds+y2d5EPwRSSc3jsitVw81O+Uyop0pXyOfPfZxnc+LmA8w/Ki/WQ=="; - }; - }; - "cssnano-utils-3.1.0" = { - name = "cssnano-utils"; - packageName = "cssnano-utils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; - sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; - }; - }; - "csso-4.2.0" = { - name = "csso"; - packageName = "csso"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; - sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; - }; - }; - "csstype-2.6.20" = { - name = "csstype"; - packageName = "csstype"; - version = "2.6.20"; - src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz"; - sha512 = "/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="; - }; - }; - "cypress-4.12.1" = { - name = "cypress"; - packageName = "cypress"; - version = "4.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cypress/-/cypress-4.12.1.tgz"; - sha512 = "9SGIPEmqU8vuRA6xst2CMTYd9sCFCxKSzrHt0wr+w2iAQMCIIsXsQ5Gplns1sT6LDbZcmLv6uehabAOl3fhc9Q=="; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "date-fns-1.30.1" = { - name = "date-fns"; - packageName = "date-fns"; - version = "1.30.1"; - src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz"; - sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "debug-4.1.1" = { - name = "debug"; - packageName = "debug"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "detect-libc-1.0.3" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - }; - "dom-serializer-1.3.2" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; - }; - }; - "domelementtype-2.2.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; - }; - }; - "domhandler-4.3.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; - sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; - }; - }; - "domutils-2.8.0" = { - name = "domutils"; - packageName = "domutils"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; - sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; - }; - }; - "dotenv-7.0.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz"; - sha512 = "M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="; - }; - }; - "dotenv-expand-5.1.0" = { - name = "dotenv-expand"; - packageName = "dotenv-expand"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; - }; - }; - "ecc-jsbn-0.1.2" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; - }; - }; - "electron-to-chromium-1.4.89" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.89"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz"; - sha512 = "z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw=="; - }; - }; - "elegant-spinner-1.0.1" = { - name = "elegant-spinner"; - packageName = "elegant-spinner"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; - sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; - }; - }; - "entities-3.0.1" = { - name = "entities"; - packageName = "entities"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"; - sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; - }; - }; - "error-ex-1.3.2" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "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=="; - }; - }; - "eventemitter2-6.4.5" = { - name = "eventemitter2"; - packageName = "eventemitter2"; - version = "6.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz"; - sha512 = "bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw=="; - }; - }; - "execa-1.0.0" = { - name = "execa"; - packageName = "execa"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; - }; - }; - "executable-4.1.1" = { - name = "executable"; - packageName = "executable"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"; - sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; - }; - }; - "exit-hook-1.1.1" = { - name = "exit-hook"; - packageName = "exit-hook"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; - sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; - }; - }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - }; - "extract-zip-1.7.0" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"; - sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; - "fd-slicer-1.1.0" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; - }; - }; - "figures-1.7.0" = { - name = "figures"; - packageName = "figures"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; - }; - }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.3.3" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; - }; - }; - "fs-extra-8.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "get-port-4.2.0" = { - name = "get-port"; - packageName = "get-port"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz"; - sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; - }; - }; - "get-stream-4.1.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - }; - "getos-3.2.1" = { - name = "getos"; - packageName = "getos"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz"; - sha512 = "U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q=="; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - }; - "glob-7.1.6" = { - name = "glob"; - packageName = "glob"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; - }; - }; - "global-dirs-2.1.0" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; - sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; - }; - }; - "globals-13.13.0" = { - name = "globals"; - packageName = "globals"; - version = "13.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; - sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; - }; - }; - "graceful-fs-4.2.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "htmlnano-2.0.0" = { - name = "htmlnano"; - packageName = "htmlnano"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.0.tgz"; - sha512 = "thKQfhcp2xgtsWNE27A2bliEeqVL5xjAgGn0wajyttvFFsvFWWah1ntV9aEX61gz0T6MBQ5xK/1lXuEumhJTcg=="; - }; - }; - "htmlparser2-7.2.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz"; - sha512 = "H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog=="; - }; - }; - "http-signature-1.3.6" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"; - sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; - }; - }; - "import-fresh-3.3.0" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - }; - "indent-string-3.2.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "ini-1.3.7" = { - name = "ini"; - packageName = "ini"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; - sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "is-ci-2.0.0" = { - name = "is-ci"; - packageName = "is-ci"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; - "is-installed-globally-0.3.2" = { - name = "is-installed-globally"; - packageName = "is-installed-globally"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; - sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; - }; - }; - "is-json-2.0.1" = { - name = "is-json"; - packageName = "is-json"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz"; - sha1 = "6be166d144828a131d686891b983df62c39491ff"; - }; - }; - "is-observable-1.1.0" = { - name = "is-observable"; - packageName = "is-observable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz"; - sha512 = "NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA=="; - }; - }; - "is-path-inside-3.0.3" = { - name = "is-path-inside"; - packageName = "is-path-inside"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - }; - "is-promise-2.2.2" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; - sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "js-tokens-4.0.0" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "json-parse-even-better-errors-2.3.1" = { - name = "json-parse-even-better-errors"; - packageName = "json-parse-even-better-errors"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - }; - "json-schema-0.4.0" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; - sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; - }; - }; - "json-source-map-0.6.1" = { - name = "json-source-map"; - packageName = "json-source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz"; - sha512 = "1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "json5-2.2.1" = { - name = "json5"; - packageName = "json5"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; - }; - }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; - }; - }; - "jsprim-2.0.2" = { - name = "jsprim"; - packageName = "jsprim"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"; - sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; - }; - }; - "lazy-ass-1.6.0" = { - name = "lazy-ass"; - packageName = "lazy-ass"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz"; - sha1 = "7999655e8646c17f089fdd187d150d3324d54513"; - }; - }; - "lilconfig-2.0.4" = { - name = "lilconfig"; - packageName = "lilconfig"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz"; - sha512 = "bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA=="; - }; - }; - "lines-and-columns-1.2.4" = { - name = "lines-and-columns"; - packageName = "lines-and-columns"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - }; - "listr-0.14.3" = { - name = "listr"; - packageName = "listr"; - version = "0.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz"; - sha512 = "RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA=="; - }; - }; - "listr-silent-renderer-1.1.1" = { - name = "listr-silent-renderer"; - packageName = "listr-silent-renderer"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz"; - sha1 = "924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"; - }; - }; - "listr-update-renderer-0.5.0" = { - name = "listr-update-renderer"; - packageName = "listr-update-renderer"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz"; - sha512 = "tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA=="; - }; - }; - "listr-verbose-renderer-0.5.0" = { - name = "listr-verbose-renderer"; - packageName = "listr-verbose-renderer"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz"; - sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; - }; - }; - "lmdb-2.2.6" = { - name = "lmdb"; - packageName = "lmdb"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.6.tgz"; - sha512 = "UmQV0oZZcV3EN6rjcAjIiuWcc3MYZGWQ0GUYz46Ron5fuTa/dUow7WSQa6leFkvZIKVUdECBWVw96tckfEzUFQ=="; - }; - }; - "lodash-4.17.21" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - }; - "lodash.memoize-4.1.2" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; - }; - }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; - }; - }; - "log-symbols-1.0.2" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; - }; - }; - "log-symbols-3.0.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; - }; - }; - "log-update-2.3.0" = { - name = "log-update"; - packageName = "log-update"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; - }; - }; - "magic-string-0.25.9" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.9"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; - sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; - }; - }; - "mdn-data-2.0.14" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"; - sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; - }; - }; - "mime-db-1.43.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; - }; - }; - "mime-types-2.1.26" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.26"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; - }; - }; - "mimic-fn-1.2.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - }; - "minimist-1.2.5" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; - }; - }; - "mkdirp-0.5.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; - }; - }; - "moment-2.29.1" = { - name = "moment"; - packageName = "moment"; - version = "2.29.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; - sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "msgpackr-1.5.5" = { - name = "msgpackr"; - packageName = "msgpackr"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.5.tgz"; - sha512 = "JG0V47xRIQ9pyUnx6Hb4+3TrQoia2nA3UIdmyTldhxaxtKFkekkKpUW/N6fwHwod9o4BGuJGtouxOk+yCP5PEA=="; - }; - }; - "msgpackr-extract-1.0.16" = { - name = "msgpackr-extract"; - packageName = "msgpackr-extract"; - version = "1.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.16.tgz"; - sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA=="; - }; - }; - "nan-2.15.0" = { - name = "nan"; - packageName = "nan"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; - sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; - }; - }; - "nanoid-3.1.22" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.1.22"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz"; - sha512 = "/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ=="; - }; - }; - "nanoid-3.3.1" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; - sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; - }; - }; - "nice-try-1.0.5" = { - name = "nice-try"; - packageName = "nice-try"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - }; - "node-addon-api-3.2.1" = { - name = "node-addon-api"; - packageName = "node-addon-api"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"; - sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; - }; - }; - "node-gyp-build-4.2.3" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; - sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; - }; - }; - "node-gyp-build-4.3.0" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz"; - sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="; - }; - }; - "node-releases-2.0.2" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; - sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; - }; - }; - "normalize-url-6.1.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - }; - "nth-check-2.0.1" = { - name = "nth-check"; - packageName = "nth-check"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz"; - sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; - }; - }; - "nullthrows-1.1.1" = { - name = "nullthrows"; - packageName = "nullthrows"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz"; - sha512 = "2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "onetime-1.1.0" = { - name = "onetime"; - packageName = "onetime"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; - sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "ordered-binary-1.2.4" = { - name = "ordered-binary"; - packageName = "ordered-binary"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz"; - sha512 = "A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg=="; - }; - }; - "ospath-1.2.2" = { - name = "ospath"; - packageName = "ospath"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"; - sha1 = "1276639774a3f8ef2572f7fe4280e0ea4550c07b"; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - }; - "p-map-2.1.0" = { - name = "p-map"; - packageName = "p-map"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; - sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; - }; - }; - "parcel-2.3.2" = { - name = "parcel"; - packageName = "parcel"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.3.2.tgz"; - sha512 = "4jhgoBcQaiGKmnmBvNyKyOvZrxCgzgUzdEoVup/fRCOP99hNmvYIN5IErIIJxsU9ObcG/RGCFF8wa4kVRsWfIg=="; - }; - }; - "parcel-reporter-static-files-copy-1.2.2" = { - name = "parcel-reporter-static-files-copy"; - packageName = "parcel-reporter-static-files-copy"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parcel-reporter-static-files-copy/-/parcel-reporter-static-files-copy-1.2.2.tgz"; - sha512 = "DMtv5QVoEp5Jp07G1QKF6IB6uns8/+joGiTh1SU71x8qsm5BBR7AqmzaKed1CAlzYPyzu0It6IjzIC8mFvn4iw=="; - }; - }; - "parent-module-1.0.1" = { - name = "parent-module"; - packageName = "parent-module"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - }; - "parse-json-5.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - }; - "pend-1.2.0" = { - name = "pend"; - packageName = "pend"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - }; - "picocolors-1.0.0" = { - name = "picocolors"; - packageName = "picocolors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "postcss-8.2.8" = { - name = "postcss"; - packageName = "postcss"; - version = "8.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz"; - sha512 = "1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw=="; - }; - }; - "postcss-8.4.12" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.12"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; - sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; - }; - }; - "postcss-calc-8.2.4" = { - name = "postcss-calc"; - packageName = "postcss-calc"; - version = "8.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; - sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; - }; - }; - "postcss-colormin-5.3.0" = { - name = "postcss-colormin"; - packageName = "postcss-colormin"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; - sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; - }; - }; - "postcss-convert-values-5.1.0" = { - name = "postcss-convert-values"; - packageName = "postcss-convert-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz"; - sha512 = "GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g=="; - }; - }; - "postcss-discard-comments-5.1.1" = { - name = "postcss-discard-comments"; - packageName = "postcss-discard-comments"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz"; - sha512 = "5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ=="; - }; - }; - "postcss-discard-duplicates-5.1.0" = { - name = "postcss-discard-duplicates"; - packageName = "postcss-discard-duplicates"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; - sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; - }; - }; - "postcss-discard-empty-5.1.1" = { - name = "postcss-discard-empty"; - packageName = "postcss-discard-empty"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; - sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; - }; - }; - "postcss-discard-overridden-5.1.0" = { - name = "postcss-discard-overridden"; - packageName = "postcss-discard-overridden"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; - sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; - }; - }; - "postcss-merge-longhand-5.1.3" = { - name = "postcss-merge-longhand"; - packageName = "postcss-merge-longhand"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.3.tgz"; - sha512 = "lX8GPGvZ0iGP/IboM7HXH5JwkXvXod1Rr8H8ixwiA372hArk0zP4ZcCy4z4Prg/bfNlbbTf0KCOjCF9kKnpP/w=="; - }; - }; - "postcss-merge-rules-5.1.1" = { - name = "postcss-merge-rules"; - packageName = "postcss-merge-rules"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz"; - sha512 = "8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww=="; - }; - }; - "postcss-minify-font-values-5.1.0" = { - name = "postcss-minify-font-values"; - packageName = "postcss-minify-font-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; - sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; - }; - }; - "postcss-minify-gradients-5.1.1" = { - name = "postcss-minify-gradients"; - packageName = "postcss-minify-gradients"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"; - sha512 = "VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw=="; - }; - }; - "postcss-minify-params-5.1.2" = { - name = "postcss-minify-params"; - packageName = "postcss-minify-params"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz"; - sha512 = "aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g=="; - }; - }; - "postcss-minify-selectors-5.2.0" = { - name = "postcss-minify-selectors"; - packageName = "postcss-minify-selectors"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz"; - sha512 = "vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA=="; - }; - }; - "postcss-normalize-charset-5.1.0" = { - name = "postcss-normalize-charset"; - packageName = "postcss-normalize-charset"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; - sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; - }; - }; - "postcss-normalize-display-values-5.1.0" = { - name = "postcss-normalize-display-values"; - packageName = "postcss-normalize-display-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; - sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; - }; - }; - "postcss-normalize-positions-5.1.0" = { - name = "postcss-normalize-positions"; - packageName = "postcss-normalize-positions"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz"; - sha512 = "8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ=="; - }; - }; - "postcss-normalize-repeat-style-5.1.0" = { - name = "postcss-normalize-repeat-style"; - packageName = "postcss-normalize-repeat-style"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz"; - sha512 = "IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw=="; - }; - }; - "postcss-normalize-string-5.1.0" = { - name = "postcss-normalize-string"; - packageName = "postcss-normalize-string"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; - sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; - }; - }; - "postcss-normalize-timing-functions-5.1.0" = { - name = "postcss-normalize-timing-functions"; - packageName = "postcss-normalize-timing-functions"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; - sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; - }; - }; - "postcss-normalize-unicode-5.1.0" = { - name = "postcss-normalize-unicode"; - packageName = "postcss-normalize-unicode"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; - sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; - }; - }; - "postcss-normalize-url-5.1.0" = { - name = "postcss-normalize-url"; - packageName = "postcss-normalize-url"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; - sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; - }; - }; - "postcss-normalize-whitespace-5.1.1" = { - name = "postcss-normalize-whitespace"; - packageName = "postcss-normalize-whitespace"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; - sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; - }; - }; - "postcss-ordered-values-5.1.1" = { - name = "postcss-ordered-values"; - packageName = "postcss-ordered-values"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz"; - sha512 = "7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw=="; - }; - }; - "postcss-reduce-initial-5.1.0" = { - name = "postcss-reduce-initial"; - packageName = "postcss-reduce-initial"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; - sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; - }; - }; - "postcss-reduce-transforms-5.1.0" = { - name = "postcss-reduce-transforms"; - packageName = "postcss-reduce-transforms"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; - sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; - }; - }; - "postcss-selector-parser-6.0.9" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz"; - sha512 = "UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ=="; - }; - }; - "postcss-svgo-5.1.0" = { - name = "postcss-svgo"; - packageName = "postcss-svgo"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; - sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; - }; - }; - "postcss-unique-selectors-5.1.1" = { - name = "postcss-unique-selectors"; - packageName = "postcss-unique-selectors"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; - sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; - }; - }; - "postcss-value-parser-4.2.0" = { - name = "postcss-value-parser"; - packageName = "postcss-value-parser"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; - sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; - }; - }; - "posthtml-0.16.6" = { - name = "posthtml"; - packageName = "posthtml"; - version = "0.16.6"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz"; - sha512 = "JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ=="; - }; - }; - "posthtml-parser-0.10.2" = { - name = "posthtml-parser"; - packageName = "posthtml-parser"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz"; - sha512 = "PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg=="; - }; - }; - "posthtml-parser-0.11.0" = { - name = "posthtml-parser"; - packageName = "posthtml-parser"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz"; - sha512 = "QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw=="; - }; - }; - "posthtml-render-3.0.0" = { - name = "posthtml-render"; - packageName = "posthtml-render"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz"; - sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; - }; - }; - "pretty-bytes-5.6.0" = { - name = "pretty-bytes"; - packageName = "pretty-bytes"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; - sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "psl-1.7.0" = { - name = "psl"; - packageName = "psl"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; - }; - }; - "pump-3.0.0" = { - name = "pump"; - packageName = "pump"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }; - }; - "punycode-2.1.1" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - }; - "qs-6.5.2" = { - name = "qs"; - packageName = "qs"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; - }; - }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; - }; - }; - "ramda-0.26.1" = { - name = "ramda"; - packageName = "ramda"; - version = "0.26.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz"; - sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="; - }; - }; - "react-refresh-0.9.0" = { - name = "react-refresh"; - packageName = "react-refresh"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz"; - sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; - }; - }; - "readable-stream-2.3.7" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - }; - "regenerator-runtime-0.13.9" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - }; - "request-progress-3.0.0" = { - name = "request-progress"; - packageName = "request-progress"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz"; - sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe"; - }; - }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - }; - "restore-cursor-1.0.1" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; - sha1 = "34661f46886327fed2991479152252df92daa541"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "rimraf-2.7.1" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; - }; - }; - "rxjs-6.6.7" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; - sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; - }; - }; - "slice-ansi-0.0.4" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - }; - "source-map-0.7.3" = { - name = "source-map"; - packageName = "source-map"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - }; - "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"; - version = "0.5.21"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - }; - "sourcemap-codec-1.4.8" = { - name = "sourcemap-codec"; - packageName = "sourcemap-codec"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - }; - "sshpk-1.16.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; - }; - }; - "stable-0.1.8" = { - name = "stable"; - packageName = "stable"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; - sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - }; - "stylehacks-5.1.0" = { - name = "stylehacks"; - packageName = "stylehacks"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"; - sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - }; - "svgo-2.8.0" = { - name = "svgo"; - packageName = "svgo"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; - sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; - }; - }; - "symbol-observable-1.2.0" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; - }; - }; - "terser-5.12.1" = { - name = "terser"; - packageName = "terser"; - version = "5.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz"; - sha512 = "NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ=="; - }; - }; - "throttleit-1.0.0" = { - name = "throttleit"; - packageName = "throttleit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - }; - "timsort-0.3.0" = { - name = "timsort"; - packageName = "timsort"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz"; - sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; - }; - }; - "tmp-0.1.0" = { - name = "tmp"; - packageName = "tmp"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz"; - sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; - }; - }; - "tough-cookie-2.5.0" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; - }; - }; - "tslib-1.13.0" = { - name = "tslib"; - packageName = "tslib"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; - sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "type-fest-0.20.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - }; - "universalify-0.1.2" = { - name = "universalify"; - packageName = "universalify"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - }; - "untildify-4.0.0" = { - name = "untildify"; - packageName = "untildify"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz"; - sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="; - }; - }; - "url-0.11.0" = { - name = "url"; - packageName = "url"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "utility-types-3.10.0" = { - name = "utility-types"; - packageName = "utility-types"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; - sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "v8-compile-cache-2.3.0" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; - "vue-3.2.31" = { - name = "vue"; - packageName = "vue"; - version = "3.2.31"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.2.31.tgz"; - sha512 = "odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw=="; - }; - }; - "vue-router-4.0.14" = { - name = "vue-router"; - packageName = "vue-router"; - version = "4.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-4.0.14.tgz"; - sha512 = "wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw=="; - }; - }; - "vuex-4.0.2" = { - name = "vuex"; - packageName = "vuex"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz"; - sha512 = "M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q=="; - }; - }; - "weak-lru-cache-1.2.2" = { - name = "weak-lru-cache"; - packageName = "weak-lru-cache"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz"; - sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="; - }; - }; - "which-1.3.1" = { - name = "which"; - packageName = "which"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "xxhash-wasm-0.4.2" = { - name = "xxhash-wasm"; - packageName = "xxhash-wasm"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz"; - sha512 = "/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="; - }; - }; - "yaml-1.10.2" = { - name = "yaml"; - packageName = "yaml"; - version = "1.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; - sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; - }; - }; - "yauzl-2.10.0" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; - }; - }; - }; - args = { - name = "polaris-web"; - packageName = "polaris-web"; - version = "1.0.0"; - src = ../../../../../../../../../nix/store/fgp5qgah5zc0x8fx5la4fvnnmp45avzw-source; - dependencies = [ - sources."@babel/code-frame-7.16.7" - (sources."@babel/highlight-7.16.10" // { - dependencies = [ - sources."@babel/helper-validator-identifier-7.16.7" - ]; - }) - sources."@babel/parser-7.17.8" - (sources."@cypress/listr-verbose-renderer-0.4.1" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) - (sources."@cypress/request-2.88.10" // { - dependencies = [ - sources."http-signature-1.3.6" - sources."json-schema-0.4.0" - sources."jsprim-2.0.2" - sources."uuid-8.3.2" - ]; - }) - (sources."@cypress/xvfb-1.2.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."@parcel/bundler-default-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - sources."@parcel/cache-2.3.2" - (sources."@parcel/codeframe-2.3.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - (sources."@parcel/compressor-raw-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - sources."@parcel/config-default-2.3.2" - (sources."@parcel/core-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - sources."@parcel/diagnostic-2.3.2" - sources."@parcel/events-2.3.2" - (sources."@parcel/fs-2.3.2" // { - dependencies = [ - sources."@parcel/types-2.3.2" - ]; - }) - sources."@parcel/fs-search-2.3.2" - sources."@parcel/graph-2.3.2" - sources."@parcel/hash-2.3.2" - sources."@parcel/logger-2.3.2" - (sources."@parcel/markdown-ansi-2.3.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - (sources."@parcel/namer-default-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - sources."@parcel/node-resolver-core-2.3.2" - (sources."@parcel/optimizer-cssnano-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - sources."nanoid-3.3.1" - sources."postcss-8.4.12" - ]; - }) - (sources."@parcel/optimizer-htmlnano-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/optimizer-image-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/optimizer-svgo-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/optimizer-terser-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/package-manager-2.3.2" // { - dependencies = [ - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/packager-css-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/packager-html-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/packager-js-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/packager-raw-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/packager-svg-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - sources."@parcel/plugin-2.0.0-beta.2" - (sources."@parcel/reporter-cli-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - (sources."@parcel/reporter-dev-server-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/resolver-default-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/runtime-browser-hmr-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/runtime-js-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/runtime-react-refresh-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/runtime-service-worker-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - sources."@parcel/source-map-2.0.2" - (sources."@parcel/transformer-babel-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/transformer-css-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - sources."nanoid-3.3.1" - sources."postcss-8.4.12" - ]; - }) - (sources."@parcel/transformer-html-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - sources."posthtml-parser-0.10.2" - ]; - }) - (sources."@parcel/transformer-image-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/transformer-js-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/transformer-json-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/transformer-postcss-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/transformer-posthtml-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - sources."posthtml-parser-0.10.2" - ]; - }) - (sources."@parcel/transformer-raw-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/transformer-react-refresh-wrap-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - ]; - }) - (sources."@parcel/transformer-svg-2.3.2" // { - dependencies = [ - sources."@parcel/plugin-2.3.2" - sources."@parcel/types-2.3.2" - sources."posthtml-parser-0.10.2" - ]; - }) - (sources."@parcel/transformer-vue-2.3.2" // { - dependencies = [ - sources."@parcel/cache-2.3.2" - sources."@parcel/codeframe-2.3.2" - sources."@parcel/diagnostic-2.3.2" - sources."@parcel/events-2.3.2" - sources."@parcel/fs-2.3.2" - sources."@parcel/fs-search-2.3.2" - sources."@parcel/logger-2.3.2" - sources."@parcel/markdown-ansi-2.3.2" - sources."@parcel/package-manager-2.3.2" - sources."@parcel/plugin-2.3.2" - sources."@parcel/source-map-2.0.2" - sources."@parcel/types-2.3.2" - sources."@parcel/utils-2.3.2" - sources."@parcel/watcher-2.0.5" - sources."@parcel/workers-2.3.2" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."node-addon-api-3.2.1" - sources."node-gyp-build-4.3.0" - ]; - }) - sources."@parcel/types-2.0.0-beta.2" - (sources."@parcel/utils-2.3.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - (sources."@parcel/watcher-2.0.5" // { - dependencies = [ - sources."node-gyp-build-4.3.0" - ]; - }) - (sources."@parcel/workers-2.3.2" // { - dependencies = [ - sources."@parcel/types-2.3.2" - ]; - }) - sources."@samverschueren/stream-to-observable-0.3.1" - sources."@swc/helpers-0.2.14" - sources."@trysound/sax-0.2.0" - sources."@types/parse-json-4.0.0" - sources."@types/sinonjs__fake-timers-6.0.4" - sources."@types/sizzle-2.3.3" - sources."@vue/compiler-core-3.2.31" - sources."@vue/compiler-dom-3.2.31" - (sources."@vue/compiler-sfc-3.2.31" // { - dependencies = [ - sources."@babel/parser-7.17.8" - sources."@vue/compiler-core-3.2.31" - sources."@vue/compiler-dom-3.2.31" - sources."@vue/shared-3.2.31" - ]; - }) - (sources."@vue/compiler-ssr-3.2.31" // { - dependencies = [ - sources."@babel/parser-7.17.8" - sources."@vue/compiler-core-3.2.31" - sources."@vue/compiler-dom-3.2.31" - sources."@vue/shared-3.2.31" - ]; - }) - sources."@vue/devtools-api-6.1.3" - sources."@vue/reactivity-3.2.31" - (sources."@vue/reactivity-transform-3.2.31" // { - dependencies = [ - sources."@babel/parser-7.17.8" - sources."@vue/compiler-core-3.2.31" - sources."@vue/shared-3.2.31" - ]; - }) - sources."@vue/runtime-core-3.2.31" - sources."@vue/runtime-dom-3.2.31" - sources."@vue/server-renderer-3.2.31" - sources."@vue/shared-3.2.31" - sources."abortcontroller-polyfill-1.7.3" - sources."acorn-8.7.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - sources."any-observable-0.3.0" - sources."arch-2.2.0" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."async-3.2.3" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" - sources."balanced-match-1.0.0" - sources."base-x-3.0.9" - sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.2" - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."browserslist-4.20.2" - sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" - sources."cachedir-2.3.0" - sources."callsites-3.1.0" - sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001319" - sources."caseless-0.12.0" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."check-more-types-2.24.0" - sources."chrome-trace-event-1.0.2" - sources."ci-info-2.0.0" - sources."cli-cursor-1.0.2" - sources."cli-table3-0.5.1" - (sources."cli-truncate-0.2.1" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - sources."clone-2.1.2" - sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colord-2.9.2" - sources."colorette-1.2.2" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."commander-7.2.0" - sources."common-tags-1.8.2" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."consolidate-0.16.0" - sources."core-util-is-1.0.2" - sources."cosmiconfig-7.0.1" - sources."cross-spawn-6.0.5" - sources."css-declaration-sorter-6.1.4" - sources."css-select-4.2.1" - sources."css-tree-1.1.3" - sources."css-what-5.1.0" - sources."cssesc-3.0.0" - sources."cssnano-5.1.5" - sources."cssnano-preset-default-5.2.5" - sources."cssnano-utils-3.1.0" - sources."csso-4.2.0" - sources."csstype-2.6.20" - (sources."cypress-4.12.1" // { - dependencies = [ - sources."commander-4.1.1" - sources."log-symbols-3.0.0" - ]; - }) - sources."dashdash-1.14.1" - sources."date-fns-1.30.1" - sources."debug-4.1.1" - sources."delayed-stream-1.0.0" - sources."detect-libc-1.0.3" - sources."dom-serializer-1.3.2" - sources."domelementtype-2.2.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - sources."dotenv-7.0.0" - sources."dotenv-expand-5.1.0" - sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.89" - sources."elegant-spinner-1.0.1" - sources."end-of-stream-1.4.4" - sources."entities-2.2.0" - sources."error-ex-1.3.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."estree-walker-2.0.2" - sources."eventemitter2-6.4.5" - sources."execa-1.0.0" - sources."executable-4.1.1" - sources."exit-hook-1.1.1" - sources."extend-3.0.2" - (sources."extract-zip-1.7.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."extsprintf-1.3.0" - sources."fd-slicer-1.1.0" - sources."figures-1.7.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" - sources."get-port-4.2.0" - sources."get-stream-4.1.0" - sources."getos-3.2.1" - sources."getpass-0.1.7" - sources."glob-7.1.6" - sources."global-dirs-2.1.0" - sources."globals-13.13.0" - sources."graceful-fs-4.2.3" - sources."has-ansi-2.0.0" - sources."has-flag-3.0.0" - sources."htmlnano-2.0.0" - (sources."htmlparser2-7.2.0" // { - dependencies = [ - sources."entities-3.0.1" - ]; - }) - sources."import-fresh-3.3.0" - sources."indent-string-3.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.7" - sources."is-arrayish-0.2.1" - sources."is-ci-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."is-installed-globally-0.3.2" - sources."is-json-2.0.1" - sources."is-observable-1.1.0" - sources."is-path-inside-3.0.3" - sources."is-promise-2.2.2" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."js-tokens-4.0.0" - sources."jsbn-0.1.1" - sources."json-parse-even-better-errors-2.3.1" - sources."json-source-map-0.6.1" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.1" - sources."jsonfile-4.0.0" - sources."lazy-ass-1.6.0" - sources."lilconfig-2.0.4" - sources."lines-and-columns-1.2.4" - sources."listr-0.14.3" - sources."listr-silent-renderer-1.1.1" - (sources."listr-update-renderer-0.5.0" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."log-symbols-1.0.2" - sources."supports-color-2.0.0" - ]; - }) - (sources."listr-verbose-renderer-0.5.0" // { - dependencies = [ - sources."cli-cursor-2.1.0" - sources."figures-2.0.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - ]; - }) - sources."lmdb-2.2.6" - sources."lodash-4.17.21" - sources."lodash.memoize-4.1.2" - sources."lodash.once-4.1.1" - sources."lodash.uniq-4.5.0" - (sources."log-update-2.3.0" // { - dependencies = [ - sources."cli-cursor-2.1.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - ]; - }) - sources."magic-string-0.25.9" - sources."mdn-data-2.0.14" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" - sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."moment-2.29.1" - sources."ms-2.1.2" - sources."msgpackr-1.5.5" - sources."msgpackr-extract-1.0.16" - sources."nan-2.15.0" - sources."nanoid-3.1.22" - sources."nice-try-1.0.5" - sources."node-addon-api-3.2.1" - sources."node-gyp-build-4.2.3" - sources."node-releases-2.0.2" - sources."normalize-url-6.1.0" - sources."npm-run-path-2.0.2" - sources."nth-check-2.0.1" - sources."nullthrows-1.1.1" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-1.1.0" - sources."ordered-binary-1.2.4" - sources."ospath-1.2.2" - sources."p-finally-1.0.0" - sources."p-map-2.1.0" - (sources."parcel-2.3.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."parcel-reporter-static-files-copy-1.2.2" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-type-4.0.0" - sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."picocolors-1.0.0" - sources."pify-2.3.0" - sources."postcss-8.2.8" - sources."postcss-calc-8.2.4" - sources."postcss-colormin-5.3.0" - sources."postcss-convert-values-5.1.0" - sources."postcss-discard-comments-5.1.1" - sources."postcss-discard-duplicates-5.1.0" - sources."postcss-discard-empty-5.1.1" - sources."postcss-discard-overridden-5.1.0" - sources."postcss-merge-longhand-5.1.3" - sources."postcss-merge-rules-5.1.1" - sources."postcss-minify-font-values-5.1.0" - sources."postcss-minify-gradients-5.1.1" - sources."postcss-minify-params-5.1.2" - sources."postcss-minify-selectors-5.2.0" - sources."postcss-normalize-charset-5.1.0" - sources."postcss-normalize-display-values-5.1.0" - sources."postcss-normalize-positions-5.1.0" - sources."postcss-normalize-repeat-style-5.1.0" - sources."postcss-normalize-string-5.1.0" - sources."postcss-normalize-timing-functions-5.1.0" - sources."postcss-normalize-unicode-5.1.0" - sources."postcss-normalize-url-5.1.0" - sources."postcss-normalize-whitespace-5.1.1" - sources."postcss-ordered-values-5.1.1" - sources."postcss-reduce-initial-5.1.0" - sources."postcss-reduce-transforms-5.1.0" - sources."postcss-selector-parser-6.0.9" - sources."postcss-svgo-5.1.0" - sources."postcss-unique-selectors-5.1.1" - sources."postcss-value-parser-4.2.0" - sources."posthtml-0.16.6" - sources."posthtml-parser-0.11.0" - sources."posthtml-render-3.0.0" - sources."pretty-bytes-5.6.0" - sources."process-nextick-args-2.0.1" - sources."psl-1.7.0" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."querystring-0.2.0" - sources."ramda-0.26.1" - sources."react-refresh-0.9.0" - sources."readable-stream-2.3.7" - sources."regenerator-runtime-0.13.9" - sources."request-progress-3.0.0" - sources."resolve-from-4.0.0" - sources."restore-cursor-1.0.1" - sources."rimraf-2.7.1" - sources."rxjs-6.6.7" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.2" - sources."slice-ansi-0.0.4" - sources."source-map-0.6.1" - sources."source-map-js-1.0.2" - sources."source-map-support-0.5.21" - sources."sourcemap-codec-1.4.8" - sources."sshpk-1.16.1" - sources."stable-0.1.8" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-eof-1.0.0" - sources."stylehacks-5.1.0" - (sources."supports-color-7.2.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) - sources."svgo-2.8.0" - sources."symbol-observable-1.2.0" - (sources."terser-5.12.1" // { - dependencies = [ - sources."commander-2.20.3" - sources."source-map-0.7.3" - ]; - }) - sources."throttleit-1.0.0" - sources."timsort-0.3.0" - sources."tmp-0.1.0" - sources."tough-cookie-2.5.0" - sources."tslib-1.13.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-fest-0.20.2" - sources."typedarray-0.0.6" - sources."universalify-0.1.2" - sources."untildify-4.0.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - sources."util-deprecate-1.0.2" - sources."utility-types-3.10.0" - sources."v8-compile-cache-2.3.0" - sources."verror-1.10.0" - sources."vue-3.2.31" - sources."vue-router-4.0.14" - sources."vuex-4.0.2" - sources."weak-lru-cache-1.2.2" - sources."which-1.3.1" - (sources."wrap-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."wrappy-1.0.2" - sources."xxhash-wasm-0.4.2" - sources."yaml-1.10.2" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Web UI for Polaris"; - license = "MIT"; - }; - production = false; - bypassCache = true; - reconstructLock = false; - }; -in -{ - args = args; - sources = sources; - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; - nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { - src = stdenv.mkDerivation { - name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; - dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; - }; - }); -} diff --git a/third_party/nixpkgs/pkgs/servers/polaris/update-web.sh b/third_party/nixpkgs/pkgs/servers/polaris/update-web.sh deleted file mode 100755 index 052eb11f34..0000000000 --- a/third_party/nixpkgs/pkgs/servers/polaris/update-web.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts nodePackages.node2nix curl jq gnused nix coreutils - -set -euo pipefail - -pushd . -cd "$(dirname "${BASH_SOURCE[0]}")"/../../.. - -latestVersion="$(curl -s "https://api.github.com/repos/agersant/polaris-web/releases?per_page=1" | jq -r ".[0].tag_name")" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; polaris-web.version or (lib.getVersion polaris-web)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "polaris-web is up-to-date: $currentVersion" - exit 0 -fi - -update-source-version polaris-web "$latestVersion" - -store_src="$(nix-build . -A polaris-web.src --no-out-link)" - -popd -cd "$(dirname "${BASH_SOURCE[0]}")" - -node2nix \ - --nodejs-12 \ - --development \ - --node-env ../../development/node-packages/node-env.nix \ - --input "$store_src"/package.json \ - --lock "$store_src"/package-lock.json \ - --output ./node-packages.nix \ - --composition ./node-composition.nix diff --git a/third_party/nixpkgs/pkgs/servers/polaris/update.sh b/third_party/nixpkgs/pkgs/servers/polaris/update.sh deleted file mode 100755 index b45a4e0838..0000000000 --- a/third_party/nixpkgs/pkgs/servers/polaris/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts curl jq nix coreutils - -set -euo pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")"/../../.. - -# update github tag and hash - -latestVersion="$(curl -s "https://api.github.com/repos/agersant/polaris/releases?per_page=1" | jq -r ".[0].tag_name")" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; polaris.version or (lib.getVersion polaris)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "polaris is up-to-date: $currentVersion" - exit 0 -fi - -update-source-version polaris "$latestVersion" diff --git a/third_party/nixpkgs/pkgs/servers/polaris/web.nix b/third_party/nixpkgs/pkgs/servers/polaris/web.nix index a8fff551b3..d0c310c2ad 100644 --- a/third_party/nixpkgs/pkgs/servers/polaris/web.nix +++ b/third_party/nixpkgs/pkgs/servers/polaris/web.nix @@ -1,65 +1,24 @@ { lib -, stdenv -, pkgs +, buildNpmPackage , fetchFromGitHub -, nodejs -, cypress }: -stdenv.mkDerivation rec { +buildNpmPackage rec { pname = "polaris-web"; - version = "build-55"; + version = "67"; src = fetchFromGitHub { owner = "agersant"; repo = "polaris-web"; - rev = version; - sha256 = "2XqU4sExF7Or7RxpOK2XU9APtBujfPhM/VkOLKVDvF4="; + rev = "build-${version}"; + hash = "sha256-mhrgHNbqxLhhLWP4eu1A3ytrx9Q3X0EESL2LuTfgsBE="; }; - nativeBuildInputs = [ - nodejs - ]; + npmDepsHash = "sha256-lScXbxkJiRq5LLFkoz5oZsmKz8I/t1rZJVonfct9r+0="; - buildPhase = - let - nodeDependencies = (import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }).nodeDependencies.override (old: { - # access to path '/nix/store/...-source' is forbidden in restricted mode - src = src; - dontNpmInstall = true; - - # ERROR: .../.bin/node-gyp-build: /usr/bin/env: bad interpreter: No such file or directory - # https://github.com/svanderburg/node2nix/issues/275 - # There are multiple instances of it, hence the globstar - preRebuild = '' - shopt -s globstar - sed -i -e "s|#!/usr/bin/env node|#! ${pkgs.nodejs}/bin/node|" \ - node_modules/**/node-gyp-build/bin.js \ - ''; - - buildInputs = [ cypress ]; - # prevent downloading cypress, use the executable in path instead - CYPRESS_INSTALL_BINARY = "0"; - - }); - in - '' - runHook preBuild - - export PATH="${nodeDependencies}/bin:${nodejs}/bin:$PATH" - - # https://github.com/parcel-bundler/parcel/issues/8005 - export NODE_OPTIONS=--no-experimental-fetch - - ln -s ${nodeDependencies}/lib/node_modules . - npm run production - - runHook postBuild - ''; + env.CYPRESS_INSTALL_BINARY = "0"; + npmBuildScript = "production"; installPhase = '' runHook preInstall @@ -70,13 +29,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = ./update-web.sh; - meta = with lib; { description = "Web client for Polaris"; homepage = "https://github.com/agersant/polaris-web"; license = licenses.mit; maintainers = with maintainers; [ pbsds ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index 5c2ccd491f..6ca9bb0640 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-faCA+ATgeEVUg/3KdKcLVypU0wB7YHymXAsTT9Yqgbc="; - aarch64-linux = "sha256-m7Pe2wwwSyannSTROZ70uDczWjOlGeHRjewZgGE76mA="; - x86_64-darwin = "sha256-CoMeJPqS/9AMyjUvxA6lA989Xzebf3pE+Q27ebOwi6c="; - x86_64-linux = "sha256-WPsp0b7YfBKtIR6Y/V4mppctY+wh/gTJ0Vp1KRlZ2+A="; + aarch64-darwin = "sha256-3dKTYw37kmIq9DG4S5qOtjK1QzZeSSCWKeXsfrXctFs="; + aarch64-linux = "sha256-SWt1XTWlWcxF3pcSkiyIXBKllwmVkJvoxB3NrIAj9KQ="; + x86_64-darwin = "sha256-YC6cH5KHzNVdWaNp4vGoGBM8UzVaiE9WfWj5vL/NZ2w="; + x86_64-linux = "sha256-lSar09oOHr2M3pAbF9JlQhYqyd2GoNmVAGmSjm0ZpOg="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.6.3.3608"; + version = "1.7.4.3769"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/psitransfer/default.nix b/third_party/nixpkgs/pkgs/servers/psitransfer/default.nix index 44566e928f..2bb4f03eb3 100644 --- a/third_party/nixpkgs/pkgs/servers/psitransfer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/psitransfer/default.nix @@ -1,44 +1,49 @@ -# To update package version: -# 1. Change version string in node-package.json and this file -# 2. Run `./generate.sh` to rebuild node dependencies with node2nix -# 3. Build this package `nix-build -A psitransfer` -# 4. Profit - -{ stdenv -, pkgs -, lib -, nodejs_18 -, fetchzip +{ lib +, buildNpmPackage +, fetchFromGitHub }: let - nodejs = nodejs_18; - - nodePackages = import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; + pname = "psitransfer"; + version = "2.1.2"; + src = fetchFromGitHub { + owner = "psi-4ward"; + repo = "psitransfer"; + rev = "v${version}"; + hash = "sha256-dBAieXIwCEstR9m+6+2/OLPKo2qHynZ1t372Il0mkXk="; }; + app = buildNpmPackage { + pname = "${pname}-app"; + inherit version src; - psitransfer = lib.head (lib.attrValues nodePackages); + npmDepsHash = "sha256-iCd+I/aTMwQqAMRHan3T191XNz4S3Cy6CDxSLIYY7IA="; - combined = psitransfer.override rec { - # version is not defined in source package.json - # version must also be maintained in node-packages.json for node2nix - version = "2.1.2"; + postPatch = '' + # https://github.com/psi-4ward/psitransfer/pull/284 + touch public/app/.npmignore + cd app + ''; - # override node2nix package src to pull pre-built release of same version - src = fetchzip { - url = "https://github.com/psi-4ward/psitransfer/releases/download/v${version}/psitransfer-v${version}.tar.gz"; - sha256 = "mfldWTVmfcIRa+1g8YDnQqem5YmrFRfCxJoitWcXvns="; - stripRoot = false; - }; - - meta = with lib; { - homepage = "https://github.com/psi-4ward/psitransfer"; - description = "Simple open source self-hosted file sharing solution"; - license = licenses.bsd2; - maintainers = with maintainers; [ hyshka ]; - }; + installPhase = '' + cp -r ../public/app $out + ''; }; -in - combined +in buildNpmPackage { + inherit pname version src; + + npmDepsHash = "sha256-H22T5IU8bjbsWhwhchDqppvYfcatbXSWqp6gdoek1Z8="; + + postPatch = '' + rm -r public/app + cp -r ${app} public/app + ''; + + dontBuild = true; + + meta = { + homepage = "https://github.com/psi-4ward/psitransfer"; + description = "Simple open source self-hosted file sharing solution"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ hyshka ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/psitransfer/generate.sh b/third_party/nixpkgs/pkgs/servers/psitransfer/generate.sh deleted file mode 100755 index 79e7ff3a00..0000000000 --- a/third_party/nixpkgs/pkgs/servers/psitransfer/generate.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix -set -euo pipefail - -node2nix \ - --nodejs-18 \ - --input node-packages.json \ - --output node-packages.nix \ - --composition node-composition.nix \ - --node-env ../../development/node-packages/node-env.nix \ - ; diff --git a/third_party/nixpkgs/pkgs/servers/psitransfer/node-composition.nix b/third_party/nixpkgs/pkgs/servers/psitransfer/node-composition.nix deleted file mode 100644 index 7b360d03dc..0000000000 --- a/third_party/nixpkgs/pkgs/servers/psitransfer/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}: - -let - nodeEnv = import ../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.json b/third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.json deleted file mode 100644 index 4fd418dc70..0000000000 --- a/third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.1.2" } -] diff --git a/third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.nix b/third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.nix deleted file mode 100644 index 183911690a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/psitransfer/node-packages.nix +++ /dev/null @@ -1,1781 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@babel/helper-string-parser-7.21.5" = { - name = "_at_babel_slash_helper-string-parser"; - packageName = "@babel/helper-string-parser"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz"; - sha512 = "5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="; - }; - }; - "@babel/helper-validator-identifier-7.19.1" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - }; - "@babel/parser-7.21.8" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.21.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz"; - sha512 = "6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="; - }; - }; - "@babel/types-7.21.5" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz"; - sha512 = "m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q=="; - }; - }; - "accepts-1.3.8" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - }; - "acorn-7.4.1" = { - name = "acorn"; - packageName = "acorn"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; - }; - }; - "archiver-5.3.1" = { - name = "archiver"; - packageName = "archiver"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz"; - sha512 = "8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w=="; - }; - }; - "archiver-utils-2.1.0" = { - name = "archiver-utils"; - packageName = "archiver-utils"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz"; - sha512 = "bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; - }; - }; - "assert-never-1.2.1" = { - name = "assert-never"; - packageName = "assert-never"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz"; - sha512 = "TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="; - }; - }; - "async-3.2.4" = { - name = "async"; - packageName = "async"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - }; - "axios-0.27.2" = { - name = "axios"; - packageName = "axios"; - version = "0.27.2"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; - }; - }; - "babel-walk-3.0.0-canary-5" = { - name = "babel-walk"; - packageName = "babel-walk"; - version = "3.0.0-canary-5"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz"; - sha512 = "GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "basic-auth-2.0.1" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; - sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; - }; - }; - "bl-4.1.0" = { - name = "bl"; - packageName = "bl"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - }; - "body-parser-1.20.1" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; - sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "brace-expansion-2.0.1" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - }; - "buffer-5.7.1" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - }; - "buffer-crc32-0.2.13" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - }; - "bytes-3.1.2" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; - }; - }; - "call-bind-1.0.2" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - }; - "character-parser-2.2.0" = { - name = "character-parser"; - packageName = "character-parser"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; - sha512 = "+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw=="; - }; - }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - }; - "common-streams-1.4.0" = { - name = "common-streams"; - packageName = "common-streams"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/common-streams/-/common-streams-1.4.0.tgz"; - sha512 = "uQQKfpsGEzk3fZnDWqsUR9Ejo8tP1U3mzbg5+xDzLZb3pFtX58PJidCzpY4Kt5Lvp87e2Bu1UVUGxe3ciYnnyQ=="; - }; - }; - "compress-commons-4.1.1" = { - name = "compress-commons"; - packageName = "compress-commons"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz"; - sha512 = "QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ=="; - }; - }; - "compressible-2.0.18" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - }; - "compression-1.7.4" = { - name = "compression"; - packageName = "compression"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "constantinople-4.0.1" = { - name = "constantinople"; - packageName = "constantinople"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz"; - sha512 = "vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw=="; - }; - }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; - "content-type-1.0.5" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; - sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; - }; - }; - "cookie-0.5.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; - "core-util-is-1.0.3" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - }; - "cors-2.8.5" = { - name = "cors"; - packageName = "cors"; - version = "2.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; - sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; - }; - }; - "crc-32-1.2.2" = { - name = "crc-32"; - packageName = "crc-32"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz"; - sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; - }; - }; - "crc32-stream-4.0.2" = { - name = "crc32-stream"; - packageName = "crc32-stream"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz"; - sha512 = "DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w=="; - }; - }; - "crypto-js-4.1.1" = { - name = "crypto-js"; - packageName = "crypto-js"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; - sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - }; - "depd-2.0.0" = { - name = "depd"; - packageName = "depd"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; - }; - }; - "destroy-1.2.0" = { - name = "destroy"; - packageName = "destroy"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; - sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; - }; - }; - "doctypes-1.1.0" = { - name = "doctypes"; - packageName = "doctypes"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; - sha512 = "LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ=="; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - }; - "express-4.18.2" = { - name = "express"; - packageName = "express"; - version = "4.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; - sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; - }; - }; - "finalhandler-1.2.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; - }; - }; - "follow-redirects-1.15.2" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; - }; - }; - "form-data-4.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - }; - "fs-constants-1.0.0" = { - name = "fs-constants"; - packageName = "fs-constants"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; - sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; - }; - }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha512 = "9ztMtDZtSKC78V8mev+k31qaTabbmuH5jatdvPBMikrFHvw5BqlYnQIn/WGK3WHeRooSTkRvLa2IPlaHjPq5Sg=="; - }; - }; - "fs-promise-2.0.3" = { - name = "fs-promise"; - packageName = "fs-promise"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-promise/-/fs-promise-2.0.3.tgz"; - sha512 = "oDrTLBQAcRd+p/tSRWvqitKegLPsvqr7aehs5N9ILWFM9az5y5Uh71jKdZ/DTMC4Kel7+GNCQyFCx/IftRv8yg=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - }; - "get-intrinsic-1.2.0" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "graceful-fs-4.2.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; - sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; - }; - }; - "has-1.0.3" = { - name = "has"; - packageName = "has"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "http-errors-2.0.0" = { - name = "http-errors"; - packageName = "http-errors"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; - sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "ieee754-1.2.1" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "ipaddr.js-1.9.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "is-core-module-2.12.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"; - sha512 = "RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ=="; - }; - }; - "is-expression-4.0.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz"; - sha512 = "zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A=="; - }; - }; - "is-promise-2.2.2" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; - sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "js-stringify-1.0.2" = { - name = "js-stringify"; - packageName = "js-stringify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; - sha512 = "rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g=="; - }; - }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha512 = "PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw=="; - }; - }; - "jstransformer-1.0.0" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; - sha512 = "C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A=="; - }; - }; - "lazystream-1.0.1" = { - name = "lazystream"; - packageName = "lazystream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"; - sha512 = "b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw=="; - }; - }; - "lodash.defaults-4.2.0" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha512 = "qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="; - }; - }; - "lodash.difference-4.5.0" = { - name = "lodash.difference"; - packageName = "lodash.difference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"; - sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="; - }; - }; - "lodash.flatten-4.4.0" = { - name = "lodash.flatten"; - packageName = "lodash.flatten"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; - }; - }; - "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.union-4.6.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; - sha512 = "c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; - }; - }; - "meterstream-1.0.1" = { - name = "meterstream"; - packageName = "meterstream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meterstream/-/meterstream-1.0.1.tgz"; - sha512 = "gUTuzs+Cv9JQfZimqsfnzEzQSbGkoQQYNxANJIErF0t9oSpKRvAZmDK2jkx7jyPdezg0AN6QUcG8XuYM6joBsA=="; - }; - }; - "method-override-3.0.0" = { - name = "method-override"; - packageName = "method-override"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-3.0.0.tgz"; - sha512 = "IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA=="; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; - "mime-1.6.0" = { - name = "mime"; - packageName = "mime"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - }; - "mime-db-1.52.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - }; - "mime-types-2.1.35" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.35"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - }; - "minimatch-3.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimatch-5.1.6" = { - name = "minimatch"; - packageName = "minimatch"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; - sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; - }; - }; - "morgan-1.10.0" = { - name = "morgan"; - packageName = "morgan"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; - sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "ms-2.1.3" = { - name = "ms"; - packageName = "ms"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; - }; - }; - "negotiator-0.6.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - }; - "normalize-path-3.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "object-inspect-1.12.3" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; - }; - }; - "on-finished-2.4.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; - sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; - }; - }; - "on-headers-1.0.2" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "promise-7.3.1" = { - name = "promise"; - packageName = "promise"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; - sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "pug-3.0.2" = { - name = "pug"; - packageName = "pug"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz"; - sha512 = "bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw=="; - }; - }; - "pug-attrs-3.0.0" = { - name = "pug-attrs"; - packageName = "pug-attrs"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz"; - sha512 = "azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA=="; - }; - }; - "pug-code-gen-3.0.2" = { - name = "pug-code-gen"; - packageName = "pug-code-gen"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz"; - sha512 = "nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg=="; - }; - }; - "pug-error-2.0.0" = { - name = "pug-error"; - packageName = "pug-error"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz"; - sha512 = "sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ=="; - }; - }; - "pug-filters-4.0.0" = { - name = "pug-filters"; - packageName = "pug-filters"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz"; - sha512 = "yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A=="; - }; - }; - "pug-lexer-5.0.1" = { - name = "pug-lexer"; - packageName = "pug-lexer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz"; - sha512 = "0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w=="; - }; - }; - "pug-linker-4.0.0" = { - name = "pug-linker"; - packageName = "pug-linker"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz"; - sha512 = "gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw=="; - }; - }; - "pug-load-3.0.0" = { - name = "pug-load"; - packageName = "pug-load"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz"; - sha512 = "OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ=="; - }; - }; - "pug-parser-6.0.0" = { - name = "pug-parser"; - packageName = "pug-parser"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz"; - sha512 = "ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw=="; - }; - }; - "pug-runtime-3.0.1" = { - name = "pug-runtime"; - packageName = "pug-runtime"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz"; - sha512 = "L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg=="; - }; - }; - "pug-strip-comments-2.0.0" = { - name = "pug-strip-comments"; - packageName = "pug-strip-comments"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz"; - sha512 = "zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ=="; - }; - }; - "pug-walk-2.0.0" = { - name = "pug-walk"; - packageName = "pug-walk"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz"; - sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; - }; - }; - "qs-6.11.0" = { - name = "qs"; - packageName = "qs"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; - sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.5.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - }; - "readable-stream-2.3.8" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; - sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; - }; - }; - "readable-stream-3.6.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; - sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; - }; - }; - "readdir-glob-1.1.3" = { - name = "readdir-glob"; - packageName = "readdir-glob"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz"; - sha512 = "v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA=="; - }; - }; - "resolve-1.22.3" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.3"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz"; - sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "send-0.18.0" = { - name = "send"; - packageName = "send"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; - }; - }; - "serve-static-1.15.0" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; - }; - }; - "setprototypeof-1.2.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "statuses-2.0.1" = { - name = "statuses"; - packageName = "statuses"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; - sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "supports-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "tar-stream-2.2.0" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; - sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; - }; - }; - "thenify-3.3.1" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; - sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; - }; - }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - }; - "to-object-reducer-1.0.1" = { - name = "to-object-reducer"; - packageName = "to-object-reducer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-object-reducer/-/to-object-reducer-1.0.1.tgz"; - sha512 = "BTMQ9u98g/OxjRr68LwQbwOV7cVQ7dIbW1Sj/epj2H6hDbkfbmnxllmUVTUi+f9uipTe8o4g5QJrSdcWZL/D6A=="; - }; - }; - "toidentifier-1.0.1" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - }; - "token-stream-1.0.0" = { - name = "token-stream"; - packageName = "token-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz"; - sha512 = "VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg=="; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - }; - "void-elements-3.1.0" = { - name = "void-elements"; - packageName = "void-elements"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz"; - sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; - }; - }; - "with-7.0.2" = { - name = "with"; - packageName = "with"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/with/-/with-7.0.2.tgz"; - sha512 = "RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "zip-stream-4.1.0" = { - name = "zip-stream"; - packageName = "zip-stream"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz"; - sha512 = "zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A=="; - }; - }; - }; -in -{ - "psitransfer-git+https://github.com/psi-4ward/psitransfer#v2.1.2" = nodeEnv.buildNodePackage { - name = "psitransfer"; - packageName = "psitransfer"; - version = "0.0.0"; - src = fetchgit { - url = "https://github.com/psi-4ward/psitransfer"; - rev = "95374e0fb62521b28d7de2272c8df5fc49813771"; - sha256 = "741022797230084b2d47d9beebedbf38b3caa36a87ca7675b77ef6225d269179"; - }; - dependencies = [ - sources."@babel/helper-string-parser-7.21.5" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/parser-7.21.8" - sources."@babel/types-7.21.5" - sources."accepts-1.3.8" - sources."acorn-7.4.1" - sources."any-promise-1.3.0" - sources."archiver-5.3.1" - (sources."archiver-utils-2.1.0" // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - }) - sources."array-flatten-1.1.1" - sources."asap-2.0.6" - sources."assert-never-1.2.1" - sources."async-3.2.4" - sources."asynckit-0.4.0" - sources."axios-0.27.2" - sources."babel-walk-3.0.0-canary-5" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."basic-auth-2.0.1" - sources."bl-4.1.0" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-crc32-0.2.13" - sources."bytes-3.0.0" - sources."call-bind-1.0.2" - sources."character-parser-2.2.0" - sources."combined-stream-1.0.8" - sources."common-streams-1.4.0" - sources."compress-commons-4.1.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."concat-map-0.0.1" - sources."constantinople-4.0.1" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.5" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."cors-2.8.5" - sources."crc-32-1.2.2" - sources."crc32-stream-4.0.2" - sources."crypto-js-4.1.1" - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."doctypes-1.1.0" - sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."safe-buffer-5.2.1" - ]; - }) - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."follow-redirects-1.15.2" - sources."form-data-4.0.0" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" - sources."fs-extra-2.1.2" - sources."fs-promise-2.0.3" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.0" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."http-errors-2.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ipaddr.js-1.9.1" - sources."is-core-module-2.12.0" - sources."is-expression-4.0.0" - sources."is-promise-2.2.2" - sources."is-regex-1.1.4" - sources."isarray-1.0.0" - sources."js-stringify-1.0.2" - sources."jsonfile-2.4.0" - sources."jstransformer-1.0.0" - (sources."lazystream-1.0.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - }) - sources."lodash.defaults-4.2.0" - sources."lodash.difference-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.isplainobject-4.0.6" - sources."lodash.union-4.6.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."meterstream-1.0.1" - (sources."method-override-3.0.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - (sources."morgan-1.10.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."on-finished-2.3.0" - ]; - }) - sources."ms-2.0.0" - sources."mz-2.7.0" - sources."negotiator-0.6.3" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" - sources."proxy-addr-2.0.7" - sources."pug-3.0.2" - sources."pug-attrs-3.0.0" - sources."pug-code-gen-3.0.2" - sources."pug-error-2.0.0" - sources."pug-filters-4.0.0" - sources."pug-lexer-5.0.1" - sources."pug-linker-4.0.0" - sources."pug-load-3.0.0" - sources."pug-parser-6.0.0" - sources."pug-runtime-3.0.1" - sources."pug-strip-comments-2.0.0" - sources."pug-walk-2.0.0" - sources."qs-6.11.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) - sources."readable-stream-3.6.2" - (sources."readdir-glob-1.1.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."resolve-1.22.3" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" - sources."statuses-2.0.1" - sources."string_decoder-1.1.1" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-stream-2.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."to-fast-properties-2.0.0" - sources."to-object-reducer-1.0.1" - sources."toidentifier-1.0.1" - sources."token-stream-1.0.0" - sources."type-is-1.6.18" - sources."unpipe-1.0.0" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."vary-1.1.2" - sources."void-elements-3.1.0" - sources."with-7.0.2" - sources."wrappy-1.0.2" - sources."zip-stream-4.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Simple open source self-hosted file sharing solution"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix index f8c61ea176..d3420f90db 100644 --- a/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pufferpanel/default.nix @@ -1,43 +1,40 @@ { lib -, buildGoModule , fetchFromGitHub -, makeWrapper -, fetchzip , fetchpatch -, pathDeps ? [ ] +, applyPatches +, buildGoModule +, buildNpmPackage +, makeWrapper +, go-swag , nixosTests }: buildGoModule rec { pname = "pufferpanel"; - version = "2.6.6"; + version = "2.6.7"; - patches = [ - # Bump go-sqlite3 version to avoid a GNU C compiler error. - (fetchpatch { - url = "https://github.com/PufferPanel/PufferPanel/commit/dd7fc80c33c7618c98311af09c78c25b77658aef.patch"; - hash = "sha256-ygMrhJoba8swoRBBii7BEiLihqOebLUtSH7os7W3s+k="; - }) + src = applyPatches { + src = fetchFromGitHub { + owner = "PufferPanel"; + repo = "PufferPanel"; + rev = "v${version}"; + hash = "sha256-ay9NNcK+6QFobe/rwtZF8USl0vMbDZBg5z57fjA5VLw="; + }; + patches = [ + # Bump sha1cd package, otherwise i686-linux fails to build. + ./bump-sha1cd.patch - # Fix errors in tests. - (fetchpatch { - url = "https://github.com/PufferPanel/PufferPanel/commit/ad6ab4b4368e1111292fadfb3d9f058fa399fa21.patch"; - hash = "sha256-BzGfcWhzRrCHKkAhWf0uvXiiiutWqthn/ed7bN2hR8U="; - }) + # Seems to be an anti-feature. Startup is the only place where user/group is + # hardcoded and checked. + # + # There is no technical reason PufferPanel cannot run as a different user, + # especially for simple commands like `pufferpanel version`. + ./disable-group-checks.patch - # Bump sha1cd package, otherwise i686-linux fails to build. - ./bump-sha1cd.patch - - # Seems to be an anti-feature. Startup is the only place where user/group is - # hardcoded and checked. - # - # There is no technical reason PufferPanel cannot run as a different user, - # especially for simple commands like `pufferpanel version`. - ./disable-group-checks.patch - - # Some tests do not have network requests stubbed :( - ./skip-network-tests.patch - ]; + # Some tests do not have network requests stubbed :( + ./skip-network-tests.patch + ]; + }; ldflags = [ "-s" @@ -46,50 +43,50 @@ buildGoModule rec { "-X=github.com/pufferpanel/pufferpanel/v2.Version=${version}-nixpkgs" ]; - src = fetchFromGitHub { - owner = "pufferpanel"; - repo = pname; - rev = "v${version}"; - hash = "sha256-0Vyi47Rkpe3oODHfsl/7tCerENpiEa3EWBHhfTO/uu4="; + frontend = buildNpmPackage { + pname = "pufferpanel-frontend"; + inherit version; + + src = "${src}/client"; + + npmDepsHash = "sha256-oWFXtV/dxzHv3sfIi01l1lHE5tcJgpVq87XgS6Iy62g="; + + NODE_OPTIONS = "--openssl-legacy-provider"; + npmBuildFlags = [ "--" "--dest=${placeholder "out"}" ]; + dontNpmInstall = true; }; - # PufferPanel is split into two parts: the backend daemon and the - # frontend. - # Getting the frontend to build in the Nix environment fails even - # with all the proper node_modules populated. To work around this, - # we just download the built frontend and package that. - frontend = fetchzip { - url = "https://github.com/PufferPanel/PufferPanel/releases/download/v${version}/pufferpanel_${version}_linux_arm64.zip"; - hash = "sha256-z7HWhiEBma37OMGEkTGaEbnF++Nat8wAZE2UeOoaO/U="; - stripRoot = false; - postFetch = '' - mv $out $TMPDIR/subdir - mv $TMPDIR/subdir/www $out - ''; - }; - - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper go-swag ]; vendorHash = "sha256-Esfk7SvqiWeiobXSI+4wYVEH9yVkB+rO7bxUQ5TzvG4="; proxyVendor = true; - postFixup = '' - mkdir -p $out/share/pufferpanel - cp -r ${src}/assets/email $out/share/pufferpanel/templates - cp -r ${frontend} $out/share/pufferpanel/www + # Generate code for Swagger documentation endpoints (see web/swagger/docs.go). + # Note that GOROOT embedded in go-swag is empty by default since it is built + # with -trimpath (see https://go.dev/cl/399214). It looks like go-swag skips + # file paths that start with $GOROOT, thus all files when it is empty. + preBuild = '' + GOROOT=''${GOROOT-$(go env GOROOT)} swag init --output web/swagger --generalInfo web/loader.go + ''; - # Rename cmd to pufferpanel and remove other binaries. - mv $out/bin $TMPDIR/bin - mkdir $out/bin - mv $TMPDIR/bin/cmd $out/bin/pufferpanel + installPhase = '' + runHook preInstall + + # Set up directory structure similar to the official PufferPanel releases. + mkdir -p $out/share/pufferpanel + cp "$GOPATH"/bin/cmd $out/share/pufferpanel/pufferpanel + cp -r $frontend $out/share/pufferpanel/www + cp -r $src/assets/email $out/share/pufferpanel/email + cp web/swagger/swagger.{json,yaml} $out/share/pufferpanel # Wrap the binary with the path to the external files, but allow setting # custom paths if needed. - wrapProgram $out/bin/pufferpanel \ + makeWrapper $out/share/pufferpanel/pufferpanel $out/bin/pufferpanel \ --set-default GIN_MODE release \ - --set-default PUFFER_PANEL_EMAIL_TEMPLATES $out/share/pufferpanel/templates/emails.json \ - --set-default PUFFER_PANEL_WEB_FILES $out/share/pufferpanel/www \ - --prefix PATH : ${lib.escapeShellArg (lib.makeBinPath pathDeps)} + --set-default PUFFER_PANEL_EMAIL_TEMPLATES $out/share/pufferpanel/email/emails.json \ + --set-default PUFFER_PANEL_WEB_FILES $out/share/pufferpanel/www + + runHook postInstall ''; passthru.tests = { @@ -101,5 +98,6 @@ buildGoModule rec { homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ ckie tie ]; + mainProgram = "pufferpanel"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/readarr/default.nix b/third_party/nixpkgs/pkgs/servers/readarr/default.nix index 1ba25683c9..3703618d29 100644 --- a/third_party/nixpkgs/pkgs/servers/readarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-TKK0009ZEFWpzR9jYRanG3sMVp8hQcTd9G/FvUu00tQ="; - arm64-linux_hash = "sha256-u1vjSYu751VoOYsCPyPzcNnmG0rrKk7VgbXMG8X96jU="; - x64-osx_hash = "sha256-IHJ6hZP4DVTotoGxfLLbOveA8TD+6DHXkC+8QqmgTeg="; + x64-linux_hash = "sha256-46BfIsJEgtZMKQdiCqSFdM2whaYRwRLycv0pmY2InDk="; + arm64-linux_hash = "sha256-zTDqbQz966RYV3FSBxmtN9JMe0j0AA21GCz4f0+NnHw="; + x64-osx_hash = "sha256-EKy8vOvCHCcC5PheIdKyr5tWZ18Q+XeKh3mCrqcG7oA="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.1.9.1905"; + version = "0.2.4.1999"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index c11326fff2..7aa78bb2c4 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.1.10"; + version = "23.1.13"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-OlRuJeLvnQeseIsOREt5Frz4zzVmGKQMYIZI4LsDn2U="; + sha256 = "sha256-32/mj1/PeeTrtN9COh/hTL4zFcpLnsS0R2uTGpyMUNk="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/third_party/nixpkgs/pkgs/servers/rustdesk-server/Cargo.lock b/third_party/nixpkgs/pkgs/servers/rustdesk-server/Cargo.lock new file mode 100644 index 0000000000..1734fbf44c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/rustdesk-server/Cargo.lock @@ -0,0 +1,2885 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "async-speed-limit" +version = "0.3.1" +source = "git+https://github.com/open-trade/async-speed-limit#f89f702ae01d4016429543d2f0dda1086157e420" +dependencies = [ + "futures-core", + "futures-io", + "futures-timer", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atoi" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f1e8a972137fad81e2a1a60b86ff17ce0338f8017264e45a9723d0083c39a1" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da31c0ed7b4690e2c78fe4b880d21cd7db04a346ebc658b4270251b695437f17" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", +] + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bcrypt" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e7c93a3fb23b2fdde989b2c9ec4dd153063ec81f408507f84c090cd91c6641" +dependencies = [ + "base64", + "blowfish", + "getrandom", + "zeroize", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blowfish" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" +dependencies = [ + "byteorder", + "cipher", +] + +[[package]] +name = "bumpalo" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +dependencies = [ + "serde", +] + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time 0.1.43", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "config" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" +dependencies = [ + "lazy_static", + "nom 5.1.2", + "serde", +] + +[[package]] +name = "confy" +version = "0.4.0" +source = "git+https://github.com/open-trade/confy#630cc28a396cb7d01eefdd9f3824486fe4d8554b" +dependencies = [ + "directories-next", + "serde", + "thiserror", + "toml", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" + +[[package]] +name = "crossbeam" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +dependencies = [ + "cfg-if", + "lazy_static", +] + +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "deadpool" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef82259c587bceda08349f28ff00f69ae4c897898f254140af6021eb218e8232" +dependencies = [ + "async-trait", + "config", + "num_cpus", + "serde", + "tokio", +] + +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "dns-lookup" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" +dependencies = [ + "cfg-if", + "libc", + "socket2 0.4.4", + "winapi", +] + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "ed25519" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d916019f70ae3a1faa1195685e290287f39207d38e6dfee727197cffcc002214" +dependencies = [ + "signature", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "env_logger" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "event-listener" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" + +[[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "winapi", +] + +[[package]] +name = "flexi_logger" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969940c39bc718475391e53a3a59b0157e64929c80cf83ad5dde5f770ecdc423" +dependencies = [ + "ansi_term", + "atty", + "chrono", + "crossbeam", + "glob", + "lazy_static", + "log", + "regex", + "rustversion", + "thiserror", + "time 0.3.9", +] + +[[package]] +name = "flume" +version = "0.10.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project", + "spin 0.9.3", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-executor" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.11.2", +] + +[[package]] +name = "futures-io" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" + +[[package]] +name = "futures-macro" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + +[[package]] +name = "futures-task" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" +dependencies = [ + "hashbrown 0.12.1", +] + +[[package]] +name = "hbb_common" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes", + "chrono", + "confy", + "directories-next", + "dirs-next", + "env_logger", + "filetime", + "futures", + "futures-util", + "lazy_static", + "log", + "mac_address", + "machine-uid", + "protobuf", + "protobuf-codegen", + "quinn", + "rand", + "regex", + "serde", + "serde_derive", + "serde_json", + "socket2 0.3.19", + "sodiumoxide", + "tokio", + "tokio-socks", + "tokio-util 0.7.1", + "toml", + "winapi", + "zstd", +] + +[[package]] +name = "hbbs" +version = "1.1.8" +dependencies = [ + "async-speed-limit", + "async-trait", + "axum", + "base64", + "bcrypt", + "chrono", + "clap", + "deadpool", + "dns-lookup", + "flexi_logger", + "hbb_common", + "headers", + "http", + "ipnetwork", + "jsonwebtoken", + "lazy_static", + "local-ip-address", + "mac_address", + "machine-uid", + "minreq", + "once_cell", + "ping", + "regex", + "rust-ini", + "serde", + "serde_derive", + "serde_json", + "sodiumoxide", + "sqlx", + "tokio-tungstenite", + "tower-http", + "tungstenite", + "uuid", + "whoami", +] + +[[package]] +name = "headers" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" +dependencies = [ + "base64", + "bitflags", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha-1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + +[[package]] +name = "httparse" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" + +[[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 = "hyper" +version = "0.14.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.4", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +dependencies = [ + "autocfg", + "hashbrown 0.11.2", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "serde", +] + +[[package]] +name = "itertools" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "jobserver" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9051c17f81bae79440afa041b3a278e1de71bfb96d32454b477fd4703ccb6f" +dependencies = [ + "base64", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" + +[[package]] +name = "libsodium-sys" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd" +dependencies = [ + "cc", + "libc", + "pkg-config", + "walkdir", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "local-ip-address" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2815836665de176ba66deaa449ada98fdf208d84730d1a84a22cbeed6151a6fa" +dependencies = [ + "libc", + "neli", + "thiserror", + "windows-sys 0.48.0", +] + +[[package]] +name = "lock_api" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "mac_address" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d1bc1084549d60725ccc53a2bfa07f67fe4689fda07b05a36531f2988104a" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "machine-uid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f1595709b0a7386bcd56ba34d250d626e5503917d05d32cdccddcd68603e212" +dependencies = [ + "winreg", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "minreq" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c785bc6027fd359756e538541c8624012ba3776d3d3fe123885643092ed4132" +dependencies = [ + "log", + "punycode", +] + +[[package]] +name = "mio" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +dependencies = [ + "libc", + "log", + "miow", + "ntapi", + "winapi", +] + +[[package]] +name = "mio" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.36.1", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", +] + +[[package]] +name = "neli" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43" +dependencies = [ + "byteorder", + "libc", + "log", + "neli-proc-macros", +] + +[[package]] +name = "neli-proc-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" +dependencies = [ + "either", + "proc-macro2", + "quote", + "serde", + "syn", +] + +[[package]] +name = "nix" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "once_cell" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[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.1", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +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" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.3", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.36.1", +] + +[[package]] +name = "paste" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" + +[[package]] +name = "pem" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" +dependencies = [ + "base64", +] + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pin-project" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ping" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69044d1c00894fc1f43d9485aadb6ab6e68df90608fa52cf1074cda6420c6b76" +dependencies = [ + "rand", + "socket2 0.4.4", + "thiserror", +] + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "proc-macro2" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "protobuf" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee4a7d8b91800c8f167a6268d1a1026607368e1adc84e98fe044aeb905302f7" +dependencies = [ + "bytes", + "once_cell", + "protobuf-support", + "thiserror", +] + +[[package]] +name = "protobuf-codegen" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07b893e5e7d3395545d5244f8c0d33674025bd566b26c03bfda49b82c6dec45e" +dependencies = [ + "anyhow", + "once_cell", + "protobuf", + "protobuf-parse", + "regex", + "tempfile", + "thiserror", +] + +[[package]] +name = "protobuf-parse" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b1447dd751c434cc1b415579837ebd0411ed7d67d465f38010da5d7cd33af4d" +dependencies = [ + "anyhow", + "indexmap", + "log", + "protobuf", + "protobuf-support", + "tempfile", + "thiserror", + "which", +] + +[[package]] +name = "protobuf-support" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca157fe12fc7ee2e315f2f735e27df41b3d97cdd70ea112824dac1ffb08ee1c" +dependencies = [ + "thiserror", +] + +[[package]] +name = "punycode" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e1dcb320d6839f6edb64f7a4a59d39b30480d4d1765b56873f7c858538a5fe" + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "rand", +] + +[[package]] +name = "quinn" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d147472bc9a09f13b06c044787b6683cdffa02e2865b7f0fb53d67c49ed2988e" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "fxhash", + "quinn-proto", + "quinn-udp", + "rustls", + "thiserror", + "tokio", + "tracing", + "webpki", +] + +[[package]] +name = "quinn-proto" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "359c5eb33845f3ee05c229e65f87cdbc503eea394964b8f1330833d460b4ff3e" +dependencies = [ + "bytes", + "fxhash", + "rand", + "ring", + "rustls", + "rustls-native-certs", + "rustls-pemfile 0.2.1", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki", +] + +[[package]] +name = "quinn-udp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df185e5e5f7611fa6e628ed8f9633df10114b03bbaecab186ec55822c44ac727" +dependencies = [ + "futures-util", + "libc", + "mio 0.7.14", + "quinn-proto", + "socket2 0.4.4", + "tokio", + "tracing", +] + +[[package]] +name = "quote" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +dependencies = [ + "bitflags", +] + +[[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 = "regex" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[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 = "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 = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustls" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.0", + "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", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +dependencies = [ + "base64", +] + +[[package]] +name = "rustversion" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" + +[[package]] +name = "simple_asn1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a762b1c38b9b990c694b9c2f8abe3372ce6a9ceaae6bca39cfc46e054f45745" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time 0.3.9", +] + +[[package]] +name = "slab" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" + +[[package]] +name = "smallvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" + +[[package]] +name = "socket2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if", + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "sodiumoxide" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028" +dependencies = [ + "ed25519", + "libc", + "libsodium-sys", + "serde", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" +dependencies = [ + "lock_api", +] + +[[package]] +name = "sqlformat" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" +dependencies = [ + "itertools", + "nom 7.1.1", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4" +dependencies = [ + "sqlx-core", + "sqlx-macros", +] + +[[package]] +name = "sqlx-core" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093" +dependencies = [ + "ahash", + "atoi", + "bitflags", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "hashlink", + "hex", + "indexmap", + "itoa", + "libc", + "libsqlite3-sys", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile 1.0.0", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "sqlx-rt", + "stringprep", + "thiserror", + "tokio-stream", + "url", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f" +dependencies = [ + "dotenv", + "either", + "heck", + "once_cell", + "proc-macro2", + "quote", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-rt", + "syn", + "url", +] + +[[package]] +name = "sqlx-rt" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f" +dependencies = [ + "once_cell", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +dependencies = [ + "itoa", + "libc", + "num_threads", + "quickcheck", + "time-macros", +] + +[[package]] +name = "time-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio 0.8.3", + "num_cpus", + "once_cell", + "parking_lot 0.12.0", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.4.4", + "tokio-macros", + "winapi", +] + +[[package]] +name = "tokio-macros" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "git+https://github.com/open-trade/tokio-socks#3de8300fbce37e2cdaef042e016aa95058d007cf" +dependencies = [ + "bytes", + "either", + "futures-core", + "futures-sink", + "futures-util", + "pin-project", + "thiserror", + "tokio", + "tokio-util 0.6.9", +] + +[[package]] +name = "tokio-stream" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "pin-project-lite", + "slab", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "tower" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tokio-util 0.7.1", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d342c6d58709c0a6d48d48dabbb62d4ef955cf5f0f3bbfd845838e7ae88dbae" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "httpdate", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util 0.7.1", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" + +[[package]] +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "tungstenite" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" +dependencies = [ + "base64", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand", + "sha-1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +dependencies = [ + "getrandom", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "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.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" + +[[package]] +name = "web-sys" +version = "0.3.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" +dependencies = [ + "webpki", +] + +[[package]] +name = "which" +version = "4.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +dependencies = [ + "either", + "lazy_static", + "libc", +] + +[[package]] +name = "whoami" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm", + "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 0.48.0", +] + +[[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winreg" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +dependencies = [ + "winapi", +] + +[[package]] +name = "zeroize" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" + +[[package]] +name = "zstd" +version = "0.9.2+zstd.1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "4.1.3+zstd.1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "1.6.2+zstd.1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +dependencies = [ + "cc", + "libc", +] diff --git a/third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix b/third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix new file mode 100644 index 0000000000..20f3b525e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/rustdesk-server/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libsodium +, Security +, sqlite +, nix-update-script +, testers +, rustdesk-server +}: + +rustPlatform.buildRustPackage rec { + pname = "rustdesk-server"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "rustdesk"; + repo = "rustdesk-server"; + rev = version; + hash = "sha256-KzIylbPe+YN513UNFuisvDAIe4kICGYDUrfURDOw/no="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "async-speed-limit-0.3.1" = "sha256-iOel6XA07RPrBjQAFLnxXX4VBpDrYZaqQc9clnsOorI="; + "confy-0.4.0" = "sha256-e91cvEixhpPzIthAxzTa3fDY6eCsHUy/eZQAqs7QTDo="; + "tokio-socks-0.5.1" = "sha256-inmAJk0fAlsVNIwfD/M+htwIdQHwGSTRrEy6N/mspMI="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libsodium + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + inherit version; + package = rustdesk-server; + command = "hbbr --version"; + }; + }; + + meta = with lib; { + description = "RustDesk Server Program"; + homepage = "https://github.com/rustdesk/rustdesk-server"; + changelog = "https://github.com/rustdesk/rustdesk-server/releases/tag/${version}"; + license = licenses.agpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ gaelreyrol tjni ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index b426e64e20..9a5ebd9f63 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -51,11 +51,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.17.7"; + version = "4.18.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-lcnBa2VKiM+u/ZWAUt1XPi+F7N8RTk7Owxh1N6CU2Rk="; + hash = "sha256-CVJWrDMuHZ+/m3/3gj+SoyM9PtZYzn/JszkFwiQ/RH8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/third_party/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch index 60b215b718..1c333bc6ad 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/third_party/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -1,4 +1,4 @@ -From 9287fcfc36ed9f2bb936ec2253244f60df80711f Mon Sep 17 00:00:00 2001 +From 7e3c8ba66b86a21fe8e5bd9a595dd6fc03fa26d4 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 22 Sep 2021 09:42:42 +0200 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded @@ -34,13 +34,10 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni Signed-off-by: Bernd Kuhls [Bachp: rebased for version 4.15.0] - -# Conflicts: -# wscript_configure_system_heimdal +[Mats: rebased for version 4.18.5] --- wscript_configure_embedded_heimdal | 11 +++++++++++ - wscript_configure_system_heimdal | 11 ----------- - 2 files changed, 11 insertions(+), 11 deletions(-) + 1 file changed, 11 insertions(+) diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal index 6066f2b39d7..e92cabad65f 100644 @@ -61,35 +58,6 @@ index 6066f2b39d7..e92cabad65f 100644 + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 6033dad08dc..c0a9bb95e87 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -86,9 +78,6 @@ finally: - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) -- -2.37.3 +2.41.0 diff --git a/third_party/nixpkgs/pkgs/servers/search/manticoresearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/manticoresearch/default.nix index 2611798248..442ebe751b 100644 --- a/third_party/nixpkgs/pkgs/servers/search/manticoresearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/manticoresearch/default.nix @@ -1,16 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl -, bison, cmake, flex, pkg-config -, boost, icu, libstemmer, mariadb-connector-c, re2 +{ lib +, stdenv +, fetchFromGitHub +, bison +, cmake +, flex +, pkg-config +, boost +, icu +, libstemmer +, mariadb-connector-c +, re2 +, nlohmann_json }: + let - columnar = stdenv.mkDerivation rec { + columnar = stdenv.mkDerivation (finalAttrs: { pname = "columnar"; - version = "c16-s5"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's GetColumnar.cmake + version = "c18-s6"; # see NEED_COLUMNAR_API/NEED_SECONDARY_API in Manticore's GetColumnar.cmake src = fetchFromGitHub { owner = "manticoresoftware"; repo = "columnar"; - rev = version; - sha256 = "sha256-iHB82FeA0rq9eRuDzY+AT/MiaRIGETsnkNPCqKRXgq8="; + rev = finalAttrs.version; + hash = "sha256-/HGh1Wktb65oXKCjGxMl+8kNwEEfPzGT4UxGoGS4+8c="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DAPI_ONLY=ON" ]; @@ -20,17 +31,17 @@ let license = lib.licenses.asl20; platforms = lib.platforms.all; }; - }; + }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "manticoresearch"; - version = "5.0.3"; + version = "6.0.4"; src = fetchFromGitHub { owner = "manticoresoftware"; repo = "manticoresearch"; - rev = version; - sha256 = "sha256-samZYwDYgI9jQ7jcoMlpxulSFwmqyt5bkxG+WZ9eXuk="; + rev = finalAttrs.version; + hash = "sha256-enSK3hlGUtrPVA/qF/AFiDJN8CbaTHCzYadBorZLE+c="; }; nativeBuildInputs = [ @@ -46,6 +57,7 @@ stdenv.mkDerivation rec { icu.dev libstemmer mariadb-connector-c + nlohmann_json re2 ]; @@ -54,6 +66,7 @@ stdenv.mkDerivation rec { # supply our own packages rather than letting manticore download dependencies during build sed -i 's/^with_get/with_menu/' CMakeLists.txt + sed -i 's/include(GetNLJSON)/find_package(nlohmann_json)/' CMakeLists.txt ''; cmakeFlags = [ @@ -63,12 +76,12 @@ stdenv.mkDerivation rec { "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" ]; - meta = with lib; { + meta = { description = "Easy to use open source fast database for search"; homepage = "https://manticoresearch.com"; - license = licenses.gpl2; + license = lib.licenses.gpl2; mainProgram = "searchd"; - maintainers = with maintainers; [ jdelStrother ]; - platforms = platforms.all; + maintainers = [ lib.maintainers.jdelStrother ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock b/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock index fc1bc1af7f..ef59c54155 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock @@ -329,9 +329,9 @@ dependencies = [ [[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", @@ -441,7 +441,7 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "api" -version = "1.3.0" +version = "1.3.2" dependencies = [ "chrono", "env_logger", @@ -522,13 +522,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.23", ] [[package]] @@ -673,7 +673,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.11", + "syn 2.0.23", ] [[package]] @@ -901,9 +901,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.5" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" dependencies = [ "clap_builder", "clap_derive", @@ -912,13 +912,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.5" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] @@ -932,7 +931,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.23", ] [[package]] @@ -967,7 +966,7 @@ dependencies = [ "futures", "hashring", "indicatif", - "itertools", + "itertools 0.11.0", "log", "merge", "num_cpus", @@ -1004,13 +1003,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1060,9 +1059,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7" +checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" dependencies = [ "console-api", "crossbeam-channel", @@ -1120,9 +1119,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpp_demangle" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b446fd40bcc17eddd6a4a78f24315eb90afdb3334999ddfd4909985c47722442" +checksum = "ee34052ee3d93d6d8f3e6f81d85c47921f6653a19a7b70e939e3e602d893a674" dependencies = [ "cfg-if", ] @@ -1172,7 +1171,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -1193,7 +1192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -1390,6 +1389,16 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +[[package]] +name = "earcutr" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +dependencies = [ + "itertools 0.10.5", + "num-traits", +] + [[package]] name = "either" version = "1.8.0" @@ -1621,7 +1630,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.23", ] [[package]] @@ -1694,10 +1703,11 @@ dependencies = [ [[package]] name = "geo" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d640a4dd1d1c98b45f4653c841a8ec15f461a71b86bc30533ae64c6f20f268" +checksum = "a5d07d2288645058f3c78bc64eadd615335791cd5adb632e9865840afbc13dad" dependencies = [ + "earcutr", "float_next_after", "geo-types", "geographiclib-rs", @@ -1886,15 +1896,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.1" @@ -2078,7 +2079,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7207d75fcf6c1868f1390fc1c610431fe66328e9ee6813330a041ef6879eca1" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", "atty", "indexmap", "itoa", @@ -2153,6 +2154,15 @@ 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.5" @@ -2366,18 +2376,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180d4b35be83d33392d1d1bfbd2ae1eca7ff5de1a94d3fc87faaa99a069e7cbd" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] @@ -2446,14 +2447,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", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -2529,13 +2530,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.23", ] [[package]] @@ -2560,11 +2561,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.1", "libc", ] @@ -2823,9 +2824,9 @@ checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" [[package]] name = "pprof" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" +checksum = "6b90f8560ad8bd57b207b8293bc5226e48e89039a6e590c12a297d91b84c7e60" dependencies = [ "backtrace", "cfg-if", @@ -2869,7 +2870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2", - "syn 2.0.11", + "syn 2.0.23", ] [[package]] @@ -2898,9 +2899,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -2970,7 +2971,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -2991,7 +2992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.107", @@ -3027,7 +3028,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.3.0" +version = "1.3.2" dependencies = [ "actix-cors", "actix-files", @@ -3047,7 +3048,7 @@ dependencies = [ "env_logger", "futures", "futures-util", - "itertools", + "itertools 0.11.0", "log", "num-traits", "num_cpus", @@ -3090,7 +3091,7 @@ dependencies = [ [[package]] name = "quantization" version = "0.1.0" -source = "git+https://github.com/qdrant/quantization.git#3443cbbd0943f3e87f39c966ef111e2a85f05174" +source = "git+https://github.com/qdrant/quantization.git#c93556cbeca5373e742286200490ec213d0de06e" dependencies = [ "cc", "permutation_iterator", @@ -3117,9 +3118,9 @@ dependencies = [ [[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", ] @@ -3563,9 +3564,9 @@ 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", ] @@ -3737,9 +3738,9 @@ dependencies = [ "geo", "geohash", "io-uring", - "itertools", + "itertools 0.11.0", "log", - "memmap2 0.7.0", + "memmap2 0.7.1", "num-derive", "num-traits", "num_cpus", @@ -3778,9 +3779,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "d614f89548720367ded108b3c843be93f3a341e22d5674ca0dd5cd57f34926af" dependencies = [ "serde_derive", ] @@ -3807,13 +3808,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "d4fe589678c688e44177da4f27152ee2d190757271dc7f1d5b6b9f68d869d641" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.23", ] [[package]] @@ -3829,9 +3830,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" dependencies = [ "itoa", "ryu", @@ -4017,7 +4018,7 @@ dependencies = [ "env_logger", "futures", "http", - "itertools", + "itertools 0.11.0", "log", "num_cpus", "parking_lot", @@ -4056,9 +4057,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "symbolic-common" -version = "10.2.1" +version = "12.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" +checksum = "38f7afd8bcd36190409e6b71d89928f7f09d918a7aa3460d847bc49a538d672e" dependencies = [ "debugid", "memmap2 0.5.10", @@ -4068,9 +4069,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "10.2.1" +version = "12.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489" +checksum = "ec64922563a36e3fe686b6d99f06f25dacad2a202ac7502ed642930a188fb20a" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -4090,9 +4091,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -4117,9 +4118,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.2" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9557d0845b86eea8182f7b10dff120214fb6cd9fd937b6f4917714e546a38695" +checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4182,22 +4183,22 @@ dependencies = [ [[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.11", + "syn 2.0.23", ] [[package]] @@ -4307,11 +4308,12 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[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", @@ -4343,7 +4345,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.23", ] [[package]] @@ -4658,9 +4660,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.4" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" dependencies = [ "getrandom 0.2.8", "serde", @@ -4738,7 +4740,7 @@ dependencies = [ [[package]] name = "wal" version = "0.1.2" -source = "git+https://github.com/qdrant/wal.git?rev=e034a1814ee15941134d442198dc1fd87d767594#e034a1814ee15941134d442198dc1fd87d767594" +source = "git+https://github.com/qdrant/wal.git?rev=a32f6a38acf7ffd761df83b0790eaefeb107cd60#a32f6a38acf7ffd761df83b0790eaefeb107cd60" dependencies = [ "byteorder", "crc", @@ -4747,7 +4749,7 @@ dependencies = [ "env_logger", "fs4", "log", - "memmap2 0.6.2", + "memmap2 0.7.1", "rand 0.8.5", "rand_distr", "rustix 0.37.19", diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix index 45c1131cc9..792662cd72 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix @@ -11,21 +11,21 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-f81CepXjU+w56yGZGJJzwp1IVOQ8vB+5WNC5icVOieA="; + sha256 = "sha256-UKGpbI5XjS0s9Aedos8FX7J1zcbsAgLY1zS3M0DSf9s="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "quantization-0.1.0" = "sha256-mhiVicQXj8639bX2mGp9XnjTNVFdd6mnk+B1B1f3ywA="; + "quantization-0.1.0" = "sha256-ZPz2vVRA81SZ1xK1d4iiTU54xnr8zGaUzKXIZKGTZOc="; "tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE="; - "wal-0.1.2" = "sha256-J+r1SaYa2ZPEfjNeVJkLYERIPLZfll02RyXeS6J/R8U="; + "wal-0.1.2" = "sha256-sMleBUAZcSnUx7/oQZr9lSDmVHxUjfGaVodvVtFEle0="; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/search/quickwit/Cargo.lock b/third_party/nixpkgs/pkgs/servers/search/quickwit/Cargo.lock index daeabd62af..f62ec3b25a 100644 --- a/third_party/nixpkgs/pkgs/servers/search/quickwit/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/search/quickwit/Cargo.lock @@ -2,18 +2,21 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - [[package]] name = "RustyXML" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5" +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -868,6 +871,21 @@ dependencies = [ "tokio", ] +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.6.2", + "object", + "rustc-demangle", +] + [[package]] name = "base16" version = "0.2.1" @@ -1891,9 +1909,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elasticsearch-dsl" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c820db919f52bf9427bd3720625641c4b7de60834eb47a9fe9a98b9b179db9b" +checksum = "68ab1335c08fb99784b100ed23db38416b5fb52f5a178966d3b972b969e183e1" dependencies = [ "chrono", "num-traits", @@ -2045,7 +2063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -2301,6 +2319,12 @@ dependencies = [ "syn 2.0.18", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + [[package]] name = "glob" version = "0.3.1" @@ -2424,15 +2448,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.1" @@ -2881,9 +2896,9 @@ checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" [[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 = "libm" @@ -2982,9 +2997,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" [[package]] name = "match_cfg" @@ -2998,7 +3013,7 @@ 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]] @@ -3046,9 +3061,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] @@ -3084,6 +3099,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3133,9 +3157,9 @@ dependencies = [ [[package]] name = "mrecordlog" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37147ad590e077179550cb783db8610443bc6b885d2aba258c4eb75938000fbd" +checksum = "2ae279fda279177cadf1f2222ce4462fef46d814ba564e094c0b03e6503e39e0" dependencies = [ "async-trait", "bytes", @@ -3144,6 +3168,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", + "tracing", ] [[package]] @@ -3293,11 +3318,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.1", "libc", ] @@ -3357,6 +3382,15 @@ dependencies = [ "url", ] +[[package]] +name = "object" +version = "0.30.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +dependencies = [ + "memchr", +] + [[package]] name = "ofb" version = "0.6.1" @@ -3416,9 +3450,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", "cfg-if", @@ -3457,9 +3491,9 @@ dependencies = [ [[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", @@ -3603,25 +3637,26 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.15.6" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" +checksum = "d813b7b31a82efae94bd30ffaac09aec85efc18db2d5ec3aead1a220ee954351" dependencies = [ "aliasable", "ouroboros_macro", + "static_assertions", ] [[package]] name = "ouroboros_macro" -version = "0.15.6" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" +checksum = "5a56f651b4dd45ae3ac3d260ced32eaf0620cddaae5f26c69b554a9016594726" dependencies = [ - "Inflector", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -3648,7 +3683,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" version = "0.5.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "stable_deref_trait", ] @@ -4293,7 +4328,7 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quickwit-actors" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4306,6 +4341,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", + "sync_wrapper", "thiserror", "tokio", "tracing", @@ -4313,7 +4349,7 @@ dependencies = [ [[package]] name = "quickwit-aws" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4337,7 +4373,7 @@ dependencies = [ [[package]] name = "quickwit-cli" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4379,6 +4415,7 @@ dependencies = [ "serde_json", "tabled", "tempfile", + "thiserror", "thousands", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -4394,7 +4431,7 @@ dependencies = [ [[package]] name = "quickwit-cluster" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4420,7 +4457,7 @@ dependencies = [ [[package]] name = "quickwit-codegen" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "heck 0.4.1", @@ -4436,7 +4473,7 @@ dependencies = [ [[package]] name = "quickwit-codegen-example" -version = "0.6.0" +version = "0.6.2" dependencies = [ "async-trait", "dyn-clone", @@ -4458,13 +4495,12 @@ dependencies = [ [[package]] name = "quickwit-common" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-speed-limit", "async-trait", "byte-unit", - "colored", "dyn-clone", "env_logger", "futures", @@ -4496,7 +4532,7 @@ dependencies = [ [[package]] name = "quickwit-config" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "byte-unit", @@ -4526,7 +4562,7 @@ dependencies = [ [[package]] name = "quickwit-control-plane" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4563,7 +4599,7 @@ dependencies = [ [[package]] name = "quickwit-core" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4595,7 +4631,7 @@ dependencies = [ [[package]] name = "quickwit-datetime" -version = "0.6.0" +version = "0.6.2" dependencies = [ "itertools", "ouroboros", @@ -4608,7 +4644,7 @@ dependencies = [ [[package]] name = "quickwit-directories" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4629,7 +4665,7 @@ dependencies = [ [[package]] name = "quickwit-doc-mapper" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "base64 0.21.2", @@ -4662,7 +4698,7 @@ dependencies = [ [[package]] name = "quickwit-grpc-clients" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4681,7 +4717,7 @@ dependencies = [ [[package]] name = "quickwit-indexing" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "arc-swap", @@ -4739,7 +4775,7 @@ dependencies = [ [[package]] name = "quickwit-ingest" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4775,7 +4811,7 @@ dependencies = [ [[package]] name = "quickwit-integration-tests" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "bytes", @@ -4807,7 +4843,7 @@ dependencies = [ [[package]] name = "quickwit-jaeger" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4842,7 +4878,7 @@ dependencies = [ [[package]] name = "quickwit-janitor" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4879,7 +4915,7 @@ dependencies = [ [[package]] name = "quickwit-macros" -version = "0.6.0" +version = "0.6.2" dependencies = [ "proc-macro2", "quickwit-macros-impl", @@ -4887,7 +4923,7 @@ dependencies = [ [[package]] name = "quickwit-macros-impl" -version = "0.6.0" +version = "0.6.2" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -4897,7 +4933,7 @@ dependencies = [ [[package]] name = "quickwit-metastore" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4918,6 +4954,7 @@ dependencies = [ "regex", "serde", "serde_json", + "serde_with 2.3.3", "sqlx", "tempfile", "thiserror", @@ -4946,7 +4983,7 @@ dependencies = [ [[package]] name = "quickwit-opentelemetry" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", @@ -4969,7 +5006,7 @@ dependencies = [ [[package]] name = "quickwit-proto" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "glob", @@ -4990,7 +5027,7 @@ dependencies = [ [[package]] name = "quickwit-query" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "base64 0.21.2", @@ -5008,7 +5045,7 @@ dependencies = [ [[package]] name = "quickwit-rest-client" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "bytes", @@ -5032,7 +5069,7 @@ dependencies = [ [[package]] name = "quickwit-search" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -5081,7 +5118,7 @@ dependencies = [ [[package]] name = "quickwit-serve" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -5143,11 +5180,12 @@ dependencies = [ [[package]] name = "quickwit-storage" -version = "0.6.0" +version = "0.6.2" dependencies = [ "anyhow", "async-trait", "aws-config", + "aws-credential-types", "aws-sdk-s3", "aws-smithy-client", "aws-smithy-http", @@ -5184,7 +5222,7 @@ dependencies = [ [[package]] name = "quickwit-telemetry" -version = "0.6.0" +version = "0.6.2" dependencies = [ "async-trait", "encoding_rs", @@ -5335,11 +5373,12 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.28.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de127f294f2dba488ed46760b129d5ecbeabbd337ccbf3739cb29d50db2161c" +checksum = "f8733bc5dc0b192d1a4b28073f9bff1326ad9e4fecd4d9b025d6fc358d1c3e79" dependencies = [ - "futures", + "futures-channel", + "futures-util", "libc", "log", "rdkafka-sys", @@ -5352,9 +5391,9 @@ dependencies = [ [[package]] name = "rdkafka-sys" -version = "4.4.0+1.9.2" +version = "4.5.0+1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ac9d87c3aba1748e3112318459f2ac8bff80bfff7359e338e0463549590249" +checksum = "1bb0676c2112342ac7165decdedbc4e7086c0af384479ccce534546b10687a5d" dependencies = [ "cmake", "libc", @@ -5363,6 +5402,7 @@ dependencies = [ "openssl-sys", "pkg-config", "sasl2-sys", + "zstd-sys", ] [[package]] @@ -5396,13 +5436,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.1", + "regex-syntax 0.7.3", ] [[package]] @@ -5414,6 +5455,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaecc05d5c4b5f7da074b9a0d1a0867e71fd36e7fc0482d8bcfe8e8fc56290" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.3", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -5422,9 +5474,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" [[package]] name = "rend" @@ -5545,9 +5597,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.7.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73e721f488c353141288f223b599b4ae9303ecf3e62923f40a492f0634a4dc3" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5556,9 +5608,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.6.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22ce362f5561923889196595504317a4372b84210e6e335da529a65ea5452b5" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" dependencies = [ "proc-macro2", "quote", @@ -5569,9 +5621,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "7.5.0" +version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ "sha2", "walkdir", @@ -5605,6 +5657,12 @@ dependencies = [ "serde_json", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -6283,6 +6341,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "string_cache" version = "0.8.7" @@ -6422,8 +6486,8 @@ dependencies = [ [[package]] name = "tantivy" -version = "0.20.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +version = "0.20.2" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "aho-corasick", "arc-swap", @@ -6435,7 +6499,6 @@ dependencies = [ "crc32fast", "crossbeam-channel", "downcast-rs", - "fail", "fastdivide", "fs4", "futures-util", @@ -6478,7 +6541,7 @@ dependencies = [ [[package]] name = "tantivy-bitpacker" version = "0.4.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "bitpacking", ] @@ -6486,7 +6549,7 @@ dependencies = [ [[package]] name = "tantivy-columnar" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "fastdivide", "fnv", @@ -6501,7 +6564,7 @@ dependencies = [ [[package]] name = "tantivy-common" version = "0.5.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "async-trait", "byteorder", @@ -6524,7 +6587,7 @@ dependencies = [ [[package]] name = "tantivy-query-grammar" version = "0.20.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "combine", "once_cell", @@ -6534,7 +6597,7 @@ dependencies = [ [[package]] name = "tantivy-sstable" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "tantivy-common", "tantivy-fst", @@ -6544,7 +6607,7 @@ dependencies = [ [[package]] name = "tantivy-stacker" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "murmurhash32", "tantivy-common", @@ -6553,7 +6616,7 @@ dependencies = [ [[package]] name = "tantivy-tokenizer-api" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=924fc70#924fc70cb58f56dcd1a0547f2528c9ea86452763" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448386136d2595b613b3236b123ff9" dependencies = [ "serde", ] @@ -6788,11 +6851,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -7404,9 +7468,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" dependencies = [ "getrandom 0.2.9", "rand 0.8.5", diff --git a/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix b/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix index 41549b1f4a..e3eaf86c16 100644 --- a/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix @@ -9,16 +9,16 @@ let pname = "quickwit"; - version = "0.6.1"; + version = "0.6.2"; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { inherit pname version; src = fetchFromGitHub { owner = "quickwit-oss"; repo = pname; rev = "v${version}"; - hash = "sha256-MzPFS1f7AdqfFKSBJHoL0h1nbzRlMJt35msoQ6Ual/Q="; + hash = "sha256-ClCKBUdFl5AhDmJdCfdOM6jzQpwducyDuqzypdqM6Zg="; }; postPatch = '' @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { --replace '&[]' '&["."]' ''; - sourceRoot = "source/quickwit"; + sourceRoot = "${src.name}/quickwit"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "chitchat-0.5.0" = "sha256-gGWMzTzQNb9JXSbPIanMJpEKhKen1KsIrWQz6wvypDY="; - "ownedbytes-0.5.0" = "sha256-+hfp2r/m4Mu+HUXy3gfyU4klHqq+5k363Tpc34IWgLQ="; + "ownedbytes-0.5.0" = "sha256-ZuWwj5EzDm4YOUU/MhmR7CBOHM444ljBFSkC+wLBia4="; "path-0.1.0" = "sha256-f+Iix+YuKy45zoQXH7ctzANaL96s7HNUBOhcM1ZV0Ko="; "pulsar-5.0.2" = "sha256-j7wpsAro6x4fk3pvSL4fxLkddJFq8duZ7jDj0Edf3YQ="; "sasl2-sys-0.1.20+2.1.28" = "sha256-u4BsfmTDFxuY3i1amLCsr7MDv356YPThMHclura0Sxs="; @@ -70,6 +70,7 @@ rustPlatform.buildRustPackage { "--skip=actors::indexer::tests::test_indexer_triggers_commit_on_drained_mailbox" "--skip=actors::indexer::tests::test_indexer_partitioning" "--skip=actors::indexing_pipeline::tests::test_merge_pipeline_does_not_stop_on_indexing_pipeline_failure" + "--skip=actors::indexer::tests::test_indexer_triggers_commit_on_target_num_docs" # fail on darwin for some reason "--skip=io::tests::test_controlled_writer_limited_async" "--skip=io::tests::test_controlled_writer_limited_sync" diff --git a/third_party/nixpkgs/pkgs/servers/search/typesense/default.nix b/third_party/nixpkgs/pkgs/servers/search/typesense/default.nix new file mode 100644 index 0000000000..b78c5d0838 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/search/typesense/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, nixosTests +}: +let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + sources = lib.importJSON ./sources.json; + platform = sources.platforms.${system} or throwSystem; + inherit (sources) version; + inherit (platform) arch hash; +in +stdenv.mkDerivation { + pname = "typesense"; + inherit version; + src = fetchurl { + url = "https://dl.typesense.org/releases/${version}/typesense-server-${version}-${arch}.tar.gz"; + inherit hash; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + # The tar.gz contains no subdirectory + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin + cp $sourceRoot/typesense-server $out/bin + ''; + + passthru = { + tests = { inherit (nixosTests) typesense; }; + updateScript = ./update.sh; + }; + + meta = with lib; { + homepage = "https://typesense.org"; + description = "Typesense is a fast, typo-tolerant search engine for building delightful search experiences."; + license = licenses.gpl3; + # There has been an attempt at building this from source, which were deemed + # unfeasible at the time of writing this (July 2023) for the following reasons. + # - Pre 0.25 would have been possible, but typesense has switched to bazel for 0.25+, + # so the build would break immediately next version + # - The new bazel build has many issues, only some of which were fixable: + # - preBuild requires export LANG="C.UTF-8", since onxxruntime contains a + # unicode file path that is handled incorrectly and otherwise leads to a build failure + # - bazel downloads extensions to the build systems at build time which have + # invalid shebangs that need to be fixed by patching rules_foreign_cc through + # bazel (so a patch in nix that adds a patch to the bazel WORKSPACE) + # - WORKSPACE has to be patched to use system cmake and ninja instead of downloaded toolchains + # - The cmake dependencies that are pulled in via bazel at build time will + # try to download stuff via cmake again, which is not possible in the sandbox. + # This is where I stopped trying for now. + # XXX: retry once typesense has officially released their bazel based build. + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ oddlama ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/search/typesense/sources.json b/third_party/nixpkgs/pkgs/servers/search/typesense/sources.json new file mode 100644 index 0000000000..a4f4455250 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/search/typesense/sources.json @@ -0,0 +1,17 @@ +{ + "version": "0.24.1", + "platforms": { + "aarch64-linux": { + "arch": "linux-arm64", + "hash": "sha256-TI/bjGqyEZpGDq1F9MBaDypm5XDTlsw9OGd3lIn7JCI=" + }, + "x86_64-linux": { + "arch": "linux-amd64", + "hash": "sha256-bmvje439QYivV96fjnEXblYJnSk8C916OwVeK2n/QR8=" + }, + "x86_64-darwin": { + "arch": "darwin-amd64", + "hash": "sha256-24odPFqHWQoGXXXDLxvMDjCRu81Y+I5QOdK/KLdeH5o=" + } + } +} diff --git a/third_party/nixpkgs/pkgs/servers/search/typesense/update.sh b/third_party/nixpkgs/pkgs/servers/search/typesense/update.sh new file mode 100755 index 0000000000..c6d733181c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/search/typesense/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-prefetch common-updater-scripts nix coreutils +# shellcheck shell=bash +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +old_version=$(jq -r ".version" sources.json || echo -n "0.0.1") +version=$(curl -s "https://api.github.com/repos/typesense/typesense/releases/latest" | jq -r ".tag_name") +version="${version#v}" + +if [[ "$old_version" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +declare -A platforms=( + [aarch64-linux]="linux-arm64" + [x86_64-darwin]="darwin-amd64" + [x86_64-linux]="linux-amd64" +) + +sources_tmp="$(mktemp)" +cat < "$sources_tmp" +{ + "version": "$version", + "platforms": {} +} +EOF + +for platform in "${!platforms[@]}"; do + arch="${platforms[$platform]}" + url="https://dl.typesense.org/releases/${version}/typesense-server-${version}-${arch}.tar.gz" + sha256hash="$(nix-prefetch-url --type sha256 "$url")" + hash="$(nix hash to-sri --type sha256 "$sha256hash")" + echo "$(jq --arg arch "$arch" \ + --arg platform "$platform" \ + --arg hash "$hash" \ + '.platforms += {($platform): {arch: $arch, hash: $hash}}' \ + "$sources_tmp")" > "$sources_tmp" +done + +cp "$sources_tmp" sources.json diff --git a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix new file mode 100644 index 0000000000..736daf883f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "weaviate"; + version = "1.20.3"; + + src = fetchFromGitHub { + owner = "weaviate"; + repo = "weaviate"; + rev = "v${version}"; + hash = "sha256-4235Yb4F0YPihiukJmUswWH/hATRiwChdZV6+erRRnk="; + }; + + vendorHash = "sha256-RL18glau8IODHy0HqLq28nE7OIUezWDJY7BE/OBFHBw="; + + subPackages = [ "cmd/weaviate-server" ]; + + ldflags = [ "-w" "-extldflags" "-static" ]; + + postInstall = '' + ln -s $out/bin/weaviate-server $out/bin/weaviate + ''; + + meta = with lib; { + description = "The ML-first vector search engine"; + homepage = "https://github.com/semi-technologies/weaviate"; + license = licenses.bsd3; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix index 20f48867bd..b9316756b1 100644 --- a/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix @@ -17,7 +17,7 @@ let inherit src version; pname = "zinc-ui"; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; npmDepsHash = "sha256-2AjUaEOn2Tj+X4f42SvNq1kX07WxkB1sl5KtGdCjbdw="; diff --git a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix index 9faf062b92..085f0fb8cc 100644 --- a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-Xx5Y667SaCQo3XowDcBAelOsmiQDoLmD/kLu9QFZgcA="; + hash = "sha256-Xhu7QNPox0i6UuunRF1APYqdLrrlW0nR2BjzsABBnCw="; }; - vendorHash = "sha256-Cca4X2meD+ytT6QcrvuiDnpzQQdYnpTfX/ZM0n8QeeU="; + vendorHash = "sha256-XAfGNRHXLGzvZ5E397CNVx9VuSa///yoX49hwQKuAA4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix index 405800cfd1..ae37dab2e9 100644 --- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.28.3"; + version = "2.28.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-N7g0xP0ibJWuzp1zNALw/GdZseLwzQnX4H9W0UJsBaU="; + sha256 = "sha256-tXP7jxpqBASNShNe9rHiewSgdW/KgkH80V24VgJlXZE="; }; sourceRoot = "snappymail"; diff --git a/third_party/nixpkgs/pkgs/servers/sozu/default.nix b/third_party/nixpkgs/pkgs/servers/sozu/default.nix index 18179efcfd..971377f998 100644 --- a/third_party/nixpkgs/pkgs/servers/sozu/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-/0scNFOWDbL5SaXOC+/DGFE5OgJx1WkdruM+yFV6n1M="; + hash = "sha256-6CuBJUMymnqNx/675PeBuZNhYYh9HtU99J1LYO2+Rxc="; }; - cargoHash = "sha256-SVfAo7jsYIhgYHP4pity62TU1aGoH6E8UysJ/Gw+rDk="; + cargoHash = "sha256-c/TC8Mn9UFIymkXxD02iB6E3kKyeuKDgvlgapiV0Nco="; nativeBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix index 11c9511b2a..96b1afec99 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.10.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-ZI5aoL4CCqSv7Sw5RApa4AeVVE97tA5HXM5tdF12hqE="; + hash = "sha256-3aG47DeYVwDj0tX26oOWVE8yq8sVtxA4uw+LOIjKNuI="; }; - vendorHash = "sha256-hIhByVm4QpDhnXuWbscKYIgE/Bi0psBE0PvmuCq2NhQ="; + vendorHash = "sha256-kUMCbRIhSb5Bqo1P9J08xVUJmUdxaq5iU34sR+nuol4="; meta = with lib; { description = "Command line for managing SpiceDB"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix new file mode 100644 index 0000000000..88a5accaff --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchzip +, buildFHSEnv +}: + +let + version = "23.1.7"; + name = "cockroachdb"; + + # For several reasons building cockroach from source has become + # nearly impossible. See https://github.com/NixOS/nixpkgs/pull/152626 + # Therefore we use the pre-build release binary and wrap it with buildFHSUserEnv to + # work on nix. + # You can generate the hashes with + # nix flake prefetch + srcs = { + aarch64-linux = fetchzip { + url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-arm64.tgz"; + hash = "sha256-73qJL3o328NckH6POXv+AUvlAJextb31Vs8NGdc8dwE="; + }; + x86_64-linux = fetchzip { + url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-amd64.tgz"; + hash = "sha256-FL/zDrl+QstBp54LE9/SbIfSPorneGZSef6dcOQJbSo="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + +in +buildFHSEnv { + inherit name; + + runScript = "${src}/cockroach"; + + meta = with lib; { + homepage = "https://www.cockroachlabs.com"; + description = "A scalable, survivable, strongly-consistent SQL database"; + license = licenses.bsl11; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ rushmorem thoughtpolice neosimsim ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 62757b5457..3f94b7b232 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.7.5"; + version = "1.8.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-nAcwH4RVvRPZfPnXyPDOO5GFpUxIBmJzl3QH+5G6jcY="; + sha256 = "sha256-vvtYhvfzuB/Yo/Oy6YedYVIvnOP7nM/4z/798i28v6U="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-ODOAxH73AflCp9tLeYMU46bqr3MAS1casuGAFWuLYjA="; + vendorHash = "sha256-qMK95buygi0c2rluoFlqmMko72x5kFFoUBPIohmkfNQ="; proxyVendor = true; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix index 1c8722c49e..43086a891d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.33"; + version = "8.0.34"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI="; + hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index 7d3d3e949e..e47818b8d2 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libevent, c-ares, pkg-config }: +{ lib, stdenv, fetchurl, openssl, libevent, c-ares, pkg-config, nixosTests }: stdenv.mkDerivation rec { pname = "pgbouncer"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl c-ares ]; enableParallelBuilding = true; + passthru.tests = { + pgbouncer = nixosTests.pgbouncer; + }; + meta = with lib; { homepage = "https://www.pgbouncer.org/"; description = "Lightweight connection pooler for PostgreSQL"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix new file mode 100644 index 0000000000..72c3155861 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/pgcat/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "pgcat"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "postgresml"; + repo = "pgcat"; + rev = "v${version}"; + hash = "sha256-ESHBOh9JSzu6Zxh0z/+nebumi/zyFVdTK0DIwR/46Xo="; + }; + + cargoHash = "sha256-2wZADXEi8bfNgSQuL7yAmDYd/a0LOssdPFa/kvSSLFU="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + checkFlags = [ + # requires network access + "--skip=dns_cache::CachedResolver::lookup_ip" + "--skip=dns_cache::CachedResolver::new" + "--skip=dns_cache::CachedResolver" + "--skip=dns_cache::tests::has_changed" + "--skip=dns_cache::tests::incorrect_address" + "--skip=dns_cache::tests::lookup_ip" + "--skip=dns_cache::tests::new" + "--skip=dns_cache::tests::thread" + "--skip=dns_cache::tests::unknown_host" + ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/pgcat --version | grep "pgcat ${version}" + ''; + + meta = with lib; { + homepage = "https://github.com/postgresml/pgcat"; + description = "PostgreSQL pooler with sharding, load balancing and failover support."; + license = with licenses; [mit]; + platforms = platforms.unix; + maintainers = with maintainers; [cathalmullan]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix index e4492c4e51..2c4989711c 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; maintainers = with maintainers; [ marsam ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.postgresql; broken = postgresql.jitSupport; }; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index 9afad9a9d5..328f2f64eb 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -11,6 +11,7 @@ , file , protobufc , libiconv +, pcre2 , nixosTests }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-dOs1bj+F8UIzeRATNgiBtnSPeAgcxoj/nW8PZzp2LRM="; }; - buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] + buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] ++ lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm; dontDisableStatic = true; @@ -34,9 +35,9 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}" ''; postConfigure = '' sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix index 6847c5064d..c489e181cb 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix @@ -31,15 +31,15 @@ , texinfo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proxysql"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "sysown"; - repo = pname; - rev = version; - hash = "sha256-D/AUjndpu4QJmlgLBXRqMj9gsHYitEYhHVMQzoab1ik="; + repo = "proxysql"; + rev = finalAttrs.version; + hash = "sha256-HFhfAWyDB20t+c4s9NlVwdANrFobVyr+vnmZqx+X20Q="; }; patches = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - GIT_VERSION = version; + GIT_VERSION = finalAttrs.version; dontConfigure = true; @@ -165,12 +165,12 @@ stdenv.mkDerivation rec { sed -i s_/usr/bin/proxysql_$out/bin/proxysql_ $out/lib/systemd/system/*.service ''; - meta = with lib; { - homepage = "https://proxysql.com/"; + meta = { broken = stdenv.isDarwin; description = "High-performance MySQL proxy"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ ajs124 ]; - platforms = platforms.unix; + homepage = "https://proxysql.com/"; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ ajs124 ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix index 73b12a8496..c11bcfa4ec 100644 --- a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.20.0"; + version = "2.20.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-xhe6N718Tuqzjuo5Kt1X4myoxA5zmwf/fOJRJpchNug="; + hash = "sha256-wC19wEQz/dQDJ+VKgCWhe3zYyxb4JrzmWENgdgSUGi0="; }; - cargoHash = "sha256-GBzS4UJGvBYacGVOcAhWjueSQWg1o7QGMIIwePf5TVI="; + cargoHash = "sha256-q6rwbt4RdE69LxBSP8oDS/sI9Txr5R1tDSnvzQaZMmI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix index 300c21f2a8..bf3f4fa300 100644 --- a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix @@ -30,7 +30,8 @@ , svt-av1 , vulkan-loader , libappindicator -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , cudaPackages ? {} }: let diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 3af5e5b6f5..c4f700cf40 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.44.0"; + version = "1.46.1"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-/SiQFkhVseLkjK7ePNzNyBs0r3XE3kHJ6CDTFjdCXec="; + hash = "sha256-aweJys46MMnkSKJoLUFCzc6sWUP+Cv5+IFVVe9iEPGI="; }; - vendorHash = "sha256-fgCrmtJs1svFz0Xn7iwLNrbBNlcO6V0yqGPMY0+V1VQ="; + vendorHash = "sha256-oELDIt+mRiBGAdoEUkSAs2SM6urkHm1aAtJnev8jDYM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index 6336538d9d..10f92e38a0 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.12.4"; + version = "2.12.5"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9E2qEdPfxnvx7WCHE/I2rP6Qk9CtsVrisQbq202+2uE="; + sha256 = "sha256-ruCTmLmAsDzrNUZAeu0NjgPZRG1ZEOFUdprMvO6ZWbc="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix index 269faed896..140f4ddfa7 100644 --- a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-Jxg1gaMTJ/BbL8TQfPcyt1hYnT/LcL4j+m+jSeh5QyA="; + sha256 = "sha256-yMmn733j6k9r8I/lvVOZNL6o35eSPJZ5G8jw9xaJZRg="; }; - vendorHash = "sha256-yXFIBWOF72nXmT8+OSvF1aKBhCMBloLmGTfvNbV9ir4="; + vendorHash = "sha256-1VMeRB34JS9EwyGhPxFsRIgKaY6NyIMsa132PQKoPYY="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; diff --git a/third_party/nixpkgs/pkgs/servers/unpfs/default.nix b/third_party/nixpkgs/pkgs/servers/unpfs/default.nix index 106d52479b..f712634697 100644 --- a/third_party/nixpkgs/pkgs/servers/unpfs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unpfs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-zyDkUb+bFsVnxAE4UODbnRtDim7gqUNuY22vuxMsLZM="; }; - sourceRoot = "source/example/unpfs"; + sourceRoot = "${src.name}/example/unpfs"; cargoSha256 = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0="; diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix index 0a9ff0bcc1..acf4b07516 100644 --- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -1,5 +1,12 @@ -{ stdenv, nixosTests, lib, pkg-config, jansson, pcre, libxcrypt -, expat, zlib +{ stdenv +, nixosTests +, lib +, pkg-config +, jansson +, pcre +, libxcrypt +, expat +, zlib # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux @@ -10,90 +17,97 @@ , makeWrapper, fetchFromGitHub }: -let php-embed = php.override { - embedSupport = true; - apxs2Support = false; - }; +let + php-embed = php.override { + embedSupport = true; + apxs2Support = false; + }; - pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { - interpreter = pkg.pythonForBuild.interpreter; - path = "plugins/python"; - inputs = [ pkg ncurses ]; - install = '' - install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py - ${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/ - ${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/ - ''; - }; + pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { + interpreter = pkg.pythonForBuild.interpreter; + path = "plugins/python"; + inputs = [ pkg ncurses ]; + install = '' + install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py + ${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/ + ${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/ + ''; + }; - available = lib.listToAttrs [ - (pythonPlugin python2) - (pythonPlugin python3) - (lib.nameValuePair "rack" { - path = "plugins/rack"; - inputs = [ ruby ]; - }) - (lib.nameValuePair "cgi" { - # usage: https://uwsgi-docs.readthedocs.io/en/latest/CGI.html?highlight=cgi - path = "plugins/cgi"; - inputs = [ ]; - }) - (lib.nameValuePair "php" { - # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx - path = "plugins/php"; - inputs = [ - php-embed - php-embed.extensions.session - php-embed.extensions.session.dev - php-embed.unwrapped.dev - ] ++ php-embed.unwrapped.buildInputs; - }) - ]; + available = lib.listToAttrs [ + (pythonPlugin python2) + (pythonPlugin python3) + (lib.nameValuePair "rack" { + path = "plugins/rack"; + inputs = [ ruby ]; + }) + (lib.nameValuePair "cgi" { + # usage: https://uwsgi-docs.readthedocs.io/en/latest/CGI.html?highlight=cgi + path = "plugins/cgi"; + inputs = [ ]; + }) + (lib.nameValuePair "php" { + # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx + path = "plugins/php"; + inputs = [ + php-embed + php-embed.extensions.session + php-embed.extensions.session.dev + php-embed.unwrapped.dev + ] ++ php-embed.unwrapped.buildInputs; + }) + ]; - getPlugin = name: - let all = lib.concatStringsSep ", " (lib.attrNames available); - in if lib.hasAttr name available - then lib.getAttr name available // { inherit name; } - else throw "Unknown UWSGI plugin ${name}, available : ${all}"; + getPlugin = name: + let + all = lib.concatStringsSep ", " (lib.attrNames available); + in + if lib.hasAttr name available + then lib.getAttr name available // { inherit name; } + else throw "Unknown UWSGI plugin ${name}, available : ${all}"; - needed = builtins.map getPlugin plugins; + needed = builtins.map getPlugin plugins; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.21"; + version = "2.0.22"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; - rev = version; - sha256 = "sha256-TUASYDyG+p1tlhmqi+ivaC7aW6UZBrPTFQUTYys5ICE="; + rev = finalAttrs.version; + hash = "sha256-pfy3EDXq3KVY2mC3BMAp/87IUiP4NhdTWZo+zVBJ+Pc="; }; patches = [ - ./no-ext-session-php_session.h-on-NixOS.patch - ./additional-php-ldflags.patch + ./no-ext-session-php_session.h-on-NixOS.patch + ./additional-php-ldflags.patch ]; - nativeBuildInputs = [ python3 pkg-config makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + python3 + ]; buildInputs = [ jansson pcre libxcrypt ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ expat zlib ] - ++ lib.optional withPAM pam - ++ lib.optional withSystemd systemd - ++ lib.optional withCap libcap - ++ lib.concatMap (x: x.inputs) needed - ; + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ expat zlib ] + ++ lib.optional withPAM pam + ++ lib.optional withSystemd systemd + ++ lib.optional withCap libcap + ++ lib.concatMap (x: x.inputs) needed; basePlugins = lib.concatStringsSep "," - ( lib.optional withPAM "pam" - ++ lib.optional withSystemd "systemd_logger" - ); + ( lib.optional withPAM "pam" + ++ lib.optional withSystemd "systemd_logger" + ); UWSGI_INCLUDES = lib.optionalString withCap "${libcap.dev}/include"; passthru = { inherit python2 python3; + tests.uwsgi = nixosTests.uwsgi; }; postPatch = '' @@ -105,29 +119,42 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure + export pluginDir=$out/lib/uwsgi substituteAll ${./nixos.ini} buildconf/nixos.ini + + runHook postConfigure ''; # this is a hack to make the php plugin link with session.so (which on nixos is a separate package) # the hack works in coordination with ./additional-php-ldflags.patch - UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) - (lib.concatStringsSep "," [ - "-Wl" - "-rpath=${php-embed.extensions.session}/lib/php/extensions/" - "--library-path=${php-embed.extensions.session}/lib/php/extensions/" - "-l:session.so" - ]); + UWSGICONFIG_PHP_LDFLAGS = lib.optionalString + (builtins.any (x: x.name == "php") needed) + (lib.concatStringsSep "," [ + "-Wl" + "-rpath=${php-embed.extensions.session}/lib/php/extensions/" + "--library-path=${php-embed.extensions.session}/lib/php/extensions/" + "-l:session.so" + ]); buildPhase = '' + runHook preBuild + mkdir -p $pluginDir python3 uwsgiconfig.py --build nixos ${lib.concatMapStringsSep ";" (x: "${x.preBuild or ""}\n ${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -Dm755 uwsgi $out/bin/uwsgi ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} + + runHook postInstall ''; postFixup = lib.optionalString (builtins.any (x: x.name == "php") needed) @@ -135,14 +162,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/uwsgi --set PHP_INI_SCAN_DIR ${php-embed}/lib ''; - meta = with lib; { - homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; + meta = { description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; - license = licenses.gpl2; - maintainers = with maintainers; [ abbradar schneefux globin ]; - platforms = platforms.unix; + homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ abbradar schneefux globin ]; + platforms = lib.platforms.unix; }; - - passthru.tests.uwsgi = nixosTests.uwsgi; - -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix b/third_party/nixpkgs/pkgs/servers/uxplay/default.nix index be2866f6e3..707ed49990 100644 --- a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uxplay/default.nix @@ -11,15 +11,15 @@ , gst_all_1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uxplay"; - version = "1.65"; + version = "1.65.3"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; - rev = "v${version}"; - sha256 = "sha256-EpYSKD5nQsbA4l7nw1RdKpJWCjTWrPkYxVIZrQdusCQ="; + rev = "v${finalAttrs.version}"; + hash = "sha256-ghimxgukQHBc0yVSpttF5lEVE6BTf9OL7RWmR5izxCo="; }; postPatch = '' @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { gst_all_1.gst-libav ]; - meta = with lib; { - homepage = "https://github.com/FDH2/UxPlay"; + meta = { description = "AirPlay Unix mirroring server"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ azuwis ]; - platforms = platforms.unix; + homepage = "https://github.com/FDH2/UxPlay"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.azuwis ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix index 8a48ec4fc7..cd78e6baa5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "23.06.1"; + version = "23.06.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "0947rnapk7xv10a12fzymjlvj8j7drjlqjm61fckshif9c1q5r6j"; + sha256 = "sha256-1Ap/imfzoezT0bcyyBrYOLlVJWqah8TZDKcAjqMm4VQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix index 428d3d3aae..8c2fcf3225 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix @@ -73,6 +73,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/dgtlmoon/changedetection.io"; description = "Simplest self-hosted free open source website change detection tracking, monitoring and notification service"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix index e43b7766a6..2aa727ca2d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { }; passthru.tests = { - inherit (nixosTests) freshrss-sqlite freshrss-pgsql; + inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth; }; buildInputs = [ php ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix index 4123d8fd40..142a67d336 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "2.8.1"; + version = "2.10"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lJ0AZJpznet2YKPIyMOx5ZdETZB8de5vp7sydfndxZg="; + sha256 = "sha256-1x+pYMHaKgLFWcL1axOv/ok1ebs0I7Q+Q6htncmgJzU="; }; propagatedBuildInputs = with py.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index d2b57a96e7..0f2073f24a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -1,84 +1,110 @@ { lib , stdenv -, fetchzip -, makeWrapper -, which +, fetchFromGitHub +, gitMinimal +, cacert +, yarn +, makeBinaryWrapper , nodejs -, mkYarnPackage -, fetchYarnDeps , python3 , nixosTests }: -mkYarnPackage rec { +let + version = "1.9.9"; + + src = fetchFromGitHub { + owner = "hedgedoc"; + repo = "hedgedoc"; + rev = version; + hash = "sha256-6eKTgEZ+YLoSmPQWBS95fJ+ioIxeTVlT+moqslByPPw="; + }; + + # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles + offlineCache = stdenv.mkDerivation { + name = "hedgedoc-${version}-offline-cache"; + inherit src; + + nativeBuildInputs = [ + cacert # needed for git + gitMinimal # needed to download git dependencies + nodejs # needed for npm to download git dependencies + yarn + ]; + + buildPhase = '' + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder $out + yarn config set --json supportedArchitectures.os '[ "linux" ]' + yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]' + yarn + ''; + + outputHashMode = "recursive"; + outputHash = "sha256-Ga+tl4oZlum43tdfez1oWGMHZAfyePGl47S+9NRRvW8="; + }; + +in stdenv.mkDerivation { pname = "hedgedoc"; - version = "1.9.7"; + inherit version src; - # we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies - # in development and production and the web assets muts be compiled with js-yaml 3 while development - # uses js-yaml 4 which breaks the text editor - src = fetchzip { - url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz"; - hash = "sha256-tPkhnnKDS5TICsW66YCOy7xWFj5usLyDMbYMYQ3Euoc="; - }; + nativeBuildInputs = [ + makeBinaryWrapper + yarn + python3 # needed for sqlite node-gyp + ]; - nativeBuildInputs = [ which makeWrapper ]; - extraBuildInputs = [ python3 ]; - - packageJSON = ./package.json; - yarnFlags = [ "--production" ]; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = "0qkc26ks33vy00jgpv4445wzgxx1mzi70pkm1l8y9amgd9wf9aig"; - }; - - configurePhase = '' - cp -r "$node_modules" node_modules - chmod -R u+w node_modules - ''; + dontConfigure = true; buildPhase = '' runHook preBuild - pushd node_modules/sqlite3 + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder ${offlineCache} + + # This will fail but create the sqlite3 files we can patch + yarn --immutable-cache || : + + # Ensure we don't download any node things + sed -i 's:--fallback-to-build:--build-from-source --nodedir=${nodejs}/include/node:g' node_modules/sqlite3/package.json export CPPFLAGS="-I${nodejs}/include/node" - npm run install --build-from-source --nodedir=${nodejs}/include/node - popd + + # Perform the actual install + yarn --immutable-cache + yarn run build patchShebangs bin/* runHook postBuild ''; - dontInstall = true; - - distPhase = '' - runHook preDist + installPhase = '' + runHook preInstall mkdir -p $out cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out - cat > $out/bin/hedgedoc <=4.14", - "express-session": "^1.14.2", - "file-type": "^18.0.0", - "formidable": "^2.0.0", - "graceful-fs": "^4.1.11", - "helmet": "^4.5.0", - "i18n": "^0.15.0", - "is-svg": "^4.3.1", - "jsdom-nogyp": "^0.8.3", - "lodash": "^4.17.20", - "lutim": "^1.0.2", - "lz-string": "git+https://github.com/hackmdio/lz-string.git", - "mariadb": "^3.0.2", - "markdown-it": "^13.0.0", - "markdown-it-abbr": "^1.0.4", - "markdown-it-container": "^3.0.0", - "markdown-it-deflist": "^2.0.1", - "markdown-it-emoji": "^2.0.0", - "markdown-it-footnote": "^3.0.1", - "markdown-it-imsize": "^2.0.1", - "markdown-it-ins": "^3.0.0", - "markdown-it-mark": "^3.0.0", - "markdown-it-mathjax": "^2.0.0", - "markdown-it-regexp": "^0.4.0", - "markdown-it-sub": "^1.0.0", - "markdown-it-sup": "^1.0.0", - "mattermost": "^3.4.0", - "meta-marked": "git+https://github.com/hedgedoc/meta-marked", - "method-override": "^3.0.0", - "minimist": "^1.2.0", - "minio": "7.0.32", - "moment": "^2.17.1", - "morgan": "^1.7.0", - "mysql2": "^3.0.0", - "node-fetch": "^2.6.1", - "passport": "^0.6.0", - "passport-dropbox-oauth2": "^1.1.0", - "passport-facebook": "^3.0.0", - "passport-github": "^1.1.0", - "passport-gitlab2": "^5.0.0", - "passport-google-oauth20": "^2.0.0", - "passport-ldapauth": "^3.0.0", - "passport-local": "^1.0.0", - "passport-oauth2": "^1.4.0", - "passport-saml": "^3.1.2", - "passport-twitter": "^1.0.4", - "passport.socketio": "^3.7.0", - "pdfobject": "^2.0.201604172", - "pg": "^8.2.1", - "pg-hstore": "^2.3.3", - "prom-client": "^14.0.0", - "prometheus-api-metrics": "^3.2.0", - "randomcolor": "^0.6.0", - "readline-sync": "^1.4.7", - "rimraf": "^4.0.0", - "sanitize-filename": "^1.6.3", - "scrypt-kdf": "^2.0.1", - "sequelize": "^5.21.1", - "shortid": "2.2.16", - "socket.io": "^2.1.1", - "sqlite3": "^5.0.8", - "store": "^2.0.12", - "string": "^3.3.3", - "toobusy-js": "^0.5.1", - "umzug": "^2.3.0", - "uuid": "^9.0.0", - "validator": "^13.0.0", - "winston": "^3.1.0", - "xss": "^1.0.3" - }, - "engines": { - "node": "^14.13.1 || 16.x" - }, - "bugs": "https://github.com/hedgedoc/hedgedoc/issues", - "keywords": [ - "Collaborative", - "Markdown", - "Notes" - ], - "homepage": "https://hedgedoc.org", - "maintainers": [ - { - "name": "Claudius Coenen", - "url": "https://www.claudiuscoenen.de/" - }, - { - "name": "Christoph (Sheogorath) Kern", - "email": "codimd@sheogorath.shivering-isles.com", - "url": "https://shivering-isles.com" - }, - { - "name": "David Mehren", - "email": "hedgedoc@herrmehren.de" - } - ], - "repository": { - "type": "git", - "url": "https://github.com/hedgedoc/hedgedoc.git" - }, - "devDependencies": { - "abcjs": "6.1.9", - "babel-cli": "6.26.0", - "babel-core": "6.26.3", - "babel-loader": "7.1.5", - "babel-plugin-transform-runtime": "6.23.0", - "babel-polyfill": "6.26.0", - "babel-preset-env": "1.7.0", - "babel-runtime": "6.26.0", - "bootstrap": "3.4.1", - "bootstrap-validator": "0.11.9", - "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git#hedgedoc/1.9.7", - "copy-webpack-plugin": "6.4.1", - "css-loader": "5.2.7", - "emojify.js": "1.1.0", - "esbuild-loader": "3.0.1", - "escape-html": "1.0.3", - "eslint": "8.34.0", - "eslint-config-standard": "17.0.0", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-n": "15.6.1", - "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "6.1.1", - "eslint-plugin-standard": "4.1.0", - "exports-loader": "1.1.1", - "expose-loader": "1.0.3", - "file-loader": "6.2.0", - "file-saver": "2.0.5", - "flowchart.js": "1.17.1", - "fork-awesome": "1.2.0", - "gist-embed": "2.6.0", - "highlight.js": "10.7.3", - "html-webpack-plugin": "4.5.2", - "imports-loader": "1.2.0", - "ionicons": "2.0.1", - "jquery": "3.6.3", - "jquery-mousewheel": "3.1.13", - "jquery-ui": "1.13.2", - "js-cookie": "3.0.1", - "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", - "js-yaml": "3.14.1", - "jsonlint": "1.6.3", - "keymaster": "1.6.2", - "less": "4.1.3", - "less-loader": "7.3.0", - "list.js": "2.3.1", - "mathjax": "2.7.9", - "mermaid": "9.1.7", - "mini-css-extract-plugin": "1.6.2", - "mocha": "10.2.0", - "mock-require": "3.0.3", - "optimize-css-assets-webpack-plugin": "6.0.1", - "prismjs": "1.29.0", - "raphael": "2.3.0", - "remark-cli": "11.0.0", - "remark-preset-lint-markdown-style-guide": "5.1.2", - "reveal.js": "3.9.2", - "select2": "3.5.2-browserify", - "socket.io-client": "2.5.0", - "spin.js": "4.1.1", - "string-loader": "0.0.1", - "turndown": "7.1.1", - "url-loader": "4.1.1", - "velocity-animate": "1.5.2", - "visibilityjs": "2.0.2", - "viz.js": "1.8.2", - "webpack": "4.46.0", - "webpack-cli": "4.10.0", - "webpack-merge": "5.8.0", - "wurl": "2.5.4" - }, - "optionalDependencies": { - "bufferutil": "^4.0.0", - "utf-8-validate": "^6.0.0" - } -} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh deleted file mode 100755 index fc6c30e9e5..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq -set -euo pipefail -cd "$(dirname "$0")" - -if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates packaging data for the hedgedoc packages." - echo "Usage: $0 [git release tag]" - exit 1 -fi - -version="$1" - -if [ -z "$version" ]; then - version="$(wget -O- "https://api.github.com/repos/hedgedoc/hedgedoc/releases?per_page=1" | jq -r '.[0].tag_name')" -fi - -src="https://raw.githubusercontent.com/hedgedoc/hedgedoc/$version" - -wget "$src/package.json" -O package.json -wget "$src/yarn.lock" -O yarn.lock - -src_old_hash=$(nix-prefetch-url --unpack "https://github.com/hedgedoc/hedgedoc/releases/download/$version/hedgedoc-$version.tar.gz") -src_hash=$(nix hash to-sri --type sha256 $src_old_hash) -yarn_hash=$(prefetch-yarn-deps yarn.lock) - -sed -i "s|version = \".*\"|version = \"$version\"|" default.nix -sed -i "s|hash = \".*\"|hash = \"$src_hash\"|" default.nix -sed -i "s|sha256 = \".*\"|sha256 = \"$yarn_hash\"|" default.nix - -rm yarn.lock diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix index 81f07c2131..eb9783413b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/kavita/default.nix @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kavita-frontend"; inherit (finalAttrs) version src; - sourceRoot = "source/UI/Web"; + sourceRoot = "${finalAttrs.src.name}/UI/Web"; npmBuildScript = "prod"; npmFlags = [ "--legacy-peer-deps" ]; @@ -73,5 +73,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ misterio77 ]; + mainProgram = "kavita"; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json index 9ec97ece37..8f0b48b50d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json @@ -1,6 +1,6 @@ { "name": "lemmy-ui", - "version": "0.18.2", + "version": "0.18.3", "description": "An isomorphic UI for lemmy", "repository": "https://github.com/LemmyNet/lemmy-ui", "license": "AGPL-3.0", @@ -8,7 +8,7 @@ "scripts": { "analyze": "webpack --mode=none", "prebuild:dev": "yarn clean && node generate_translations.js", - "build:dev": "webpack --env LEMMY_UI_DISABLE_CSP=true --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", + "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", "prebuild:prod": "yarn clean && node generate_translations.js", "build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production", "clean": "yarn run rimraf dist", @@ -69,7 +69,6 @@ "jwt-decode": "^3.1.2", "lemmy-js-client": "0.18.1", "lodash.isequal": "^4.5.0", - "lodash.merge": "^4.6.2", "markdown-it": "^13.0.1", "markdown-it-container": "^3.0.0", "markdown-it-emoji": "^2.0.2", diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json index 489b5ecff4..e9250c0134 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.18.2", - "uiVersion": "0.18.2", - "serverSha256": "sha256-T08CjsRREgGJb1vXJrYihYaCin8NNHtsG+2PUHoI4Ho=", - "serverCargoSha256": "sha256-nTZcLOpsbdeGzpz3PzgXZEGZHMbvSDA5rB2A3S9tMF8=", - "uiSha256": "sha256-qFFnmdCONjfPyfp8v0VonPQP8G5b2DVpxEUAQT731Z0=", - "uiYarnDepsSha256": "sha256-fRJpA9WstNNNOePoqotJKYmlikkcjc34iM0WO8+a/3Q=" + "serverVersion": "0.18.3", + "uiVersion": "0.18.3", + "serverHash": "sha256-1feDR3WX4hwaAPEGkM3syb+CsYS3zkzQb2q8be/4UC4=", + "serverCargoHash": "sha256-CVZyOwM0BAeIVy74tj4NNE6occ6yo8eWpMhMb1DnoJY=", + "uiHash": "sha256-asmn5KQ4hhy1yGoeUrQJZLWXPelnb16utQWYplDqIOg=", + "uiYarnDepsHash": "sha256-fRJpA9WstNNNOePoqotJKYmlikkcjc34iM0WO8+a/3Q=" } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix index 652dfbe7b1..c8229c02cd 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { owner = "LemmyNet"; repo = "lemmy"; rev = version; - sha256 = pinData.serverSha256; + hash = pinData.serverHash; fetchSubmodules = true; }; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { echo 'pub const VERSION: &str = "${version}";' > crates/utils/src/version.rs ''; - cargoSha256 = pinData.serverCargoSha256; + cargoHash = pinData.serverCargoHash; buildInputs = [ postgresql ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix index 06cceef3aa..cd7b111027 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix @@ -40,7 +40,7 @@ let repo = name; rev = version; fetchSubmodules = true; - sha256 = pinData.uiSha256; + hash = pinData.uiHash; }; in mkYarnPackage { @@ -52,7 +52,7 @@ mkYarnPackage { packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - sha256 = pinData.uiYarnDepsSha256; + hash = pinData.uiYarnDepsHash; }; yarnPreBuild = '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.py b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.py index 95bd59dec3..9390082531 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.py +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.py @@ -1,12 +1,10 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github +#! nix shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github from urllib.request import Request, urlopen import dataclasses import subprocess -import hashlib import os.path import semver -import base64 from typing import ( Optional, Dict, @@ -29,10 +27,10 @@ SERVER_REPO = "lemmy" class Pin: serverVersion: str uiVersion: str - serverSha256: str = "" - serverCargoSha256: str = "" - uiSha256: str = "" - uiYarnDepsSha256: str = "" + serverHash: str = "" + serverCargoHash: str = "" + uiHash: str = "" + uiYarnDepsHash: str = "" filename: Optional[str] = None @@ -48,9 +46,9 @@ class Pin: def github_get(path: str) -> Dict: - """Send a GET request to Gituhb, optionally adding GITHUB_TOKEN auth header""" + """Send a GET request to GitHub, optionally adding GITHUB_TOKEN auth header""" url = f"https://api.github.com/{path.lstrip('/')}" - print(f"Retreiving {url}") + print(f"Retrieving {url}") req = Request(url) @@ -65,16 +63,8 @@ def get_latest_release(owner: str, repo: str) -> str: return github_get(f"/repos/{owner}/{repo}/releases/latest")["tag_name"] -def sha256_url(url: str) -> str: - sha256 = hashlib.sha256() - with urlopen(url) as resp: - while data := resp.read(1024): - sha256.update(data) - return "sha256-" + base64.urlsafe_b64encode(sha256.digest()).decode() - - def prefetch_github(owner: str, repo: str, rev: str) -> str: - """Prefetch github rev and return sha256 hash""" + """Prefetch GitHub rev and return SRI hash""" print(f"Prefetching {owner}/{repo}({rev})") proc = subprocess.run( @@ -83,18 +73,14 @@ def prefetch_github(owner: str, repo: str, rev: str) -> str: stdout=subprocess.PIPE, ) - sha256 = json.loads(proc.stdout)["sha256"] - if not sha256.startswith("sha256-"): # Work around bug in nix-prefetch-github - return "sha256-" + sha256 - - return sha256 + return json.loads(proc.stdout)["hash"] def get_latest_tag(owner: str, repo: str, prerelease: bool = False) -> str: - """Get the latest tag from a Github Repo""" + """Get the latest tag from a GitHub Repo""" tags: List[str] = [] - # As the Github API doesn't have any notion of "latest" for tags we need to + # As the GitHub API doesn't have any notion of "latest" for tags we need to # collect all of them and sort so we can figure out the latest one. i = 0 while i <= 100: # Prevent infinite looping @@ -144,9 +130,9 @@ def get_fod_hash(attr: str) -> str: def make_server_pin(pin: Pin, attr: str) -> None: - pin.serverSha256 = prefetch_github(OWNER, SERVER_REPO, pin.serverVersion) + pin.serverHash = prefetch_github(OWNER, SERVER_REPO, pin.serverVersion) pin.write() - pin.serverCargoSha256 = get_fod_hash(attr) + pin.serverCargoHash = get_fod_hash(attr) pin.write() @@ -159,9 +145,9 @@ def make_ui_pin(pin: Pin, package_json: str, attr: str) -> None: with open(os.path.join(SCRIPT_DIR, package_json), "wb") as fd: fd.write(resp.read()) - pin.uiSha256 = prefetch_github(OWNER, UI_REPO, pin.uiVersion) + pin.uiHash = prefetch_github(OWNER, UI_REPO, pin.uiVersion) pin.write() - pin.uiYarnDepsSha256 = get_fod_hash(attr) + pin.uiYarnDepsHash = get_fod_hash(attr) pin.write() diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/livebook/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/livebook/default.nix index 44257acd56..35ee0bf850 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/livebook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/livebook/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.9.2"; + version = "0.10.0"; inherit elixir; @@ -13,13 +13,13 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; rev = "v${version}"; - hash = "sha256-khC3gtRvywgAY6qHslZgAV3kmziJgKhdCB8CDg/HkIU="; + hash = "sha256-Bp1CEvVv5DPDDikRPubsG6p4LLiHXTEXE+ZIip3LsGA="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-rwWGs4fGeuyV6BBFgCyyDwKf/YLgs1wY0xnHYy8iioE="; + hash = "sha256-qFLCWr7LzI9WNgj0AJO3Tw7rrA1JhBOEpX79RMjv2nk="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index 0e2c4c999c..f68ec50118 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix @@ -23,8 +23,8 @@ in }; netbox = callPackage generic { - version = "3.5.4"; - hash = "sha256-CJ7NgKDDEmOFFULaG6wjP5pvGieyU4YRsvmIvqve5qg="; + version = "3.5.6"; + hash = "sha256-n5EJQcC5uVoL5KjGzF7bLF8c4Wke/YBJpx2V9KZz5Qo="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix index 30d9c002ca..d569fdfbb5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix @@ -4,7 +4,7 @@ , rustPlatform , makeWrapper , protobuf -, Security +, darwin , imagemagick , ffmpeg , exiftool @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks ]; postInstall = '' wrapProgram "$out/bin/pict-rs" \ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix index d890e571d9..cc0cad874c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix @@ -18,7 +18,7 @@ let owner = "plausible"; repo = "analytics"; rev = "v${version}"; - sha256 = "1ckw5cd4z96jkjhmzjq7k3kzjj7bvj38i5xq9r43cz0sn7w3470k"; + hash = "sha256-Exwy+LEafDZITriXiIbc60j555gHy1+hnNKkTxorfLI="; }; # TODO consider using `mix2nix` as soon as it supports git dependencies. diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/update.sh index 74387212d2..8ed285cfcb 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/update.sh +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/update.sh @@ -33,18 +33,18 @@ echo "$package_json" \ > $dir/package.json tarball_meta="$(nix-prefetch-github plausible analytics --rev "$latest")" -tarball_hash="$(nix to-base32 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" +tarball_hash="$(jq -r '.hash' <<< "$tarball_meta")" tarball_path="$(nix-build -E 'with import ./. {}; { p }: fetchFromGitHub (builtins.fromJSON p)' --argstr p "$tarball_meta")" -fake_hash="$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)" +fake_hash="$(nix-instantiate --eval -A lib.fakeHash | xargs echo)" sed -i "$dir/default.nix" \ -e 's,version = ".*",version = "'"$nix_version"'",' \ - -e '/^ src = fetchFromGitHub/,+4{;s/sha256 = "\(.*\)"/sha256 = "'"$tarball_hash"'"/}' \ - -e '/^ mixFodDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$fake_hash"'"/}' + -e '/^ src = fetchFromGitHub/,+4{;s#hash = "\(.*\)"#hash = "'"$tarball_hash"'"#}' \ + -e '/^ mixFodDeps =/,+3{;s#hash = "\(.*\)"#hash = "'"$fake_hash"'"#}' -mix_hash="$(nix to-base32 $(nix-build -A plausible.mixFodDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true))" +mix_hash="$(nix-build -A plausible.mixFodDeps 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" -sed -i "$dir/default.nix" -e '/^ mixFodDeps =/,+3{;s/sha256 = "\(.*\)"/sha256 = "'"$mix_hash"'"/}' +sed -i "$dir/default.nix" -e '/^ mixFodDeps =/,+3{;s#hash = "\(.*\)"#hash = "'"$mix_hash"'"#}' tmp_setup_dir="$(mktemp -d)" trap "rm -rf $tmp_setup_dir" EXIT diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix index 8cc99e5cf4..37fd2317bb 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix @@ -5,22 +5,35 @@ python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-06-26"; + version = "unstable-2023-07-19"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "da7c30291dcf53cc5b3d98f9aada5615cd1593a9"; - sha256 = "sha256-kbNw/YgcBZNkmn2nmsnEnc9Y8MJg3zGFdW1x9GIo+dM="; + rev = "a446dea1bb492eac417de9a900fae7cdf94aeec0"; + sha256 = "sha256-iZDaKCkDlp3O3IixWdXVykNRIxas+irG0dWAOU4wycI="; }; postPatch = '' sed -i 's/==.*$//' requirements.txt ''; - preBuild = '' - export SEARX_DEBUG="true"; - ''; + preBuild = + let + versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version)); + commitAbbrev = builtins.substring 0 8 src.rev; + in + '' + export SEARX_DEBUG="true"; + + cat > searx/version_frozen.py < @@ -836,6 +817,7 @@ self: super: --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; + meta.mainProgram = "lndir"; }); twm = super.twm.overrideAttrs (attrs: { @@ -962,6 +944,12 @@ self: super: ''; }); + xset = super.xset.overrideAttrs (attrs: { + meta = attrs.meta // { + mainProgram = "xset"; + }; + }); + # convert Type1 vector fonts to OpenType fonts fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ]; diff --git a/third_party/nixpkgs/pkgs/shells/any-nix-shell/default.nix b/third_party/nixpkgs/pkgs/shells/any-nix-shell/default.nix index 095347a3ca..fd4807e6d6 100644 --- a/third_party/nixpkgs/pkgs/shells/any-nix-shell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/any-nix-shell/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://github.com/haslersn/any-nix-shell"; maintainers = with maintainers; [ haslersn ]; + mainProgram = "any-nix-shell"; }; } diff --git a/third_party/nixpkgs/pkgs/shells/carapace/default.nix b/third_party/nixpkgs/pkgs/shells/carapace/default.nix index 73cb1c8dc9..c49885846c 100644 --- a/third_party/nixpkgs/pkgs/shells/carapace/default.nix +++ b/third_party/nixpkgs/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.25.1"; + version = "0.25.3"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "sha256-EWdo+86mZt5sQMPgX2Co484YaP6An7o7t9rmn3GujaI="; + sha256 = "sha256-N1rPAK+fjFqojxMMRgohTwhlYxHC0fUICZ+fcG23gUE="; }; - vendorHash = "sha256-R+PfIG3d0eB0eTpAnZfSnvACtDOv0uxIzoW+f7rF4cY="; + vendorHash = "sha256-LooEhKK+JSUaEMio81WGMv5l1SqEIs2r978yEc7sPlo="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix index 558ade2b98..1b5b02b204 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix @@ -5,13 +5,13 @@ let in buildFishPlugin rec { pname = "fzf.fish"; - version = "9.8"; + version = "9.9"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "sha256-xWaMd5POCDeeFTsGtHbIvsPelIp+GZPC1X1CseCo3BA="; + sha256 = "sha256-Aqr6+DcOS3U1R8o9Mlbxszo5/Dy9viU4KbmRGXo95R8="; }; nativeCheckInputs = [ fzf fd unixtools.script procps ]; diff --git a/third_party/nixpkgs/pkgs/shells/murex/default.nix b/third_party/nixpkgs/pkgs/shells/murex/default.nix index 8e3792e5b1..2f47dcc6e1 100644 --- a/third_party/nixpkgs/pkgs/shells/murex/default.nix +++ b/third_party/nixpkgs/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "4.3.3200"; + version = "4.4.9100"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W0P/WZ+GC0on7ZKjGNq6UQO9iAMIo7vODn9JltfK5XY="; + sha256 = "sha256-3YXRjwDEJC4rZdvrgj8Hp8oD+4NN5LOUJmM/9bjwfQw="; }; vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU="; diff --git a/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix b/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix index 345f917ddc..87a3c06312 100644 --- a/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "nix-your-shell"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g5TC+4DGbTAlG39R8QIM5cB3/mtkp/vz8puB0Kr6aag="; + sha256 = "sha256-5zHjz0NOKcZCuR6QaLrwOXih3Xoqf2uBrJnxTX/TQok="; }; - cargoSha256 = "sha256-AiWKSWwMh6KWCTTRRCBxekv2rukz+ijnRit11K/AnhU="; + cargoSha256 = "sha256-4Z/z4VgnJQd8Uc0tMDnx7sChzXtG5ZDL88jTlhPSonM="; meta = with lib; { description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index a992a2ea03..b76b63167e 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.82.0"; + version = "0.83.1"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-D/R+/60Lo2rLUA/313CTJQookqSNtbD7LnVf0vBC9Qc="; + hash = "sha256-WMMGsJFgUkascCja7v0VA3spaOb5QmMFXQ2JOT9beO4="; }; - cargoHash = "sha256-LTnBJDA2RkAP3ZCpl5enUc0PLS63EVXQyIopUwBd8OQ="; + cargoHash = "sha256-/0+k3qOM9/rY6XmeVjqQWkjv19yZTkmfMK51z4+ppJU="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix index ce01f25743..0a49f709a6 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix @@ -1,17 +1,18 @@ { lib , stdenvNoCC , fetchFromGitHub +, unstableGitUpdater }: stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2023-04-26"; + version = "unstable-2023-07-29"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "724f89c330dc5b93a2fde29f732cbd5b8d73785c"; - hash = "sha256-aCLFbxVE8/hWsPNPLt2Qn8CaBkYJJLSDgpl6LYvFVYc="; + rev = "3ee56c6ec31fcc8dbffee85e1c73eb6fe0bbba8d"; + hash = "sha256-luGIvcKOfhDorPfGfL449+eD+58MGo5jMCsNwIRJWt4="; }; installPhase = '' @@ -23,6 +24,8 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "A place to share Nushell scripts with each other"; homepage = "https://github.com/nushell/nu_scripts"; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index abddd85254..bbba12bddb 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -11,9 +11,9 @@ let in rustPlatform.buildRustPackage { inherit pname; - version = nushell.version; + version = "0.83.1"; src = nushell.src; - cargoHash = "sha256-+RFCkM++6DgrwFjTr3JlCgh9FqDBUOQsOucbZAi+V/k="; + cargoHash = "sha256-qRKONc8rDRALEin8WGxi7Jma4uD+U+9Gu6zpmYWmGOc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix index d14f5f21d8..00b70f279c 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -9,11 +9,11 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.82.0"; + version = "0.83.1"; src = nushell.src; - cargoHash = "sha256-j0FI6Ed8YVIpJ4MBDl6h9qfnolMlPJeoY0Q/qfbGTBA="; + cargoHash = "sha256-0Bcu2h1ooc4z4ezKSjl7ca5cNQwnF3je7XzdhuqP4iQ="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; diff --git a/third_party/nixpkgs/pkgs/shells/rc-9front/default.nix b/third_party/nixpkgs/pkgs/shells/rc-9front/default.nix index e68674dfb3..2c3d565db5 100644 --- a/third_party/nixpkgs/pkgs/shells/rc-9front/default.nix +++ b/third_party/nixpkgs/pkgs/shells/rc-9front/default.nix @@ -1,6 +1,7 @@ { lib , stdenv -, fetchgit +, fetchFrom9Front +, unstableGitUpdater , byacc , installShellFiles }: @@ -9,8 +10,10 @@ stdenv.mkDerivation { pname = "rc-9front"; version = "unstable-2022-11-01"; - src = fetchgit { - url = "git://shithub.us/cinap_lenrek/rc"; + src = fetchFrom9Front { + domain = "shithub.us"; + owner = "cinap_lenrek"; + repo = "rc"; rev = "69041639483e16392e3013491fcb382efd2b9374"; hash = "sha256-xc+EfC4bc9ZA97jCQ6CGCzeLGf+Hx3/syl090/x4ew4="; }; @@ -31,7 +34,10 @@ stdenv.mkDerivation { install -m644 rcmain.unix $out/lib/rcmain ''; - passthru.shellPath = "/bin/rc"; + passthru = { + shellPath = "/bin/rc"; + updateScript = unstableGitUpdater { shallowClone = false; }; + }; meta = with lib; { description = "The 9front shell"; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/default.nix index 1297e62226..d2bdd5d34d 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/default.nix @@ -131,6 +131,7 @@ EOF homepage = "https://www.zsh.org/"; maintainers = with lib.maintainers; [ pSub artturin ]; platforms = lib.platforms.unix; + mainProgram = "zsh"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index 47dc4748c1..1e2e9f29b2 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-/phoIi8amqdO+OK26+CE2OXwHTE71PaV9NIXEnGl6Co="; + sha256 = "sha256-31BD5jUA54oLSsL4NzGaGAiOXMcZwy7uX65pD+jtE4M="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix new file mode 100644 index 0000000000..9a8f9f9b55 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix @@ -0,0 +1,30 @@ +{ + stdenv, + lib, + fetchFromGitHub, +}: +stdenv.mkDerivation rec { + pname = "zsh-abbr"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "olets"; + repo = "zsh-abbr"; + rev = "v${version}"; + hash = "sha256-iKL2vn7TmQr78y0Bn02DgNf9DS5jZyh6uK9MzYTFZaA"; + }; + + strictDeps = true; + + installPhase = '' + install -D zsh-abbr.zsh $out/share/zsh/${pname}/abbr.plugin.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/olets/zsh-abbr"; + description = "The zsh manager for auto-expanding abbreviations, inspired by fish shell"; + license = with licenses; [cc-by-nc-nd-40 hl3]; + maintainers = with maintainers; [icy-thought]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix index dc8297b072..3f3596b4d7 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-forgit/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { runHook preInstall install -D bin/git-forgit $out/bin/git-forgit + install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit + install -D completions/git-forgit.zsh $out/share/zsh/${pname}/git-forgit.zsh install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh wrapProgram $out/bin/git-forgit \ --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]} diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix index 63e5fe8281..4b2aea76a7 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-history-substring-search"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-history-substring-search"; rev = "v${version}"; - sha256 = "0y8va5kc2ram38hbk2cibkk64ffrabfv1sh4xm7pjspsba9n5p1y"; + sha256 = "0vjw4s0h4sams1a1jg9jx92d6hd2swq4z908nbmmm2qnz212y88r"; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-vi-mode/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-vi-mode/default.nix index 9d366eded0..372dedcf5d 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-vi-mode/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-vi-mode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-vi-mode"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "jeffreytse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KQ7UKudrpqUwI6gMluDTVN0qKpB15PI5P1YHHCBIlpg="; + sha256 = "sha256-QE6ZwwM2X0aPqNnbVrj0y7w9hmuRf0H1j8nXYwyoLo4="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/stdenv/adapters.nix b/third_party/nixpkgs/pkgs/stdenv/adapters.nix index 22da13f5d1..f29bdf671c 100644 --- a/third_party/nixpkgs/pkgs/stdenv/adapters.nix +++ b/third_party/nixpkgs/pkgs/stdenv/adapters.nix @@ -67,7 +67,7 @@ rec { "--disable-shared" # brrr... ]; })); - } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "libc") { + } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "glibc") { extraBuildInputs = (old.extraBuildInputs or []) ++ [ pkgs.glibc.static ]; @@ -121,9 +121,6 @@ rec { # Apple does not provide a static version of libSystem or crt0.o # So we can’t build static binaries without extensive hacks. ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeStaticBinaries - - # Glibc doesn’t come with static runtimes by default. - # ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ((lib.flip overrideInStdenv) [ self.glibc.static ]) ); diff --git a/third_party/nixpkgs/pkgs/stdenv/native/default.nix b/third_party/nixpkgs/pkgs/stdenv/native/default.nix index bae4ff2c93..de447f4e75 100644 --- a/third_party/nixpkgs/pkgs/stdenv/native/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/native/default.nix @@ -152,7 +152,10 @@ in inherit config overlays; stdenv = makeStdenv { inherit (prevStage) cc fetchurl; - } // { inherit (prevStage) fetchurl; }; + overrides = prev: final: { inherit (prevStage) fetchurl; }; + } // { + inherit (prevStage) fetchurl; + }; }) # Using that, build a stdenv that adds the ‘xz’ command (which most systems @@ -162,7 +165,7 @@ in stdenv = makeStdenv { inherit (prevStage.stdenv) cc fetchurl; extraPath = [ prevStage.xz ]; - overrides = self: super: { inherit (prevStage) xz; }; + overrides = self: super: { inherit (prevStage) fetchurl xz; }; extraNativeBuildInputs = if localSystem.isLinux then [ prevStage.patchelf ] else []; }; }) diff --git a/third_party/nixpkgs/pkgs/test/cross/default.nix b/third_party/nixpkgs/pkgs/test/cross/default.nix index f31d6aefbd..46bb3c8d52 100644 --- a/third_party/nixpkgs/pkgs/test/cross/default.nix +++ b/third_party/nixpkgs/pkgs/test/cross/default.nix @@ -134,8 +134,9 @@ let pkgs.pkgsLLVM.stdenv pkgs.pkgsStatic.bash pkgs.pkgsCross.arm-embedded.stdenv + pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc - #pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc + pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index b6793d25b6..6bfa1c4393 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -66,15 +66,7 @@ with pkgs; cuda = callPackage ./cuda { }; - trivial-builders = recurseIntoAttrs { - writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {}; - writeTextFile = callPackage ../build-support/trivial-builders/test/write-text-file.nix {}; - writeShellScript = callPackage ../build-support/trivial-builders/test/write-shell-script.nix {}; - references = callPackage ../build-support/trivial-builders/test/references.nix {}; - overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {}; - concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {}; - linkFarm = callPackage ../build-support/trivial-builders/test/link-farm.nix {}; - }; + trivial-builders = callPackage ../build-support/trivial-builders/test/default.nix {}; writers = callPackage ../build-support/writers/test.nix {}; diff --git a/third_party/nixpkgs/pkgs/test/haskell/default.nix b/third_party/nixpkgs/pkgs/test/haskell/default.nix index 86764380ec..2ecbd4caf8 100644 --- a/third_party/nixpkgs/pkgs/test/haskell/default.nix +++ b/third_party/nixpkgs/pkgs/test/haskell/default.nix @@ -5,6 +5,5 @@ lib.recurseIntoAttrs { cabalSdist = callPackage ./cabalSdist { }; documentationTarball = callPackage ./documentationTarball { }; setBuildTarget = callPackage ./setBuildTarget { }; - writers = callPackage ./writers { }; incremental = callPackage ./incremental { }; } diff --git a/third_party/nixpkgs/pkgs/test/haskell/writers/default.nix b/third_party/nixpkgs/pkgs/test/haskell/writers/default.nix deleted file mode 100644 index f05fda4bc7..0000000000 --- a/third_party/nixpkgs/pkgs/test/haskell/writers/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Wrap only the haskell-related tests from tests.writers -# in their own derivation for Hydra CI in the haskell-updates -# jobset. Can presumably removed as soon as tests.writers is -# always green on darwin as well: -# https://github.com/NixOS/nixpkgs/issues/126182 -{ runCommand, tests }: - -let - inherit (tests.writers) - writeTest - bin - simple - path - ; -in - -runCommand "test-haskell-writers" { - meta = { - inherit (tests.writers.meta) platforms; - }; -} '' - ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} - ${writeTest "success" "test-haskell-simple-writer" simple.haskell} - ${writeTest "success" "test-haskell-path-writer" path.haskell} - touch $out -'' diff --git a/third_party/nixpkgs/pkgs/test/texlive/default.nix b/third_party/nixpkgs/pkgs/test/texlive/default.nix index ae0e913a76..cb004dc3c9 100644 --- a/third_party/nixpkgs/pkgs/test/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/test/texlive/default.nix @@ -321,4 +321,54 @@ echo "tested $binCount binCount: $ignoredCount ignored, $brokenCount broken, $failedCount failed" [[ $failedCount = 0 ]] ''; + + # verify that the precomputed licensing information in default.nix + # does indeed match the metadata of the individual packages. + # + # This is part of the test suite (and not the normal evaluation) to save + # time for "normal" evaluations. To be more in line with the other tests, this + # also builds a derivation, even though it is essentially an eval-time assertion. + licenses = + let + concatLicenses = builtins.foldl' (acc: el: if builtins.elem el acc then acc else acc ++ [ el ]); + # converts a license to its attribute name in lib.licenses + licenseToAttrName = license: + builtins.head (builtins.attrNames + (lib.filterAttrs (n: v: license == v) lib.licenses)); + lt = (a: b: a < b); + + savedLicenses = scheme: scheme.meta.license; + savedLicensesAttrNames = scheme: map licenseToAttrName (savedLicenses scheme); + + correctLicenses = scheme: builtins.foldl' + (acc: pkg: concatLicenses acc (lib.toList (pkg.meta.license or []))) + [] + scheme.passthru.packages; + correctLicensesAttrNames = scheme: + lib.sort lt + (map licenseToAttrName (correctLicenses scheme)); + + hasLicenseMismatch = scheme: + (lib.isDerivation scheme) && + (savedLicensesAttrNames scheme) != (correctLicensesAttrNames scheme); + incorrectSchemes = lib.filterAttrs + (n: hasLicenseMismatch) + texlive.combined; + prettyPrint = name: scheme: + '' + license info for ${name} is incorrect! Note that order is enforced. + saved: [ ${lib.concatStringsSep " " (savedLicensesAttrNames scheme)} ] + correct: [ ${lib.concatStringsSep " " (correctLicensesAttrNames scheme)} ] + ''; + errorText = lib.concatStringsSep "\n\n" (lib.mapAttrsToList prettyPrint incorrectSchemes); + in + runCommand "texlive-test-license" { + inherit errorText; + } + (if (incorrectSchemes == {}) + then "echo everything is fine! > $out" + else '' + echo "$errorText" + false + ''); } diff --git a/third_party/nixpkgs/pkgs/tools/X11/kdocker/default.nix b/third_party/nixpkgs/pkgs/tools/X11/kdocker/default.nix new file mode 100644 index 0000000000..21a11f8fa3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/X11/kdocker/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, wrapQtAppsHook +, libX11 +, libXmu +, libXpm +, qtbase +, qtx11extras +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kdocker"; + version = "5.4"; + + src = fetchFromGitHub { + owner = "user-none"; + repo = "KDocker"; + rev = "${finalAttrs.version}"; + hash = "sha256-CTz2M9nv5Rf1amnSpLiIUZLH9Q3te6ZyFNUzSGHdYJc="; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + libX11 + libXmu + libXpm + qtbase + qtx11extras + ]; + + prePatch = '' + for h in Xatom Xlib Xmu; do + sed -i "s|#include <$h|#include =3.2,<3.4" "cryptography" \ --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" \ + --replace "msal[broker]==1.22.0" "msal[broker]" \ --replace "packaging>=20.9,<22.0" "packaging" ''; nativeCheckInputs = with self; [ pytest ]; @@ -117,8 +118,8 @@ let azure-data-tables = overrideAzureMgmtPackage super.azure-data-tables "12.4.0" "zip" "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw="; - azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "3.0.0" "zip" - "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ="; + azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "4.0.0" "zip" + "sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw="; azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; @@ -138,11 +139,11 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b2" "zip" "sha256-e+I5MdbbX7WhxHCj1Ery3z2WUrJtpWGD1bhLbqReb58="; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b8" "zip" - "sha256-OyA0O10UMx8BKUvxTQU6/eZupuKoxFQk2kvd/qINjFU="; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b10" "zip" + "sha256-sM8oZdhv+5WCd4RnMtEmCikTBmzGsap5heKzSbHbRPI="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.2.0" "zip" - "sha256-2rU5Mc5tcSHEaej4LeiJ/WwWjk3fZFdd7MIwqmHgRss="; + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.4.0" "zip" + "sha256-2JeOvtNxx6Z3AY4GI9fBRKbMcYVHsbrhk8C+5t5eelk="; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "6.0.0" "zip" "sha256-lIEYi/jvF9pYbnH+clUzfU0fExlY+dZojIyZRtTLQh8="; @@ -162,8 +163,8 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "23.0.0" "zip" - "sha256-V8IUTQvbUSOpsqkGfBqLo4DVIB7fryYMVx6WpfWzOnc="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "24.0.0" "zip" + "sha256-sUp3LDVsc1DmVf4HdaXGSDeEvmAE2weSHHTxL/BwRk8="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip" "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; @@ -272,8 +273,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip" "sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA="; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.0" "zip" - "sha256-QZbbdvgCbPleZnPpYTZI/Cgmeus8Kb5uyXuobnf6Ox4="; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.2" "zip" + "sha256-LG6oMTZepgT87KdJrwCpc4ZYEclUsEAHUitZrxFCkL4="; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; @@ -308,8 +309,8 @@ let azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip" "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.1.0" "tar.gz" - "sha256-VvNI+mhi2nCFBAXUEL5ph3xj/cBRMf2Mo2uXIgKC+oc="; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.2.0" "tar.gz" + "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I="; azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { version = "1.1.1"; @@ -523,12 +524,12 @@ let }); argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec { - version = "2.0.0"; + version = "3.1.1"; src = fetchPypi { inherit (oldAttrs) pname; inherit version; - hash = "sha256-Y3KteMidZiA1EBQYriU2aERbORdVz+lOpS8bnSJCWyA="; + hash = "sha256-bExWPxTwFECq/6Pq4TRBxdsjV7Xuxjmr58CxUzRiff8="; }; }); @@ -553,11 +554,11 @@ let }); azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs(oldAttrs: rec { - version = "22.0.0"; + version = "23.1.0b2"; src = oldAttrs.src.override { inherit version; - hash = "sha256-/rXZeeGLUvLP0CO0oKM+VKb3bMaiUtyM117OLGMpjpQ="; + hash = "sha256-kMmiKVwjPgmsTIxxxDRNXE41jSTJkemnKhO+P/OcPZI="; }; }); }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix index f892edc5f5..e11172e507 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix @@ -15,12 +15,12 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-yNyQ3cmy0Rc2+8EygMJwB/kmmmOiyq5V+7dyFFHyaVA="; - x86_64-darwin = "sha256-sODceZObYQned+opKQ4BgRZxlJQ12c2D01+FG8JF2N0="; - aarch64-darwin = "sha256-sODceZObYQned+opKQ4BgRZxlJQ12c2D01+FG8JF2N0="; + x86_64-linux = "sha256-USljQ/cnbSabzsZWXlZ0eeZSqkTr3wVP0ktXqZ7Fw4U="; + x86_64-darwin = "sha256-VB5075VfQRtlLoG3lfkVz8ASoODiwleTYC2JJR51LtI="; + aarch64-darwin = "sha256-VB5075VfQRtlLoG3lfkVz8ASoODiwleTYC2JJR51LtI="; }.${system} or throwSystem; - version = "16.6.2"; + version = "16.7.6"; src = fetchzip { url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip"; inherit sha256; diff --git a/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix index 903bfe7f32..7d24270f8d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { meta = with lib; { description = "A tool to detect crontab errors"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; homepage = "https://github.com/lyda/chkcrontab"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index b27aa9f593..bb588a8226 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KrgPHdYR0kYwyNhO2EwIO00Xnjy0MmrzHb5LDmbrgB0="; + sha256 = "sha256-sXYdP1HvwamKKvCNM5T2vu86y5mQ9MD44SrFgqWfQkE="; }; - vendorHash = "sha256-1YOx7tqPJwCZlJSAG9o+STKRAIR72dptvTOpa9rRt3A="; + vendorHash = "sha256-TbgxXkLIEu7jSnngVRbp4E22GgOkXSB0b8JzHI/pNGk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index f87723cc31..78d9e1d0fb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "credhub-cli"; - version = "2.9.17"; + version = "2.9.18"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-sxIyiUw5bI2M5mndjt6l5i5WJej24mMdmXrV5MbwTY8="; + sha256 = "sha256-Fr9hV8mPBIid/5jR5u6jiGjr7a9HbSVCaReXx9jGo/Q="; }; # these tests require network access that we're not going to give them diff --git a/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix b/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix index 413fad40dc..1a19413694 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cw"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix index 7859145dfd..151da67fe9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "docker"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KtDWrtd88s4Al3iWxIYE+YlhZTzf8/YDVYE2AwxH8ho="; + sha256 = "sha256-3zWlYW+2LA/JK/lv/OTzMlF2HlQPID0WYks0dQrP3GY="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix index 8451d8b687..32421a62da 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix @@ -1,6 +1,7 @@ { stdenv , lib -, fetchgit +, fetchFrom9Front +, unstableGitUpdater , installShellFiles , makeWrapper , xorg @@ -19,10 +20,11 @@ stdenv.mkDerivation { pname = "drawterm"; version = "unstable-2023-06-27"; - src = fetchgit { - url = "git://git.9front.org/plan9front/drawterm"; + src = fetchFrom9Front { + owner = "plan9front"; + repo = "drawterm"; rev = "36debf46ac184a22c6936345d22e4cfad995948c"; - sha256 = "ebqw1jqeRC0FWeUIO/HaEovuwzU6+B48TjZbVJXByvA="; + hash = "sha256-ebqw1jqeRC0FWeUIO/HaEovuwzU6+B48TjZbVJXByvA="; }; enableParallelBuilding = true; @@ -54,6 +56,8 @@ stdenv.mkDerivation { installManPage drawterm.1 ''; + passthru.updateScript = unstableGitUpdater { shallowClone = false; }; + meta = with lib; { description = "Connect to Plan 9 CPU servers from other operating systems."; homepage = "https://drawterm.9front.org/"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/ejson2env/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ejson2env/default.nix index fae0ce1f7b..1b28cdcc4f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ejson2env/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ejson2env/default.nix @@ -19,9 +19,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index f01edc1d61..3a8f2801e9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.148.0"; + version = "0.150.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-0/gjBUbngj6lVw3ascI0P+n95IkjsDhEq5x72P5DnSg="; + hash = "sha256-JmmbIeLr9jxr+LgVOw/IyIxkun0aTvdvq1e/EPUvvng="; }; - vendorHash = "sha256-30OmvzC0Sd0ce2IAleE7prQBlMvMGvUGF5IfrG2m0IQ="; + vendorHash = "sha256-zSRsPO7ms7k2B+KEOUIqc6hZuKJ2lpZatnBQWjqFdJA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 648c3c0e4e..13dd336996 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.71.0"; + version = "1.71.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-GSr5q/djXFv+Hg9RxMSOfG6/57rysD1LxJdKfzcGG64="; + sha256 = "sha256-c+u4mEpkzIEg3C1nQCSAhWdWWVxrW12Tt1RelgPkP1Y="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix index 146a7e241d..6ec8819e3b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.11.11"; + version = "0.11.13"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-Jf6QiGn8C3pQ/FQSEc+h06514kNXHpnKVyZ1l+S/uHw="; + sha256 = "sha256-S4XouqqIBalXqfznrJ8F2TxU9h+gqObnjRXEQnj67LQ="; }; - vendorHash = "sha256-3aoj4G3npO/DYjRu55iP9Y79z3da0edClOJlWuQC//A="; + vendorHash = "sha256-Y1F+7bJwsUb09xTSRSdfa6bOPMFCkNBaNurrfB9IPCA="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix index 1b90de1d46..6ea2b6c3da 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-/VmBFMjCkd1xhudlcjYGGv+6tgEsyY/xqQoGdupJvOg="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; patches = [ # Also disables update check diff --git a/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix index 2beecd158b..b565fd0ee0 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -93,9 +93,7 @@ python.pkgs.buildPythonApplication rec { passthru = { inherit python; - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = gimme-aws-creds; command = ''touch tmp.conf && OKTA_CONFIG="tmp.conf" gimme-aws-creds --version''; diff --git a/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix index bd216050b2..e8d400d7f6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gixy/default.nix @@ -3,7 +3,7 @@ let python = python3.override { packageOverrides = self: super: { - pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec { + pyparsing = super.pyparsing.overridePythonAttrs rec { version = "2.4.7"; src = fetchFromGitHub { owner = "pyparsing"; @@ -14,7 +14,7 @@ let nativeBuildInputs = [ super.setuptools ]; - }); + }; }; }; in diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix index f4e5bca730..2b25d65a7f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -1,12 +1,10 @@ -{ stdenv -, lib -, google-cloud-sdk +{ lib +, stdenv , system , snapshotPath , autoPatchelfHook , python3 , libxcrypt-legacy -, ... }: let @@ -143,7 +141,7 @@ let { url = src; inherit sha256; - }) ; + }); dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 9401523e34..f354dde039 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,7 +7,7 @@ # 3) used by `google-cloud-sdk` only on GCE guests # -{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }: +{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }: let pythonEnv = python.withPackages (p: with p; [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix index 1260f9673a..c71f23c978 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix @@ -1,4 +1,4 @@ -{ lib, google-cloud-sdk, callPackage, runCommand, components }: +{ lib, google-cloud-sdk, runCommand, components }: comps_: diff --git a/third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix new file mode 100644 index 0000000000..eea6a9e736 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, CoreServices +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "hop-cli"; + version = "0.2.52"; + + src = fetchFromGitHub { + owner = "hopinc"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-xuOkW5jetl+8obeFJnbkVZa+wYWfTNiTOmcrzC8+wGE="; + }; + + cargoHash = "sha256-ePUlw4UzsQ2lNuJ5g5OAYh6nKTIoHdDMb34Jzuqtas8="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices Security + ]; + + OPENSSL_NO_VENDOR = 1; + + checkFlags = [ + # This test fails on read-only filesystems + "--skip=commands::volumes::utils::test::test_parse_target_from_path_like" + ]; + + meta = with lib; { + mainProgram = "hop"; + description = "Interact with Hop in your terminal"; + homepage = "https://github.com/hopinc/cli"; + changelog = "https://github.com/hopinc/cli/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/ibmcloud-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ibmcloud-cli/default.nix new file mode 100644 index 0000000000..9df1c4da54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/ibmcloud-cli/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchurl +, installShellFiles +}: +let + arch = with stdenv.hostPlatform; if isx86_64 then "amd64" + else if isAarch64 then "arm64" + else if isi686 then "386" + else if isPower64 && isLittleEndian then "ppc64le" + else if isS390x then "s390x" + else throw "Unsupported arch: ${stdenv.hostPlatform.system}"; + platform = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "macos_arm64" + else if stdenv.hostPlatform.isDarwin then "macos" + else "linux_${arch}"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "ibmcloud-cli"; + version = "2.17.0"; + + src = fetchurl { + url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz"; + sha256 = { + "x86_64-darwin" = "18f0dylgwwn9p1jmchqhq061s435n85qr2872i532whbrziwwjf3"; + "aarch64-darwin" = "1rid6rv601z4ayd3yi5srqbfn5bspypxarikvm563ygxawh1bxyi"; + "x86_64-linux" = "0ry8ix5id2zk04w9d9581g127f9jpj7bwg3x0pk3n9yfwn61g96d"; + "aarch64-linux" = "0s5jaqhyl234670q1mg89in2g5b9w3gzvnzl8qmlmgqkaxvzxj94"; + "i686-linux" = "0iw8y7iy9yx7y8v8b2wfl24f2rv9r20yj7l4sislxspfyvqv54p2"; + "powerpc64le-linux" = "19ac0na163l9h7ygbf3jwwv7zf0wagqvn6kcdh871c690i86wg9z"; + "s390x-linux" = "1zvy28jpxijzgdbr9q4rfyx6mk295mqp4nk8z299nm9ryk4q81lv"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + install -D ibmcloud $out/bin/ibmcloud + mkdir -p $out/share/ibmcloud + cp CF_CLI_Notices.txt CF_CLI_SLC_Notices.txt LICENSE NOTICE $out/share/ibmcloud + export HOME=$(mktemp -d) + installShellCompletion --cmd ibmcloud --bash <($out/bin/ibmcloud --generate-bash-completion) + + runHook postInstall + ''; + + meta = with lib; { + description = "Command line client for IBM Cloud"; + homepage = "https://cloud.ibm.com/docs/cli"; + license = licenses.asl20; + maintainers = with maintainers; [ emilytrau ]; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "powerpc64le-linux" "s390x-linux" ] ++ platforms.darwin; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "ibmcloud"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix index b06c2fde64..31721c6e7a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix @@ -1,23 +1,22 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub -, lib , testers , kics }: buildGoModule rec { pname = "kics"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-IYyGZ0eJcGLQoQyfgbwxzzoEZ2dUKLlEaZ4NhuP5Q30="; + sha256 = "sha256-h6ZnaknqMcW+Zp2t5RHPK/e/Ilw5yWY2fcSTJe2mVR4="; }; - vendorHash = "sha256-cMKEUH/teEfyhHgBz3pMD8sotZ51t6O+4EiQ9BJt2Qg="; + vendorHash = "sha256-ipXfxqHdushJ2P//oyGGjZsq5EypDEpHKlW32VHaMXw="; subPackages = [ "cmd/console" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index 4ef0fb7a58..b80aa87823 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.12.3"; + version = "4.13.2"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H6JGeLE/fzbfo8/mn5hTKcr7XfvmjOojeXLxUKGzt4w="; + sha256 = "sha256-nFRDA0EHV1i9mcl1i5WpfhTNseU9E9jmlPd1xFbkCaM="; }; - vendorHash = "sha256-Pwtvv/qVX91yWx49IYdveVCySoVxekvHomfAzOdFj7w="; + vendorHash = "sha256-mjCxe4hCCIcjVDWVizqqqo6/kn8iS8s32urMtDD5yq4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 7d4c10688b..02bf8cbd4e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,14 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.15"; + version = "5.16"; src = fetchurl { - urls = [ - "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" - "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" - ]; - hash = "sha256-ez/875yu0XYu5ORf4ak6RN1jWGxuGk0n9023zJkoluM="; + url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; + hash = "sha256-evtNPZvnx8rzr/tJkEp0E7BhUBWHBSJdMtZJQk3VZI8="; }; vendorHash = null; @@ -35,7 +32,7 @@ buildGoModule rec { --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" ''; - excludedPackages = [ "test" "lxd/db/generate" ]; + excludedPackages = [ "test" "lxd/db/generate" "lxd-agent" "lxd-migrate" ]; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ @@ -52,10 +49,15 @@ buildGoModule rec { tags = [ "libsqlite3" ]; preBuild = '' - # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 + # required for go-dqlite. See: https://github.com/canonical/lxd/pull/8939 export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" ''; + # build static binaries: https://github.com/canonical/lxd/blob/6fd175c45e65cd475d198db69d6528e489733e19/Makefile#L43-L51 + postBuild = '' + make lxd-agent lxd-migrate + ''; + preCheck = let skippedTests = [ "TestValidateConfig" @@ -78,14 +80,14 @@ buildGoModule rec { passthru.tests.lxd-ui = nixosTests.lxd-ui; passthru.ui = callPackage ./ui.nix { }; passthru.updateScript = gitUpdater { - url = "https://github.com/lxc/lxd.git"; + url = "https://github.com/canonical/lxd.git"; rev-prefix = "lxd-"; }; meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = "https://linuxcontainers.org/lxd/"; - changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; + homepage = "https://ubuntu.com/lxd"; + changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; maintainers = with maintainers; [ marsam adamcstephens ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix index 3ffcb00a9e..a6d41659a9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix @@ -33,8 +33,7 @@ mkYarnPackage rec { meta = { description = "Web user interface for LXD."; - homepage = "https://linuxcontainers.org/lxd/"; - changelog = "https://github.com/canonical/lxd-ui"; + homepage = "https://github.com/canonical/lxd-ui"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix index 62e0d30248..5d511368ef 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_18, jq, dos2unix }: +{ lib, fetchzip, yarn2nix-moretea, nodejs_18, dos2unix }: yarn2nix-moretea.mkYarnPackage { version = "1.1.6"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/okta-aws-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/okta-aws-cli/default.nix index 18bf3f04ee..38a2d42ac0 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "1.0.2"; + version = "1.1.0"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-gC5/KwtawVfCx6C5kP0/ZesEzn9XxrPX/X8E8Mb/KUE="; + sha256 = "sha256-TRS1+msrp+Wd+9FhQSErZGvfpcRA5ltNKIyVHLveMOo="; }; vendorHash = "sha256-AJmQxMRj602yodzIdhZV+R22KxnEIbT9iSz/5G5T6r8="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix index 478c7d46c8..be5f8f9140 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { version = "1.7.16"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix b/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix index db56ef894b..0969acab5e 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix @@ -14,7 +14,7 @@ bundlerApp { description = "A network device configuration backup tool. It's a RANCID replacement!"; homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz nicknovitski netali ]; + maintainers = with maintainers; [ nicknovitski netali ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/pbm/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pbm/default.nix index 7a1997f1d1..39445a5235 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pbm/default.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "pbm"; - version = "1.3.1"; + version = "1.3.2"; - nugetSha256 = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo="; + nugetSha256 = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8="; meta = with lib; { description = "CLI for managing Akka.NET applications and Akka.NET Clusters."; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index 81dbd7a700..ee650446ee 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "7.4"; + version = "7.5"; yarnSha256 = "sha256-rEKMUZksmR2jPwtXy6drNwAJktK/3Dee6EZVFHPngWs="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-ksvSDySutTB9QX0Gh9jBjGlDyG/vEMhgadu91iNvznw="; + hash = "sha256-o8jPqp4jLF/lZ0frCzPDCSxCy51Nt0mbdeNB44ZwNHI="; }; # keep the scope, as it is used throughout the derivation and tests @@ -63,9 +63,13 @@ pythonPackages.buildPythonApplication rec { # relax dependencies sed 's|==|>=|g' -i requirements.txt - #TODO: Can be removed once cryptography>=40 has been merged to master + #TODO: Can be removed once boto3>=1.28.0 and cryptography>=41 has been merged to master substituteInPlace requirements.txt \ - --replace "cryptography>=40.0.*" "cryptography>=39.0.*" + --replace "boto3>=1.28.*" "boto3>=1.26.*" + substituteInPlace requirements.txt \ + --replace "botocore>=1.31.*" "botocore>=1.29.*" + substituteInPlace requirements.txt \ + --replace "cryptography>=41.0.*" "cryptography>=40.0.*" # fix extra_require error with "*" in match sed 's|*|0|g' -i requirements.txt substituteInPlace pkg/pip/setup_pip.py \ diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index 4da957880b..b9c2a46390 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dalance/procs"; changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 sciencentistguy ]; + maintainers = with maintainers; [ Br1ght0ne sciencentistguy ]; + mainProgram = "procs"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index 2e321853a8..1a1241b382 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,104 +1,104 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.72.1"; + version = "3.76.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-linux-x64.tar.gz"; - sha256 = "1gr0ynim2dm182077bvbxykl91md032lr5h23s5mz0sf06j48r87"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-linux-x64.tar.gz"; + sha256 = "1h2h6g7fdxdm5298mar6zcqxy4givk87105q93l02l31k46mydgw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-linux-amd64.tar.gz"; - sha256 = "147i9cz1j0bj4bzkp3rj00w9mhghvh56arszslww4f89ys75isc6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-linux-amd64.tar.gz"; + sha256 = "056284cllv3jgm0w4piikfzfxj4j7jy5km06b9v85ykscgdmf2x9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-linux-amd64.tar.gz"; - sha256 = "0bkgygq3i8sjlx8yi95m760v74kx8rya5lvhwh4139xb3d8863i4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-linux-amd64.tar.gz"; + sha256 = "159wx1sa2bw55zp9janm4wzz1hgqbdvmzlmg8shxc3ny1i7np98g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-linux-amd64.tar.gz"; - sha256 = "1x70s33qhyj9qpbh2vy6lj5pwr1cxwzxzn58c5mmz5x984x7v1zc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-linux-amd64.tar.gz"; + sha256 = "164ma8nsi8bg85wpb2w054lbrqa0yzssmlx8kb99b6rci01m4c2p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-linux-amd64.tar.gz"; - sha256 = "0fhyvbky5482swz4ghd35qiwmr94dlvcm070q04a98j8pb1nv87l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-linux-amd64.tar.gz"; + sha256 = "0zhvp0pq8nnx10wkh1if1jzxgwdkibm8gd5b25yacncg3190rj6w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-linux-amd64.tar.gz"; - sha256 = "06dzs92a58p9jllwwv3bvzxi56yzrv37imwxw0hxabqp7fm8pfhm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-linux-amd64.tar.gz"; + sha256 = "0zd8g62i4f39979mmk517dbw86aqizviiclism4pji3xas77p7m0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-linux-amd64.tar.gz"; - sha256 = "154y3qlddz2lqa1qnm0w762w858g72x6iczs2jz7gcfbvlghryij"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-linux-amd64.tar.gz"; + sha256 = "0yhzmiiic7nvqcdxfrsbwgxnd1d3fqb1z9zn2j7iavp2clkf67ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-linux-amd64.tar.gz"; - sha256 = "0j2kzbymfqdh9mgjm8akalbwij8gzfics9w60plpi6adwg08skdx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-linux-amd64.tar.gz"; + sha256 = "1mjwsz3v1mr0iyaklv74455v29nlqx1hysjj33fal0j429wbwaz2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-linux-amd64.tar.gz"; - sha256 = "0a1z89005769fc5j58jv67cz2gjggzw8nxyxm8aby0nfl5qsip3d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-linux-amd64.tar.gz"; + sha256 = "1sy0zj483gwv675ib40wb5ppjx31yh56p42538kxb9208ah1xcp0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-linux-amd64.tar.gz"; - sha256 = "1wgfxkrbv409vzm2b45jaxp6vxf5cnfyl7mpbgr68vadpam0qv1l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-linux-amd64.tar.gz"; + sha256 = "1cdka8jiq9gxx8iqsvvc7klkjkkria3w3d4fxa6xx82y7g2kia4s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-linux-amd64.tar.gz"; - sha256 = "1z42nbgl3anwa8zx0l8kbd1zi3f9i74cvd3lgfnix5g5jd3gacxc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-linux-amd64.tar.gz"; + sha256 = "1y1mh7jyhh86528nf21lvi5b17mwlc4q8n5143jvnxvxpnn90jzf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-amd64.tar.gz"; sha256 = "1ld9zss8qfj3a3v75a09b3py266ba5ghdrj1d7vj9rdgid8xlxlq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-linux-amd64.tar.gz"; - sha256 = "07220y0nv4p6g92s0g9aviha9r3rapj0kk4wid7qihj5kg607h8c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-linux-amd64.tar.gz"; + sha256 = "0vndpw6xc9iz69rfawkjihxs7gq8mch5z8qi742yicygw5hsmr58"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-linux-amd64.tar.gz"; - sha256 = "1sv8g0dybvmwsllicjfc0vf6libigwh3nazs0s4p177x6pcvlsml"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-linux-amd64.tar.gz"; + sha256 = "1jlqclpr30vj0danzi242kj4yf291vi7hiahzm81dlwi1s7ychh6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-linux-amd64.tar.gz"; - sha256 = "0yfksasj440509k0jkw4v8h917bdyp6jsvv0bi6r14g94izdm6yx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-linux-amd64.tar.gz"; + sha256 = "0dqp2sqw49jcc4sahi0xrifs989jpnd3lrfvv924m5vjj55prif8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-linux-amd64.tar.gz"; - sha256 = "14636lffz2gsnippb40m0kpdzynzj2qi7v67x9skfn426glhfq0h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-linux-amd64.tar.gz"; + sha256 = "100yr0ancgssylla3na92d5l2vv3qb55ckmjprl314z3ki5azfdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-linux-amd64.tar.gz"; - sha256 = "0wiqryn2szblm8cyy4pyg5x1gj0pfgffzx3jg7in6asxzpqwkw0m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-linux-amd64.tar.gz"; + sha256 = "0sn7n5gm9x655pc5jhb66w7r707hbnljpxg16dphav38ccm6ich4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-linux-amd64.tar.gz"; - sha256 = "0vfkv0cz8akssxaddfqvjk3xrb2didsiwisfc3wn7cg8ilgy7x7k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-linux-amd64.tar.gz"; + sha256 = "1v8qddz1fpm10hzqmg1khl9jvxvgb4v5dgbg9hxgbpc31i3bpn28"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-linux-amd64.tar.gz"; - sha256 = "0nrixy5jv91jdq0qq2v244nahrlz5lprihzsry1gacdkzgarw86l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-linux-amd64.tar.gz"; + sha256 = "05zn312baszcsly6ix6211x2xdjj7ll11aykyp98f91cyia9klcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-linux-amd64.tar.gz"; - sha256 = "0glf41791pm6pi1pwr83xbjwn934a4z00kjqk0n4a108fmf17pg8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-amd64.tar.gz"; + sha256 = "1xq92rsk7bimkr52c13mjypd0ygs7qc9ijyi2ghnf0585d1z5bk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-linux-amd64.tar.gz"; - sha256 = "0r3aqbjy2slpm0pfc0znx44b2xlqcmaqzpaazgj7ggqn2048jvf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-linux-amd64.tar.gz"; + sha256 = "1jpwygcg82yxwrjq5sazijbwk92m4vfdlhslj0hbfgdj4xbi70rf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-linux-amd64.tar.gz"; - sha256 = "1nsncg2njppczs7l532z8dl3g7q1a57hnmam5wq7mqx3408x7jb6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-linux-amd64.tar.gz"; + sha256 = "1m8gfw7jkxljh1wbqbaj9njkwcj9ii535fillkmn92p049izw0xj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-linux-amd64.tar.gz"; - sha256 = "003sin31fjnz4m2cc780digdgc59rmkgm82n91v7y3pv9mj7d2np"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-linux-amd64.tar.gz"; + sha256 = "1x50ayk6vla5j2b9ld890vsyl2m47k39g5cwwhpvdy3zbsnb39d9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; @@ -113,24 +113,24 @@ sha256 = "0hsf00j8hs4l9ln8vab9syl14b83xmvxql342gvi4rcz291gff3p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-linux-amd64.tar.gz"; - sha256 = "0yrzdbcvg16a2v7hc6rq4cmavimkj4hjxd3kfkw8gd2cbi4kcmwf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-linux-amd64.tar.gz"; + sha256 = "13c7c4ddp07rf6vfca16gax270253l7rd9bb068fgg25d6fcfzgw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-linux-amd64.tar.gz"; sha256 = "1a1l07v0hbay0gxvr05mrknllq6vqkyjbv9486klsdswqr9l4p6n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-linux-amd64.tar.gz"; - sha256 = "16vrb5c22gj67q3458rkgzin5d3ml4vm1wi860fy43fk875r5q53"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-linux-amd64.tar.gz"; + sha256 = "17ny01652c9wls1zr9m5v9al6l7x5awydpw3fkp685ygvasnbnj3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-linux-amd64.tar.gz"; - sha256 = "1mjjfrx32sc4g6bmnjd52wd4hxjyk83f6gwl0apjzasxr06xkq0a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-linux-amd64.tar.gz"; + sha256 = "138pgczdayy2yx92y9syqx7xdj4giqpg6fks66g67cvk88jhl2nz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-linux-amd64.tar.gz"; - sha256 = "05zmzhqnpmpwhjw4467sryxl20kswdn770lm83h5zn5c1i0kgpw0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-linux-amd64.tar.gz"; + sha256 = "02rvbvshg7bcdjx45d1fkvhf6vdqw68a0zfyp08h67vagx8l2dxv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-linux-amd64.tar.gz"; @@ -141,16 +141,16 @@ sha256 = "1n0brv4m8xjyd3lk1rgwbj7c5bpa1m6lr95ipzj3nk8338mb420n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-linux-amd64.tar.gz"; - sha256 = "0d6aw10x2lksn940818hnil4fhmswkhpxkz7v0inc5iz3lclpjni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-linux-amd64.tar.gz"; + sha256 = "08i5ja0lmwncfi8c05485sw08b6r9590wvcr342n1mvgljv7mqc0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-amd64.tar.gz"; sha256 = "01jsl59rwns87ybx1hmfr634ma381i7xmx40ahrrfpg851mzsgig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-linux-amd64.tar.gz"; - sha256 = "020mya26d9jzwivgjnz6diyk8dq6zslw62qjr45a8ygk9hwfbmmk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-linux-amd64.tar.gz"; + sha256 = "0sgzzqfq26dykzc4ij98ksnhv92d6c4n74pjwag2pfy78yzrm7rl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-linux-amd64.tar.gz"; @@ -163,100 +163,100 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-darwin-x64.tar.gz"; - sha256 = "145pgphsd33cqba9hs3mwfs7i3i23sfj16ps894k7yl6nr2r04il"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-darwin-x64.tar.gz"; + sha256 = "1z1915lllvhg5isl3zxp4nnpqrbm4yfj4wq00zg5pdaamvnf7yig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-darwin-amd64.tar.gz"; - sha256 = "1kfs09r7v8b93xrrz2wlp7x723pfmpzjcb0avkjj2zr0nq4wa96f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-darwin-amd64.tar.gz"; + sha256 = "0idzbwf0ygnajqn7w7j7q3z8ap37ji18vlxf0rmbld12404lmnlb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "141dafxbam67qn9929vx02zkpm63zdiixl7lp5gdqqxls11zw3kq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-darwin-amd64.tar.gz"; + sha256 = "055lfa13ijl90yli2vm6h18565gzsp440x82bl21lhdvjmd97rq7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-darwin-amd64.tar.gz"; - sha256 = "09rzfgh2fyx7hzix3c98az47xdxpdhgd9pgk925qjq7lz61q4kvc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-darwin-amd64.tar.gz"; + sha256 = "0w62sxbdmjzqms1g6sa7b229vm8mja7yfcry42k396jmlpf748sr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-darwin-amd64.tar.gz"; - sha256 = "0mgm4gdkph5zkls5g9bf202pjdkqwhp3lndjx04n5d8ryzhaa154"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "14jhqb7zbgc4yf44h6lmdlmh799v9c80xyrdndr54yj1mz7d9nfr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-darwin-amd64.tar.gz"; - sha256 = "0dyd5p8acycvyn1g449kiqh5m30sc4h964hv65ac1j1fi3al3978"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-darwin-amd64.tar.gz"; + sha256 = "0k65d3gl29fkb3vf132mwxklz0im8zdmkjgw92npvqan62bvg9gk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-darwin-amd64.tar.gz"; - sha256 = "06xqyz2j96h6i9hjwgj77l0w9m9qks8jbb37ppx85vfqzn1y0msp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-darwin-amd64.tar.gz"; + sha256 = "0c8hmkqifms6y5wb5rw2xm2as1zrr91q94ikig9p02qv0g0m63n8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-darwin-amd64.tar.gz"; - sha256 = "1qyzv0s664s1cc5z6gxq48wc3v2rmz5mdnlbgmkivd79gyyapaa7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-darwin-amd64.tar.gz"; + sha256 = "0qx9jbhj86nzw1vprji1ybpp8ailnn66jr3kff80cm6nms2afcd4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-darwin-amd64.tar.gz"; - sha256 = "0cwar1wf9xsrwvk5pk4lj8lnhd1i55nkvrp59jmk04a6lgr18b0g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-darwin-amd64.tar.gz"; + sha256 = "1ak4ca47d15cv1ymm5r2rrakzdln2spky1jyi5drs5h292xrajgj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-darwin-amd64.tar.gz"; - sha256 = "07a38ar4ny02rnq8pxx9yizz3b5frzaafxs4cmi0xgmxghz8csm2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-darwin-amd64.tar.gz"; + sha256 = "1v37hwzj6z3dih80fvs7lf3kpjka12279zql0p2vf5frkch3yrdm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-darwin-amd64.tar.gz"; - sha256 = "1v5jhn3m9x07wxhn40rpv08rd2rqdzn2lnaa6z45g2hpyglbmzfn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-darwin-amd64.tar.gz"; + sha256 = "18x8zrhqd4l3kb2jr5lkxg4zvp3mybr3zlyx5qi2rkax8bqn4amz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-amd64.tar.gz"; sha256 = "0v5h4jd1yyinchq332svcvcr1rw22xz6qv8c2660p0i50hhakv1p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-darwin-amd64.tar.gz"; - sha256 = "0yyh94xngwdrscl46hi5laxi507c138pqpzswgbji80vchlhh7n4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-darwin-amd64.tar.gz"; + sha256 = "03r639yn0maqhlxfnmld7hhrms5gnajw9sqgw3k40xj8rfiiw6ar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-darwin-amd64.tar.gz"; - sha256 = "028k7i3h1r15dvc34g7fz9k7d1qil4ll6avjxarm17gb1c2w1pmw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-darwin-amd64.tar.gz"; + sha256 = "1sj8qjsjypg5ijxc6kv23hxr6qpky46w79mzcyaba0qhw0pffmaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-darwin-amd64.tar.gz"; - sha256 = "0slwbpwh73jrj4xp5lpih8gv8jms6krq0r0dmppvq2ihzr7l2kxz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-darwin-amd64.tar.gz"; + sha256 = "00jx9xvkl2bk1jvi9crcn5b5rp67i2gnfmicskjz801lmcca7dia"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-darwin-amd64.tar.gz"; - sha256 = "19dgli3xwqs5491sd5z9ivmakqnlm3hqhk0hxnx7bfdd8azicay5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-darwin-amd64.tar.gz"; + sha256 = "0h65ixspip86xbvmywpv95vbdcdwfpg5x81k0960l1mzgw2brf2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-darwin-amd64.tar.gz"; - sha256 = "1s4bldc9j0ny3yvq53iglxh50ccrmx8qsfcjjddg29g4n4qv79zf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-darwin-amd64.tar.gz"; + sha256 = "1jc77321nrm09gw2qz34dr2npncrhr922fz6f0fxp5xr6g5j5cqa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-darwin-amd64.tar.gz"; - sha256 = "0yfw903dak0gd6i99w3j7inkqy7ip6p38gzr39p52abi1s8d2d2b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-darwin-amd64.tar.gz"; + sha256 = "0pg6idwgyxi5ifcyn7fhhimbb3p4ldmiwdy6ll5iiaf8xdk4h4cg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-darwin-amd64.tar.gz"; - sha256 = "0zpk35rlz8a2ar3rszr4yysam5z1bgw28h3zhylprzjapfvjbh21"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-darwin-amd64.tar.gz"; + sha256 = "17pzmy1nad6r1a1giy45bn78f0dc6isnwn2ym7pc86nbf199m7rg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-darwin-amd64.tar.gz"; - sha256 = "1msnkvvw4zxcj67k382y1hgrcgljsk9rbkahn9rfrwf0fay72ldv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-amd64.tar.gz"; + sha256 = "18vqn7cs5l6fyxmplvcmb779sa91ka8vzz40giggdxzsdjjj9dpx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-darwin-amd64.tar.gz"; - sha256 = "0911c5xfagw6w08mnnnwp1jns6z6qkmvs8v955qczagqf12aqfn3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-darwin-amd64.tar.gz"; + sha256 = "0i9is2gj51fwy0nill9vhi65clqlx8iqwa6cvvd5x4qqh8mfslma"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-darwin-amd64.tar.gz"; - sha256 = "00gn1dlaxl6jb6744qdyrc5jsgnpjxmm60zx7lp253bnj6qa9wnk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-darwin-amd64.tar.gz"; + sha256 = "13jl22xzifgl4l3kizxdsk2cfqi5vlfngkka05p6d9zh3v5kz2v7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "1li9wcsra16driikq52a1xi360awjk2kb2jbgg3glg36ng6c9rn4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-darwin-amd64.tar.gz"; + sha256 = "0d4j4njn19kxyxjgaw2m0xxr68s2i90dq1n9yyvk1d6rh6m55hlx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; @@ -271,24 +271,24 @@ sha256 = "08m0xpra2c93j258nq8lcz4yfp8chl0kyq4csc625jmp0wx1fdfc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "0q9hjfyn4r14fplxx597kjy8g3jpcps4bp7gsyy4ri8fipldjnf3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-darwin-amd64.tar.gz"; + sha256 = "1g4baplhlgp8mxgb31sw1zinpdzzam7xcnc50i1xhr89i33zxfxy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-darwin-amd64.tar.gz"; sha256 = "0xdz6l3d646mmzn9llfw2zpgr8dk2drqkhf8fff9xljy736qc2zn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-darwin-amd64.tar.gz"; - sha256 = "1hvzpshc28yq1y9636k9mbwgkpbp6gnka3q5mqpmsmp51g3pw751"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-darwin-amd64.tar.gz"; + sha256 = "14w5mzm2im86pxnlj7qzwdlq77lsnqjznb1mv3fyq5c43maf8d22"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-darwin-amd64.tar.gz"; - sha256 = "0a8q6yad8xak8m6aiq39ifnf2vy9aa6y3yssiq5pr9n9z51chfkk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-darwin-amd64.tar.gz"; + sha256 = "17jbd4i6wri9gfx8rh4aanmd97y66pzi286dsfprfi1m9gs8x3hz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-darwin-amd64.tar.gz"; - sha256 = "10xc481va5yvla73kx4d9n1mbscf5sxmrgfapb13nh4f8ic6rkzb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "1l6v7n4ch6z70amgrzp6lp181qwnip6vizj3cmdy3zaqyg49r1gx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-darwin-amd64.tar.gz"; @@ -299,16 +299,16 @@ sha256 = "1cr0zbfrid4xsyjmabppzg7f867vmhpjf29s4qrb3g9vg0k4fibk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-darwin-amd64.tar.gz"; - sha256 = "1m5pgah9q31kc4d3m5s74qqlax00r2x8i8y07pmb8g3fjr9hvk1s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-darwin-amd64.tar.gz"; + sha256 = "1vvqcn832snkqkk0d1rgx6wraxxy2j0nss4zjqyin8wvhrd7ddak"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-amd64.tar.gz"; sha256 = "1jn1j72s3dqjw0xdyk7mncw61fzqmwg4sqbbh7f3708wv1rznv5a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "04l94yi47hpk6ih67iqlx6fv8i9qzb3bcwph17xwzf5sqx09n0cw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-darwin-amd64.tar.gz"; + sha256 = "00fbabsijwz6smm1s76vsjvahq5fp8wmjy1zhwxicmvacswcc5jp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-darwin-amd64.tar.gz"; @@ -321,100 +321,100 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-linux-arm64.tar.gz"; - sha256 = "0vq3qkryl68i6psxjm6aibav80hg2ndvfnvjyfd3cz4cmi3s8fd1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-linux-arm64.tar.gz"; + sha256 = "0qf2kg6rzihfw13kbx8gar78hmsfaalc5i9fyaijnnjw1r9jn4b6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-linux-arm64.tar.gz"; - sha256 = "1i8dn1byk0ykx5k1543najwlz09mpw6jlk4sl48jwjgh64595kb0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-linux-arm64.tar.gz"; + sha256 = "15335mk5f8k32m45divp9pbahygjz6hd7vkaf7wgqwqa4qnahwgz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-linux-arm64.tar.gz"; - sha256 = "15zz4nm8rj4jq3all8z7dvi2wnry861pv21c5pnsg32c93gl8swf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-linux-arm64.tar.gz"; + sha256 = "14cdzl3a7h5rm5h6rkji4qbsiyi1077i59wnqj2vl4qk971ba6n8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-linux-arm64.tar.gz"; - sha256 = "1a3kzpcjgz3019m9mnqb9j8yw0hrca2h5kz2zmzckr89fknlhk8b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-linux-arm64.tar.gz"; + sha256 = "18wcfx560jfsm7cimcgp36vpsbcvs9vbcm16a0db5wms8kc8synf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-linux-arm64.tar.gz"; - sha256 = "0p6n38la1chyq9g2d7p9gncf74pipxzq6gifsa36bki16m1wwy7d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-linux-arm64.tar.gz"; + sha256 = "1b76jgm6zmgzv1px26az1hpm4q3np6gl8yb9jgc7nk6bz739dvyi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-linux-arm64.tar.gz"; - sha256 = "1zc1d9ngv35hc7523p7prij5mriid11d259y3yd3jrdapiq8b9l1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-linux-arm64.tar.gz"; + sha256 = "09rm18fndgdna4b5jj300jk0l6bmapcizpnqdb3gcl02q6nd2jiv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-linux-arm64.tar.gz"; - sha256 = "0jlidmypn95nlnqim7p2i9fmwf7brdcsi5qwi6yihhcpsfya2ihw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-linux-arm64.tar.gz"; + sha256 = "1rgcsb0gbsr0r7rnyrzim92b54ig4vqzprcc7jcb6j5af4xmj2gs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-linux-arm64.tar.gz"; - sha256 = "1isvmdafq2gwq5hdm7lkbk84038vwjrssmqyf6b269x1c8p65g7n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-linux-arm64.tar.gz"; + sha256 = "0qnbgz640hjwnb73myzxgsmp9zl8lhkby3hmgf29g1ki893lnfj9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-linux-arm64.tar.gz"; - sha256 = "1n0xyyrsg4x6qbnwg8m0cs1wfhs749v1g32wm81pa13kg1k57ya3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-linux-arm64.tar.gz"; + sha256 = "1wzmwgazl60zsrhbv2x7153l4n8k5m93xmvchpcw058j2m92w259"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-linux-arm64.tar.gz"; - sha256 = "1sl88zb6gfcv5a28qf26zkm5wnxy914hwkf2z1jfzc33226dzcaa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-linux-arm64.tar.gz"; + sha256 = "13f1xmcdnjaz6g6pp0vh0hh1cvzba8jwp41fl1zpv36hngps53m1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-linux-arm64.tar.gz"; - sha256 = "0xisws2zz0fqdfjl28jnh51pwamlgbiz3x837p7w2r0q5cafa0xp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-linux-arm64.tar.gz"; + sha256 = "1v1s84fai552vd5cm6k0b3r59vgjkjd3yq3p2rl5i3bqgz7c76bj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-arm64.tar.gz"; sha256 = "09m1444wy8y6qjbp9pzki3gvi9mrs88cpc7001m8xnb0iyhjj0sx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-linux-arm64.tar.gz"; - sha256 = "08pkv0x3qkrdavq9khgbpr908y76767ixpc7m24lx0iy9xcxzmvs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-linux-arm64.tar.gz"; + sha256 = "05bq68jf75f4fm7qyl2z8xnjy9pyy3r4h8bak064vpygdjq5bhcy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-linux-arm64.tar.gz"; - sha256 = "0rvhilivm394a9kn5bzn4fyspab6cxrgmp73ab5pl8j10m3xgjl8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-linux-arm64.tar.gz"; + sha256 = "0sjhwrv21n52hf9id7ls18r3wcighvb0kbm87236vw9mysg8si2l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-linux-arm64.tar.gz"; - sha256 = "17dby8kfawi4jycfkhnl2w30i649dfl25j5sk2adm0nnwibygpdy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-linux-arm64.tar.gz"; + sha256 = "1cd92zc0b2b2jr7g95kaq7g97abvhfqwq2vyrxzcvrvs0vn4arfn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-linux-arm64.tar.gz"; - sha256 = "1arx0kq1ab13lsj5gnlhsvxqg13ixwd890i12xdbykhzl018dzr0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-linux-arm64.tar.gz"; + sha256 = "0i37kyifmpzz9fa4ymih6ppf94hbra8wfgha2pj4jbw43c6bv9cy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-linux-arm64.tar.gz"; - sha256 = "13f3z2f1bfzn3lx165gvlyg9dj9wbsqkwmz3vgzb2n6vfd2v7kz5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-linux-arm64.tar.gz"; + sha256 = "0132ahb2agpzrnhn17i0hrs7kch8g1x65p2h6npfnzl408zx1pry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-linux-arm64.tar.gz"; - sha256 = "0fmq2ll8ksb8b1v976inrcmrxfmp1k8710j6bi3ac3fjqlakm6y1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-linux-arm64.tar.gz"; + sha256 = "16i116riyz28y4jlznzw36c2fpkjnxv3bjiswfrlz9qhp4a6acpd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-linux-arm64.tar.gz"; - sha256 = "1f0ma10m2337yph79jf370w586w4iadqx6qiwcc57k5n2fz6qbfg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-linux-arm64.tar.gz"; + sha256 = "1pp1l1x4gpz9v87x92jzqb2wqxw756igwx78fphaivd9airp0fl4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-linux-arm64.tar.gz"; - sha256 = "0lcpxb3nf3sqzwp8h2s79hkk4a5s9rvxd36vsys45nbp5g14lvp3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-arm64.tar.gz"; + sha256 = "17bykmfj9kxw2c94wjxcfakd10apnc88axr3wx2pa2k5idxd3ih0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-linux-arm64.tar.gz"; - sha256 = "1lz5cnqdb3xmf9k7ds5whqqjwv0c5r4gpxjf8c8nnz1njkfx2sfw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-linux-arm64.tar.gz"; + sha256 = "0glgzm8w3qvy3zcswzrm0nmdd5n62934v8lbm3h3c2s5law08zrv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-linux-arm64.tar.gz"; - sha256 = "1j6hycdx8l9mwrvhx656pi7il6w1nknlk2p232nfi2qjlaz6ps0d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-linux-arm64.tar.gz"; + sha256 = "1d034j9v47f03kaya07vidksy67wxfhsl3ilgdmz1wffdkwg43wy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-linux-arm64.tar.gz"; - sha256 = "1in86cnz777fpjhg6j2z5s890580a3j23sqvwv4bbr1bcbs1wbks"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-linux-arm64.tar.gz"; + sha256 = "16z5xb56zi975ad8l3wwz7lnc0f22waif6vnrbmd90jcjfx3gf5a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; @@ -429,24 +429,24 @@ sha256 = "1knr6yypkkxsays2ga6idia1bcc9y8n7dm0l5f3j7a56mhm7wmw4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-linux-arm64.tar.gz"; - sha256 = "0hj4a0llq088xcfp85k6nn8ssffj51lvhqp05sg8x3kbg6n0dapy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-linux-arm64.tar.gz"; + sha256 = "1rhan3mjvs5kqzaklq42gb04jn1bph0bd64w2cwbaw6c34p7c1kp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-linux-arm64.tar.gz"; sha256 = "0x8mgh057ln80rvwxzdis2qd4knasvm2f3f5cniywnb4zz1xygv2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-linux-arm64.tar.gz"; - sha256 = "0pzckb7km63491p2dm4n4f6xhblqgwazgml6vm1gwm4ww0pw8qhi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-linux-arm64.tar.gz"; + sha256 = "12kl7dazjmz2sn15yd1fin5f7d8aj0qm9f5a9vp52qjadpzsmvy0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-linux-arm64.tar.gz"; - sha256 = "0k65mif1rdyfz71ir9xhvqkzwpsk1wjsf7z8dhdd0s008dqkd43w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-linux-arm64.tar.gz"; + sha256 = "0lw95n1s4ac0ys764saj16lfq2hlfh98067hi2qm6kxjwiplmzh6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-linux-arm64.tar.gz"; - sha256 = "0cshgck8fz5qq60bc04jd83756rnk1skwm1fvjc78vb38fyrgy84"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-linux-arm64.tar.gz"; + sha256 = "03aviplnf7hcj4hy3y308hw8zlkdqgvfx0587xzmd7dcw0q5br9s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-linux-arm64.tar.gz"; @@ -457,16 +457,16 @@ sha256 = "0wc2j439pi1s5j6ncmdj0670svis5ljfgn1q49lh37pgn88m7m75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-linux-arm64.tar.gz"; - sha256 = "1p8xjjsfy9hkww6p66jzr5q5nn07ng25y6yjzb3xvcfsrbkzylsm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-linux-arm64.tar.gz"; + sha256 = "15a93vb3b3nlk7fyl9qh2jayhv48fk0hja07nvjkz23xfl3zpxdr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-arm64.tar.gz"; sha256 = "1psibvdvnqmcjyd4knwxqq97k72da7qgrm2g08n41bvjdv10j6hh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-linux-arm64.tar.gz"; - sha256 = "129fzjlp26pqb5xb4gqqyy62qk2hxrfhdmn5z5wib4vqhpjvl4nk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-linux-arm64.tar.gz"; + sha256 = "1xsmlza394wc38pyi4zzhfn7mvn4znvv00k9dxm8w3bxnym5gpbl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-linux-arm64.tar.gz"; @@ -479,100 +479,100 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.72.1-darwin-arm64.tar.gz"; - sha256 = "1b4f102cbywxnhx5p4v15xky3p437ws54rmk7xdzn4qs675cndss"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.76.0-darwin-arm64.tar.gz"; + sha256 = "0awvmrvs5ggj7klqbkgbmmxb20snrnk306003l34q3nscqqxd8zm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.3.1-darwin-arm64.tar.gz"; - sha256 = "0jcina7ziy381d815s25v18k53nwf1bb5rkiq36d39pqjy8h7cn1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.5.0-darwin-arm64.tar.gz"; + sha256 = "03icn9ab7lsdh4kr2zwlbz6s2mp23zscb8igy75iz9scip49ahis"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "08fzl53xbd3vamr7xhp84l7c8qm2ashyg2vs97rzijblb7bp04c5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.0.0-darwin-arm64.tar.gz"; + sha256 = "1lgqfvkxymfcfjzn9c94cigz34rc9fiqcdmg125dndjz5nnxk3zl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.38.0-darwin-arm64.tar.gz"; - sha256 = "0vg1k0qz98p3p1k5c57p6fbkmajpi0mdynwilhz9gwbrvx3vd9xh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.40.0-darwin-arm64.tar.gz"; + sha256 = "1ry88fr8ix4rn73xk6hv4si7khkdf7di98b9ncymna9520z2jxgv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.5.3-darwin-arm64.tar.gz"; - sha256 = "1p56v8028gcsaxwry9ig31dfr9dxmnbd8jsggjjbz0d74jcqdcqh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "07mvh4ffc8zqx037fdk4n4yd4b6zmd873g1dfb8kgf875vs5wdfh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.21.0-darwin-arm64.tar.gz"; - sha256 = "1qfv67sb4pambxfsk58wxnbx1fl1xxksw2k05vyyss9a3xzf9mi7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-darwin-arm64.tar.gz"; + sha256 = "0260gpq212dj3c782bdx4fn2c9vk1kv0j42sq037k4ih430wqxwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.41.0-darwin-arm64.tar.gz"; - sha256 = "1wdqazsx7496y0xwphnnyi8zbpivjgmc8xpb76ajz1dar5vx0m7r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-darwin-arm64.tar.gz"; + sha256 = "06cm6va9bbkcm1sznlkjc95b1n20bsf3yvw1pysh3pwbs1qwd8v3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.38.0-darwin-arm64.tar.gz"; - sha256 = "1c6l6c429az92v97dbnlbk8046hv39j6whyvklw32pqa8ab9jknd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.45.0-darwin-arm64.tar.gz"; + sha256 = "18h0pzn7q5lm1p8i3yp2yvqyq3qhn2ipzsjj5sl383dnwbsp5z1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.8.0-darwin-arm64.tar.gz"; - sha256 = "0bwnirhdhdsa2q68295ab1ny8jvqmykgf1sdwfnlc0gnz34nxyd2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.39.0-darwin-arm64.tar.gz"; + sha256 = "1lrnjw7jd5nxcvkhmymkdyg180i93jfy3snnh0a950m4dbmk5ap3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.44.0-darwin-arm64.tar.gz"; - sha256 = "0i6gjnfish862fiyay7qq94l1k0cvcpvbgp73kadlraw8rcjnli5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.9.0-darwin-arm64.tar.gz"; + sha256 = "17nrxc6s9f56m7mwdaa06n4dqq2bldpss6ahqy4a79ha2qvhsxin"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.4.0-darwin-arm64.tar.gz"; - sha256 = "1j4fpy3j4g9sr619iwkwhb9037d976wdnbfpqy9fig1dayz4q6mn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.6.0-darwin-arm64.tar.gz"; + sha256 = "10glgipfjm5ph6g4c48cggymaf4mzw8vm2f7xw62fxly8mqy2s24"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-arm64.tar.gz"; sha256 = "0301sm5d28yjw15k214rskq1w19a5b5l218y2qfzvv89z5qgh84r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.19.0-darwin-arm64.tar.gz"; - sha256 = "1xcq4qb2xj24wkrsn1qz61k94m8kqf1wiwc1vlphjim009v7xb78"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-darwin-arm64.tar.gz"; + sha256 = "1f8f2ncbdfxb6spgpzwfypj9vw9r3hcjwdgwg26n6zsfsd5jzfzx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.4-darwin-arm64.tar.gz"; - sha256 = "0bp22i99vv8r9wxf453kg5h9q4il93hgh8v9q868zg6hnfaig79b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.20.0-darwin-arm64.tar.gz"; + sha256 = "00fp3kns2558kwwy0jmlvg3fzhyp629nszgz2gbkdyasbh6a8qh9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.2.4-darwin-arm64.tar.gz"; - sha256 = "0x24l3y6jq7j240hsj2n9pqpnyjq0141n6c7i662nxx4dxzf040w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "1i4skyqjr9xd4jqsslfckjsj2ld896a0vwhaj2rxrvd7ljrjvgz6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.0-darwin-arm64.tar.gz"; - sha256 = "11vcj5zxjfc1jwxlpam0w839dig5z19d6swcy100yjp00wqp5k50"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.3-darwin-arm64.tar.gz"; + sha256 = "1mg3pp3zl2jcc8k102a4zjr66x8379k5bdvixf1clgg9kb56i9bk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.58.0-darwin-arm64.tar.gz"; - sha256 = "0qdxxw3zaxrqq2wzbav9614w2x2w6rrar9k4lav0rmfizvvbg2cd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.61.0-darwin-arm64.tar.gz"; + sha256 = "0kjanryv6yfg59hiidj3x9cxrpdcnbsnxmwqv8qqk0ls7qs6smk2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.10.0-darwin-arm64.tar.gz"; - sha256 = "11198hv8lm05xz4yvlz495palp1h4zn3x0zvml4clhn2ip03mmp2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.14.1-darwin-arm64.tar.gz"; + sha256 = "0pny6zhbx3r17vwrb0yw6qkjfa5m2nr3g4hwl2p3cwxgn9bfdwpy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.0.0-darwin-arm64.tar.gz"; - sha256 = "10ilfmllagp8008d5sdkdyd0ajr018n03lxi63x0bzc8xxfkp1an"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.0-darwin-arm64.tar.gz"; + sha256 = "02m6rfbyl4ysd470zmadc9gqrxbxpkbfd609zk0i4li9i36ch85f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.0-darwin-arm64.tar.gz"; - sha256 = "03yibn1j9l7dxrras4ihqagj9nws20dppmg5j40h1kwdjyaa4krd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-arm64.tar.gz"; + sha256 = "0wcxrcpijn6jzz0l5azfqvh31xzg5q5bvk39iifczimdvw37xnva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.12.1-darwin-arm64.tar.gz"; - sha256 = "0im49ll5azdbqfvjwbkc0pcq071zjb0n6af2qk2bkb2aymcgkv57"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.0-darwin-arm64.tar.gz"; + sha256 = "0aic4acxf50x5ybfdx9rravsyjx0wvnzabqy5lgicxwd6hkc84yi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.29.1-darwin-arm64.tar.gz"; - sha256 = "0w75mc0ffmgy22pl6wqfj9vbm1zz5ihybiqk942wnaq0swjc7zaz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-darwin-arm64.tar.gz"; + sha256 = "12nx3cn38j9agaw4qqp44f5w16954zhlxj3cjn3kna9phc7lza6a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "1v920f9cnz8f1s0md48db6qq8xgqif2w4vxcq1czfr5i1c1hhv0w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-darwin-arm64.tar.gz"; + sha256 = "1dcwi9lnbx7ikj58fzznvz8c7lwnbfcdhw0mlnbldxkxfzba32sp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; @@ -587,24 +587,24 @@ sha256 = "0iys3f21qfdx1gilba9xds5wv5d5xcw6qsd9c2662i42ccgggcjn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "1fhll8bgamlv4kljngydmnhbc90bz3figg10qy3qa9kgqkrxm041"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-darwin-arm64.tar.gz"; + sha256 = "1cjrj1vl9ljx32j7zss74kqg367zcz6nmisz0am5i040kiqgb7na"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-darwin-arm64.tar.gz"; sha256 = "1w7g9gc01fpsa41csp5sv6q2w9g4i7gn5b1lnm0dal16169dkpy6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.27.1-darwin-arm64.tar.gz"; - sha256 = "160r0a6iwpp1chk0sshj3ds2w1sv5wvrn2gmkgbvvg5mg4lymwm0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.30.2-darwin-arm64.tar.gz"; + sha256 = "1r9ffydqvm9ldybq134h3rcik8c5lh0i8rz01vx7wp03flrx92iw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.37.0-darwin-arm64.tar.gz"; - sha256 = "0xamhaxrwzi74vxpp41avb35qzq3mhwybjgs7sq0p208j5mrbawl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.42.0-darwin-arm64.tar.gz"; + sha256 = "1cbzsf1hn0qqxzs7zh8wawnlfc95qi36ba8wk1jzy6m357wlzswh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.14.0-darwin-arm64.tar.gz"; - sha256 = "17pv2i810z16l2mw6n5g0nd2c7ahx9pi5zrvjkw0zlj5zqn0gg6r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "16g2yjlhg3cja48qp70mmrms70n7mpz917izzmrv1ymazdjzsspm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-darwin-arm64.tar.gz"; @@ -615,16 +615,16 @@ sha256 = "0sxdpvx2hwd1sgaz34ddpa676n0g081ymrldr881cb5lfh01zbji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.11.0-darwin-arm64.tar.gz"; - sha256 = "06n5hbwa69xf30hhynd87r2n80lxnzshffvrdn3i790dbvl034z2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-darwin-arm64.tar.gz"; + sha256 = "0l5rzcdx9v6h4qb8pk631cb68c2m3rcpia1aq64psb91g8lhrwa3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-arm64.tar.gz"; sha256 = "1lnbsfcv1vrgc2hzmqwydxp9j6w9cmgpkpm83hmzz2ryy2vn6g07"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "12r3dbhqidlibzcl14al8rkwlrdxvaikh9cla8wd7hjpjmd4d5yj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-darwin-arm64.tar.gz"; + sha256 = "1r25pimq5r8f2r68prb14wk0ppb6ikf9z61lj6x8h5ym1advgirk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.4.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 31b05d00ec..9d072d728f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.60.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; - rev = "v${version}"; - hash = "sha256-fyx0JMZ/SYf3goE1kvqWNZvsVYcUkPQfUCCHOsLk3Cs="; + rev = "refs/tagsv${version}"; + hash = "sha256-2w8z6/piPXJ4tGdO1IrzjLcCDGF/C8/Mln+XWu4U2+0="; }; - vendorHash = "sha256-jdUpLnn370mIp3Ra8c7fmEb4bk8xi6KrzUUpokE2jkQ="; + vendorHash = "sha256-UicCXaKA2xmkcYCz4RNN4kG2Rj0OIrN+IL3UJF97oIo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index c63ef78fa2..bba79f7cb5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-bTpJ3/78GdqiQZOMyYmaX4d66MSIVbUt5mf4ckU3XtA="; + sha256 = "sha256-ytnYrvvfO8L+TI1x0ydDBnh5lurWL1avCPVAlK/cOuI="; }; - vendorHash = "sha256-5V4RxKFVx3Z+TLD9yPqdWXbJvMOau/yHCjy59mSFm90="; + vendorHash = "sha256-UWWnT6ft/eGCn/6T1IDQSdfgv8htxDL2cFl4reAx51k="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/admin/simplotask/default.nix b/third_party/nixpkgs/pkgs/tools/admin/simplotask/default.nix index 08e7d0faea..11e19cf99b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/simplotask/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/simplotask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.8.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-u2Nj8AgkqwocxQMcPszzLaUu9vrbAA/cKjEqqxnbnr8="; + hash = "sha256-cUsxkp/cWA7odhPli00rVodX2FjM0xCl7g/uOlJQl3Y="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix index 0d9d93cf35..1f03755ef9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "syft"; - version = "0.84.1"; + version = "0.85.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-3BQuFEQhzX4TnPiNdbIatuvuXZVDBGQUyJ7+2d5rIRU="; + hash = "sha256-TNo5WNSy0ogv0hn+O7VL7DCMaDtwhs1UNbTt5K7/40U="; # 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; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-/95AL+BlvtQkwlnbHBGx1rTU3VYHIdw1bqGxwBsLMcA="; + vendorHash = "sha256-OVCM7WAyKVpd7VNV4wmfAoMJWurEhTBPQsln34oS5U8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix index a405f10671..d1a0d8cf41 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , xorg , xkeyboard_config , zlib diff --git a/third_party/nixpkgs/pkgs/tools/admin/tlsclient/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tlsclient/default.nix index b26cb85a6e..2cf0f0d548 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/tlsclient/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/tlsclient/default.nix @@ -3,30 +3,32 @@ , fetchFromSourcehut , pkg-config , openssl -, installShellFiles +, gitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tlsclient"; - version = "1.5"; + version = "1.6.4"; src = fetchFromSourcehut { owner = "~moody"; repo = "tlsclient"; - rev = "v${version}"; - hash = "sha256-9LKx9x5Kx7Mo4EL/b89Mdsdu8NqVYxohn98XnF+IWXs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-36fhY9kO6tPUuRkpk3Jv9oBRYX/SnmdZg0Rzt/A6MQE="; }; strictDeps = true; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config installShellFiles ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - makeFlags = [ "tlsclient" ]; - installPhase = '' - install -Dm755 -t $out/bin tlsclient - installManPage tlsclient.1 - ''; + buildFlags = [ "tlsclient" ]; + installFlags = [ "PREFIX=$(out)" ]; + installTargets = "tlsclient.install"; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; meta = with lib; { description = "tlsclient command line utility"; @@ -37,4 +39,4 @@ stdenv.mkDerivation rec { mainProgram = "tlsclient"; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 6fb0b2c05c..302bed9318 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -5,19 +5,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fpCPYqAuppEffoSVf2c3xMB1MhTBhn6xhbxPZ03PdI0="; + sha256 = "sha256-qxtYYFhABrkJlwWBx4ak7xnaqg7x+D1fUF1gcJFK0e4="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorHash = "sha256-9aHekHHnh9WOqelzNbwflg1/2VFl129WIXPWhdPnar4="; + vendorHash = "sha256-mE+GpD9vMhjVQsH+mckU6GhNiLMDV5H31Jj1/HLBSEs="; - excludedPackages = [ "magefiles" "misc" ]; + subPackages = [ "cmd/trivy" ]; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix index ddad76e413..f1fd58877d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jg83GHNlzPPzzhrLWw686vrmLlDL5L0+OUYqMoYUiJw="; + sha256 = "sha256-EIMHCal4jt8tMEfx2Lol2/7IK8uROaNC1ABB+0d0YTg="; }; vendorHash = "sha256-SqDGXV8MpvEQFAkcE1NWvWjdzYsvbO5vA6k+hpY0js0="; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix index 4743f7ded3..2408f3cf6d 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/ctrtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07aayck82w5xcp3si35d7ghybmrbqw91fqqvmbpjrjcixc6m42z7"; }; - sourceRoot = "source/ctrtool"; + sourceRoot = "${src.name}/ctrtool"; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++"]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/audio/botamusique/default.nix b/third_party/nixpkgs/pkgs/tools/audio/botamusique/default.nix index 5eaaa9c873..02460f61d9 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/botamusique/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/botamusique/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , python3Packages , ffmpeg , makeWrapper diff --git a/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix b/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix index fa01756f89..f135cccbc6 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "isrcsubmit"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix index 777a7535a1..7ea5cf622b 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix @@ -7,7 +7,6 @@ , cmake , pkg-config , fetchFromGitHub -, git , python3 , Accelerate , _experimental-update-script-combinators @@ -88,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateOpenfst ]; - }; + }; meta = with lib; { description = "Speech Recognition Toolkit"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/linuxwave/default.nix b/third_party/nixpkgs/pkgs/tools/audio/linuxwave/default.nix index 0b8bcc6ca3..5d01416661 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/linuxwave/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/linuxwave/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "linuxwave"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "orhun"; repo = "linuxwave"; rev = "v${version}"; - hash = "sha256-JWVQSMJNtZvs8Yg8bUM6Sb9YMt8KGElunQVIK2mUrhE="; + hash = "sha256-5c8h9bAe3Qv7PJ3PPcwMJYKPlWsmnqshe6vLIgtdDiQ="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix b/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix index 841704427c..ec55367474 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/midimonster/default.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchurl -, zlib , fetchFromGitHub , gnumake , gcc @@ -15,7 +13,7 @@ , libevdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "midimonster"; version = "0.6.0"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { owner = "cbdevnet"; rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0"; sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp"; -}; + }; doCheck = true; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix index 66f6d1880a..03b632ae7e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-notification/default.nix @@ -2,7 +2,6 @@ , stdenv , pkg-config , fetchFromGitHub -, systemd , file , iniparser , ffmpeg @@ -33,9 +32,9 @@ stdenv.mkDerivation rec { ffmpeg libmpdclient discount - ]; + ]; - installPhase = '' + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { ''; postPatch = '' - substituteInPlace systemd/mpd-notification.service --replace /usr $out - ''; + substituteInPlace systemd/mpd-notification.service --replace /usr $out + ''; - meta = with lib; { + meta = with lib; { description = "Notifications for mpd"; homepage = "https://github.com/eworm-de/mpd-notification"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix index 5c995f407a..137fa838c6 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/picotts/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "picotts"; version = "unstable-2018-10-19"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libtool popt ]; - sourceRoot = "source/pico"; + sourceRoot = "${finalAttrs.src.name}/pico"; preConfigure = "./autogen.sh"; meta = { description = "Text to speech voice sinthesizer from SVox"; @@ -21,6 +21,4 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.canndrew ]; platforms = lib.platforms.linux; }; -} - - +}) diff --git a/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix b/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix index df8ed3e969..d753d7bb3e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix @@ -1,34 +1,33 @@ { lib , stdenv , fetchFromGitHub + +# build time , cmake , pkg-config -, espeak-ng + +# runtime , onnxruntime , pcaudiolib +, piper-phonemize +, spdlog + +# tests , piper-train }: -let +stdenv.mkDerivation (finalAttrs: { pname = "piper"; - version = "0.0.2"; -in -stdenv.mkDerivation { - inherit pname version; + version = "1.2.0"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; - rev = "70afec58bc131010c8993c154ff02a78d1e7b8b0"; - hash = "sha256-zTW7RGcV8Hh7G6Braf27F/8s7nNjAqagp7tmrKO10BY="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk="; }; - sourceRoot = "source/src/cpp"; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "/usr/local/include/onnxruntime" "${onnxruntime}" - ''; + sourceRoot = "${finalAttrs.src.name}/src/cpp"; nativeBuildInputs = [ cmake @@ -36,9 +35,15 @@ stdenv.mkDerivation { ]; buildInputs = [ - espeak-ng onnxruntime pcaudiolib + piper-phonemize + piper-phonemize.espeak-ng + spdlog + ]; + + env.NIX_CFLAGS_COMPILE = builtins.toString [ + "-isystem ${lib.getDev piper-phonemize}/include/piper-phonemize" ]; installPhase = '' @@ -55,10 +60,10 @@ stdenv.mkDerivation { }; meta = with lib; { - changelog = "https://github.com/rhasspy/piper/releases/tag/v${version}"; + changelog = "https://github.com/rhasspy/piper/releases/tag/v${finalAttrs.version}"; description = "A fast, local neural text to speech system"; homepage = "https://github.com/rhasspy/piper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch b/third_party/nixpkgs/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch new file mode 100644 index 0000000000..9d2e46bb4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch @@ -0,0 +1,18 @@ +diff --git a/src/cpp/synthesize.hpp b/src/cpp/synthesize.hpp +index ef61aef..4c7db7a 100644 +--- a/synthesize.hpp ++++ b/synthesize.hpp +@@ -119,11 +119,11 @@ void synthesize(SynthesisConfig &synthesisConfig, ModelSession &session, + + // Clean up + for (size_t i = 0; i < outputTensors.size(); i++) { +- Ort::OrtRelease(outputTensors[i].release()); ++ Ort::detail::OrtRelease(outputTensors[i].release()); + } + + for (size_t i = 0; i < inputTensors.size(); i++) { +- Ort::OrtRelease(inputTensors[i].release()); ++ Ort::detail::OrtRelease(inputTensors[i].release()); + } + } + } // namespace larynx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piper-train/default.nix b/third_party/nixpkgs/pkgs/tools/audio/piper/train.nix similarity index 52% rename from third_party/nixpkgs/pkgs/development/python-modules/piper-train/default.nix rename to third_party/nixpkgs/pkgs/tools/audio/piper/train.nix index 5cf8cdea10..2cab1ba4ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piper-train/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/piper/train.nix @@ -1,38 +1,26 @@ -{ buildPythonPackage -, piper-tts - -# build -, cython -, python - -# propagates -, espeak-phonemizer -, librosa -, numpy -, onnxruntime -, pytorch-lightning -, torch +{ piper-tts +, python3 }: -buildPythonPackage { - inherit (piper-tts) version src meta; +let + python = python3.override { + packageOverrides = self: super: { + }; + }; +in + +python.pkgs.buildPythonPackage { + inherit (piper-tts) version src; pname = "piper-train"; format = "setuptools"; - sourceRoot = "source/src/python"; + sourceRoot = "${piper-tts.src.name}/src/python"; - nativeBuildInputs = [ + nativeBuildInputs = with python.pkgs; [ cython ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "onnxruntime~=1.11.0" "onnxruntime" \ - --replace "pytorch-lightning~=1.7.0" "pytorch-lightning" \ - --replace "torch~=1.11.0" "torch" - ''; - postBuild = '' make -C piper_train/vits/monotonic_align ''; @@ -43,11 +31,12 @@ buildPythonPackage { cp -v ./piper_train/vits/monotonic_align/piper_train/vits/monotonic_align/core.*.so $MONOTONIC_ALIGN/ ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ espeak-phonemizer librosa numpy onnxruntime + piper-phonemize pytorch-lightning torch ]; @@ -57,4 +46,9 @@ buildPythonPackage { ]; doCheck = false; # no tests + + meta = piper-tts.meta // { + # requires torch<2, pytorch-lightning~=1.7 + broken = true; + }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix index 5410dced90..6b28632138 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -15,14 +15,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.15.6"; + version = "0.16.0"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-ZEmj0D+q2/UpDTEZDPb13BKiNRUcZsJmJRWOCq+8CUk="; + hash = "sha256-2JZyINyzy4X1DTp4ZsMLY/rCsH4JdQ8bF/3hoqtvNTU="; }; postPatch = let diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch index 1af62cb1fe..27a6bd0824 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 1c0b2d2..bbff1d1 100644 +index 04eedbc..ee0b495 100644 --- a/setup.py +++ b/setup.py @@ -35,4 +35,9 @@ setup( @@ -13,17 +13,20 @@ index 1c0b2d2..bbff1d1 100644 + } ) diff --git a/wyoming_faster_whisper/__main__.py b/wyoming_faster_whisper/__main__.py -index 5557cc5..bb9d69f 100755 +index 8a5039f..bd1e7b6 100755 --- a/wyoming_faster_whisper/__main__.py +++ b/wyoming_faster_whisper/__main__.py -@@ -131,5 +131,9 @@ async def main() -> None: +@@ -131,8 +131,12 @@ async def main() -> None: # ----------------------------------------------------------------------------- --if __name__ == "__main__": +def run(): - asyncio.run(main()) ++ asyncio.run(main()) + + -+if __name__ == "__main__": -+ run() + if __name__ == "__main__": + try: +- asyncio.run(main()) ++ run() + except KeyboardInterrupt: + pass diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix index 7479473223..50ec99f6de 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "wyoming-faster-whisper"; - version = "0.0.3"; + version = "1.0.1"; format = "setuptools"; src = fetchPypi { pname = "wyoming_faster_whisper"; inherit version; - hash = "sha256-uqepa70lprzV3DJK2wrNAAyZkMMJ5S86RKK716zxYU4="; + hash = "sha256-wo62m8gIP9hXihkd8j2haVvz3TlJv3m5WWthTPFwesk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper-entrypoint.patch b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper-entrypoint.patch index c2e4245e5b..4f7d09fd40 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper-entrypoint.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper-entrypoint.patch @@ -1,8 +1,8 @@ diff --git a/setup.py b/setup.py -index 1355313..3b144c1 100644 +index 05e42c1..8347acb 100644 --- a/setup.py +++ b/setup.py -@@ -35,4 +35,9 @@ setup( +@@ -41,4 +41,9 @@ setup( "Programming Language :: Python :: 3.10", ], keywords="rhasspy wyoming piper", @@ -13,18 +13,20 @@ index 1355313..3b144c1 100644 + } ) diff --git a/wyoming_piper/__main__.py b/wyoming_piper/__main__.py -index f60cf13..a0a15f7 100755 +index ab1580b..4c0a143 100755 --- a/wyoming_piper/__main__.py +++ b/wyoming_piper/__main__.py -@@ -143,5 +143,9 @@ async def main() -> None: +@@ -143,8 +143,12 @@ def get_description(voice_info: Dict[str, Any]): # ----------------------------------------------------------------------------- --if __name__ == "__main__": +def run(): - asyncio.run(main()) ++ asyncio.run(main()) + + -+if __name__ == "__main__": -+ run() -\ No newline at end of file + if __name__ == "__main__": + try: +- asyncio.run(main()) ++ run() + except KeyboardInterrupt: + pass diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix index 830f720596..c5ce6f9900 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "wyoming-piper"; - version = "0.0.3"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { pname = "wyoming_piper"; inherit version; - hash = "sha256-vl7LjW/2HBx6o/+vpap+wSG3XXzDwFacNmcbeU/8bOs="; + hash = "sha256-cdCWpejHNCjyYtIxGms9yaEerRmFnGllUN7+3uQy4mQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix index c57a5dbd04..06bca00fc5 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { version = yabridge.version; src = yabridge.src; - sourceRoot = "source/tools/yabridgectl"; + sourceRoot = "${yabridge.src.name}/tools/yabridgectl"; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index c2500300d9..ed647cc988 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -57,11 +57,13 @@ python3Packages.buildPythonApplication rec { passthru.tests.version = testers.testVersion { package = borgmatic; }; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ imlonghao ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix b/third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix index 5ce6b287e9..017df9a800 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/hpe-ltfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "193593hsc8nf5dn1fkxhzs1z4fpjh64hdkc8q6n9fgplrpxdlr4s"; }; - sourceRoot = "source/ltfs"; + sourceRoot = "${src.name}/ltfs"; # include sys/sysctl.h is deprecated in glibc. The sysctl calls are only used # for Apple to determine the kernel version. Because this build only targets diff --git a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix index dfde510441..76c4c89bce 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.23"; + version = "0.3.24"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-na9k26+GDdASZ37n0QtFuRDMtq338QOlXTf0X4raOJI="; + sha256 = "sha256-EY5SL8/KITEoOWq2owxQjnemYNsjYqJLLlRVFdYPoVA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch b/third_party/nixpkgs/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch index 148b9a1a95..10664b5725 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch @@ -1,18 +1,18 @@ -From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001 +From 72f7d8abee34107b815e49540f2fad7f1ab0b2cc Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Thu, 25 Feb 2021 09:20:51 +0100 Subject: [PATCH] Skip testing restore with permission failure The test fails in sandboxed builds. --- - cmd/restic/integration_test.go | 1 + + cmd/restic/cmd_restore_integration_test.go | 1 + 1 file changed, 1 insertion(+) -diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go -index 7d198d33..1588ccb1 100644 ---- a/cmd/restic/integration_test.go -+++ b/cmd/restic/integration_test.go -@@ -1170,6 +1170,7 @@ func TestRestoreLatest(t *testing.T) { +diff --git a/cmd/restic/cmd_restore_integration_test.go b/cmd/restic/cmd_restore_integration_test.go +index 2c7cbe1fb..f25f13754 100644 +--- a/cmd/restic/cmd_restore_integration_test.go ++++ b/cmd/restic/cmd_restore_integration_test.go +@@ -200,6 +200,7 @@ func TestRestoreLatest(t *testing.T) { } func TestRestoreWithPermissionFailure(t *testing.T) { @@ -21,5 +21,5 @@ index 7d198d33..1588ccb1 100644 defer cleanup() -- -2.29.2 +2.41.0 diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index 28379107ad..9a7e4d676a 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q="; + hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM="; + vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY="; subPackages = [ "cmd/restic" ]; @@ -26,7 +26,7 @@ buildGoModule rec { passthru.tests.restic = nixosTests.restic; postPatch = '' - rm cmd/restic/integration_fuse_test.go + rm cmd/restic/cmd_mount_integration_test.go ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/backup/sanoid/default.nix b/third_party/nixpkgs/pkgs/tools/backup/sanoid/default.nix index d2b37615e9..f37a471490 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/sanoid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/sanoid/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "sanoid"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "jimsalterjrs"; repo = pname; rev = "v${version}"; - sha256 = "12g5cjx34ys6ix6ivahsbr3bbbi1fmjwdfdk382z6q71w3pyxxzf"; + sha256 = "sha256-qfRGZ10fhLL4tJL97VHrdOkO/4OVpa087AsL9t8LMmk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A policy-driven snapshot management tool for ZFS filesystems"; homepage = "https://github.com/jimsalterjrs/sanoid"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lopsided98 ]; + maintainers = with maintainers; [ lopsided98 Frostman ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix b/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix index 8a0e43b600..ad7fc761d8 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/tarsnap/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice roconnor ]; + mainProgram = "tarsnap"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix index a7453119a9..abbc413278 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix @@ -1,32 +1,30 @@ { lib, python3Packages, fetchPypi }: -let - pythonPackages = python3Packages; - -in -pythonPackages.buildPythonApplication rec { - pname = "zfs_autobackup"; - version = "3.1"; +python3Packages.buildPythonApplication rec { + pname = "zfs-autobackup"; + version = "3.1.3"; src = fetchPypi { - inherit pname version; - sha256 = "42c22001717b3d7cfdae6297fedc11b2dd1eb2a4bd25b6bb1c9232dd3b70ad67"; + inherit version; + pname = "zfs_autobackup"; + sha256 = "sha256-ckikq8Am81O0wkL4ozRBFTCa15PrmkD54A2qEY6kA5c="; }; - # argparse is part of the standardlib - prePatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with pythonPackages; [ colorama ]; + propagatedBuildInputs = with python3Packages; [ colorama ]; + + pythonRemoveDeps = [ "argparse" ]; # tests need zfs filesystem doCheck = false; - pythonImportsCheck = [ "colorama" "argparse" ]; + + pythonImportsCheck = [ "zfs_autobackup" ]; meta = with lib; { - homepage = "https://github.com/psy0rz/zfs_autobackup"; description = "ZFS backup, replicationand snapshot tool"; + homepage = "https://github.com/psy0rz/zfs_autobackup"; + changelog = "https://github.com/psy0rz/zfs_autobackup/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix index ac64242fe6..63845045c0 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix @@ -5,7 +5,6 @@ , cinnamon , gnome , gobject-introspection -, intltool , libnotify , pavucontrol , python3Packages diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 5b887222c5..1fa1870345 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 +, obex_data_server, xdg-utils, dnsmasq, dhcpcd, iproute2 , gnome, librsvg, wrapGAppsHook, gobject-introspection , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { ]; makeWrapperArgs = [ - "--prefix PATH ':' ${lib.makeBinPath [ dnsmasq dhcp iproute2 ]}" + "--prefix PATH ':' ${lib.makeBinPath [ dnsmasq dhcpcd iproute2 ]}" "--suffix PATH ':' ${lib.makeBinPath [ xdg-utils ]}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix index 7a86be1fa1..7904e8d5b5 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bluetuith"; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix index 8a89f5fc84..07dc7303a0 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , appimageTools }: diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix index 527d70e7a9..959899d3b3 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,21 +1,60 @@ -{lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}: +{ + lib, + stdenv, + fetchurl, + fetchpatch, + pkg-config, + libiconv, + libvorbis, + libmad, + libao, + CoreServices, + IOKit, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cdrdao"; version = "1.2.5"; src = fetchurl { - url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2"; + url = "mirror://sourceforge/cdrdao/cdrdao-${finalAttrs.version}.tar.bz2"; hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY="; }; makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libvorbis libmad libao ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libiconv + libvorbis + libmad + libao + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + IOKit + ]; hardeningDisable = [ "format" ]; + patches = [ + # Fix build on macOS SDK < 12 + # https://github.com/cdrdao/cdrdao/pull/19 + (fetchpatch { + url = "https://github.com/cdrdao/cdrdao/commit/105d72a61f510e3c47626476f9bbc9516f824ede.patch"; + hash = "sha256-NVIw59CSrc/HcslhfbYQNK/qSmD4QbfuV8hWYhWelX4="; + }) + + # Fix undefined behaviour caused by uninitialized variable + # https://github.com/cdrdao/cdrdao/pull/21 + (fetchpatch { + url = "https://github.com/cdrdao/cdrdao/commit/251a40ab42305c412674c7c2d391374d91e91c95.patch"; + hash = "sha256-+nGlWw5rgc5Ns2l+6fQ4Hp2LbhO4R/I95h9WGIh/Ebw="; + }) + ]; + # we have glibc/include/linux as a symlink to the kernel headers, # and the magic '..' points to kernelheaders, and not back to the glibc/include postPatch = '' @@ -25,10 +64,10 @@ stdenv.mkDerivation rec { # Needed on gcc >= 6. env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - meta = with lib; { + meta = { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = "https://cdrdao.sourceforge.net/"; - platforms = platforms.linux; - license = licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 70fcedde85..80e456d072 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "srt-to-vtt-cl"; @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-validation.patch; - }) + ./fix-validation.patch + ./simplify-macOS-builds.patch ]; installPhase = '' mkdir -p $out/bin - cp bin/$(uname -s)/$(uname -m)/srt-vtt $out/bin + cp bin/srt-vtt $out/bin ''; meta = with lib; { @@ -27,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; homepage = "https://github.com/nwoltman/srt-to-vtt-cl"; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch b/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch new file mode 100644 index 0000000000..71497f23be --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch @@ -0,0 +1,31 @@ +From be08356f421825d3d2dd7ab687f86d9981a31f9a Mon Sep 17 00:00:00 2001 +From: "Travis A. Everett" +Date: Thu, 3 Aug 2023 20:15:40 -0500 +Subject: [PATCH] simplify macOS builds + +--- + Makefile | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 6dfd829..19c3ae3 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,13 +8,7 @@ CXXFLAGS = -std=c++11 -O2 -MMD -I ./deps + OBJECTS := src/text_encoding_detect.o src/Utils.o src/Converter.o src/main.o + DEPENDS := $(OBJECTS:.o=.d) + EXEC = srt-vtt +-UNAME_S := $(shell uname -s) +-ifeq ($(UNAME_S), Darwin) +- BIN_DIR = bin/Mac-OSX +-else +- UNAME_M := $(shell uname -m) +- BIN_DIR = bin/$(UNAME_S)/$(UNAME_M) +-endif ++BIN_DIR = bin + EXEC_PATH = $(BIN_DIR)/$(EXEC) + + .PHONY: test +-- +2.39.0 + diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix index f1902597ac..1983018788 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoPatchelfHook , bash , copyDesktopItems @@ -51,7 +50,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy"; - version = "1.0.93"; + version = "1.0.94"; src = let @@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-oz5IVq0QsPX90N4EBold2QQ8/CY4XF+KcQ41L+TR4iI="; + hash = "sha256-dVcr0qDG95QC9ay1Sbhs9IxCGzpLvej2XRmje29fWhQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/compression/flips/default.nix b/third_party/nixpkgs/pkgs/tools/compression/flips/default.nix index 024ff5fbe9..4ba618556a 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/flips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/flips/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "flips"; - version = "unstable-2021-10-28"; + version = "unstable-2023-03-15"; src = fetchFromGitHub { owner = "Alcaro"; repo = "Flips"; - rev = "3a8733e74c9bdbb6b89da2b45913a0be3d0e1866"; - sha256 = "1jik580mz2spik5mgh60h93ryaj5x8dffncnr1lwija0v803xld7"; + rev = "fdd5c6e34285beef5b9be759c9b91390df486c66"; + hash = "sha256-uuHgpt7aWqiMTUILm5tAEGGeZrls3g/DdylYQgsfpTw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/third_party/nixpkgs/pkgs/tools/compression/flips/use-system-libdivsufsort.patch index aa741decb0..d621fe3a9f 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/flips/use-system-libdivsufsort.patch +++ b/third_party/nixpkgs/pkgs/tools/compression/flips/use-system-libdivsufsort.patch @@ -1,12 +1,12 @@ diff --git a/Makefile b/Makefile -index c9d8b6d..9d66b0b 100644 +index b3d5aeb..a5acc08 100644 --- a/Makefile +++ b/Makefile -@@ -79,9 +79,7 @@ endif +@@ -83,9 +83,7 @@ endif + MOREFLAGS := $(CFLAGS_$(TARGET)) - --DIVSUF := libdivsufsort-2.0.1 +-DIVSUF := $(SRCDIR)/libdivsufsort-2.0.1 -SOURCES += $(DIVSUF)/lib/divsufsort.c $(DIVSUF)/lib/sssort.c $(DIVSUF)/lib/trsort.c -MOREFLAGS += -I$(DIVSUF)/include -DHAVE_CONFIG_H -D__STDC_FORMAT_MACROS +MOREFLAGS += -ldivsufsort diff --git a/third_party/nixpkgs/pkgs/tools/compression/keka/default.nix b/third_party/nixpkgs/pkgs/tools/compression/keka/default.nix new file mode 100644 index 0000000000..71e979fa0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/compression/keka/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +, makeWrapper +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "keka"; + version = "1.3.2"; + + src = fetchurl { + url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip"; + sha256 = "0id8j639kba5yc0z34lgvadzgv9z9s2573nn6dx9m6gd8qpnk2x7"; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications $out/bin + unzip -d $out/Applications $src + makeWrapper $out/Applications/Keka.app/Contents/MacOS/Keka $out/bin/keka \ + --add-flags "--cli" + + runHook postInstall + ''; + + meta = with lib; { + description = "macOS file archiver"; + homepage = "https://www.keka.io"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/compression/zfp/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zfp/default.nix index 2d3890484e..d63140b147 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zfp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zfp/default.nix @@ -1,6 +1,7 @@ { cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv +, config , enableCfp ? true -, enableCuda ? false +, enableCuda ? config.cudaSupport , enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true diff --git a/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix index 753368b70b..2c844cffc2 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zopfli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "zopfli"; diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index 3a51bdce19..791dda4f11 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file -, fetchpatch , legacySupport ? false , static ? stdenv.hostPlatform.isStatic # these need to be ran on the host, thus disable when cross-compiling diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix index 5710d80c2c..fd1166e1a3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bees/default.nix @@ -75,8 +75,8 @@ in substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper ln -s ${bees}/bin/beesd "$out"/bin/beesd -'').overrideAttrs (old: { +'').overrideAttrs { passthru.tests = { smoke-test = nixosTests.bees; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix index a74d182fb3..64edc17a89 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix @@ -12,7 +12,7 @@ let pname = "cpplite"; inherit version src; - sourceRoot = "source/cpplite"; + sourceRoot = "${src.name}/cpplite"; patches = [ ./install-adls.patch ]; cmakeFlags = [ "-DBUILD_ADLS=ON" "-DUSE_OPENSSL=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 3efd4c69c5..a2efc2e82c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-qfJhmdWBeBb1sKjw9jdj8/sBQ6IDiKkpt0LcrVvyfCQ="; + sha256 = "sha256-S+MAFXYCcNCBZCzAAjqL/ufLZXoqoFVkTmpW1oaVuW4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 605f505dd5..1b0c9c9863 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -107,7 +107,7 @@ let optZfs = shouldUsePkg zfs; # Downgrade rocksdb, 7.10 breaks ceph - rocksdb' = rocksdb.overrideAttrs (oldAttrs: { + rocksdb' = rocksdb.overrideAttrs { version = "7.9.2"; src = fetchFromGitHub { owner = "facebook"; @@ -115,7 +115,7 @@ let rev = "refs/tags/v7.9.2"; hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; - }); + }; hasRadosgw = optExpat != null && optCurl != null && optLibedit != null; @@ -165,21 +165,18 @@ let # Watch out for python <> boost compatibility python = python310.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { version = "1.4.46"; src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; - nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ - pytest-xdist - ]); - disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ + disabledTestPaths = [ "test/aaa_profiling" "test/ext/mypy" ]; - }); + }; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix index a439e29358..93bfdd8d23 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/cpcfs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ makeWrapper ncurses readline ronn ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index fba5476123..588dcb320a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryfs"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-7luTCDjrquG8aBZ841VPwV9/ea8faHGLQtmRahqGTss="; + hash = "sha256-OkJhLg+YzS3kDhlpUQe9A+OiVBPG/iKs6OU7aKFJ5wY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index 1efef2d9b5..3d3c1b54db 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , autoreconfHook , neon , procps diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix index 9c38852e4e..efdb9f3dc1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, btrfs-progs, python3 }: let - btrfsProgsPatched = btrfs-progs.overrideAttrs (oldAttrs: { + btrfsProgsPatched = btrfs-progs.overrideAttrs { patches = [ (fetchpatch { name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; @@ -9,7 +9,7 @@ let sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; }) ]; - }); + }; py3 = python3.withPackages (ps: with ps; [ prettytable numpy diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/disk-inventory-x/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/disk-inventory-x/default.nix new file mode 100644 index 0000000000..008781d4cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/disk-inventory-x/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "disk-inventory-x"; + version = "1.3"; + + src = fetchurl { + url = "https://www.derlien.com/diskinventoryx/downloads/Disk%20Inventory%20X%20${finalAttrs.version}.dmg"; + sha256 = "1rfqp8ia6ficvqxynn43f1pba4rfmhf61kn2ihysbnjs8c33bbvq"; + }; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "Disk usage utility for Mac OS X"; + homepage = "https://www.derlien.com"; + license = licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = [ "x86_64-darwin" ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix index b28aaadca9..d825c1b0fb 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, runCommand }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "dupe-krill"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix index 1ffe03601d..e5804f3785 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix @@ -7,9 +7,8 @@ , boost , cmake , double-conversion -, fmt_8 +, fmt , fuse3 -, gflags , glog , gtest , jemalloc @@ -21,30 +20,27 @@ , pkg-config , ronn , xxHash +, utf8cpp , zstd }: stdenv.mkDerivation rec { pname = "dwarfs"; - version = "0.6.2"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-fA/3AooDndqYiK215cu/zTqCqeccHnwIX2CfJ9sC+Fc="; + hash = "sha256-DcPRrATI2cpLZWAL+sSCoXvJ1R0O3yHqhlJW1aEpDpA="; }; - patches = with lib.versions; [ - (substituteAll { + patches = [ + (with lib.versions; substituteAll { src = ./version_info.patch; - gitRev = "v${version}"; - gitDesc = "v${version}"; - gitBranch = "v${version}"; - gitId = "v${version}"; # displayed as version number - + versionFull = version; # displayed as version number (with v prepended) versionMajor = major version; versionMinor = minor version; versionPatch = patch version; @@ -55,14 +51,11 @@ stdenv.mkDerivation rec { "-DPREFER_SYSTEM_ZSTD=ON" "-DPREFER_SYSTEM_XXHASH=ON" "-DPREFER_SYSTEM_GTEST=ON" + "-DPREFER_SYSTEM_LIBFMT=ON" # may be added under an option in the future # "-DWITH_LEGACY_FUSE=ON" "-DWITH_TESTS=ON" - - # temporary hack until folly builds work on aarch64, - # see https://github.com/facebook/folly/issues/1880 - "-DCMAKE_LIBRARY_ARCHITECTURE=${if stdenv.isx86_64 then "x86_64" else "dummy"}" ]; nativeBuildInputs = [ @@ -75,12 +68,13 @@ stdenv.mkDerivation rec { buildInputs = [ # dwarfs boost - fmt_8 + fmt fuse3 jemalloc libarchive lz4 xxHash + utf8cpp zstd # folly @@ -93,9 +87,9 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ gtest ]; - # this fails inside of the sandbox due to missing access + # these fail inside of the sandbox due to missing access # to the FUSE device - GTEST_FILTER = "-tools.everything"; + GTEST_FILTER = "-dwarfs/tools_test.end_to_end/*:dwarfs/tools_test.mutating_ops/*"; meta = with lib; { description = "A fast high compression read-only file system"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/version_info.patch b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/version_info.patch index 59936302ac..8d62bd8d22 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/version_info.patch +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/version_info.patch @@ -1,6 +1,24 @@ +diff --git a/cmake/package_version.cmake b/cmake/package_version.cmake +new file mode 100644 +index 0000000..d4fdb9c +--- /dev/null ++++ b/cmake/package_version.cmake +@@ -0,0 +1,12 @@ ++# autogenerated code, do not modify ++ ++set(PRJ_GIT_REV "v@versionFull@") ++set(PRJ_GIT_DESC "v@versionFull@") ++set(PRJ_GIT_BRANCH "HEAD") ++set(PRJ_GIT_ID "v@versionFull@") ++set(PRJ_GIT_RELEASE_TAG "v@versionFull@") ++set(PRJ_VERSION_FULL "@versionFull@") ++set(PRJ_VERSION_SHORT "@versionFull@") ++set(PRJ_VERSION_MAJOR "@versionMajor@") ++set(PRJ_VERSION_MINOR "@versionMinor@") ++set(PRJ_VERSION_PATCH "@versionPatch@") diff --git a/include/dwarfs/version.h b/include/dwarfs/version.h -new file mode 100755 -index 0000000..9b12c59 +new file mode 100644 +index 0000000..54cf86a --- /dev/null +++ b/include/dwarfs/version.h @@ -0,0 +1,16 @@ @@ -21,8 +39,8 @@ index 0000000..9b12c59 + +} // namespace dwarfs diff --git a/src/dwarfs/version.cpp b/src/dwarfs/version.cpp -new file mode 100755 -index 0000000..3af0215 +new file mode 100644 +index 0000000..5759120 --- /dev/null +++ b/src/dwarfs/version.cpp @@ -0,0 +1,12 @@ @@ -32,9 +50,9 @@ index 0000000..3af0215 + +namespace dwarfs { + -+char const* PRJ_GIT_REV = "@gitRev@"; -+char const* PRJ_GIT_DESC = "@gitDesc@"; -+char const* PRJ_GIT_BRANCH = "@gitBranch@"; -+char const* PRJ_GIT_ID = "@gitId@"; ++char const* PRJ_GIT_REV = "@versionFull@"; ++char const* PRJ_GIT_DESC = "v@versionFull@"; ++char const* PRJ_GIT_BRANCH = "HEAD"; ++char const* PRJ_GIT_ID = "v@versionFull@"; + +} // namespace dwarfs diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix index 6e9af03fdb..fe4e61014a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix @@ -1,20 +1,30 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.6.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-rSnj38U4Rt5Wh+3A610tTeT2Q1BVGvpMa7rpDf4YzTI="; + hash = "sha256-3uukeuxB1GjmJ59bkgDEzgG9RMZhmB5TSv3uiXV8GNg="; }; - cargoHash = "sha256-or1vLbtA2tPnGJ3tYWrmaXmPCIutojBlIWMLRNpxpY4="; + cargoHash = "sha256-td4B9/DAmASqLGO3PVLLWeO3GeDbLHI7wNcOT1qk20k="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installManPage $releaseDir/build/*/out/dysk.1 + installShellCompletion $releaseDir/build/*/out/{dysk.bash,dysk.fish,_dysk} + ''; meta = with lib; { description = "Get information on your mounted disks"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix index 4eb488b2d0..ef4a46868c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, cacert, testers, Security, garage, nixosTests }: +, cacert, Security, garage, nixosTests }: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 23446ce998..a1f424915f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , fuse diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix index 53841f6842..207fcfc9c7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix @@ -16,7 +16,7 @@ buildGoModule { sha256 = "sha256-6yVMNSwwPZlADXuPBDRlgoz4Stuz2pgv6r6+y2/C8XY="; }; - vendorSha256 = "sha256-2N8MshBo9+2q8K00eTW5So6d8ZNRzOfQkEKmxR428gI="; + vendorSha256 = "sha256-shFld293pdmVcnu3p0NoBmPGLJddZd4O/gJ8klgdlQ8="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix index aa2260cb37..7f7a9f54fd 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , makeWrapper , python3 diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix index 171bb3f480..47afb4b2d6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.35.1"; + version = "2.36.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-mUnjWMxeZJ9wIpJJDqQIUk2x7oifZ/b2HZlPtQ77q8U="; + sha256 = "sha256-oGgL3uMKMs66GTgWtMMX0M9ARXiJnV3l3Tnja373sCo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mkspiffs/presets.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mkspiffs/presets.nix index c0b74d9cf1..d4008b2fa3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mkspiffs/presets.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mkspiffs/presets.nix @@ -4,10 +4,10 @@ lib.mapAttrs ( name: { CPPFLAGS }: - mkspiffs.overrideAttrs (drv: { + mkspiffs.overrideAttrs { inherit CPPFLAGS; BUILD_CONFIG_NAME = "-${name}"; - }) + } ) { arduino-esp8266.CPPFLAGS = [ "-DSPIFFS_USE_MAGIC_LENGTH=0" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix new file mode 100644 index 0000000000..678abe4892 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, fuse, boost, gcc, icu, libzip, pandoc +, pkg-config }: + +stdenv.mkDerivation (finalAttrs: { + pname = "mount-zip"; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "google"; + repo = "mount-zip"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+slN5eedSddYKgiNLq4KZ5BXwvGQw9859sVfkcIBYeo="; + }; + + nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; + buildInputs = [ fuse libzip ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "FUSE file system for ZIP archives"; + homepage = "https://github.com/google/mount-zip"; + longDescription = '' + mount-zip is a tool allowing to open, explore and extract ZIP archives. + + This project is a fork of fuse-zip. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ arti5an ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix index a4e1b6d62c..d4ef2154d8 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix @@ -1,16 +1,13 @@ { lib , stdenv , fetchurl -, fetchpatch , acl , autoreconfHook , avahi , db -, ed , libevent , libgcrypt , libiconv -, libtirpc , openssl , pam , perl diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix index fbb1532f3e..5f3b5e534c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libuuid, libselinux +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libuuid, libselinux , e2fsprogs }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix index acdde0335b..88f2f8a087 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.92"; + version = "1.93"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-CS6lxDIBwhcnEG6XehbyAI4vb72PmwQ7p+gC1bbJEzM="; + sha256 = "sha256-7rLHnQlyJDOn/RikOrrEAQ7O+4T+26vNGiTkOgNH75Q="; }; buildInputs = [ curl openssl libxml2 fuse ]; @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mount an S3 bucket as filesystem through FUSE"; - license = licenses.gpl2; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/s3fs-fuse/s3fs-fuse"; + changelog = "https://github.com/s3fs-fuse/s3fs-fuse/raw/v${version}/ChangeLog"; + maintainers = [ ]; + license = licenses.gpl2Only; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sdat2img/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sdat2img/default.nix index 44e884201d..4176eabad4 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/sdat2img/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sdat2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { pname = "sdat2img"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix index c52b83ceb1..ae658330b2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , help2man , lz4 , lzo diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index 71243dff5d..7f08c9f716 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "squashfuse"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "vasi"; repo = pname; rev = version; - sha256 = "sha256-agapkSl4KEK+7MA2+gcfaXv6+rpG0MQAhAG5At9rXqk="; + sha256 = "sha256-gK1k1Ooue3HLtBmPFMZdW4h2Ee1Uy4T26EOBeQICQpM="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock index e0a30c77dd..3cd26958ed 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -2,6 +2,21 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "aho-corasick" version = "1.0.2" @@ -43,15 +58,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[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", ] @@ -77,9 +92,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -98,13 +113,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -113,13 +128,28 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "bindgen" version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -154,6 +184,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" version = "0.10.4" @@ -165,12 +201,11 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -239,22 +274,21 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.2" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.1" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] @@ -279,9 +313,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", ] @@ -341,11 +375,11 @@ dependencies = [ [[package]] name = "devicemapper" -version = "0.33.4" +version = "0.33.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792cb2154d0e257d330b13f820e424d91de0a149050f2f478d97202926ce28a" +checksum = "75a9fd602a98d192f7662a1f4c4cf6920a1b454c3a9e724f6490cf8e30910114" dependencies = [ - "bitflags", + "bitflags 1.3.2", "devicemapper-sys", "env_logger", "lazy_static", @@ -391,9 +425,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[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 = "env_logger" @@ -442,12 +476,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 = "float-cmp" @@ -520,7 +551,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -574,6 +605,12 @@ dependencies = [ "wasi", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + [[package]] name = "glob" version = "0.3.1" @@ -582,18 +619,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[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 = "humantime" @@ -603,9 +631,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[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", @@ -624,26 +652,6 @@ dependencies = [ "cc", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - [[package]] name = "iocuddle" version = "0.1.1" @@ -652,12 +660,11 @@ checksum = "d8972d5be69940353d5347a1344cb375d9b457d6809b428b05bb1ca2fb9ce007" [[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", + "hermit-abi", "rustix", "windows-sys", ] @@ -672,16 +679,25 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -722,9 +738,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libcryptsetup-rs" @@ -732,7 +748,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54de25d80cf59c099a01fc9939251bbf8021c131adf97beb7d57c094b16ed474" dependencies = [ - "bitflags", + "bitflags 1.3.2", "either", "lazy_static", "libc", @@ -813,15 +829,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "log" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "loopdev" @@ -854,6 +870,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.8.8" @@ -871,7 +896,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 0.1.10", "libc", @@ -884,7 +909,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 1.0.0", "libc", "memoffset", @@ -910,9 +935,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[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", "libm", @@ -920,14 +945,23 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -942,9 +976,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -973,7 +1007,7 @@ dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1003,9 +1037,9 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1017,7 +1051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -1038,9 +1072,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1090,25 +1124,31 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata", + "regex-syntax 0.7.4", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] [[package]] name = "regex-syntax" @@ -1118,9 +1158,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "retry" @@ -1141,6 +1181,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -1149,13 +1195,12 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno 0.3.1", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -1175,38 +1220,38 @@ dependencies = [ [[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 = "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.163" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -1215,9 +1260,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 1.0.0", "cpufeatures", @@ -1266,7 +1311,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.5.7" +version = "3.5.8" dependencies = [ "assert_cmd", "assert_matches", @@ -1284,7 +1329,7 @@ dependencies = [ "env_logger", "futures", "iocuddle", - "itertools", + "itertools 0.11.0", "lazy_static", "libblkid-rs", "libc", @@ -1340,9 +1385,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -1351,11 +1396,10 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if 1.0.0", "fastrand", "redox_syscall", @@ -1380,11 +1424,12 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[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", "libc", "mio", "num_cpus", @@ -1403,7 +1448,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.27", ] [[package]] @@ -1420,9 +1465,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[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 = "utf8parse" @@ -1432,9 +1477,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[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 = [ "getrandom", "serde", @@ -1469,9 +1514,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 1.0.0", "wasm-bindgen-macro", @@ -1479,24 +1524,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.18", + "syn 2.0.27", "wasm-bindgen-shared", ] [[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", @@ -1504,22 +1549,22 @@ 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.18", + "syn 2.0.27", "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 = "winapi" @@ -1572,9 +1617,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix index 224a4293c1..892591576d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.5.7"; + version = "3.5.8"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; - rev = "v${version}"; - hash = "sha256-JkGDik2RL+JnUJloV5597UlSnF5PncP3F6nzghJpGBg="; + rev = "refs/tags/stratisd-v${version}"; + hash = "sha256-/Yqruz8gUyfL6zXYwlNvXa9feLBOOT4q4Gl/jxt1cMs="; }; cargoDeps = rustPlatform.importCargoLock { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { lvm2 ]; - outputs = ["out" "initrd"]; + outputs = [ "out" "initrd" ]; EXECUTABLES_PATHS = lib.makeBinPath ([ xfsprogs diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix index 4ac3d777bc..6f33735f58 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-CvXn5b1kEZ2gYqfKSFRNzqkyOAcfcI1/3etRJTKwqog="; + sha256 = "sha256-+GhYeQ27uwg9JOv1qbf1+UbMd+vPXJ05nsXZD9OakzI="; }; - sourceRoot = "source/cmd/tar2ext4"; + sourceRoot = "${src.name}/cmd/tar2ext4"; vendorHash = null; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix index 5e325591e6..623cef8844 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix index 885d64f7c4..03adc070c0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix @@ -1,5 +1,4 @@ { stdenv -, pkgs , lib , fetchurl , e2fsprogs diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix index 7f14e1b1dc..ee9177e37c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - hash = "sha256-7Jh8nwvLLbKZG/+4DTUxULOJw6K3m2gwQR9wQq32mQw="; + hash = "sha256-wxhoQYv79Jo6nEf8cM3/3p2W9P8AUb0EoIgeZlRkgQQ="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix index afafbca58b..601baabd87 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix @@ -1,8 +1,7 @@ -{ rustPlatform +{ lib +, rustPlatform , cloud-utils , fetchFromGitHub -, lib -, llvmPackages , pkg-config , util-linux , zfs diff --git a/third_party/nixpkgs/pkgs/tools/games/dualsensectl/default.nix b/third_party/nixpkgs/pkgs/tools/games/dualsensectl/default.nix index f08622aa3a..cb17ba25d7 100644 --- a/third_party/nixpkgs/pkgs/tools/games/dualsensectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/dualsensectl/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dualsensectl"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "nowrep"; repo = "dualsensectl"; rev = "v${version}"; - hash = "sha256-OZmZ+ENBBKzRZ9jLIn9Bz7oGYrSAjZ5XlOR9fpN0cZs="; + hash = "sha256-DrPVzbaLO2NgjNcEFyCs2W+dlbdpBeRX1ZfFenqz7IY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/games/pokefinder/cstddef.patch b/third_party/nixpkgs/pkgs/tools/games/pokefinder/cstddef.patch deleted file mode 100644 index c74340b0d6..0000000000 --- a/third_party/nixpkgs/pkgs/tools/games/pokefinder/cstddef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/Core/Util/EncounterSlot.cpp b/Source/Core/Util/EncounterSlot.cpp -index adddbdab..71c98e83 100644 ---- a/Source/Core/Util/EncounterSlot.cpp -+++ b/Source/Core/Util/EncounterSlot.cpp -@@ -20,6 +20,7 @@ - #include "EncounterSlot.hpp" - #include - #include -+#include - - namespace - { diff --git a/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix b/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix index fe2c8bdf56..1ddde132d1 100644 --- a/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix @@ -1,45 +1,74 @@ { lib , stdenv +, copyDesktopItems +, makeDesktopItem , fetchFromGitHub , cmake , qtbase , qttools , qtwayland +, imagemagick , wrapQtAppsHook , gitUpdater }: stdenv.mkDerivation rec { pname = "pokefinder"; - version = "4.0.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Admiral-Fish"; repo = "PokeFinder"; rev = "v${version}"; - sha256 = "j7xgjNF8NWLFVPNItWcFM5WL8yPxgHxVX00x7lt45WI="; + sha256 = "fYBeWc9eYLbj4+ku1jwaO5ISL8a7WJnBHJ4qz4W8RHA="; fetchSubmodules = true; + # the repo has identical cmake and CMake folders, causing issues on macOS + postFetch = if stdenv.isDarwin then '' + mv $out/cmake $out/cmake.tmp + mv $out/cmake.tmp $out/CMake + '' else '' + rm -rf $out/cmake + ''; }; - patches = [ ./cstddef.patch ]; + patches = [ ./set-desktop-file-name.patch ]; postPatch = '' patchShebangs Source/Core/Resources/ ''; - installPhase = lib.optionalString (!stdenv.isDarwin) '' - install -D Source/Forms/PokeFinder $out/bin/PokeFinder - '' + lib.optionalString stdenv.isDarwin '' + installPhase = '' + runHook preInstall + '' + lib.optionalString (stdenv.isDarwin) '' mkdir -p $out/Applications - cp -R Source/Forms/PokeFinder.app $out/Applications + cp -R Source/PokeFinder.app $out/Applications + '' + lib.optionalString (!stdenv.isDarwin) '' + install -D Source/PokeFinder $out/bin/PokeFinder + mkdir -p $out/share/pixmaps + convert "$src/Source/Form/Images/pokefinder.ico[-1]" $out/share/pixmaps/pokefinder.png + '' + '' + runHook postInstall ''; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems imagemagick ]; + + desktopItems = [ + (makeDesktopItem { + name = "pokefinder"; + exec = "PokeFinder"; + icon = "pokefinder"; + comment = "Cross platform Pokémon RNG tool"; + desktopName = "PokéFinder"; + categories = [ "Utility" ]; + }) + ]; buildInputs = [ qtbase qttools ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; meta = with lib; { homepage = "https://github.com/Admiral-Fish/PokeFinder"; diff --git a/third_party/nixpkgs/pkgs/tools/games/pokefinder/set-desktop-file-name.patch b/third_party/nixpkgs/pkgs/tools/games/pokefinder/set-desktop-file-name.patch new file mode 100644 index 0000000000..e22046f6fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/pokefinder/set-desktop-file-name.patch @@ -0,0 +1,12 @@ +diff --git a/Source/main.cpp b/Source/main.cpp +index 3e58a381..2e7e4a86 100644 +--- a/Source/main.cpp ++++ b/Source/main.cpp +@@ -69,6 +69,7 @@ int main(int argc, char *argv[]) + { + QApplication a(argc, argv); + a.setApplicationName("PokeFinder"); ++ a.setDesktopFileName("pokefinder"); + a.setOrganizationName("PokeFinder Team"); + + Q_INIT_RESOURCE(resources); diff --git a/third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/default.nix b/third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/default.nix index 577be97384..6cf54c9a8f 100644 --- a/third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/ps3-disc-dumper/default.nix @@ -1,6 +1,5 @@ { lib , buildDotnetModule -, dotnetCorePackages , fetchFromGitHub , zlib , openssl diff --git a/third_party/nixpkgs/pkgs/tools/games/slipstream/default.nix b/third_party/nixpkgs/pkgs/tools/games/slipstream/default.nix new file mode 100644 index 0000000000..7200af3d19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/slipstream/default.nix @@ -0,0 +1,48 @@ +{ lib, fetchFromGitHub, makeWrapper, maven, jdk }: +let + mavenWithJdk = maven.override { inherit jdk; }; +in +mavenWithJdk.buildMavenPackage rec { + pname = "slipstream"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "Vhati"; + repo = "Slipstream-Mod-Manager"; + rev = "v${version}"; + hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU="; + }; + + mvnHash = "sha256-8i3OVSy8RUGVoQzwADszVvNYe50f4nsJie1y7tsOK4U="; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java + install -Dm644 target/ftl-mod-manager-${version}.jar $out/share/java + install -Dm644 target/modman.jar $out/share/java + + # slipstream is very finniky about having specific + # folders at startup, so wrapper creates them for it. + # this is because slipstream expects to be started from + # archive it comes from, but we can't do that since + # we need the mods directory to be writable. + # see: https://github.com/Vhati/Slipstream-Mod-Manager/blob/85cad4ffbef8583d908b189204d7d22a26be43f8/src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java#L105 + makeWrapper ${jdk}/bin/java $out/bin/${pname} \ + --run '_dir="''${XDG_DATA_HOME:-$HOME/.local/share}/slipstream"' \ + --run 'mkdir -p $_dir/{mods,backup}' \ + --run 'cd $_dir' \ + --append-flags "-jar $out/share/java/modman.jar" + + runHook postInstall + ''; + + meta = with lib; { + description = "A mod manager for FTL: Faster Than Light"; + homepage = "https://github.com/Vhati/Slipstream-Mod-Manager"; + license = licenses.gpl2; + maintainers = with maintainers; [ mib ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix b/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix index b39e87fbe9..b9744015fe 100644 --- a/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { name = "steam-rom-manager"; - version = "2.3.40"; + version = "2.4.17"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-qm7F1/+3iVtsxSAptbhiI5sEHR0B9vo7AdEPy1/PANU="; + sha256 = "sha256-NRqryY9v6s51/eoCdqqID6m5Osx5PPChKGxjmLhh7ac="; }; extraInstallCommands = let diff --git a/third_party/nixpkgs/pkgs/tools/games/steamtinkerlaunch/default.nix b/third_party/nixpkgs/pkgs/tools/games/steamtinkerlaunch/default.nix index ea64c7208b..4f37109f54 100644 --- a/third_party/nixpkgs/pkgs/tools/games/steamtinkerlaunch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/steamtinkerlaunch/default.nix @@ -3,7 +3,6 @@ , git , gnugrep , fetchFromGitHub -, installShellFiles , lib , makeWrapper , stdenv diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 795378d370..136c46d69c 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub , autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv diff --git a/third_party/nixpkgs/pkgs/tools/graphics/didder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/didder/default.nix index e5acb60586..e42a89c72d 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/didder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/didder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, pandoc }: +{ lib, buildGoModule, fetchFromGitHub, pandoc }: buildGoModule rec { pname = "didder"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix new file mode 100644 index 0000000000..eafed87ba1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: +rustPlatform.buildRustPackage rec { + pname = "dnglab"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "dnglab"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4uTpCBzBBkcpVBVZMOBD6f9ut71OuUNQ5+AkaQcU86M="; + }; + + cargoSha256 = "sha256-WvXQNDYvR6s4M2Hlpqwq1/wFQYW2QU/ngQimKOFkhOQ="; + + postInstall = '' + rm $out/bin/benchmark $out/bin/identify + ''; + + meta = with lib; { + description = "Camera RAW to DNG file format converter"; + homepage = "https://github.com/dnglab/dnglab"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index bfcaa7154c..cbfdeb22fb 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -8,7 +8,6 @@ , wayland-scanner , libjpeg , libpng -, xorg , libX11 , libGL , libdrm diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix index ab6a5110db..1b7fd162db 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , autoreconfHook , pkg-config , cairo diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix deleted file mode 100644 index adbe371dbb..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -# generated with cabal2nix by ./generate.sh -{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist -, directory, fetchgit, filepath, Glob, hpack, lib, parallel-io -, process, safe, text, time, yaml -}: -mkDerivation { - pname = "ldgallery-compiler"; - version = "2.1"; - src = fetchgit { - url = "https://github.com/pacien/ldgallery.git"; - sha256 = "184zysh5qwkbki8mn0br87h65yi5j39qwnmhz05z3ir9wfiniq4b"; - rev = "11bbbae2850b9c45da697a8ed9626495a50a38c0"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/compiler; echo source root reset to $sourceRoot"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base cmdargs containers data-ordlist directory filepath Glob - parallel-io process safe text time yaml - ]; - libraryToolDepends = [ hpack ]; - executableHaskellDepends = [ - aeson base cmdargs containers data-ordlist directory filepath Glob - parallel-io process safe text time yaml - ]; - testHaskellDepends = [ - aeson base cmdargs containers data-ordlist directory filepath Glob - parallel-io process safe text time yaml - ]; - prePatch = "hpack"; - homepage = "https://ldgallery.pacien.org"; - description = "A static generator which turns a collection of tagged pictures into a searchable web gallery"; - license = lib.licenses.agpl3Only; - mainProgram = "ldgallery"; - maintainers = [ lib.maintainers.pacien ]; - - # Does not compile with ghc-9.2 - hydraPlatforms = lib.platforms.none; - broken = true; -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/generate.sh b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/generate.sh deleted file mode 100755 index 355206cb0f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/compiler/generate.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the nix file for the ldgallery-compiler package." - echo "Usage: $0 " - exit 1 -fi - -echo "# generated with cabal2nix by ./generate.sh" > default.nix - -cabal2nix \ - --maintainer pacien \ - --subpath compiler \ - --revision $1 \ - "https://github.com/pacien/ldgallery.git" \ - >> default.nix diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix deleted file mode 100644 index 1b620656ce..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick, CoreServices }: - -with lib; -with haskell.lib.compose; - -let - ldgallery-viewer = pkgs.callPackage ./viewer { inherit CoreServices; }; - inherit (haskellPackages) ldgallery-compiler; - -in - -# making sure that the versions of the compiler and viewer parts are in sync -assert ldgallery-compiler.version == versions.majorMinor ldgallery-viewer.version; - -justStaticExecutables (overrideCabal (oldAttrs: { - pname = "ldgallery"; # bundled viewer + compiler - - buildTools = (oldAttrs.buildTools or []) ++ [ makeWrapper pandoc ]; - - prePatch = '' - # add viewer dist to data - ln -s "${ldgallery-viewer}/share/ldgallery/viewer" "data/" - - ${oldAttrs.prePatch or ""} - ''; - - postInstall = '' - ${oldAttrs.postInstall or ""} - - # wrapper for runtime dependencies registration - wrapProgram "$out/bin/ldgallery" \ - --prefix PATH : ${lib.makeBinPath [ imagemagick ]} - - # bash completion - mkdir -p "$out/share/bash-completion/completions" - "$out/bin/ldgallery" \ - --help=bash \ - > "$out/share/bash-completion/completions/ldgallery" - - # man pages - mkdir -p $out/share/man/man{1,7} - ln -s ${ldgallery-viewer}/share/man/man7/* "$out/share/man/man7/" - pandoc --standalone --to man \ - "../ldgallery-quickstart.7.md" \ - --output "$out/share/man/man7/ldgallery-quickstart.7" - pandoc --standalone --to man \ - "ldgallery.1.md" \ - --output "$out/share/man/man1/ldgallery.1" - ''; - - # other package metadata (maintainer, description, license, ...) - # are inherited from the compiler package -}) ldgallery-compiler) diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix deleted file mode 100644 index bbaed09684..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkgs, pandoc, CoreServices }: - -let - # Note for maintainers: - # * keep version in sync with the ldgallery compiler - # * regenerate node-*.nix with `./generate.sh ` - sourcePkg = fetchFromGitHub { - owner = "pacien"; - repo = "ldgallery"; - rev = "v2.1"; - sha256 = "sha256-i+Boo+Mpx/EL+LBajtOQJfpi4EF5AVtRnGtyXKD2n6A="; - }; - - nodePackages = import ./node-composition.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - }; - - nodePkg = nodePackages.package.override { - src = "${sourcePkg}/viewer"; - postInstall = "npm run build"; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - }; - -in - -# making sure that the source and the node package are in sync -assert lib.versions.majorMinor nodePkg.version == lib.removePrefix "v" sourcePkg.rev; - -stdenv.mkDerivation { - pname = nodePkg.packageName; - version = nodePkg.version; - src = nodePkg; - - buildInputs = [ pandoc ]; - - installPhase = '' - mkdir -p "$out/share/ldgallery" - cp -rp "lib/node_modules/ldgallery-viewer/dist" \ - "$out/share/ldgallery/viewer/" - cp -rp "${sourcePkg}/example" \ - "$out/share/ldgallery/viewer/" - - mkdir -p "$out/share/man/man7" - pandoc --standalone --to man \ - "lib/node_modules/ldgallery-viewer/ldgallery-viewer.7.md" \ - --output "$out/share/man/man7/ldgallery-viewer.7" - ''; -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh deleted file mode 100755 index 1f9b4f1452..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/generate.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix wget - -# TODO: merge with other node packages in nixpkgs/pkgs/development/node-packages once -# * support for npm projects in sub-directories is added to node2nix: -# https://github.com/svanderburg/node2nix/issues/177 -# * we find a way to enable development dependencies for some of the packages - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the node composition and package nix files for the ldgallery-viewer package." - echo "Usage: $0 " - exit 1 -fi - -wget https://github.com/pacien/ldgallery/raw/$1/viewer/package.json - -# Development dependencies are required for this Vue application to build -node2nix \ - --node-env ../../../../development/node-packages/node-env.nix \ - --development \ - --input ./package.json \ - --output node-packages.nix \ - --composition node-composition.nix \ - --nodejs-14 \ - --no-copy-node-env - -rm package.json diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix deleted file mode 100644 index a621dc22de..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: - -let - nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix deleted file mode 100644 index d3191bd1e1..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/node-packages.nix +++ /dev/null @@ -1,9570 +0,0 @@ -# This file has been generated by node2nix 1.11.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@achrinza/node-ipc-9.2.5" = { - name = "_at_achrinza_slash_node-ipc"; - packageName = "@achrinza/node-ipc"; - version = "9.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz"; - sha512 = "kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ=="; - }; - }; - "@ampproject/remapping-2.2.0" = { - name = "_at_ampproject_slash_remapping"; - packageName = "@ampproject/remapping"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"; - sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; - }; - }; - "@babel/code-frame-7.18.6" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; - }; - }; - "@babel/compat-data-7.19.1" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz"; - sha512 = "72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="; - }; - }; - "@babel/core-7.19.1" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz"; - sha512 = "1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw=="; - }; - }; - "@babel/generator-7.19.0" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz"; - sha512 = "S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg=="; - }; - }; - "@babel/helper-annotate-as-pure-7.18.6" = { - name = "_at_babel_slash_helper-annotate-as-pure"; - packageName = "@babel/helper-annotate-as-pure"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; - sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; - }; - }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" = { - name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; - packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"; - sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; - }; - }; - "@babel/helper-compilation-targets-7.19.1" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz"; - sha512 = "LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg=="; - }; - }; - "@babel/helper-create-class-features-plugin-7.19.0" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz"; - sha512 = "NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw=="; - }; - }; - "@babel/helper-create-regexp-features-plugin-7.19.0" = { - name = "_at_babel_slash_helper-create-regexp-features-plugin"; - packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz"; - sha512 = "htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw=="; - }; - }; - "@babel/helper-define-polyfill-provider-0.3.3" = { - name = "_at_babel_slash_helper-define-polyfill-provider"; - packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz"; - sha512 = "z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww=="; - }; - }; - "@babel/helper-environment-visitor-7.18.9" = { - name = "_at_babel_slash_helper-environment-visitor"; - packageName = "@babel/helper-environment-visitor"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; - sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; - }; - }; - "@babel/helper-explode-assignable-expression-7.18.6" = { - name = "_at_babel_slash_helper-explode-assignable-expression"; - packageName = "@babel/helper-explode-assignable-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; - sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; - }; - }; - "@babel/helper-function-name-7.19.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; - }; - }; - "@babel/helper-hoist-variables-7.18.6" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; - sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.18.9" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; - sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; - }; - }; - "@babel/helper-module-imports-7.18.6" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; - sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; - }; - }; - "@babel/helper-module-transforms-7.19.0" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz"; - sha512 = "3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ=="; - }; - }; - "@babel/helper-optimise-call-expression-7.18.6" = { - name = "_at_babel_slash_helper-optimise-call-expression"; - packageName = "@babel/helper-optimise-call-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; - sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; - }; - }; - "@babel/helper-plugin-utils-7.19.0" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; - sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.18.9" = { - name = "_at_babel_slash_helper-remap-async-to-generator"; - packageName = "@babel/helper-remap-async-to-generator"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; - sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; - }; - }; - "@babel/helper-replace-supers-7.19.1" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; - sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; - }; - }; - "@babel/helper-simple-access-7.18.6" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; - }; - }; - "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { - name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; - packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; - sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; - }; - }; - "@babel/helper-split-export-declaration-7.18.6" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; - sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; - }; - }; - "@babel/helper-string-parser-7.18.10" = { - name = "_at_babel_slash_helper-string-parser"; - packageName = "@babel/helper-string-parser"; - version = "7.18.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; - }; - }; - "@babel/helper-validator-identifier-7.19.1" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - }; - "@babel/helper-validator-option-7.18.6" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; - }; - }; - "@babel/helper-wrap-function-7.19.0" = { - name = "_at_babel_slash_helper-wrap-function"; - packageName = "@babel/helper-wrap-function"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz"; - sha512 = "txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg=="; - }; - }; - "@babel/helpers-7.19.0" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz"; - sha512 = "DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg=="; - }; - }; - "@babel/highlight-7.18.6" = { - name = "_at_babel_slash_highlight"; - packageName = "@babel/highlight"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; - }; - }; - "@babel/parser-7.19.1" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz"; - sha512 = "h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="; - }; - }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { - name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@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=="; - }; - }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" = { - name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"; - sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; - }; - }; - "@babel/plugin-proposal-async-generator-functions-7.19.1" = { - name = "_at_babel_slash_plugin-proposal-async-generator-functions"; - packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz"; - sha512 = "0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q=="; - }; - }; - "@babel/plugin-proposal-class-properties-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-class-properties"; - packageName = "@babel/plugin-proposal-class-properties"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; - sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; - }; - }; - "@babel/plugin-proposal-class-static-block-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-class-static-block"; - packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; - sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; - }; - }; - "@babel/plugin-proposal-decorators-7.19.1" = { - name = "_at_babel_slash_plugin-proposal-decorators"; - packageName = "@babel/plugin-proposal-decorators"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.1.tgz"; - sha512 = "LfIKNBBY7Q1OX5C4xAgRQffOg2OnhAo9fnbcOHgOC9Yytm2Sw+4XqHufRYU86tHomzepxtvuVaNO+3EVKR4ivw=="; - }; - }; - "@babel/plugin-proposal-dynamic-import-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-dynamic-import"; - packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; - sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; - }; - }; - "@babel/plugin-proposal-export-namespace-from-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-export-namespace-from"; - packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; - sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; - }; - }; - "@babel/plugin-proposal-json-strings-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-json-strings"; - packageName = "@babel/plugin-proposal-json-strings"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; - sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; - }; - }; - "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; - packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; - sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; - }; - }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; - packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; - sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; - }; - }; - "@babel/plugin-proposal-numeric-separator-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-numeric-separator"; - packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; - sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; - }; - }; - "@babel/plugin-proposal-object-rest-spread-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-object-rest-spread"; - packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; - sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; - }; - }; - "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; - packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; - sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; - }; - }; - "@babel/plugin-proposal-optional-chaining-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-optional-chaining"; - packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; - sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; - }; - }; - "@babel/plugin-proposal-private-methods-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-private-methods"; - packageName = "@babel/plugin-proposal-private-methods"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; - sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; - }; - }; - "@babel/plugin-proposal-private-property-in-object-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-private-property-in-object"; - packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; - sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; - }; - }; - "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; - packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; - sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; - }; - }; - "@babel/plugin-syntax-async-generators-7.8.4" = { - name = "_at_babel_slash_plugin-syntax-async-generators"; - packageName = "@babel/plugin-syntax-async-generators"; - version = "7.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; - }; - }; - "@babel/plugin-syntax-class-properties-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-class-properties"; - packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; - }; - }; - "@babel/plugin-syntax-class-static-block-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-class-static-block"; - packageName = "@babel/plugin-syntax-class-static-block"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; - sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; - }; - }; - "@babel/plugin-syntax-decorators-7.19.0" = { - name = "_at_babel_slash_plugin-syntax-decorators"; - packageName = "@babel/plugin-syntax-decorators"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz"; - sha512 = "xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ=="; - }; - }; - "@babel/plugin-syntax-dynamic-import-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-dynamic-import"; - packageName = "@babel/plugin-syntax-dynamic-import"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; - sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; - }; - }; - "@babel/plugin-syntax-export-namespace-from-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-export-namespace-from"; - packageName = "@babel/plugin-syntax-export-namespace-from"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; - sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; - }; - }; - "@babel/plugin-syntax-import-assertions-7.18.6" = { - name = "_at_babel_slash_plugin-syntax-import-assertions"; - packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; - sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; - }; - }; - "@babel/plugin-syntax-json-strings-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-json-strings"; - packageName = "@babel/plugin-syntax-json-strings"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; - }; - }; - "@babel/plugin-syntax-jsx-7.18.6" = { - name = "_at_babel_slash_plugin-syntax-jsx"; - packageName = "@babel/plugin-syntax-jsx"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; - sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; - }; - }; - "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; - packageName = "@babel/plugin-syntax-logical-assignment-operators"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; - }; - }; - "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; - packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; - }; - }; - "@babel/plugin-syntax-numeric-separator-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-numeric-separator"; - packageName = "@babel/plugin-syntax-numeric-separator"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; - }; - }; - "@babel/plugin-syntax-object-rest-spread-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-object-rest-spread"; - packageName = "@babel/plugin-syntax-object-rest-spread"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; - }; - }; - "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; - packageName = "@babel/plugin-syntax-optional-catch-binding"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; - }; - }; - "@babel/plugin-syntax-optional-chaining-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-chaining"; - packageName = "@babel/plugin-syntax-optional-chaining"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; - }; - }; - "@babel/plugin-syntax-private-property-in-object-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-private-property-in-object"; - packageName = "@babel/plugin-syntax-private-property-in-object"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; - sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; - }; - }; - "@babel/plugin-syntax-top-level-await-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-top-level-await"; - packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; - sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; - }; - }; - "@babel/plugin-transform-arrow-functions-7.18.6" = { - name = "_at_babel_slash_plugin-transform-arrow-functions"; - packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; - sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; - }; - }; - "@babel/plugin-transform-async-to-generator-7.18.6" = { - name = "_at_babel_slash_plugin-transform-async-to-generator"; - packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; - sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; - }; - }; - "@babel/plugin-transform-block-scoped-functions-7.18.6" = { - name = "_at_babel_slash_plugin-transform-block-scoped-functions"; - packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; - sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; - }; - }; - "@babel/plugin-transform-block-scoping-7.18.9" = { - name = "_at_babel_slash_plugin-transform-block-scoping"; - packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; - sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; - }; - }; - "@babel/plugin-transform-classes-7.19.0" = { - name = "_at_babel_slash_plugin-transform-classes"; - packageName = "@babel/plugin-transform-classes"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz"; - sha512 = "YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A=="; - }; - }; - "@babel/plugin-transform-computed-properties-7.18.9" = { - name = "_at_babel_slash_plugin-transform-computed-properties"; - packageName = "@babel/plugin-transform-computed-properties"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; - sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; - }; - }; - "@babel/plugin-transform-destructuring-7.18.13" = { - name = "_at_babel_slash_plugin-transform-destructuring"; - packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; - sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; - }; - }; - "@babel/plugin-transform-dotall-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-dotall-regex"; - packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; - sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; - }; - }; - "@babel/plugin-transform-duplicate-keys-7.18.9" = { - name = "_at_babel_slash_plugin-transform-duplicate-keys"; - packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; - sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; - }; - }; - "@babel/plugin-transform-exponentiation-operator-7.18.6" = { - name = "_at_babel_slash_plugin-transform-exponentiation-operator"; - packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; - sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; - }; - }; - "@babel/plugin-transform-for-of-7.18.8" = { - name = "_at_babel_slash_plugin-transform-for-of"; - packageName = "@babel/plugin-transform-for-of"; - version = "7.18.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; - sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; - }; - }; - "@babel/plugin-transform-function-name-7.18.9" = { - name = "_at_babel_slash_plugin-transform-function-name"; - packageName = "@babel/plugin-transform-function-name"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; - sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; - }; - }; - "@babel/plugin-transform-literals-7.18.9" = { - name = "_at_babel_slash_plugin-transform-literals"; - packageName = "@babel/plugin-transform-literals"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; - sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; - }; - }; - "@babel/plugin-transform-member-expression-literals-7.18.6" = { - name = "_at_babel_slash_plugin-transform-member-expression-literals"; - packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; - sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; - }; - }; - "@babel/plugin-transform-modules-amd-7.18.6" = { - name = "_at_babel_slash_plugin-transform-modules-amd"; - packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; - sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; - }; - }; - "@babel/plugin-transform-modules-commonjs-7.18.6" = { - name = "_at_babel_slash_plugin-transform-modules-commonjs"; - packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; - sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; - }; - }; - "@babel/plugin-transform-modules-systemjs-7.19.0" = { - name = "_at_babel_slash_plugin-transform-modules-systemjs"; - packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz"; - sha512 = "x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A=="; - }; - }; - "@babel/plugin-transform-modules-umd-7.18.6" = { - name = "_at_babel_slash_plugin-transform-modules-umd"; - packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; - sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; - }; - }; - "@babel/plugin-transform-named-capturing-groups-regex-7.19.1" = { - name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; - packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz"; - sha512 = "oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw=="; - }; - }; - "@babel/plugin-transform-new-target-7.18.6" = { - name = "_at_babel_slash_plugin-transform-new-target"; - packageName = "@babel/plugin-transform-new-target"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; - sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; - }; - }; - "@babel/plugin-transform-object-super-7.18.6" = { - name = "_at_babel_slash_plugin-transform-object-super"; - packageName = "@babel/plugin-transform-object-super"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; - sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; - }; - }; - "@babel/plugin-transform-parameters-7.18.8" = { - name = "_at_babel_slash_plugin-transform-parameters"; - packageName = "@babel/plugin-transform-parameters"; - version = "7.18.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; - }; - }; - "@babel/plugin-transform-property-literals-7.18.6" = { - name = "_at_babel_slash_plugin-transform-property-literals"; - packageName = "@babel/plugin-transform-property-literals"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; - sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; - }; - }; - "@babel/plugin-transform-regenerator-7.18.6" = { - name = "_at_babel_slash_plugin-transform-regenerator"; - packageName = "@babel/plugin-transform-regenerator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; - sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; - }; - }; - "@babel/plugin-transform-reserved-words-7.18.6" = { - name = "_at_babel_slash_plugin-transform-reserved-words"; - packageName = "@babel/plugin-transform-reserved-words"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; - sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; - }; - }; - "@babel/plugin-transform-runtime-7.19.1" = { - name = "_at_babel_slash_plugin-transform-runtime"; - packageName = "@babel/plugin-transform-runtime"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.1.tgz"; - sha512 = "2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA=="; - }; - }; - "@babel/plugin-transform-shorthand-properties-7.18.6" = { - name = "_at_babel_slash_plugin-transform-shorthand-properties"; - packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; - sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; - }; - }; - "@babel/plugin-transform-spread-7.19.0" = { - name = "_at_babel_slash_plugin-transform-spread"; - packageName = "@babel/plugin-transform-spread"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz"; - sha512 = "RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w=="; - }; - }; - "@babel/plugin-transform-sticky-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-sticky-regex"; - packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; - sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; - }; - }; - "@babel/plugin-transform-template-literals-7.18.9" = { - name = "_at_babel_slash_plugin-transform-template-literals"; - packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; - sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; - }; - }; - "@babel/plugin-transform-typeof-symbol-7.18.9" = { - name = "_at_babel_slash_plugin-transform-typeof-symbol"; - packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; - sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; - }; - }; - "@babel/plugin-transform-unicode-escapes-7.18.10" = { - name = "_at_babel_slash_plugin-transform-unicode-escapes"; - packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.18.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; - sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; - }; - }; - "@babel/plugin-transform-unicode-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-unicode-regex"; - packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; - sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; - }; - }; - "@babel/preset-env-7.19.1" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz"; - sha512 = "c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA=="; - }; - }; - "@babel/preset-modules-0.1.5" = { - name = "_at_babel_slash_preset-modules"; - packageName = "@babel/preset-modules"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; - sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; - }; - }; - "@babel/runtime-7.19.0" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz"; - sha512 = "eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA=="; - }; - }; - "@babel/template-7.18.10" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.18.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; - }; - }; - "@babel/traverse-7.19.1" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz"; - sha512 = "0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA=="; - }; - }; - "@babel/types-7.19.0" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz"; - sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; - }; - }; - "@eslint/eslintrc-1.3.2" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz"; - sha512 = "AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ=="; - }; - }; - "@fortawesome/fontawesome-common-types-6.1.2" = { - name = "_at_fortawesome_slash_fontawesome-common-types"; - packageName = "@fortawesome/fontawesome-common-types"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz"; - sha512 = "wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA=="; - }; - }; - "@fortawesome/fontawesome-svg-core-6.1.2" = { - name = "_at_fortawesome_slash_fontawesome-svg-core"; - packageName = "@fortawesome/fontawesome-svg-core"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.2.tgz"; - sha512 = "853G/Htp0BOdXnPoeCPTjFrVwyrJHpe8MhjB/DYE9XjwhnNDfuBCd3aKc2YUYbEfHEcBws4UAA0kA9dymZKGjA=="; - }; - }; - "@fortawesome/free-solid-svg-icons-6.1.2" = { - name = "_at_fortawesome_slash_free-solid-svg-icons"; - packageName = "@fortawesome/free-solid-svg-icons"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.2.tgz"; - sha512 = "lTgZz+cMpzjkHmCwOG3E1ilUZrnINYdqMmrkv30EC3XbRsGlbIOL8H9LaNp5SV4g0pNJDfQ4EdTWWaMvdwyLiQ=="; - }; - }; - "@fortawesome/vue-fontawesome-3.0.1" = { - name = "_at_fortawesome_slash_vue-fontawesome"; - packageName = "@fortawesome/vue-fontawesome"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.1.tgz"; - sha512 = "CdXZJoCS+aEPec26ZP7hWWU3SaJlQPZSCGdgpQ2qGl2HUmtUUNrI3zC4XWdn1JUmh3t5OuDeRG1qB4eGRNSD4A=="; - }; - }; - "@hapi/hoek-9.3.0" = { - name = "_at_hapi_slash_hoek"; - packageName = "@hapi/hoek"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz"; - sha512 = "/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="; - }; - }; - "@hapi/topo-5.1.0" = { - name = "_at_hapi_slash_topo"; - packageName = "@hapi/topo"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz"; - sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; - }; - }; - "@humanwhocodes/config-array-0.9.5" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; - sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; - }; - }; - "@humanwhocodes/object-schema-1.2.1" = { - name = "_at_humanwhocodes_slash_object-schema"; - packageName = "@humanwhocodes/object-schema"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - }; - "@intlify/core-base-9.1.10" = { - name = "_at_intlify_slash_core-base"; - packageName = "@intlify/core-base"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.10.tgz"; - sha512 = "So9CNUavB/IsZ+zBmk2Cv6McQp6vc2wbGi1S0XQmJ8Vz+UFcNn9MFXAe9gY67PreIHrbLsLxDD0cwo1qsxM1Nw=="; - }; - }; - "@intlify/devtools-if-9.1.10" = { - name = "_at_intlify_slash_devtools-if"; - packageName = "@intlify/devtools-if"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.10.tgz"; - sha512 = "SHaKoYu6sog3+Q8js1y3oXLywuogbH1sKuc7NSYkN3GElvXSBaMoCzW+we0ZSFqj/6c7vTNLg9nQ6rxhKqYwnQ=="; - }; - }; - "@intlify/message-compiler-9.1.10" = { - name = "_at_intlify_slash_message-compiler"; - packageName = "@intlify/message-compiler"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.10.tgz"; - sha512 = "+JiJpXff/XTb0EadYwdxOyRTB0hXNd4n1HaJ/a4yuV960uRmPXaklJsedW0LNdcptd/hYUZtCkI7Lc9J5C1gxg=="; - }; - }; - "@intlify/message-resolver-9.1.10" = { - name = "_at_intlify_slash_message-resolver"; - packageName = "@intlify/message-resolver"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.10.tgz"; - sha512 = "5YixMG/M05m0cn9+gOzd4EZQTFRUu8RGhzxJbR1DWN21x/Z3bJ8QpDYj6hC4FwBj5uKsRfKpJQ3Xqg98KWoA+w=="; - }; - }; - "@intlify/runtime-9.1.10" = { - name = "_at_intlify_slash_runtime"; - packageName = "@intlify/runtime"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.10.tgz"; - sha512 = "7QsuByNzpe3Gfmhwq6hzgXcMPpxz8Zxb/XFI6s9lQdPLPe5Lgw4U1ovRPZTOs6Y2hwitR3j/HD8BJNGWpJnOFA=="; - }; - }; - "@intlify/shared-9.1.10" = { - name = "_at_intlify_slash_shared"; - packageName = "@intlify/shared"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.10.tgz"; - sha512 = "Om54xJeo1Vw+K1+wHYyXngE8cAbrxZHpWjYzMR9wCkqbhGtRV5VLhVc214Ze2YatPrWlS2WSMOWXR8JktX/IgA=="; - }; - }; - "@intlify/vue-devtools-9.1.10" = { - name = "_at_intlify_slash_vue-devtools"; - packageName = "@intlify/vue-devtools"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.10.tgz"; - sha512 = "5l3qYARVbkWAkagLu1XbDUWRJSL8br1Dj60wgMaKB0+HswVsrR6LloYZTg7ozyvM621V6+zsmwzbQxbVQyrytQ=="; - }; - }; - "@jridgewell/gen-mapping-0.1.1" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; - sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; - }; - }; - "@jridgewell/gen-mapping-0.3.2" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; - sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; - }; - }; - "@jridgewell/resolve-uri-3.1.0" = { - name = "_at_jridgewell_slash_resolve-uri"; - packageName = "@jridgewell/resolve-uri"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; - }; - }; - "@jridgewell/set-array-1.1.2" = { - name = "_at_jridgewell_slash_set-array"; - packageName = "@jridgewell/set-array"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; - }; - }; - "@jridgewell/source-map-0.3.2" = { - name = "_at_jridgewell_slash_source-map"; - packageName = "@jridgewell/source-map"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz"; - sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.14" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; - }; - }; - "@jridgewell/trace-mapping-0.3.15" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.3.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz"; - sha512 = "oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g=="; - }; - }; - "@leichtgewicht/ip-codec-2.0.4" = { - name = "_at_leichtgewicht_slash_ip-codec"; - packageName = "@leichtgewicht/ip-codec"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"; - sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; - }; - }; - "@node-ipc/js-queue-2.0.3" = { - name = "_at_node-ipc_slash_js-queue"; - packageName = "@node-ipc/js-queue"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz"; - sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; - }; - }; - "@nodelib/fs.scandir-2.1.5" = { - name = "_at_nodelib_slash_fs.scandir"; - packageName = "@nodelib/fs.scandir"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - }; - "@nodelib/fs.stat-2.0.5" = { - name = "_at_nodelib_slash_fs.stat"; - packageName = "@nodelib/fs.stat"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - }; - "@nodelib/fs.walk-1.2.8" = { - name = "_at_nodelib_slash_fs.walk"; - packageName = "@nodelib/fs.walk"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; - }; - }; - "@polka/url-1.0.0-next.21" = { - name = "_at_polka_slash_url"; - packageName = "@polka/url"; - version = "1.0.0-next.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz"; - sha512 = "a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="; - }; - }; - "@sideway/address-4.1.4" = { - name = "_at_sideway_slash_address"; - packageName = "@sideway/address"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz"; - sha512 = "7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw=="; - }; - }; - "@sideway/formula-3.0.0" = { - name = "_at_sideway_slash_formula"; - packageName = "@sideway/formula"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz"; - sha512 = "vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg=="; - }; - }; - "@sideway/pinpoint-2.0.0" = { - name = "_at_sideway_slash_pinpoint"; - packageName = "@sideway/pinpoint"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz"; - sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="; - }; - }; - "@soda/friendly-errors-webpack-plugin-1.8.1" = { - name = "_at_soda_slash_friendly-errors-webpack-plugin"; - packageName = "@soda/friendly-errors-webpack-plugin"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"; - sha512 = "h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="; - }; - }; - "@soda/get-current-script-1.0.2" = { - name = "_at_soda_slash_get-current-script"; - packageName = "@soda/get-current-script"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; - sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; - }; - }; - "@trysound/sax-0.2.0" = { - name = "_at_trysound_slash_sax"; - packageName = "@trysound/sax"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"; - sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; - }; - }; - "@types/body-parser-1.19.2" = { - name = "_at_types_slash_body-parser"; - packageName = "@types/body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; - }; - }; - "@types/bonjour-3.5.10" = { - name = "_at_types_slash_bonjour"; - packageName = "@types/bonjour"; - version = "3.5.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz"; - sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; - }; - }; - "@types/connect-3.4.35" = { - name = "_at_types_slash_connect"; - packageName = "@types/connect"; - version = "3.4.35"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; - sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; - }; - }; - "@types/connect-history-api-fallback-1.3.5" = { - name = "_at_types_slash_connect-history-api-fallback"; - packageName = "@types/connect-history-api-fallback"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"; - sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; - }; - }; - "@types/eslint-8.4.6" = { - name = "_at_types_slash_eslint"; - packageName = "@types/eslint"; - version = "8.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz"; - sha512 = "/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g=="; - }; - }; - "@types/eslint-scope-3.7.4" = { - name = "_at_types_slash_eslint-scope"; - packageName = "@types/eslint-scope"; - version = "3.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; - sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; - }; - }; - "@types/estree-0.0.51" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.51"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"; - sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; - }; - }; - "@types/express-4.17.14" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; - }; - }; - "@types/express-serve-static-core-4.17.31" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; - }; - }; - "@types/hammerjs-2.0.41" = { - name = "_at_types_slash_hammerjs"; - packageName = "@types/hammerjs"; - version = "2.0.41"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz"; - sha512 = "ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA=="; - }; - }; - "@types/html-minifier-terser-6.1.0" = { - name = "_at_types_slash_html-minifier-terser"; - packageName = "@types/html-minifier-terser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; - }; - }; - "@types/http-proxy-1.17.9" = { - name = "_at_types_slash_http-proxy"; - packageName = "@types/http-proxy"; - version = "1.17.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"; - sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; - }; - }; - "@types/json-schema-7.0.11" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; - sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; - }; - }; - "@types/json5-0.0.29" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - }; - "@types/marked-4.0.6" = { - name = "_at_types_slash_marked"; - packageName = "@types/marked"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/marked/-/marked-4.0.6.tgz"; - sha512 = "ITAVUzsnVbhy5afxhs4PPPbrv2hKVEDH5BhhaQNQlVG0UNu+9A18XSdYr53nBdHZ0ADEQLl+ciOjXbs7eHdiQQ=="; - }; - }; - "@types/mime-3.0.1" = { - name = "_at_types_slash_mime"; - packageName = "@types/mime"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"; - sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; - }; - }; - "@types/minimist-1.2.2" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; - sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; - }; - }; - "@types/node-18.7.18" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.7.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz"; - sha512 = "m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="; - }; - }; - "@types/normalize-package-data-2.4.1" = { - name = "_at_types_slash_normalize-package-data"; - packageName = "@types/normalize-package-data"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; - sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; - }; - }; - "@types/parse-json-4.0.0" = { - name = "_at_types_slash_parse-json"; - packageName = "@types/parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - }; - "@types/qs-6.9.7" = { - name = "_at_types_slash_qs"; - packageName = "@types/qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; - sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; - }; - }; - "@types/range-parser-1.2.4" = { - name = "_at_types_slash_range-parser"; - packageName = "@types/range-parser"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; - }; - }; - "@types/retry-0.12.0" = { - name = "_at_types_slash_retry"; - packageName = "@types/retry"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"; - sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; - }; - }; - "@types/serve-index-1.9.1" = { - name = "_at_types_slash_serve-index"; - packageName = "@types/serve-index"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; - }; - }; - "@types/serve-static-1.15.0" = { - name = "_at_types_slash_serve-static"; - packageName = "@types/serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; - }; - }; - "@types/sockjs-0.3.33" = { - name = "_at_types_slash_sockjs"; - packageName = "@types/sockjs"; - version = "0.3.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz"; - sha512 = "f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw=="; - }; - }; - "@types/web-bluetooth-0.0.15" = { - name = "_at_types_slash_web-bluetooth"; - packageName = "@types/web-bluetooth"; - version = "0.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.15.tgz"; - sha512 = "w7hEHXnPMEZ+4nGKl/KDRVpxkwYxYExuHOYXyzIzCDzEZ9ZCGMAewulr9IqJu2LR4N37fcnb1XVeuZ09qgOxhA=="; - }; - }; - "@types/webpack-env-1.18.0" = { - name = "_at_types_slash_webpack-env"; - packageName = "@types/webpack-env"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.0.tgz"; - sha512 = "56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg=="; - }; - }; - "@types/ws-8.5.3" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; - }; - }; - "@typescript-eslint/eslint-plugin-5.31.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.31.0.tgz"; - sha512 = "VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ=="; - }; - }; - "@typescript-eslint/parser-5.31.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz"; - sha512 = "UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw=="; - }; - }; - "@typescript-eslint/scope-manager-5.31.0" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz"; - sha512 = "8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg=="; - }; - }; - "@typescript-eslint/type-utils-5.31.0" = { - name = "_at_typescript-eslint_slash_type-utils"; - packageName = "@typescript-eslint/type-utils"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.31.0.tgz"; - sha512 = "7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w=="; - }; - }; - "@typescript-eslint/types-5.31.0" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz"; - sha512 = "/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g=="; - }; - }; - "@typescript-eslint/typescript-estree-5.31.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz"; - sha512 = "3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw=="; - }; - }; - "@typescript-eslint/utils-5.31.0" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.31.0.tgz"; - sha512 = "kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg=="; - }; - }; - "@typescript-eslint/visitor-keys-5.31.0" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.31.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz"; - sha512 = "ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg=="; - }; - }; - "@vue/babel-helper-vue-jsx-merge-props-1.4.0" = { - name = "_at_vue_slash_babel-helper-vue-jsx-merge-props"; - packageName = "@vue/babel-helper-vue-jsx-merge-props"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz"; - sha512 = "JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA=="; - }; - }; - "@vue/babel-helper-vue-transform-on-1.0.2" = { - name = "_at_vue_slash_babel-helper-vue-transform-on"; - packageName = "@vue/babel-helper-vue-transform-on"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz"; - sha512 = "hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA=="; - }; - }; - "@vue/babel-plugin-jsx-1.1.1" = { - name = "_at_vue_slash_babel-plugin-jsx"; - packageName = "@vue/babel-plugin-jsx"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz"; - sha512 = "j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w=="; - }; - }; - "@vue/babel-plugin-transform-vue-jsx-1.4.0" = { - name = "_at_vue_slash_babel-plugin-transform-vue-jsx"; - packageName = "@vue/babel-plugin-transform-vue-jsx"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz"; - sha512 = "Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA=="; - }; - }; - "@vue/babel-preset-app-5.0.8" = { - name = "_at_vue_slash_babel-preset-app"; - packageName = "@vue/babel-preset-app"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz"; - sha512 = "yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg=="; - }; - }; - "@vue/babel-preset-jsx-1.4.0" = { - name = "_at_vue_slash_babel-preset-jsx"; - packageName = "@vue/babel-preset-jsx"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz"; - sha512 = "QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA=="; - }; - }; - "@vue/babel-sugar-composition-api-inject-h-1.4.0" = { - name = "_at_vue_slash_babel-sugar-composition-api-inject-h"; - packageName = "@vue/babel-sugar-composition-api-inject-h"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz"; - sha512 = "VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g=="; - }; - }; - "@vue/babel-sugar-composition-api-render-instance-1.4.0" = { - name = "_at_vue_slash_babel-sugar-composition-api-render-instance"; - packageName = "@vue/babel-sugar-composition-api-render-instance"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz"; - sha512 = "6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q=="; - }; - }; - "@vue/babel-sugar-functional-vue-1.4.0" = { - name = "_at_vue_slash_babel-sugar-functional-vue"; - packageName = "@vue/babel-sugar-functional-vue"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz"; - sha512 = "lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw=="; - }; - }; - "@vue/babel-sugar-inject-h-1.4.0" = { - name = "_at_vue_slash_babel-sugar-inject-h"; - packageName = "@vue/babel-sugar-inject-h"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz"; - sha512 = "muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA=="; - }; - }; - "@vue/babel-sugar-v-model-1.4.0" = { - name = "_at_vue_slash_babel-sugar-v-model"; - packageName = "@vue/babel-sugar-v-model"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz"; - sha512 = "0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ=="; - }; - }; - "@vue/babel-sugar-v-on-1.4.0" = { - name = "_at_vue_slash_babel-sugar-v-on"; - packageName = "@vue/babel-sugar-v-on"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz"; - sha512 = "m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA=="; - }; - }; - "@vue/cli-overlay-5.0.8" = { - name = "_at_vue_slash_cli-overlay"; - packageName = "@vue/cli-overlay"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz"; - sha512 = "KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ=="; - }; - }; - "@vue/cli-plugin-babel-5.0.8" = { - name = "_at_vue_slash_cli-plugin-babel"; - packageName = "@vue/cli-plugin-babel"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz"; - sha512 = "a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ=="; - }; - }; - "@vue/cli-plugin-eslint-5.0.8" = { - name = "_at_vue_slash_cli-plugin-eslint"; - packageName = "@vue/cli-plugin-eslint"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz"; - sha512 = "d11+I5ONYaAPW1KyZj9GlrV/E6HZePq5L5eAF5GgoVdu6sxr6bDgEoxzhcS1Pk2eh8rn1MxG/FyyR+eCBj/CNg=="; - }; - }; - "@vue/cli-plugin-router-5.0.8" = { - name = "_at_vue_slash_cli-plugin-router"; - packageName = "@vue/cli-plugin-router"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz"; - sha512 = "Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg=="; - }; - }; - "@vue/cli-plugin-typescript-5.0.8" = { - name = "_at_vue_slash_cli-plugin-typescript"; - packageName = "@vue/cli-plugin-typescript"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.8.tgz"; - sha512 = "JKJOwzJshBqsmp4yLBexwVMebOZ4VGJgbnYvmHVxasJOStF2RxwyW28ZF+zIvASGdat4sAUuo/3mAQyVhm7JHg=="; - }; - }; - "@vue/cli-plugin-vuex-5.0.8" = { - name = "_at_vue_slash_cli-plugin-vuex"; - packageName = "@vue/cli-plugin-vuex"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz"; - sha512 = "HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA=="; - }; - }; - "@vue/cli-service-5.0.8" = { - name = "_at_vue_slash_cli-service"; - packageName = "@vue/cli-service"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz"; - sha512 = "nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw=="; - }; - }; - "@vue/cli-shared-utils-5.0.8" = { - name = "_at_vue_slash_cli-shared-utils"; - packageName = "@vue/cli-shared-utils"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz"; - sha512 = "uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ=="; - }; - }; - "@vue/compiler-core-3.2.37" = { - name = "_at_vue_slash_compiler-core"; - packageName = "@vue/compiler-core"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz"; - sha512 = "81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg=="; - }; - }; - "@vue/compiler-dom-3.2.37" = { - name = "_at_vue_slash_compiler-dom"; - packageName = "@vue/compiler-dom"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz"; - sha512 = "yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ=="; - }; - }; - "@vue/compiler-sfc-3.2.37" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz"; - sha512 = "+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg=="; - }; - }; - "@vue/compiler-ssr-3.2.37" = { - name = "_at_vue_slash_compiler-ssr"; - packageName = "@vue/compiler-ssr"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz"; - sha512 = "7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw=="; - }; - }; - "@vue/component-compiler-utils-3.3.0" = { - name = "_at_vue_slash_component-compiler-utils"; - packageName = "@vue/component-compiler-utils"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"; - sha512 = "97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="; - }; - }; - "@vue/devtools-api-6.2.1" = { - name = "_at_vue_slash_devtools-api"; - packageName = "@vue/devtools-api"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz"; - sha512 = "OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="; - }; - }; - "@vue/eslint-config-standard-8.0.0" = { - name = "_at_vue_slash_eslint-config-standard"; - packageName = "@vue/eslint-config-standard"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/eslint-config-standard/-/eslint-config-standard-8.0.0.tgz"; - sha512 = "ikvNsEOz/43XF+oCibAKHSHVkKQBycJ+sVFsO4PTknttCyjclrBSOIUB/0pu/40Wq8zjFf4v/t+26TG551Z53w=="; - }; - }; - "@vue/eslint-config-typescript-11.0.0" = { - name = "_at_vue_slash_eslint-config-typescript"; - packageName = "@vue/eslint-config-typescript"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.0.tgz"; - sha512 = "txuRzxnQVmtUvvy9UyWUy9sHWXNeRPGmSPqP53hRtaiUeCTAondI9Ho9GQYI/8/eWljYOST7iA4Aa8sANBkWaA=="; - }; - }; - "@vue/reactivity-3.2.37" = { - name = "_at_vue_slash_reactivity"; - packageName = "@vue/reactivity"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz"; - sha512 = "/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A=="; - }; - }; - "@vue/reactivity-transform-3.2.37" = { - name = "_at_vue_slash_reactivity-transform"; - packageName = "@vue/reactivity-transform"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz"; - sha512 = "IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg=="; - }; - }; - "@vue/runtime-core-3.2.37" = { - name = "_at_vue_slash_runtime-core"; - packageName = "@vue/runtime-core"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz"; - sha512 = "JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ=="; - }; - }; - "@vue/runtime-dom-3.2.37" = { - name = "_at_vue_slash_runtime-dom"; - packageName = "@vue/runtime-dom"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz"; - sha512 = "HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw=="; - }; - }; - "@vue/server-renderer-3.2.37" = { - name = "_at_vue_slash_server-renderer"; - packageName = "@vue/server-renderer"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz"; - sha512 = "kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA=="; - }; - }; - "@vue/shared-3.2.37" = { - name = "_at_vue_slash_shared"; - packageName = "@vue/shared"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz"; - sha512 = "4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="; - }; - }; - "@vue/vue-loader-v15-15.10.0" = { - name = "_at_vue_slash_vue-loader-v15"; - packageName = "@vue/vue-loader-v15"; - version = "15.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; - sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; - }; - }; - "@vue/web-component-wrapper-1.3.0" = { - name = "_at_vue_slash_web-component-wrapper"; - packageName = "@vue/web-component-wrapper"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"; - sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; - }; - }; - "@vueuse/core-9.1.1" = { - name = "_at_vueuse_slash_core"; - packageName = "@vueuse/core"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/core/-/core-9.1.1.tgz"; - sha512 = "QfuaNWRDMQcCUwXylCyYhPC3ScS9Tiiz4J0chdwr3vOemBwRToSywq8MP+ZegKYFnbETzRY8G/5zC+ca30wrRQ=="; - }; - }; - "@vueuse/metadata-9.1.1" = { - name = "_at_vueuse_slash_metadata"; - packageName = "@vueuse/metadata"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.1.1.tgz"; - sha512 = "XZ2KtSW+85LLHB/IdGILPAtbIVHasPsAW7aqz3BRMzJdAQWRiM/FGa1OKBwLbXtUw/AmjKYFlZJo7eOFIBXRog=="; - }; - }; - "@vueuse/shared-9.1.1" = { - name = "_at_vueuse_slash_shared"; - packageName = "@vueuse/shared"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/shared/-/shared-9.1.1.tgz"; - sha512 = "c+IfcOYmHiHqoEa3ED1Tbpue5GHmoUmTp8PtO4YbczthtY155Rt6DmWhjxMLXBF1Bcidagxljmp/7xtAzEHXLw=="; - }; - }; - "@webassemblyjs/ast-1.11.1" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"; - sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; - }; - }; - "@webassemblyjs/floating-point-hex-parser-1.11.1" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; - sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; - }; - }; - "@webassemblyjs/helper-api-error-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; - sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; - }; - }; - "@webassemblyjs/helper-buffer-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; - sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="; - }; - }; - "@webassemblyjs/helper-numbers-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-numbers"; - packageName = "@webassemblyjs/helper-numbers"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; - sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; - }; - }; - "@webassemblyjs/helper-wasm-bytecode-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; - sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; - }; - }; - "@webassemblyjs/helper-wasm-section-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; - sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg=="; - }; - }; - "@webassemblyjs/ieee754-1.11.1" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; - sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; - }; - }; - "@webassemblyjs/leb128-1.11.1" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; - sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; - }; - }; - "@webassemblyjs/utf8-1.11.1" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; - sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; - }; - }; - "@webassemblyjs/wasm-edit-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; - sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA=="; - }; - }; - "@webassemblyjs/wasm-gen-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; - sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA=="; - }; - }; - "@webassemblyjs/wasm-opt-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; - sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw=="; - }; - }; - "@webassemblyjs/wasm-parser-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; - sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; - }; - }; - "@webassemblyjs/wast-printer-1.11.1" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; - sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; - }; - }; - "@xtuc/ieee754-1.2.0" = { - name = "_at_xtuc_slash_ieee754"; - packageName = "@xtuc/ieee754"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - }; - "@xtuc/long-4.2.2" = { - name = "_at_xtuc_slash_long"; - packageName = "@xtuc/long"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - }; - "accepts-1.3.8" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - }; - "acorn-8.8.0" = { - name = "acorn"; - packageName = "acorn"; - version = "8.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; - sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; - }; - }; - "acorn-import-assertions-1.8.0" = { - name = "acorn-import-assertions"; - packageName = "acorn-import-assertions"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"; - sha512 = "m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="; - }; - }; - "acorn-jsx-5.3.2" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - }; - "acorn-walk-8.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; - sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; - }; - }; - "address-1.2.1" = { - name = "address"; - packageName = "address"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.2.1.tgz"; - sha512 = "B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA=="; - }; - }; - "ajv-6.12.6" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - }; - "ajv-8.11.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"; - sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; - }; - }; - "ajv-formats-2.1.1" = { - name = "ajv-formats"; - packageName = "ajv-formats"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"; - sha512 = "Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="; - }; - }; - "ajv-keywords-3.5.2" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; - }; - }; - "ajv-keywords-5.1.0" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"; - sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; - }; - }; - "ansi-escapes-3.2.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; - }; - }; - "ansi-html-community-0.0.8" = { - name = "ansi-html-community"; - packageName = "ansi-html-community"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"; - sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; - }; - }; - "ansi-regex-3.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"; - sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - }; - "ansi-styles-4.3.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; - }; - }; - "anymatch-3.1.2" = { - name = "anymatch"; - packageName = "anymatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; - }; - }; - "arch-2.2.0" = { - name = "arch"; - packageName = "arch"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"; - sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; - }; - }; - "argparse-1.0.10" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - }; - "argparse-2.0.1" = { - name = "argparse"; - packageName = "argparse"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; - "array-flatten-2.1.2" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; - sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; - }; - }; - "array-includes-3.1.5" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz"; - sha512 = "iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ=="; - }; - }; - "array-union-2.1.0" = { - name = "array-union"; - packageName = "array-union"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - }; - "array.prototype.flat-1.3.0" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz"; - sha512 = "12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw=="; - }; - }; - "async-2.6.4" = { - name = "async"; - packageName = "async"; - version = "2.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; - sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; - }; - }; - "at-least-node-1.0.0" = { - name = "at-least-node"; - packageName = "at-least-node"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - }; - "autoprefixer-10.4.11" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "10.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.11.tgz"; - sha512 = "5lHp6DgRodxlBLSkzHOTcufWFflH1ewfy2hvFQyjrblBFlP/0Yh4O/Wrg4ow8WRlN3AAUFFLAQwX8hTptzqVHg=="; - }; - }; - "babel-loader-8.2.5" = { - name = "babel-loader"; - packageName = "babel-loader"; - version = "8.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz"; - sha512 = "OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ=="; - }; - }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; - }; - }; - "babel-plugin-polyfill-corejs2-0.3.3" = { - name = "babel-plugin-polyfill-corejs2"; - packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz"; - sha512 = "8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q=="; - }; - }; - "babel-plugin-polyfill-corejs3-0.6.0" = { - name = "babel-plugin-polyfill-corejs3"; - packageName = "babel-plugin-polyfill-corejs3"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz"; - sha512 = "+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA=="; - }; - }; - "babel-plugin-polyfill-regenerator-0.4.1" = { - name = "babel-plugin-polyfill-regenerator"; - packageName = "babel-plugin-polyfill-regenerator"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz"; - sha512 = "NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "batch-0.6.1" = { - name = "batch"; - packageName = "batch"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; - sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; - }; - }; - "big.js-5.2.2" = { - name = "big.js"; - packageName = "big.js"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; - }; - }; - "binary-extensions-2.2.0" = { - name = "binary-extensions"; - packageName = "binary-extensions"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; - }; - }; - "bl-4.1.0" = { - name = "bl"; - packageName = "bl"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - }; - "bluebird-3.7.2" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - }; - "body-parser-1.20.0" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; - sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; - }; - }; - "bonjour-service-1.0.14" = { - name = "bonjour-service"; - packageName = "bonjour-service"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz"; - sha512 = "HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ=="; - }; - }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "braces-3.0.2" = { - name = "braces"; - packageName = "braces"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - }; - "browserslist-4.21.4" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; - }; - }; - "buffer-5.7.1" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - }; - "buffer-from-1.1.2" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - }; - "builtins-5.0.1" = { - name = "builtins"; - packageName = "builtins"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz"; - sha512 = "qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ=="; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - }; - "bytes-3.1.2" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; - }; - }; - "call-bind-1.0.2" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - }; - "callsites-3.1.0" = { - name = "callsites"; - packageName = "callsites"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - }; - "camel-case-4.1.2" = { - name = "camel-case"; - packageName = "camel-case"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"; - sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; - }; - }; - "camelcase-5.3.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - }; - "camelcase-6.3.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - }; - "caniuse-api-3.0.0" = { - name = "caniuse-api"; - packageName = "caniuse-api"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; - }; - }; - "caniuse-lite-1.0.30001402" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001402"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001402.tgz"; - sha512 = "Mx4MlhXO5NwuvXGgVb+hg65HZ+bhUYsz8QtDGDo2QmaJS2GBX47Xfi2koL86lc8K+l+htXeTEB/Aeqvezoo6Ew=="; - }; - }; - "case-sensitive-paths-webpack-plugin-2.4.0" = { - name = "case-sensitive-paths-webpack-plugin"; - packageName = "case-sensitive-paths-webpack-plugin"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"; - sha512 = "roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="; - }; - }; - "chalk-2.4.2" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - }; - "chalk-3.0.0" = { - name = "chalk"; - packageName = "chalk"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "chokidar-3.5.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; - sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; - }; - }; - "chrome-trace-event-1.0.3" = { - name = "chrome-trace-event"; - packageName = "chrome-trace-event"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; - }; - }; - "ci-info-1.6.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz"; - sha512 = "vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="; - }; - }; - "clean-css-5.3.1" = { - name = "clean-css"; - packageName = "clean-css"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz"; - sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha512 = "8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="; - }; - }; - "cli-cursor-3.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - }; - "cli-highlight-2.1.11" = { - name = "cli-highlight"; - packageName = "cli-highlight"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; - sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; - }; - }; - "cli-spinners-2.7.0" = { - name = "cli-spinners"; - packageName = "cli-spinners"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz"; - sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; - }; - }; - "clipboardy-2.3.0" = { - name = "clipboardy"; - packageName = "clipboardy"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz"; - sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; - }; - }; - "cliui-7.0.4" = { - name = "cliui"; - packageName = "cliui"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; - }; - }; - "clone-1.0.4" = { - name = "clone"; - packageName = "clone"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; - sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; - }; - }; - "clone-deep-4.0.1" = { - name = "clone-deep"; - packageName = "clone-deep"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"; - sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - }; - "color-convert-2.0.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - }; - "colord-2.9.3" = { - name = "colord"; - packageName = "colord"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"; - sha512 = "jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="; - }; - }; - "colorette-2.0.19" = { - name = "colorette"; - packageName = "colorette"; - version = "2.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"; - sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; - }; - }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; - "commander-8.3.0" = { - name = "commander"; - packageName = "commander"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - }; - "commondir-1.0.1" = { - name = "commondir"; - packageName = "commondir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; - sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; - }; - }; - "compressible-2.0.18" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - }; - "compression-1.7.4" = { - name = "compression"; - packageName = "compression"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "connect-history-api-fallback-2.0.0" = { - name = "connect-history-api-fallback"; - packageName = "connect-history-api-fallback"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"; - sha512 = "U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="; - }; - }; - "consolidate-0.15.1" = { - name = "consolidate"; - packageName = "consolidate"; - version = "0.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; - sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; - }; - }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; - "content-type-1.0.4" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; - }; - }; - "convert-source-map-1.8.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; - }; - }; - "cookie-0.5.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; - "copy-webpack-plugin-9.1.0" = { - name = "copy-webpack-plugin"; - packageName = "copy-webpack-plugin"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz"; - sha512 = "rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA=="; - }; - }; - "core-js-3.25.0" = { - name = "core-js"; - packageName = "core-js"; - version = "3.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz"; - sha512 = "CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA=="; - }; - }; - "core-js-compat-3.25.1" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.25.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.1.tgz"; - sha512 = "pOHS7O0i8Qt4zlPW/eIFjwp+NrTPx+wTL0ctgI2fHn31sZOq89rDsmtc/A2vAX7r6shl+bmVI+678He46jgBlw=="; - }; - }; - "core-util-is-1.0.3" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - }; - "cosmiconfig-6.0.0" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; - sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; - }; - }; - "cosmiconfig-7.0.1" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; - }; - }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A=="; - }; - }; - "cross-spawn-6.0.5" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "6.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "css-declaration-sorter-6.3.1" = { - name = "css-declaration-sorter"; - packageName = "css-declaration-sorter"; - version = "6.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz"; - sha512 = "fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w=="; - }; - }; - "css-loader-6.7.1" = { - name = "css-loader"; - packageName = "css-loader"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz"; - sha512 = "yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw=="; - }; - }; - "css-minimizer-webpack-plugin-3.4.1" = { - name = "css-minimizer-webpack-plugin"; - packageName = "css-minimizer-webpack-plugin"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; - sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; - }; - }; - "css-select-4.3.0" = { - name = "css-select"; - packageName = "css-select"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"; - sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; - }; - }; - "css-tree-1.1.3" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"; - sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; - }; - }; - "css-what-6.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"; - sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; - }; - }; - "cssesc-3.0.0" = { - name = "cssesc"; - packageName = "cssesc"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; - }; - }; - "cssnano-5.1.13" = { - name = "cssnano"; - packageName = "cssnano"; - version = "5.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz"; - sha512 = "S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ=="; - }; - }; - "cssnano-preset-default-5.2.12" = { - name = "cssnano-preset-default"; - packageName = "cssnano-preset-default"; - version = "5.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz"; - sha512 = "OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew=="; - }; - }; - "cssnano-utils-3.1.0" = { - name = "cssnano-utils"; - packageName = "cssnano-utils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; - sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; - }; - }; - "csso-4.2.0" = { - name = "csso"; - packageName = "csso"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; - sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; - }; - }; - "csstype-2.6.21" = { - name = "csstype"; - packageName = "csstype"; - version = "2.6.21"; - src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz"; - sha512 = "Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "deep-is-0.1.4" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - }; - "deepmerge-1.5.2" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; - sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; - }; - }; - "deepmerge-4.2.2" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; - }; - }; - "default-gateway-6.0.3" = { - name = "default-gateway"; - packageName = "default-gateway"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"; - sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; - }; - }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha512 = "s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA=="; - }; - }; - "define-lazy-prop-2.0.0" = { - name = "define-lazy-prop"; - packageName = "define-lazy-prop"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; - sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; - }; - }; - "define-properties-1.1.4" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - }; - "depd-2.0.0" = { - name = "depd"; - packageName = "depd"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; - }; - }; - "destroy-1.2.0" = { - name = "destroy"; - packageName = "destroy"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; - sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; - }; - }; - "detect-node-2.1.0" = { - name = "detect-node"; - packageName = "detect-node"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"; - sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; - }; - }; - "dir-glob-3.0.1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - }; - "dns-equal-1.0.0" = { - name = "dns-equal"; - packageName = "dns-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; - sha512 = "z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="; - }; - }; - "dns-packet-5.4.0" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz"; - sha512 = "EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g=="; - }; - }; - "doctrine-2.1.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - }; - "doctrine-3.0.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - }; - "dom-converter-0.2.0" = { - name = "dom-converter"; - packageName = "dom-converter"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; - sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; - }; - }; - "dom-serializer-1.4.1" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; - sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; - }; - }; - "domelementtype-2.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; - sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; - }; - }; - "domhandler-4.3.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; - sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; - }; - }; - "domutils-2.8.0" = { - name = "domutils"; - packageName = "domutils"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; - sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; - }; - }; - "dot-case-3.0.4" = { - name = "dot-case"; - packageName = "dot-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - }; - "dotenv-10.0.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"; - sha512 = "rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="; - }; - }; - "dotenv-expand-5.1.0" = { - name = "dotenv-expand"; - packageName = "dotenv-expand"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; - }; - }; - "duplexer-0.1.2" = { - name = "duplexer"; - packageName = "duplexer"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; - sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; - }; - }; - "easy-stack-1.0.1" = { - name = "easy-stack"; - packageName = "easy-stack"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz"; - sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - }; - "electron-to-chromium-1.4.254" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.254"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz"; - sha512 = "Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q=="; - }; - }; - "emoji-regex-8.0.0" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - }; - "emojis-list-3.0.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "enhanced-resolve-5.10.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "5.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz"; - sha512 = "T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ=="; - }; - }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; - }; - }; - "error-ex-1.3.2" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - }; - "error-stack-parser-2.1.4" = { - name = "error-stack-parser"; - packageName = "error-stack-parser"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"; - sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; - }; - }; - "es-abstract-1.20.2" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz"; - sha512 = "XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ=="; - }; - }; - "es-module-lexer-0.9.3" = { - name = "es-module-lexer"; - packageName = "es-module-lexer"; - version = "0.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"; - sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; - }; - }; - "es-shim-unscopables-1.0.0" = { - name = "es-shim-unscopables"; - packageName = "es-shim-unscopables"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - }; - "escape-string-regexp-4.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - }; - "eslint-8.20.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz"; - sha512 = "d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA=="; - }; - }; - "eslint-config-standard-17.0.0" = { - name = "eslint-config-standard"; - packageName = "eslint-config-standard"; - version = "17.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz"; - sha512 = "/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg=="; - }; - }; - "eslint-import-resolver-custom-alias-1.3.0" = { - name = "eslint-import-resolver-custom-alias"; - packageName = "eslint-import-resolver-custom-alias"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-custom-alias/-/eslint-import-resolver-custom-alias-1.3.0.tgz"; - sha512 = "9rrpduF6/SZHFXrJgjeA+edJek6xulplYfo/UJvLPrY38O9UY00rAq76dHRnZ289yftc5NIfx3THi0IILRQ3dg=="; - }; - }; - "eslint-import-resolver-node-0.3.6" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; - }; - }; - "eslint-module-utils-2.7.4" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"; - sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; - }; - }; - "eslint-plugin-es-3.0.1" = { - name = "eslint-plugin-es"; - packageName = "eslint-plugin-es"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz"; - sha512 = "GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ=="; - }; - }; - "eslint-plugin-es-4.1.0" = { - name = "eslint-plugin-es"; - packageName = "eslint-plugin-es"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz"; - sha512 = "GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ=="; - }; - }; - "eslint-plugin-import-2.26.0" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; - }; - }; - "eslint-plugin-n-15.2.5" = { - name = "eslint-plugin-n"; - packageName = "eslint-plugin-n"; - version = "15.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.2.5.tgz"; - sha512 = "8+BYsqiyZfpu6NXmdLOXVUfk8IocpCjpd8nMRRH0A9ulrcemhb2VI9RSJMEy5udx++A/YcVPD11zT8hpFq368g=="; - }; - }; - "eslint-plugin-node-11.1.0" = { - name = "eslint-plugin-node"; - packageName = "eslint-plugin-node"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz"; - sha512 = "oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g=="; - }; - }; - "eslint-plugin-promise-6.0.0" = { - name = "eslint-plugin-promise"; - packageName = "eslint-plugin-promise"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz"; - sha512 = "7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw=="; - }; - }; - "eslint-plugin-vue-9.3.0" = { - name = "eslint-plugin-vue"; - packageName = "eslint-plugin-vue"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.3.0.tgz"; - sha512 = "iscKKkBZgm6fGZwFt6poRoWC0Wy2dQOlwUPW++CiPoQiw1enctV2Hj5DBzzjJZfyqs+FAXhgzL4q0Ww03AgSmQ=="; - }; - }; - "eslint-scope-5.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; - }; - }; - "eslint-scope-7.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - }; - "eslint-utils-2.1.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; - }; - }; - "eslint-utils-3.0.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - }; - "eslint-visitor-keys-1.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; - }; - }; - "eslint-visitor-keys-2.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - }; - "eslint-visitor-keys-3.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; - }; - }; - "eslint-webpack-plugin-3.2.0" = { - name = "eslint-webpack-plugin"; - packageName = "eslint-webpack-plugin"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz"; - sha512 = "avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w=="; - }; - }; - "espree-9.4.0" = { - name = "espree"; - packageName = "espree"; - version = "9.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz"; - sha512 = "DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw=="; - }; - }; - "esprima-4.0.1" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - }; - "esquery-1.4.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - }; - "esrecurse-4.3.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - }; - "estraverse-4.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - }; - "estraverse-5.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; - 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"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - }; - "event-pubsub-4.3.0" = { - name = "event-pubsub"; - packageName = "event-pubsub"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz"; - sha512 = "z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="; - }; - }; - "eventemitter3-4.0.7" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; - }; - }; - "events-3.3.0" = { - name = "events"; - packageName = "events"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - }; - "execa-0.8.0" = { - name = "execa"; - packageName = "execa"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; - sha512 = "zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA=="; - }; - }; - "execa-1.0.0" = { - name = "execa"; - packageName = "execa"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; - }; - }; - "execa-5.1.1" = { - name = "execa"; - packageName = "execa"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; - sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; - }; - }; - "express-4.18.1" = { - name = "express"; - packageName = "express"; - version = "4.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; - sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; - }; - }; - "fast-deep-equal-3.1.3" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - }; - "fast-glob-3.2.12" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"; - sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; - }; - }; - "fast-json-stable-stringify-2.1.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - }; - "fastq-1.13.0" = { - name = "fastq"; - packageName = "fastq"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; - }; - }; - "faye-websocket-0.11.4" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"; - sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; - }; - }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; - }; - }; - "file-entry-cache-6.0.1" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - }; - "finalhandler-1.2.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; - }; - }; - "find-cache-dir-3.3.2" = { - name = "find-cache-dir"; - packageName = "find-cache-dir"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; - sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; - }; - }; - "find-up-4.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - }; - "flat-cache-3.0.4" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - }; - "flatted-3.2.7" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"; - sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; - }; - }; - "follow-redirects-1.15.2" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; - }; - }; - "fork-ts-checker-webpack-plugin-6.5.2" = { - name = "fork-ts-checker-webpack-plugin"; - packageName = "fork-ts-checker-webpack-plugin"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz"; - sha512 = "m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fraction.js-4.2.0" = { - name = "fraction.js"; - packageName = "fraction.js"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"; - sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - }; - "fs-extra-9.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - }; - "fs-monkey-1.0.3" = { - name = "fs-monkey"; - packageName = "fs-monkey"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz"; - sha512 = "cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "fsevents-2.3.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - }; - "function.prototype.name-1.1.5" = { - name = "function.prototype.name"; - packageName = "function.prototype.name"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - }; - "functional-red-black-tree-1.0.1" = { - name = "functional-red-black-tree"; - packageName = "functional-red-black-tree"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; - }; - }; - "functions-have-names-1.2.3" = { - name = "functions-have-names"; - packageName = "functions-have-names"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - }; - "gensync-1.0.0-beta.2" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - }; - "get-caller-file-2.0.5" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - }; - "get-intrinsic-1.1.3" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="; - }; - }; - "get-stream-4.1.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - }; - "get-stream-6.0.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"; - sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; - }; - }; - "get-symbol-description-1.0.0" = { - name = "get-symbol-description"; - packageName = "get-symbol-description"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "glob-parent-5.1.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - }; - "glob-parent-6.0.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - }; - "glob-to-regexp-0.4.1" = { - name = "glob-to-regexp"; - packageName = "glob-to-regexp"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; - sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; - }; - }; - "globals-11.12.0" = { - name = "globals"; - packageName = "globals"; - version = "11.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - }; - "globals-13.17.0" = { - name = "globals"; - packageName = "globals"; - version = "13.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"; - sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; - }; - }; - "globby-11.1.0" = { - name = "globby"; - packageName = "globby"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; - }; - }; - "graceful-fs-4.2.10" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - }; - "gzip-size-6.0.0" = { - name = "gzip-size"; - packageName = "gzip-size"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"; - sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; - }; - }; - "hammerjs-2.0.8" = { - name = "hammerjs"; - packageName = "hammerjs"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz"; - sha512 = "tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ=="; - }; - }; - "handle-thing-2.0.1" = { - name = "handle-thing"; - packageName = "handle-thing"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; - sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; - }; - }; - "has-1.0.3" = { - name = "has"; - packageName = "has"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - }; - "has-bigints-1.0.2" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "has-property-descriptors-1.0.0" = { - name = "has-property-descriptors"; - packageName = "has-property-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "hash-sum-1.0.2" = { - name = "hash-sum"; - packageName = "hash-sum"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; - sha512 = "fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA=="; - }; - }; - "hash-sum-2.0.0" = { - name = "hash-sum"; - packageName = "hash-sum"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz"; - sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; - }; - }; - "he-1.2.0" = { - name = "he"; - packageName = "he"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; - }; - }; - "highlight.js-10.7.3" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "10.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; - sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; - }; - }; - "hosted-git-info-2.8.9" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; - sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; - }; - }; - "hpack.js-2.1.6" = { - name = "hpack.js"; - packageName = "hpack.js"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; - sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; - }; - }; - "html-entities-2.3.3" = { - name = "html-entities"; - packageName = "html-entities"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"; - sha512 = "DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="; - }; - }; - "html-minifier-terser-6.1.0" = { - name = "html-minifier-terser"; - packageName = "html-minifier-terser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw=="; - }; - }; - "html-tags-2.0.0" = { - name = "html-tags"; - packageName = "html-tags"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz"; - sha512 = "+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g=="; - }; - }; - "html-tags-3.2.0" = { - name = "html-tags"; - packageName = "html-tags"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz"; - sha512 = "vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg=="; - }; - }; - "html-webpack-plugin-5.5.0" = { - name = "html-webpack-plugin"; - packageName = "html-webpack-plugin"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz"; - sha512 = "sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw=="; - }; - }; - "htmlparser2-6.1.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; - sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; - }; - }; - "http-deceiver-1.2.7" = { - name = "http-deceiver"; - packageName = "http-deceiver"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; - sha512 = "LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="; - }; - }; - "http-errors-1.6.3" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha512 = "lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="; - }; - }; - "http-errors-2.0.0" = { - name = "http-errors"; - packageName = "http-errors"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; - sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; - }; - }; - "http-parser-js-0.5.8" = { - name = "http-parser-js"; - packageName = "http-parser-js"; - version = "0.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"; - sha512 = "SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="; - }; - }; - "http-proxy-1.18.1" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; - sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; - }; - }; - "http-proxy-middleware-2.0.6" = { - name = "http-proxy-middleware"; - packageName = "http-proxy-middleware"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"; - sha512 = "ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw=="; - }; - }; - "human-signals-2.1.0" = { - name = "human-signals"; - packageName = "human-signals"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"; - sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "icss-utils-5.1.0" = { - name = "icss-utils"; - packageName = "icss-utils"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; - sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; - }; - }; - "ieee754-1.2.1" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - }; - "ignore-5.2.0" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - }; - "immutable-4.1.0" = { - name = "immutable"; - packageName = "immutable"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz"; - sha512 = "oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ=="; - }; - }; - "import-fresh-3.3.0" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "internal-slot-1.0.3" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; - }; - }; - "ipaddr.js-1.9.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "ipaddr.js-2.0.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"; - sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; - }; - }; - "is-bigint-1.0.4" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - }; - "is-binary-path-2.1.0" = { - name = "is-binary-path"; - packageName = "is-binary-path"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; - }; - }; - "is-boolean-object-1.1.2" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - }; - "is-callable-1.2.6" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz"; - sha512 = "krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q=="; - }; - }; - "is-ci-1.2.1" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz"; - sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="; - }; - }; - "is-core-module-2.10.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz"; - sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg=="; - }; - }; - "is-date-object-1.0.5" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - }; - "is-docker-2.2.1" = { - name = "is-docker"; - packageName = "is-docker"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; - sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - }; - "is-file-esm-1.0.0" = { - name = "is-file-esm"; - packageName = "is-file-esm"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-file-esm/-/is-file-esm-1.0.0.tgz"; - sha512 = "rZlaNKb4Mr8WlRu2A9XdeoKgnO5aA53XdPHgCKVyCrQ/rWi89RET1+bq37Ru46obaQXeiX4vmFIm1vks41hoSA=="; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; - }; - }; - "is-fullwidth-code-point-3.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - }; - "is-glob-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; - "is-interactive-1.0.0" = { - name = "is-interactive"; - packageName = "is-interactive"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"; - sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; - }; - }; - "is-negative-zero-2.0.2" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - }; - "is-number-object-1.0.7" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - }; - "is-plain-obj-3.0.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"; - sha512 = "gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="; - }; - }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "is-shared-array-buffer-1.0.2" = { - name = "is-shared-array-buffer"; - packageName = "is-shared-array-buffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; - }; - }; - "is-stream-2.0.1" = { - name = "is-stream"; - packageName = "is-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; - sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; - }; - }; - "is-string-1.0.7" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - }; - "is-symbol-1.0.4" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - }; - "is-unicode-supported-0.1.0" = { - name = "is-unicode-supported"; - packageName = "is-unicode-supported"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; - sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; - }; - }; - "is-weakref-1.0.2" = { - name = "is-weakref"; - packageName = "is-weakref"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - }; - "is-wsl-2.2.0" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; - }; - }; - "javascript-stringify-2.1.0" = { - name = "javascript-stringify"; - packageName = "javascript-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz"; - sha512 = "JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="; - }; - }; - "jest-worker-27.5.1" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"; - sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; - }; - }; - "jest-worker-28.1.3" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz"; - sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g=="; - }; - }; - "joi-17.6.0" = { - name = "joi"; - packageName = "joi"; - version = "17.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz"; - sha512 = "OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw=="; - }; - }; - "js-message-1.0.7" = { - name = "js-message"; - packageName = "js-message"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz"; - sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; - }; - }; - "js-tokens-4.0.0" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - }; - "js-yaml-3.14.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; - sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "js-yaml-loader-1.2.2" = { - name = "js-yaml-loader"; - packageName = "js-yaml-loader"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml-loader/-/js-yaml-loader-1.2.2.tgz"; - sha512 = "H+NeuNrG6uOs/WMjna2SjkaCw13rMWiT/D7l9+9x5n8aq88BDsh2sRmdfxckWPIHtViYHWRG6XiCKYvS1dfyLg=="; - }; - }; - "jsesc-0.5.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; - }; - }; - "jsesc-2.5.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - }; - "json-parse-better-errors-1.0.2" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; - }; - }; - "json-parse-even-better-errors-2.3.1" = { - name = "json-parse-even-better-errors"; - packageName = "json-parse-even-better-errors"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - }; - "json-schema-traverse-1.0.0" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; - }; - }; - "json-stable-stringify-without-jsonify-1.0.1" = { - name = "json-stable-stringify-without-jsonify"; - packageName = "json-stable-stringify-without-jsonify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - }; - "json5-1.0.1" = { - name = "json5"; - packageName = "json5"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - }; - "json5-2.2.1" = { - name = "json5"; - packageName = "json5"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; - }; - }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; - "kind-of-6.0.3" = { - name = "kind-of"; - packageName = "kind-of"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; - }; - }; - "klona-2.0.5" = { - name = "klona"; - packageName = "klona"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"; - sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="; - }; - }; - "launch-editor-2.6.0" = { - name = "launch-editor"; - packageName = "launch-editor"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz"; - sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="; - }; - }; - "launch-editor-middleware-2.6.0" = { - name = "launch-editor-middleware"; - packageName = "launch-editor-middleware"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz"; - sha512 = "K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA=="; - }; - }; - "levn-0.4.1" = { - name = "levn"; - packageName = "levn"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - }; - "lilconfig-2.0.6" = { - name = "lilconfig"; - packageName = "lilconfig"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"; - sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; - }; - }; - "lines-and-columns-1.2.4" = { - name = "lines-and-columns"; - packageName = "lines-and-columns"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - }; - "loader-runner-4.3.0" = { - name = "loader-runner"; - packageName = "loader-runner"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"; - sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; - }; - }; - "loader-utils-1.4.0" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; - }; - }; - "loader-utils-2.0.2" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; - }; - }; - "locate-path-5.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - }; - "lodash-4.17.21" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; - }; - }; - "lodash.defaultsdeep-4.6.1" = { - name = "lodash.defaultsdeep"; - packageName = "lodash.defaultsdeep"; - version = "4.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; - sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; - }; - }; - "lodash.kebabcase-4.1.1" = { - name = "lodash.kebabcase"; - packageName = "lodash.kebabcase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; - sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="; - }; - }; - "lodash.mapvalues-4.6.0" = { - name = "lodash.mapvalues"; - packageName = "lodash.mapvalues"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; - sha512 = "JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ=="; - }; - }; - "lodash.memoize-4.1.2" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="; - }; - }; - "lodash.merge-4.6.2" = { - name = "lodash.merge"; - packageName = "lodash.merge"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; - }; - }; - "log-symbols-4.1.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; - sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; - }; - }; - "log-update-2.3.0" = { - name = "log-update"; - packageName = "log-update"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg=="; - }; - }; - "lower-case-2.0.2" = { - name = "lower-case"; - packageName = "lower-case"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"; - sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; - }; - }; - "lru-cache-4.1.5" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "magic-string-0.25.9" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.9"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; - sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; - }; - }; - "make-dir-3.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - }; - "marked-4.0.19" = { - name = "marked"; - packageName = "marked"; - version = "4.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.0.19.tgz"; - sha512 = "rgQF/OxOiLcvgUAj1Q1tAf4Bgxn5h5JZTp04Fx4XUkVhs7B+7YA9JEWJhJpoO8eJt8MkZMwqLCNeNqj1bCREZQ=="; - }; - }; - "mdn-data-2.0.14" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"; - sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; - "memfs-3.4.7" = { - name = "memfs"; - packageName = "memfs"; - version = "3.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz"; - sha512 = "ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw=="; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; - }; - }; - "merge-source-map-1.1.0" = { - name = "merge-source-map"; - packageName = "merge-source-map"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; - sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; - }; - }; - "merge-stream-2.0.0" = { - name = "merge-stream"; - packageName = "merge-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; - }; - }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; - "micromatch-4.0.5" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - }; - "mime-1.6.0" = { - name = "mime"; - packageName = "mime"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - }; - "mime-db-1.52.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - }; - "mime-types-2.1.35" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.35"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - }; - "mimic-fn-1.2.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - }; - "mimic-fn-2.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - }; - "mini-css-extract-plugin-2.6.1" = { - name = "mini-css-extract-plugin"; - packageName = "mini-css-extract-plugin"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz"; - sha512 = "wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg=="; - }; - }; - "minimalistic-assert-1.0.1" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; - }; - }; - "minimatch-3.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimist-1.2.6" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; - }; - }; - "minipass-3.3.5" = { - name = "minipass"; - packageName = "minipass"; - version = "3.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; - sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; - }; - }; - "mkdirp-0.5.6" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; - }; - }; - "module-alias-2.2.2" = { - name = "module-alias"; - packageName = "module-alias"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz"; - sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; - }; - }; - "mosha-vue-toastify-1.0.23" = { - name = "mosha-vue-toastify"; - packageName = "mosha-vue-toastify"; - version = "1.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/mosha-vue-toastify/-/mosha-vue-toastify-1.0.23.tgz"; - sha512 = "K9fij3e3H+E/Lj82ISrgmyKrtM5RNmtZC/KG/KH47+oZGmzAkN/Zuz39kBdT/Mp8OxaHuIWQntEUMP+HdmK1xA=="; - }; - }; - "mrmime-1.0.1" = { - name = "mrmime"; - packageName = "mrmime"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"; - sha512 = "hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "ms-2.1.3" = { - name = "ms"; - packageName = "ms"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - }; - "multicast-dns-7.2.5" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "7.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"; - sha512 = "2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="; - }; - }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; - }; - }; - "nanoid-3.3.4" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; - sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; - }; - }; - "natural-compare-1.4.0" = { - name = "natural-compare"; - packageName = "natural-compare"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - }; - "negotiator-0.6.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; - "nice-try-1.0.5" = { - name = "nice-try"; - packageName = "nice-try"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - }; - "no-case-3.0.4" = { - name = "no-case"; - packageName = "no-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"; - sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; - }; - }; - "node-fetch-2.6.7" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; - }; - }; - "node-forge-1.3.1" = { - name = "node-forge"; - packageName = "node-forge"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"; - sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; - }; - }; - "node-releases-2.0.6" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; - sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; - }; - }; - "normalize-package-data-2.5.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; - }; - }; - "normalize-path-1.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz"; - sha512 = "7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA=="; - }; - }; - "normalize-path-3.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - }; - "normalize-range-0.1.2" = { - name = "normalize-range"; - packageName = "normalize-range"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; - sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; - }; - }; - "normalize-url-6.1.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; - }; - }; - "npm-run-path-4.0.1" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; - }; - }; - "nth-check-2.1.1" = { - name = "nth-check"; - packageName = "nth-check"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"; - sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "object-inspect-1.12.2" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; - "object.assign-4.1.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; - sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; - }; - }; - "object.values-1.1.5" = { - name = "object.values"; - packageName = "object.values"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; - }; - }; - "obuf-1.1.2" = { - name = "obuf"; - packageName = "obuf"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; - sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; - }; - }; - "on-finished-2.4.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; - sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; - }; - }; - "on-headers-1.0.2" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="; - }; - }; - "onetime-5.1.2" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - }; - "open-8.4.0" = { - name = "open"; - packageName = "open"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; - }; - }; - "opener-1.5.2" = { - name = "opener"; - packageName = "opener"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"; - sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; - }; - }; - "optionator-0.9.1" = { - name = "optionator"; - packageName = "optionator"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - }; - "ora-5.4.1" = { - name = "ora"; - packageName = "ora"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; - sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; - }; - }; - "p-limit-2.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - }; - "p-locate-4.1.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - }; - "p-retry-4.6.2" = { - name = "p-retry"; - packageName = "p-retry"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"; - sha512 = "312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ=="; - }; - }; - "p-try-2.2.0" = { - name = "p-try"; - packageName = "p-try"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - }; - "param-case-3.0.4" = { - name = "param-case"; - packageName = "param-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"; - sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; - }; - }; - "parent-module-1.0.1" = { - name = "parent-module"; - packageName = "parent-module"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - }; - "parse-json-5.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - }; - "parse5-5.1.1" = { - name = "parse5"; - packageName = "parse5"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; - sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; - }; - }; - "parse5-6.0.1" = { - name = "parse5"; - packageName = "parse5"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; - }; - }; - "parse5-htmlparser2-tree-adapter-6.0.1" = { - name = "parse5-htmlparser2-tree-adapter"; - packageName = "parse5-htmlparser2-tree-adapter"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; - sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "pascal-case-3.1.2" = { - name = "pascal-case"; - packageName = "pascal-case"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"; - sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; - }; - }; - "path-exists-4.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - }; - "picocolors-0.2.1" = { - name = "picocolors"; - packageName = "picocolors"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"; - sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; - }; - }; - "picocolors-1.0.0" = { - name = "picocolors"; - packageName = "picocolors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - }; - "picomatch-2.3.1" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - }; - "pinia-2.0.21" = { - name = "pinia"; - packageName = "pinia"; - version = "2.0.21"; - src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.21.tgz"; - sha512 = "6ol04PtL29O0Z6JHI47O3JUSoyOJ7Og0rstXrHVMZSP4zAldsQBXJCNF0i/H7m8vp/Hjd/CSmuPl7C5QAwpeWQ=="; - }; - }; - "pkg-dir-4.2.0" = { - name = "pkg-dir"; - packageName = "pkg-dir"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; - }; - }; - "portfinder-1.0.32" = { - name = "portfinder"; - packageName = "portfinder"; - version = "1.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz"; - sha512 = "on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg=="; - }; - }; - "postcss-7.0.39" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"; - sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; - }; - }; - "postcss-8.4.16" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.16"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"; - sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; - }; - }; - "postcss-calc-8.2.4" = { - name = "postcss-calc"; - packageName = "postcss-calc"; - version = "8.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; - sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; - }; - }; - "postcss-colormin-5.3.0" = { - name = "postcss-colormin"; - packageName = "postcss-colormin"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; - sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; - }; - }; - "postcss-convert-values-5.1.2" = { - name = "postcss-convert-values"; - packageName = "postcss-convert-values"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz"; - sha512 = "c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g=="; - }; - }; - "postcss-discard-comments-5.1.2" = { - name = "postcss-discard-comments"; - packageName = "postcss-discard-comments"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"; - sha512 = "+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="; - }; - }; - "postcss-discard-duplicates-5.1.0" = { - name = "postcss-discard-duplicates"; - packageName = "postcss-discard-duplicates"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; - sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; - }; - }; - "postcss-discard-empty-5.1.1" = { - name = "postcss-discard-empty"; - packageName = "postcss-discard-empty"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; - sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; - }; - }; - "postcss-discard-overridden-5.1.0" = { - name = "postcss-discard-overridden"; - packageName = "postcss-discard-overridden"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; - sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; - }; - }; - "postcss-loader-6.2.1" = { - name = "postcss-loader"; - packageName = "postcss-loader"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz"; - sha512 = "WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q=="; - }; - }; - "postcss-merge-longhand-5.1.6" = { - name = "postcss-merge-longhand"; - packageName = "postcss-merge-longhand"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz"; - sha512 = "6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw=="; - }; - }; - "postcss-merge-rules-5.1.2" = { - name = "postcss-merge-rules"; - packageName = "postcss-merge-rules"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz"; - sha512 = "zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ=="; - }; - }; - "postcss-minify-font-values-5.1.0" = { - name = "postcss-minify-font-values"; - packageName = "postcss-minify-font-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; - sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; - }; - }; - "postcss-minify-gradients-5.1.1" = { - name = "postcss-minify-gradients"; - packageName = "postcss-minify-gradients"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"; - sha512 = "VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw=="; - }; - }; - "postcss-minify-params-5.1.3" = { - name = "postcss-minify-params"; - packageName = "postcss-minify-params"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz"; - sha512 = "bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg=="; - }; - }; - "postcss-minify-selectors-5.2.1" = { - name = "postcss-minify-selectors"; - packageName = "postcss-minify-selectors"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"; - sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; - }; - }; - "postcss-modules-extract-imports-3.0.0" = { - name = "postcss-modules-extract-imports"; - packageName = "postcss-modules-extract-imports"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; - sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; - }; - }; - "postcss-modules-local-by-default-4.0.0" = { - name = "postcss-modules-local-by-default"; - packageName = "postcss-modules-local-by-default"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; - sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; - }; - }; - "postcss-modules-scope-3.0.0" = { - name = "postcss-modules-scope"; - packageName = "postcss-modules-scope"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; - sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; - }; - }; - "postcss-modules-values-4.0.0" = { - name = "postcss-modules-values"; - packageName = "postcss-modules-values"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; - sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; - }; - }; - "postcss-normalize-charset-5.1.0" = { - name = "postcss-normalize-charset"; - packageName = "postcss-normalize-charset"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; - sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; - }; - }; - "postcss-normalize-display-values-5.1.0" = { - name = "postcss-normalize-display-values"; - packageName = "postcss-normalize-display-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; - sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; - }; - }; - "postcss-normalize-positions-5.1.1" = { - name = "postcss-normalize-positions"; - packageName = "postcss-normalize-positions"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"; - sha512 = "6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg=="; - }; - }; - "postcss-normalize-repeat-style-5.1.1" = { - name = "postcss-normalize-repeat-style"; - packageName = "postcss-normalize-repeat-style"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"; - sha512 = "mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g=="; - }; - }; - "postcss-normalize-string-5.1.0" = { - name = "postcss-normalize-string"; - packageName = "postcss-normalize-string"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; - sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; - }; - }; - "postcss-normalize-timing-functions-5.1.0" = { - name = "postcss-normalize-timing-functions"; - packageName = "postcss-normalize-timing-functions"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; - sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; - }; - }; - "postcss-normalize-unicode-5.1.0" = { - name = "postcss-normalize-unicode"; - packageName = "postcss-normalize-unicode"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; - sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; - }; - }; - "postcss-normalize-url-5.1.0" = { - name = "postcss-normalize-url"; - packageName = "postcss-normalize-url"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; - sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; - }; - }; - "postcss-normalize-whitespace-5.1.1" = { - name = "postcss-normalize-whitespace"; - packageName = "postcss-normalize-whitespace"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; - sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; - }; - }; - "postcss-ordered-values-5.1.3" = { - name = "postcss-ordered-values"; - packageName = "postcss-ordered-values"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"; - sha512 = "9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ=="; - }; - }; - "postcss-reduce-initial-5.1.0" = { - name = "postcss-reduce-initial"; - packageName = "postcss-reduce-initial"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; - sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; - }; - }; - "postcss-reduce-transforms-5.1.0" = { - name = "postcss-reduce-transforms"; - packageName = "postcss-reduce-transforms"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; - sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; - }; - }; - "postcss-selector-parser-6.0.10" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"; - sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; - }; - }; - "postcss-svgo-5.1.0" = { - name = "postcss-svgo"; - packageName = "postcss-svgo"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; - sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; - }; - }; - "postcss-unique-selectors-5.1.1" = { - name = "postcss-unique-selectors"; - packageName = "postcss-unique-selectors"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; - sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; - }; - }; - "postcss-value-parser-4.2.0" = { - name = "postcss-value-parser"; - packageName = "postcss-value-parser"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; - sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; - }; - }; - "prelude-ls-1.2.1" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - }; - "prettier-2.7.1" = { - name = "prettier"; - packageName = "prettier"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; - }; - }; - "pretty-error-4.0.0" = { - name = "pretty-error"; - packageName = "pretty-error"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz"; - sha512 = "AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "progress-webpack-plugin-1.0.16" = { - name = "progress-webpack-plugin"; - packageName = "progress-webpack-plugin"; - version = "1.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz"; - sha512 = "sdiHuuKOzELcBANHfrupYo+r99iPRyOnw15qX+rNlVUqXGfjXdH4IgxriKwG1kNJwVswKQHMdj1hYZMcb9jFaA=="; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; - }; - }; - "pump-3.0.0" = { - name = "pump"; - packageName = "pump"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - }; - "punycode-2.1.1" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - }; - "qs-6.10.3" = { - name = "qs"; - packageName = "qs"; - version = "6.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; - sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; - }; - }; - "queue-microtask-1.2.3" = { - name = "queue-microtask"; - packageName = "queue-microtask"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - }; - "randombytes-2.1.0" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.5.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - }; - "read-pkg-5.2.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; - sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; - }; - }; - "read-pkg-up-7.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; - sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; - }; - }; - "readable-stream-2.3.7" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - }; - "readable-stream-3.6.0" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - }; - "readdirp-3.6.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; - sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; - }; - }; - "regenerate-1.4.2" = { - name = "regenerate"; - packageName = "regenerate"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; - sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; - }; - }; - "regenerate-unicode-properties-10.1.0" = { - name = "regenerate-unicode-properties"; - packageName = "regenerate-unicode-properties"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"; - sha512 = "d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="; - }; - }; - "regenerator-runtime-0.13.9" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - }; - "regenerator-transform-0.15.0" = { - name = "regenerator-transform"; - packageName = "regenerator-transform"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; - sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; - }; - }; - "regexp.prototype.flags-1.4.3" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - }; - "regexpp-3.2.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - }; - "regexpu-core-5.2.1" = { - name = "regexpu-core"; - packageName = "regexpu-core"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz"; - sha512 = "HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ=="; - }; - }; - "regjsgen-0.7.1" = { - name = "regjsgen"; - packageName = "regjsgen"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz"; - sha512 = "RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="; - }; - }; - "regjsparser-0.9.1" = { - name = "regjsparser"; - packageName = "regjsparser"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"; - sha512 = "dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ=="; - }; - }; - "relateurl-0.2.7" = { - name = "relateurl"; - packageName = "relateurl"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; - sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; - }; - }; - "renderkid-3.0.0" = { - name = "renderkid"; - packageName = "renderkid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz"; - sha512 = "q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg=="; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - }; - "require-from-string-2.0.2" = { - name = "require-from-string"; - packageName = "require-from-string"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; - sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; - }; - }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; - }; - }; - "resolve-1.22.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; - }; - }; - "restore-cursor-3.1.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - }; - "retry-0.13.1" = { - name = "retry"; - packageName = "retry"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; - sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; - }; - }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; - "run-parallel-1.2.0" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "sass-1.54.0" = { - name = "sass"; - packageName = "sass"; - version = "1.54.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.54.0.tgz"; - sha512 = "C4zp79GCXZfK0yoHZg+GxF818/aclhp9F48XBu/+bm9vXEVAYov9iU3FBVRMq3Hx3OA4jfKL+p2K9180mEh0xQ=="; - }; - }; - "sass-loader-13.0.2" = { - name = "sass-loader"; - packageName = "sass-loader"; - version = "13.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz"; - sha512 = "BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q=="; - }; - }; - "schema-utils-2.7.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; - sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; - }; - }; - "schema-utils-2.7.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; - }; - }; - "schema-utils-3.1.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"; - sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; - }; - }; - "schema-utils-4.0.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz"; - sha512 = "1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg=="; - }; - }; - "select-hose-2.0.0" = { - name = "select-hose"; - packageName = "select-hose"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; - sha512 = "mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="; - }; - }; - "selfsigned-2.1.1" = { - name = "selfsigned"; - packageName = "selfsigned"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"; - sha512 = "GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="; - }; - }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; - "semver-6.3.0" = { - name = "semver"; - packageName = "semver"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - }; - "semver-7.3.7" = { - name = "semver"; - packageName = "semver"; - version = "7.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; - }; - }; - "send-0.18.0" = { - name = "send"; - packageName = "send"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; - }; - }; - "serialize-javascript-6.0.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; - sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; - }; - }; - "serve-index-1.9.1" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw=="; - }; - }; - "serve-static-1.15.0" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; - }; - }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; - }; - }; - "setprototypeof-1.2.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - }; - "shallow-clone-3.0.1" = { - name = "shallow-clone"; - packageName = "shallow-clone"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"; - sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; - }; - }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "shell-quote-1.7.3" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz"; - sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "sirv-1.0.19" = { - name = "sirv"; - packageName = "sirv"; - version = "1.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz"; - sha512 = "JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ=="; - }; - }; - "slash-3.0.0" = { - name = "slash"; - packageName = "slash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - }; - "sockjs-0.3.24" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.24"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz"; - sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - 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"; - version = "0.5.21"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - }; - "sourcemap-codec-1.4.8" = { - name = "sourcemap-codec"; - packageName = "sourcemap-codec"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - }; - "spdx-correct-3.1.1" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; - }; - }; - "spdx-exceptions-2.3.0" = { - name = "spdx-exceptions"; - packageName = "spdx-exceptions"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; - }; - }; - "spdx-expression-parse-3.0.1" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; - }; - }; - "spdx-license-ids-3.0.12" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "3.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; - sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; - }; - }; - "spdy-4.0.2" = { - name = "spdy"; - packageName = "spdy"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; - sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; - }; - }; - "spdy-transport-3.0.0" = { - name = "spdy-transport"; - packageName = "spdy-transport"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; - }; - }; - "ssri-8.0.1" = { - name = "ssri"; - packageName = "ssri"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; - sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; - }; - }; - "stable-0.1.8" = { - name = "stable"; - packageName = "stable"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; - sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; - }; - }; - "stackframe-1.3.4" = { - name = "stackframe"; - packageName = "stackframe"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"; - sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="; - }; - }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; - }; - }; - "statuses-2.0.1" = { - name = "statuses"; - packageName = "statuses"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; - sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; - }; - }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "string-width-4.2.3" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string.prototype.trimend-1.0.5" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; - }; - }; - "string.prototype.trimstart-1.0.5" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "string_decoder-1.3.0" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="; - }; - }; - "strip-final-newline-2.0.0" = { - name = "strip-final-newline"; - packageName = "strip-final-newline"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; - }; - }; - "strip-indent-2.0.0" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; - sha512 = "RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA=="; - }; - }; - "strip-json-comments-3.1.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - }; - "stylehacks-5.1.0" = { - name = "stylehacks"; - packageName = "stylehacks"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"; - sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; - }; - }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - }; - "supports-color-8.1.1" = { - name = "supports-color"; - packageName = "supports-color"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; - sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; - }; - }; - "supports-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "svg-tags-1.0.0" = { - name = "svg-tags"; - packageName = "svg-tags"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"; - sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; - }; - }; - "svgo-2.8.0" = { - name = "svgo"; - packageName = "svgo"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; - sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; - }; - }; - "tapable-1.1.3" = { - name = "tapable"; - packageName = "tapable"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; - sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; - }; - }; - "tapable-2.2.1" = { - name = "tapable"; - packageName = "tapable"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"; - sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; - }; - }; - "terser-5.15.0" = { - name = "terser"; - packageName = "terser"; - version = "5.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz"; - sha512 = "L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA=="; - }; - }; - "terser-webpack-plugin-5.3.6" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "5.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz"; - sha512 = "kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ=="; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - }; - "thenify-3.3.1" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; - sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; - }; - }; - "thread-loader-3.0.4" = { - name = "thread-loader"; - packageName = "thread-loader"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/thread-loader/-/thread-loader-3.0.4.tgz"; - sha512 = "ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA=="; - }; - }; - "thunky-1.1.0" = { - name = "thunky"; - packageName = "thunky"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; - sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; - }; - }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - }; - "toidentifier-1.0.1" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - }; - "totalist-1.1.0" = { - name = "totalist"; - packageName = "totalist"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz"; - sha512 = "gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; - }; - }; - "ts-loader-9.3.1" = { - name = "ts-loader"; - packageName = "ts-loader"; - version = "9.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.1.tgz"; - sha512 = "OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw=="; - }; - }; - "tsconfig-paths-3.14.1" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - }; - "tslib-1.14.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - }; - "tslib-2.4.0" = { - name = "tslib"; - packageName = "tslib"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - }; - "tsutils-3.21.0" = { - name = "tsutils"; - packageName = "tsutils"; - version = "3.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; - sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; - }; - }; - "type-check-0.4.0" = { - name = "type-check"; - packageName = "type-check"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - }; - "type-fest-0.20.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - }; - "type-fest-0.6.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; - sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; - }; - }; - "type-fest-0.8.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "typescript-4.7.4" = { - name = "typescript"; - packageName = "typescript"; - version = "4.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"; - sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; - }; - }; - "un-eval-1.2.0" = { - name = "un-eval"; - packageName = "un-eval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/un-eval/-/un-eval-1.2.0.tgz"; - sha512 = "Wlj/pum6dQtGTPD/lclDtoVPkSfpjPfy1dwnnKw/sZP5DpBH9fLhBgQfsqNhe5/gS1D+vkZUuB771NRMUPA5CA=="; - }; - }; - "unbox-primitive-1.0.2" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { - name = "unicode-canonical-property-names-ecmascript"; - packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; - }; - }; - "unicode-match-property-ecmascript-2.0.0" = { - name = "unicode-match-property-ecmascript"; - packageName = "unicode-match-property-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; - sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; - }; - }; - "unicode-match-property-value-ecmascript-2.0.0" = { - name = "unicode-match-property-value-ecmascript"; - packageName = "unicode-match-property-value-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; - sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; - }; - }; - "unicode-property-aliases-ecmascript-2.1.0" = { - name = "unicode-property-aliases-ecmascript"; - packageName = "unicode-property-aliases-ecmascript"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"; - sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; - }; - }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - }; - "update-browserslist-db-1.0.9" = { - name = "update-browserslist-db"; - packageName = "update-browserslist-db"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz"; - sha512 = "/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg=="; - }; - }; - "uri-js-4.4.1" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "utila-0.4.0" = { - name = "utila"; - packageName = "utila"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; - sha512 = "Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "v-lazy-image-2.1.1" = { - name = "v-lazy-image"; - packageName = "v-lazy-image"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v-lazy-image/-/v-lazy-image-2.1.1.tgz"; - sha512 = "QC6Jcok99CRhhsO7svfI3hcBaT945dSuaHk3jr7WHm+QJMzbB/f32xKkdF45qL5ezd5KeoqHKh4gD92mQtjfXQ=="; - }; - }; - "v8-compile-cache-2.3.0" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - }; - "validate-npm-package-license-3.0.4" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - }; - "vue-3.2.37" = { - name = "vue"; - packageName = "vue"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz"; - sha512 = "bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ=="; - }; - }; - "vue-cli-plugin-pinia-0.1.4" = { - name = "vue-cli-plugin-pinia"; - packageName = "vue-cli-plugin-pinia"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-pinia/-/vue-cli-plugin-pinia-0.1.4.tgz"; - sha512 = "YZy0Zhsgpl5MLoe6hJwNdsuaxW7xYc4jZyohS3ZzWpibCXNdxbr1INOJpLpLeE1ai9VoPXXHvooPxUZs+hHEDg=="; - }; - }; - "vue-demi-0.13.11" = { - name = "vue-demi"; - packageName = "vue-demi"; - version = "0.13.11"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz"; - sha512 = "IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="; - }; - }; - "vue-dragscroll-4.0.4" = { - name = "vue-dragscroll"; - packageName = "vue-dragscroll"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-dragscroll/-/vue-dragscroll-4.0.4.tgz"; - sha512 = "2VaDPzvVJKR0FxOwIt9ot53tpVG3K6Qcb7LFOHQ869WVBXWuVcJTXyBRKyrUACY82O3kIdPvj/Kzsw4ZeBkL0w=="; - }; - }; - "vue-eslint-parser-9.1.0" = { - name = "vue-eslint-parser"; - packageName = "vue-eslint-parser"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz"; - sha512 = "NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ=="; - }; - }; - "vue-hot-reload-api-2.3.4" = { - name = "vue-hot-reload-api"; - packageName = "vue-hot-reload-api"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; - sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; - }; - }; - "vue-i18n-9.1.10" = { - name = "vue-i18n"; - packageName = "vue-i18n"; - version = "9.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.10.tgz"; - sha512 = "jpr7gV5KPk4n+sSPdpZT8Qx3XzTcNDWffRlHV/cT2NUyEf+sEgTTmLvnBAibjOFJ0zsUyZlVTAWH5DDnYep+1g=="; - }; - }; - "vue-loader-17.0.0" = { - name = "vue-loader"; - packageName = "vue-loader"; - version = "17.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.0.tgz"; - sha512 = "OWSXjrzIvbF2LtOUmxT3HYgwwubbfFelN8PAP9R9dwpIkj48TVioHhWWSx7W7fk+iF5cgg3CBJRxwTdtLU4Ecg=="; - }; - }; - "vue-router-4.1.5" = { - name = "vue-router"; - packageName = "vue-router"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-4.1.5.tgz"; - sha512 = "IsvoF5D2GQ/EGTs/Th4NQms9gd2NSqV+yylxIyp/OYp8xOwxmU8Kj/74E9DTSYAyH5LX7idVUngN3JSj1X4xcQ=="; - }; - }; - "vue-style-loader-4.1.3" = { - name = "vue-style-loader"; - packageName = "vue-style-loader"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"; - sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; - }; - }; - "vue-template-es2015-compiler-1.9.1" = { - name = "vue-template-es2015-compiler"; - packageName = "vue-template-es2015-compiler"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; - sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; - }; - }; - "watchpack-2.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"; - sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; - }; - }; - "wbuf-1.7.3" = { - name = "wbuf"; - packageName = "wbuf"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; - sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; - }; - }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; - }; - }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; - }; - }; - "webpack-5.74.0" = { - name = "webpack"; - packageName = "webpack"; - version = "5.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; - sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; - }; - }; - "webpack-bundle-analyzer-4.6.1" = { - name = "webpack-bundle-analyzer"; - packageName = "webpack-bundle-analyzer"; - version = "4.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz"; - sha512 = "oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw=="; - }; - }; - "webpack-chain-6.5.1" = { - name = "webpack-chain"; - packageName = "webpack-chain"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz"; - sha512 = "7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="; - }; - }; - "webpack-dev-middleware-5.3.3" = { - name = "webpack-dev-middleware"; - packageName = "webpack-dev-middleware"; - version = "5.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"; - sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; - }; - }; - "webpack-dev-server-4.11.0" = { - name = "webpack-dev-server"; - packageName = "webpack-dev-server"; - version = "4.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.0.tgz"; - sha512 = "L5S4Q2zT57SK7tazgzjMiSMBdsw+rGYIX27MgPgx7LDhWO0lViPrHKoLS7jo5In06PWYAhlYu3PbyoC6yAThbw=="; - }; - }; - "webpack-merge-5.8.0" = { - name = "webpack-merge"; - packageName = "webpack-merge"; - version = "5.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"; - sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; - }; - }; - "webpack-sources-3.2.3" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"; - sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; - }; - }; - "webpack-virtual-modules-0.4.5" = { - name = "webpack-virtual-modules"; - packageName = "webpack-virtual-modules"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.5.tgz"; - sha512 = "8bWq0Iluiv9lVf9YaqWQ9+liNgXSHICm+rg544yRgGYaR8yXZTVBaHZkINZSB2yZSWo4b0F6MIxqJezVfOEAlg=="; - }; - }; - "websocket-driver-0.7.4" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"; - sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; - }; - }; - "websocket-extensions-0.1.4" = { - name = "websocket-extensions"; - packageName = "websocket-extensions"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; - sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; - }; - }; - "whatwg-fetch-3.6.2" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; - sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; - }; - }; - "whatwg-url-5.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; - }; - }; - "which-1.3.1" = { - name = "which"; - packageName = "which"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - }; - "which-2.0.2" = { - name = "which"; - packageName = "which"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - }; - "which-boxed-primitive-1.0.2" = { - name = "which-boxed-primitive"; - packageName = "which-boxed-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - }; - "wildcard-2.0.0" = { - name = "wildcard"; - packageName = "wildcard"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"; - sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; - }; - }; - "word-wrap-1.2.3" = { - name = "word-wrap"; - packageName = "word-wrap"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha512 = "iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ=="; - }; - }; - "wrap-ansi-7.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "ws-7.5.9" = { - name = "ws"; - packageName = "ws"; - version = "7.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; - }; - }; - "ws-8.8.1" = { - name = "ws"; - packageName = "ws"; - version = "8.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz"; - sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; - }; - }; - "xml-name-validator-4.0.0" = { - name = "xml-name-validator"; - packageName = "xml-name-validator"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; - sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; - }; - }; - "y18n-5.0.8" = { - name = "y18n"; - packageName = "y18n"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - }; - "yaml-1.10.2" = { - name = "yaml"; - packageName = "yaml"; - version = "1.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; - sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; - }; - }; - "yargs-16.2.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - "yorkie-2.0.0" = { - name = "yorkie"; - packageName = "yorkie"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz"; - sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; - }; - }; - }; - args = { - name = "ldgallery-viewer"; - packageName = "ldgallery-viewer"; - version = "2.1.0"; - src = ./.; - dependencies = [ - sources."@achrinza/node-ipc-9.2.5" - sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.1" - (sources."@babel/core-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/generator-7.19.0" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-create-class-features-plugin-7.19.0" - sources."@babel/helper-create-regexp-features-plugin-7.19.0" - (sources."@babel/helper-define-polyfill-provider-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.19.0" - sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.18.9" - sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.19.0" - sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" - sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" - sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.19.0" - sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.1" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.19.1" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.18.6" - sources."@babel/plugin-proposal-decorators-7.19.1" - sources."@babel/plugin-proposal-dynamic-import-7.18.6" - sources."@babel/plugin-proposal-export-namespace-from-7.18.9" - sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" - sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" - sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.18.6" - sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.19.0" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.18.6" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.18.6" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.18.6" - sources."@babel/plugin-transform-async-to-generator-7.18.6" - sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" - sources."@babel/plugin-transform-classes-7.19.0" - sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" - sources."@babel/plugin-transform-dotall-regex-7.18.6" - sources."@babel/plugin-transform-duplicate-keys-7.18.9" - sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-for-of-7.18.8" - sources."@babel/plugin-transform-function-name-7.18.9" - sources."@babel/plugin-transform-literals-7.18.9" - sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.18.6" - sources."@babel/plugin-transform-modules-commonjs-7.18.6" - sources."@babel/plugin-transform-modules-systemjs-7.19.0" - sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" - sources."@babel/plugin-transform-new-target-7.18.6" - sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.18.8" - sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-regenerator-7.18.6" - sources."@babel/plugin-transform-reserved-words-7.18.6" - (sources."@babel/plugin-transform-runtime-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.19.0" - sources."@babel/plugin-transform-sticky-regex-7.18.6" - sources."@babel/plugin-transform-template-literals-7.18.9" - sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-unicode-escapes-7.18.10" - sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.19.0" - sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.1" - sources."@babel/types-7.19.0" - (sources."@eslint/eslintrc-1.3.2" // { - dependencies = [ - sources."globals-13.17.0" - sources."type-fest-0.20.2" - ]; - }) - sources."@fortawesome/fontawesome-common-types-6.1.2" - sources."@fortawesome/fontawesome-svg-core-6.1.2" - sources."@fortawesome/free-solid-svg-icons-6.1.2" - sources."@fortawesome/vue-fontawesome-3.0.1" - sources."@hapi/hoek-9.3.0" - sources."@hapi/topo-5.1.0" - sources."@humanwhocodes/config-array-0.9.5" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@intlify/core-base-9.1.10" - sources."@intlify/devtools-if-9.1.10" - sources."@intlify/message-compiler-9.1.10" - sources."@intlify/message-resolver-9.1.10" - sources."@intlify/runtime-9.1.10" - sources."@intlify/shared-9.1.10" - sources."@intlify/vue-devtools-9.1.10" - sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - (sources."@jridgewell/source-map-0.3.2" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.2" - ]; - }) - sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" - sources."@leichtgewicht/ip-codec-2.0.4" - sources."@node-ipc/js-queue-2.0.3" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@polka/url-1.0.0-next.21" - sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.0" - sources."@sideway/pinpoint-2.0.0" - (sources."@soda/friendly-errors-webpack-plugin-1.8.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."@soda/get-current-script-1.0.2" - sources."@trysound/sax-0.2.0" - sources."@types/body-parser-1.19.2" - sources."@types/bonjour-3.5.10" - sources."@types/connect-3.4.35" - sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.4.6" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-0.0.51" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" - sources."@types/hammerjs-2.0.41" - sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-proxy-1.17.9" - sources."@types/json-schema-7.0.11" - sources."@types/json5-0.0.29" - sources."@types/marked-4.0.6" - sources."@types/mime-3.0.1" - sources."@types/minimist-1.2.2" - sources."@types/node-18.7.18" - sources."@types/normalize-package-data-2.4.1" - sources."@types/parse-json-4.0.0" - sources."@types/qs-6.9.7" - sources."@types/range-parser-1.2.4" - sources."@types/retry-0.12.0" - sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.0" - sources."@types/sockjs-0.3.33" - sources."@types/web-bluetooth-0.0.15" - sources."@types/webpack-env-1.18.0" - sources."@types/ws-8.5.3" - sources."@typescript-eslint/eslint-plugin-5.31.0" - sources."@typescript-eslint/parser-5.31.0" - sources."@typescript-eslint/scope-manager-5.31.0" - sources."@typescript-eslint/type-utils-5.31.0" - sources."@typescript-eslint/types-5.31.0" - sources."@typescript-eslint/typescript-estree-5.31.0" - sources."@typescript-eslint/utils-5.31.0" - sources."@typescript-eslint/visitor-keys-5.31.0" - sources."@vue/babel-helper-vue-jsx-merge-props-1.4.0" - sources."@vue/babel-helper-vue-transform-on-1.0.2" - sources."@vue/babel-plugin-jsx-1.1.1" - (sources."@vue/babel-plugin-transform-vue-jsx-1.4.0" // { - dependencies = [ - sources."html-tags-2.0.0" - ]; - }) - sources."@vue/babel-preset-app-5.0.8" - sources."@vue/babel-preset-jsx-1.4.0" - sources."@vue/babel-sugar-composition-api-inject-h-1.4.0" - sources."@vue/babel-sugar-composition-api-render-instance-1.4.0" - sources."@vue/babel-sugar-functional-vue-1.4.0" - sources."@vue/babel-sugar-inject-h-1.4.0" - (sources."@vue/babel-sugar-v-model-1.4.0" // { - dependencies = [ - sources."camelcase-5.3.1" - sources."html-tags-2.0.0" - ]; - }) - (sources."@vue/babel-sugar-v-on-1.4.0" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) - sources."@vue/cli-overlay-5.0.8" - sources."@vue/cli-plugin-babel-5.0.8" - sources."@vue/cli-plugin-eslint-5.0.8" - sources."@vue/cli-plugin-router-5.0.8" - sources."@vue/cli-plugin-typescript-5.0.8" - sources."@vue/cli-plugin-vuex-5.0.8" - sources."@vue/cli-service-5.0.8" - (sources."@vue/cli-shared-utils-5.0.8" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."@vue/compiler-core-3.2.37" - sources."@vue/compiler-dom-3.2.37" - sources."@vue/compiler-sfc-3.2.37" - sources."@vue/compiler-ssr-3.2.37" - (sources."@vue/component-compiler-utils-3.3.0" // { - dependencies = [ - sources."hash-sum-1.0.2" - sources."lru-cache-4.1.5" - sources."picocolors-0.2.1" - sources."postcss-7.0.39" - sources."yallist-2.1.2" - ]; - }) - sources."@vue/devtools-api-6.2.1" - sources."@vue/eslint-config-standard-8.0.0" - sources."@vue/eslint-config-typescript-11.0.0" - sources."@vue/reactivity-3.2.37" - sources."@vue/reactivity-transform-3.2.37" - sources."@vue/runtime-core-3.2.37" - sources."@vue/runtime-dom-3.2.37" - sources."@vue/server-renderer-3.2.37" - sources."@vue/shared-3.2.37" - (sources."@vue/vue-loader-v15-15.10.0" // { - dependencies = [ - sources."hash-sum-1.0.2" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."@vue/web-component-wrapper-1.3.0" - sources."@vueuse/core-9.1.1" - sources."@vueuse/metadata-9.1.1" - sources."@vueuse/shared-9.1.1" - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-buffer-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/helper-wasm-section-1.11.1" - sources."@webassemblyjs/ieee754-1.11.1" - sources."@webassemblyjs/leb128-1.11.1" - sources."@webassemblyjs/utf8-1.11.1" - sources."@webassemblyjs/wasm-edit-1.11.1" - sources."@webassemblyjs/wasm-gen-1.11.1" - sources."@webassemblyjs/wasm-opt-1.11.1" - sources."@webassemblyjs/wasm-parser-1.11.1" - sources."@webassemblyjs/wast-printer-1.11.1" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."accepts-1.3.8" - sources."acorn-8.8.0" - sources."acorn-import-assertions-1.8.0" - sources."acorn-jsx-5.3.2" - sources."acorn-walk-8.2.0" - sources."address-1.2.1" - sources."ajv-6.12.6" - (sources."ajv-formats-2.1.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."ajv-keywords-3.5.2" - sources."ansi-escapes-3.2.0" - sources."ansi-html-community-0.0.8" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.2" - sources."arch-2.2.0" - sources."argparse-2.0.1" - sources."array-flatten-2.1.2" - sources."array-includes-3.1.5" - sources."array-union-2.1.0" - sources."array.prototype.flat-1.3.0" - sources."async-2.6.4" - sources."at-least-node-1.0.0" - sources."autoprefixer-10.4.11" - sources."babel-loader-8.2.5" - sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.6.0" - sources."babel-plugin-polyfill-regenerator-0.4.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."batch-0.6.1" - sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" - sources."bl-4.1.0" - sources."bluebird-3.7.2" - (sources."body-parser-1.20.0" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."bonjour-service-1.0.14" - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browserslist-4.21.4" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."builtins-5.0.1" - sources."bytes-3.0.0" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."camelcase-6.3.0" - sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001402" - sources."case-sensitive-paths-webpack-plugin-2.4.0" - sources."chalk-2.4.2" - sources."chokidar-3.5.3" - sources."chrome-trace-event-1.0.3" - sources."ci-info-1.6.0" - sources."clean-css-5.3.1" - sources."cli-cursor-3.1.0" - (sources."cli-highlight-2.1.11" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."cli-spinners-2.7.0" - sources."clipboardy-2.3.0" - sources."cliui-7.0.4" - sources."clone-1.0.4" - sources."clone-deep-4.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colord-2.9.3" - sources."colorette-2.0.19" - sources."commander-2.20.3" - sources."commondir-1.0.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."concat-map-0.0.1" - sources."connect-history-api-fallback-2.0.0" - sources."consolidate-0.15.1" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.4" - sources."convert-source-map-1.8.0" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - (sources."copy-webpack-plugin-9.1.0" // { - dependencies = [ - sources."glob-parent-6.0.2" - sources."schema-utils-3.1.1" - ]; - }) - sources."core-js-3.25.0" - sources."core-js-compat-3.25.1" - sources."core-util-is-1.0.3" - sources."cosmiconfig-6.0.0" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."css-declaration-sorter-6.3.1" - sources."css-loader-6.7.1" - (sources."css-minimizer-webpack-plugin-3.4.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - sources."css-select-4.3.0" - sources."css-tree-1.1.3" - sources."css-what-6.1.0" - sources."cssesc-3.0.0" - sources."cssnano-5.1.13" - sources."cssnano-preset-default-5.2.12" - sources."cssnano-utils-3.1.0" - sources."csso-4.2.0" - sources."csstype-2.6.21" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" - (sources."default-gateway-6.0.3" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."defaults-1.0.3" - sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-node-2.1.0" - sources."dir-glob-3.0.1" - sources."dns-equal-1.0.0" - sources."dns-packet-5.4.0" - sources."doctrine-3.0.0" - sources."dom-converter-0.2.0" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."dotenv-10.0.0" - sources."dotenv-expand-5.1.0" - sources."duplexer-0.1.2" - sources."easy-stack-1.0.1" - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.254" - sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.10.0" - sources."entities-2.2.0" - sources."error-ex-1.3.2" - sources."error-stack-parser-2.1.4" - sources."es-abstract-1.20.2" - sources."es-module-lexer-0.9.3" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - (sources."eslint-8.20.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."escape-string-regexp-4.0.0" - sources."eslint-scope-7.1.1" - sources."estraverse-5.3.0" - sources."glob-parent-6.0.2" - sources."globals-13.17.0" - sources."has-flag-4.0.0" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.20.2" - sources."which-2.0.2" - ]; - }) - sources."eslint-config-standard-17.0.0" - sources."eslint-import-resolver-custom-alias-1.3.0" - (sources."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-module-utils-2.7.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-plugin-es-4.1.0" // { - dependencies = [ - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - ]; - }) - (sources."eslint-plugin-import-2.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."doctrine-2.1.0" - sources."ms-2.0.0" - ]; - }) - sources."eslint-plugin-n-15.2.5" - (sources."eslint-plugin-node-11.1.0" // { - dependencies = [ - sources."eslint-plugin-es-3.0.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."semver-6.3.0" - ]; - }) - sources."eslint-plugin-promise-6.0.0" - sources."eslint-plugin-vue-9.3.0" - sources."eslint-scope-5.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" - (sources."eslint-webpack-plugin-3.2.0" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."has-flag-4.0.0" - sources."jest-worker-28.1.3" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."espree-9.4.0" - sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."estree-walker-2.0.2" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."event-pubsub-4.3.0" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."execa-1.0.0" - (sources."express-4.18.1" // { - dependencies = [ - sources."array-flatten-1.1.1" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.12" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" - sources."faye-websocket-0.11.4" - sources."figures-2.0.0" - sources."file-entry-cache-6.0.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."follow-redirects-1.15.2" - (sources."fork-ts-checker-webpack-plugin-6.5.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."schema-utils-2.7.0" - sources."supports-color-7.2.0" - sources."tapable-1.1.3" - ]; - }) - sources."forwarded-0.2.0" - sources."fraction.js-4.2.0" - sources."fresh-0.5.2" - sources."fs-extra-9.1.0" - sources."fs-monkey-1.0.3" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functional-red-black-tree-1.0.1" - sources."functions-have-names-1.2.3" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."globals-11.12.0" - sources."globby-11.1.0" - sources."graceful-fs-4.2.10" - sources."gzip-size-6.0.0" - sources."hammerjs-2.0.8" - sources."handle-thing-2.0.1" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hash-sum-2.0.0" - sources."he-1.2.0" - sources."highlight.js-10.7.3" - sources."hosted-git-info-2.8.9" - (sources."hpack.js-2.1.6" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."html-entities-2.3.3" - (sources."html-minifier-terser-6.1.0" // { - dependencies = [ - sources."commander-8.3.0" - ]; - }) - sources."html-tags-3.2.0" - sources."html-webpack-plugin-5.5.0" - sources."htmlparser2-6.1.0" - sources."http-deceiver-1.2.7" - sources."http-errors-2.0.0" - sources."http-parser-js-0.5.8" - sources."http-proxy-1.18.1" - sources."http-proxy-middleware-2.0.6" - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."icss-utils-5.1.0" - sources."ieee754-1.2.1" - sources."ignore-5.2.0" - sources."immutable-4.1.0" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.3" - sources."ipaddr.js-2.0.1" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" - sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.6" - sources."is-ci-1.2.1" - sources."is-core-module-2.10.0" - sources."is-date-object-1.0.5" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-file-esm-1.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-negative-zero-2.0.2" - sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-plain-obj-3.0.0" - sources."is-plain-object-2.0.4" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-stream-1.1.0" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-unicode-supported-0.1.0" - sources."is-weakref-1.0.2" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."javascript-stringify-2.1.0" - (sources."jest-worker-27.5.1" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."joi-17.6.0" - sources."js-message-1.0.7" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - (sources."js-yaml-loader-1.2.2" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.1" - sources."jsonfile-6.1.0" - sources."kind-of-6.0.3" - sources."klona-2.0.5" - sources."launch-editor-2.6.0" - sources."launch-editor-middleware-2.6.0" - sources."levn-0.4.1" - sources."lilconfig-2.0.6" - sources."lines-and-columns-1.2.4" - sources."loader-runner-4.3.0" - sources."loader-utils-2.0.2" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."lodash.defaultsdeep-4.6.1" - sources."lodash.kebabcase-4.1.1" - sources."lodash.mapvalues-4.6.0" - sources."lodash.memoize-4.1.2" - sources."lodash.merge-4.6.2" - sources."lodash.uniq-4.5.0" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."log-update-2.3.0" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."cli-cursor-2.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."lru-cache-6.0.0" - sources."magic-string-0.25.9" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."marked-4.0.19" - sources."mdn-data-2.0.14" - sources."media-typer-0.3.0" - sources."memfs-3.4.7" - sources."merge-descriptors-1.0.1" - sources."merge-source-map-1.1.0" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - (sources."mini-css-extract-plugin-2.6.1" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - sources."minimalistic-assert-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.6" - sources."minipass-3.3.5" - sources."mkdirp-0.5.6" - sources."module-alias-2.2.2" - sources."mosha-vue-toastify-1.0.23" - sources."mrmime-1.0.1" - sources."ms-2.1.2" - sources."multicast-dns-7.2.5" - sources."mz-2.7.0" - sources."nanoid-3.3.4" - sources."natural-compare-1.4.0" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."node-fetch-2.6.7" - sources."node-forge-1.3.1" - sources."node-releases-2.0.6" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."normalize-path-3.0.0" - sources."normalize-range-0.1.2" - sources."normalize-url-6.1.0" - sources."npm-run-path-2.0.2" - sources."nth-check-2.1.1" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."object.values-1.1.5" - sources."obuf-1.1.2" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.0" - sources."opener-1.5.2" - sources."optionator-0.9.1" - (sources."ora-5.4.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-retry-4.6.2" - sources."p-try-2.2.0" - (sources."param-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."parse5-5.1.1" - (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { - dependencies = [ - sources."parse5-6.0.1" - ]; - }) - sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.4.0" - ]; - }) - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pinia-2.0.21" - sources."pkg-dir-4.2.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."postcss-8.4.16" - sources."postcss-calc-8.2.4" - sources."postcss-colormin-5.3.0" - sources."postcss-convert-values-5.1.2" - sources."postcss-discard-comments-5.1.2" - sources."postcss-discard-duplicates-5.1.0" - sources."postcss-discard-empty-5.1.1" - sources."postcss-discard-overridden-5.1.0" - (sources."postcss-loader-6.2.1" // { - dependencies = [ - sources."cosmiconfig-7.0.1" - ]; - }) - sources."postcss-merge-longhand-5.1.6" - sources."postcss-merge-rules-5.1.2" - sources."postcss-minify-font-values-5.1.0" - sources."postcss-minify-gradients-5.1.1" - sources."postcss-minify-params-5.1.3" - sources."postcss-minify-selectors-5.2.1" - sources."postcss-modules-extract-imports-3.0.0" - sources."postcss-modules-local-by-default-4.0.0" - sources."postcss-modules-scope-3.0.0" - sources."postcss-modules-values-4.0.0" - sources."postcss-normalize-charset-5.1.0" - sources."postcss-normalize-display-values-5.1.0" - sources."postcss-normalize-positions-5.1.1" - sources."postcss-normalize-repeat-style-5.1.1" - sources."postcss-normalize-string-5.1.0" - sources."postcss-normalize-timing-functions-5.1.0" - sources."postcss-normalize-unicode-5.1.0" - sources."postcss-normalize-url-5.1.0" - sources."postcss-normalize-whitespace-5.1.1" - sources."postcss-ordered-values-5.1.3" - sources."postcss-reduce-initial-5.1.0" - sources."postcss-reduce-transforms-5.1.0" - sources."postcss-selector-parser-6.0.10" - sources."postcss-svgo-5.1.0" - sources."postcss-unique-selectors-5.1.1" - sources."postcss-value-parser-4.2.0" - sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" - sources."pretty-error-4.0.0" - sources."process-nextick-args-2.0.1" - sources."progress-webpack-plugin-1.0.16" - (sources."proxy-addr-2.0.7" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) - sources."pseudomap-1.0.2" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.10.3" - sources."queue-microtask-1.2.3" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) - sources."read-pkg-5.2.0" - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - sources."readable-stream-3.6.0" - sources."readdirp-3.6.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.15.0" - sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" - sources."regexpu-core-5.2.1" - sources."regjsgen-0.7.1" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."relateurl-0.2.7" - sources."renderkid-3.0.0" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" - sources."resolve-1.22.1" - sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" - sources."retry-0.13.1" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sass-1.54.0" - sources."sass-loader-13.0.2" - sources."schema-utils-2.7.1" - sources."select-hose-2.0.0" - sources."selfsigned-2.1.1" - sources."semver-7.3.7" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serialize-javascript-6.0.0" - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."ms-2.0.0" - sources."setprototypeof-1.1.0" - sources."statuses-1.5.0" - ]; - }) - sources."serve-static-1.15.0" - sources."setprototypeof-1.2.0" - sources."shallow-clone-3.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.3" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."sirv-1.0.19" - sources."slash-3.0.0" - sources."sockjs-0.3.24" - sources."source-map-0.6.1" - sources."source-map-js-1.0.2" - sources."source-map-support-0.5.21" - sources."sourcemap-codec-1.4.8" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" - sources."spdy-4.0.2" - sources."spdy-transport-3.0.0" - sources."sprintf-js-1.0.3" - sources."ssri-8.0.1" - sources."stable-0.1.8" - sources."stackframe-1.3.4" - sources."statuses-2.0.1" - sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" - (sources."string_decoder-1.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-2.0.0" - sources."strip-json-comments-3.1.1" - sources."stylehacks-5.1.0" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svg-tags-1.0.0" - (sources."svgo-2.8.0" // { - dependencies = [ - sources."commander-7.2.0" - ]; - }) - sources."tapable-2.2.1" - sources."terser-5.15.0" - (sources."terser-webpack-plugin-5.3.6" // { - dependencies = [ - sources."schema-utils-3.1.1" - ]; - }) - sources."text-table-0.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - (sources."thread-loader-3.0.4" // { - dependencies = [ - sources."schema-utils-3.1.1" - ]; - }) - sources."thunky-1.1.0" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."totalist-1.1.0" - sources."tr46-0.0.3" - (sources."ts-loader-9.3.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."tsconfig-paths-3.14.1" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) - sources."tslib-1.14.1" - sources."tsutils-3.21.0" - sources."type-check-0.4.0" - sources."type-fest-0.6.0" - sources."type-is-1.6.18" - sources."typescript-4.7.4" - sources."un-eval-1.2.0" - sources."unbox-primitive-1.0.2" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.0.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.9" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."utila-0.4.0" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."v-lazy-image-2.1.1" - sources."v8-compile-cache-2.3.0" - sources."validate-npm-package-license-3.0.4" - sources."vary-1.1.2" - sources."vue-3.2.37" - sources."vue-cli-plugin-pinia-0.1.4" - sources."vue-demi-0.13.11" - sources."vue-dragscroll-4.0.4" - (sources."vue-eslint-parser-9.1.0" // { - dependencies = [ - sources."eslint-scope-7.1.1" - sources."estraverse-5.3.0" - ]; - }) - sources."vue-hot-reload-api-2.3.4" - sources."vue-i18n-9.1.10" - (sources."vue-loader-17.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."vue-router-4.1.5" - (sources."vue-style-loader-4.1.3" // { - dependencies = [ - sources."hash-sum-1.0.2" - sources."json5-1.0.1" - sources."loader-utils-1.4.0" - ]; - }) - sources."vue-template-es2015-compiler-1.9.1" - sources."watchpack-2.4.0" - sources."wbuf-1.7.3" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - (sources."webpack-5.74.0" // { - dependencies = [ - sources."schema-utils-3.1.1" - ]; - }) - (sources."webpack-bundle-analyzer-4.6.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-7.2.0" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."webpack-chain-6.5.1" // { - dependencies = [ - sources."deepmerge-1.5.2" - ]; - }) - (sources."webpack-dev-middleware-5.3.3" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - ]; - }) - (sources."webpack-dev-server-4.11.0" // { - dependencies = [ - sources."ajv-8.11.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.0" - sources."ws-8.8.1" - ]; - }) - sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.3" - sources."webpack-virtual-modules-0.4.5" - sources."websocket-driver-0.7.4" - sources."websocket-extensions-0.1.4" - sources."whatwg-fetch-3.6.2" - sources."whatwg-url-5.0.0" - sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."wildcard-2.0.0" - sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-7.5.9" - sources."xml-name-validator-4.0.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yaml-1.10.2" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - (sources."yorkie-2.0.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.8.0" - sources."get-stream-3.0.0" - sources."lru-cache-4.1.5" - sources."normalize-path-1.0.0" - sources."yallist-2.1.2" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - homepage = "https://ldgallery.pacien.org/"; - license = "AGPL-3"; - }; - production = false; - bypassCache = true; - reconstructLock = true; - }; -in -{ - args = args; - sources = sources; - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; - nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { - src = stdenv.mkDerivation { - name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; - dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; - }; - }); -} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/maskromtool/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/maskromtool/default.nix index cee7d3726c..f36932e3be 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/maskromtool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/maskromtool/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maskromtool"; - version = "2023-06-17"; + version = "2023-07-20"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${version}"; - hash = "sha256-NumMO9whM5ZdEtxI3gjp2Ky2b8/rjPSiD9G/95xJk1o="; + hash = "sha256-AUZh1GAGN5RUXyK+YvQfhAp124bSI0LvCSaTRutLuE4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix index fc4e0d964f..d7e757e679 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }) ]; - sourceRoot = "source/pdftoipe"; + sourceRoot = "${src.name}/pdftoipe"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ poppler ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index d7abf3787e..05cb130467 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -3,7 +3,6 @@ , fetchzip , fetchFromGitHub , cmake -, spirv-headers , vulkan-headers , vulkan-loader , glslang @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-eLAIlOl1sUxijeVPFG+NscZGxDdtrQqVkMuxhegESHk="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; models = fetchzip { # Choose the newst release from https://github.com/xinntao/Real-ESRGAN/releases to update diff --git a/third_party/nixpkgs/pkgs/tools/graphics/smartcrop/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/smartcrop/default.nix new file mode 100644 index 0000000000..d08c11fd3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/smartcrop/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "smartcrop"; + version = "unstable-2023-03-16"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "smartcrop"; + rev = "f1935b108c21d44756141bfebf302dfd7b03fdbe"; + hash = "sha256-3fNDmKR5b6SexG3fBn7uXrtL1gbXrpo8d8boKul1R6Y="; + }; + + vendorHash = "sha256-ov3dHF/NxqxWPaVzddaJSjz3boLpZtIPtvP1iNBtiTc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Find good image crops for arbitrary crop sizes"; + homepage = "https://github.com/muesli/smartcrop"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix index 03d3728086..11ee723091 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchCrate , rustPlatform +, fetchCrate }: rustPlatform.buildRustPackage rec { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix index 23ce5ff68b..765b830e29 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/timg/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "timg"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - hash = "sha256-1zv5+62roS0iSVXa1QXGKuO0Qd6D3e3tZD2HZ5czRRk="; + hash = "sha256-hGQL6MAsaSVV/w5fDKAcd4KIBuh2pvl3D2QUzi/aeG0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix index 3fa206d886..a840209e65 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix @@ -18,7 +18,7 @@ , chafa , enableOpencv ? stdenv.isLinux , opencv -, enableSway ? stdenv.isLinux +, enableWayland ? stdenv.isLinux , extra-cmake-modules , wayland , wayland-protocols @@ -30,19 +30,20 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-HvcH8ysH43i87so758m6QD+AuNfTiOdo5knI+3PBO8U="; + hash = "sha256-RW2dKueidFM/RkGfOAorHukGVm1srbuAlyUP/r+JWi0="; }; # error: no member named 'ranges' in namespace 'std' postPatch = lib.optionalString withoutStdRanges '' - for f in src/canvas/chafa.cpp src/canvas/iterm2/iterm2.cpp; do + for f in src/canvas/chafa.cpp src/canvas/iterm2/iterm2.cpp src/terminal.cpp; do sed -i "1i #include " $f + sed -i "2i #include " $f substituteInPlace $f \ --replace "#include " "" \ --replace "std::ranges" "ranges" @@ -72,7 +73,7 @@ stdenv.mkDerivation rec { cli11 ] ++ lib.optionals enableOpencv [ opencv - ] ++ lib.optionals enableSway [ + ] ++ lib.optionals enableWayland [ extra-cmake-modules wayland wayland-protocols @@ -85,8 +86,8 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals (!enableOpencv) [ "-DENABLE_OPENCV=OFF" - ] ++ lib.optionals enableSway [ - "-DENABLE_SWAY=ON" + ] ++ lib.optionals enableWayland [ + "-DENABLE_WAYLAND=ON" ] ++ lib.optionals (!enableX11) [ "-DENABLE_X11=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 774f749519..1adfa8e7c1 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.14.2"; + version = "8.14.3"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - hash = "sha256-QUWZ11t2JEJBdpNuIY2uRiSL/hffRbV0SV5HowxWaME="; + hash = "sha256-2BE/cDQU/FP0Lo9/gZiG1IAskTbnhBtzbcL2dRziHmU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index d8cb710b29..56fe4e122e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,5 +1,6 @@ { cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers, OpenCL -, cudaSupport ? false, cudatoolkit ? null +, config +, cudaSupport ? config.cudaSupport, cudatoolkit ? null }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix index 6f41f2826b..29e1d39195 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix @@ -4,14 +4,12 @@ , freetype , zlib , openssl -, dpkg , fetchurl , gcc-unwrapped , libjpeg8 , libpng , fontconfig , stdenv -, wkhtmltopdf , xar , xorg }: diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix index dce5bd4859..e58db09f70 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix @@ -1,4 +1,4 @@ -{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit +{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch , python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5 , jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad, nixosTests }: let @@ -24,7 +24,7 @@ let sha256 = "ExS0Cg3rs0I9IOVbZHLt8UEfk8/LmY9oAHPVVlYuTPw="; }; -in clangStdenv.mkDerivation rec { +in clangStdenv.mkDerivation { pname = "fcitx5-mozc"; version = "2.26.4220.102"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 24019041eb..8adc271ff8 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -48,6 +48,8 @@ mkDerivation rec { libXdmcp ]; + qtWrapperArgs = [ "--prefix" "FCITX_ADDON_DIRS" ":" "${placeholder "out"}/lib/fcitx5" ]; + meta = with lib; { description = "Fcitx5 Qt Library"; homepage = "https://github.com/fcitx/fcitx5-qt"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py index fba390211c..6c745ef7db 100755 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests +#!nix-shell -i python3 -p nix-update python3Packages.requests from nix_prefetch_github import * import requests diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 26a50951c0..0cb7d845ed 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -5,7 +5,6 @@ , xorg , pkg-config , wrapGAppsHook -, ibus , gtk3 , go }: diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix index c72d7f1a60..2e322d24a7 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, ibus, gtk3, libthai }: +{ lib, stdenv, fetchurl, pkg-config, ibus, gtk3, libthai }: stdenv.mkDerivation rec { pname = "ibus-libthai"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Thai input method engine for IBus"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 181bfd5e1f..89e4d3d15c 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.15"; + version = "1.3.16"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nOj5gwhFodZv29hAN6S8EhQ+XlWp31FDOGIXtyAOM1E="; + hash = "sha256-TybqFQ2EgYo4zCYXwDJ0dke7HSzkZXs0lG2zR2XmlG4="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ibus ibus-table python3 ]; + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ ibus ibus-table ]; preBuild = '' export HOME=$TMPDIR @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/moebiuscurve/ibus-table-others"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ mudri ]; + maintainers = with maintainers; [ mudri McSinyx ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix index 092901e08c..ff2a7363d9 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix @@ -1,5 +1,4 @@ { lib -, python3 , pkgconfig , wrapGAppsHook , gettext diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix index ba0c051644..810ade71bb 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, cmake -, pkg-config , systemd , runtimeShell , python3 @@ -43,7 +41,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "keyd"; inherit version src; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix index 73d7353894..c526f6a844 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , m17n_db , autoreconfHook , pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index bb974fbc8b..da6074a96a 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages, iconv, skktools }: +{ lib, stdenv, fetchurl, iconv, skktools }: let # kana to kanji diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix new file mode 100644 index 0000000000..b28b7ad784 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, _7zz +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "unnaturalscrollwheels"; + version = "1.3.0"; + + src = fetchurl { + url = "https://github.com/ther0n/UnnaturalScrollWheels/releases/download/${finalAttrs.version}/UnnaturalScrollWheels-${finalAttrs.version}.dmg"; + sha256 = "1c6vlf0kc7diz0hb1fmrqaj7kzzfvr65zcchz6xv5cxf0md4n70r"; + }; + sourceRoot = "."; + + # APFS format is unsupported by undmg + nativeBuildInputs = [ _7zz ]; + unpackCmd = "7zz x $curSrc"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "Invert scroll direction for physical scroll wheels"; + homepage = "https://github.com/ther0n/UnnaturalScrollWheels"; + license = licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/llm/gorilla-cli/default.nix b/third_party/nixpkgs/pkgs/tools/llm/gorilla-cli/default.nix new file mode 100644 index 0000000000..ff5e3468ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/llm/gorilla-cli/default.nix @@ -0,0 +1,38 @@ +{ lib +, python3 +, fetchFromGitHub +, nix-update-script +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gorilla-cli"; + version = "0.0.9"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gorilla-llm"; + repo = "gorilla-cli"; + rev = version; + hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ="; + }; + + disabled = python3.pythonOlder "3.6"; + + propagatedBuildInputs = with python3.pkgs; [ + requests + halo + prompt-toolkit + ]; + + passthru.updateScript = nix-update-script { }; + + # no tests + doCheck = false; + + meta = with lib; { + description = "LLMs for your CLI"; + homepage = "https://github.com/gorilla-llm/gorilla-cli"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/shell_gpt/default.nix b/third_party/nixpkgs/pkgs/tools/llm/shell_gpt/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/tools/misc/shell_gpt/default.nix rename to third_party/nixpkgs/pkgs/tools/llm/shell_gpt/default.nix index b29695db71..eca521ba57 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shell_gpt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/llm/shell_gpt/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "shell_gpt"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g7zQ9ii38jBMUT0n8SjkccnGlkpCO4817GZ2yidxpMU="; + sha256 = "sha256-R4rhATuM0VL/N5+dXf3r9bF2/AVEcQhB2J4KYnxdHbk="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/a4term/default.nix b/third_party/nixpkgs/pkgs/tools/misc/a4term/default.nix new file mode 100644 index 0000000000..6c9ab7aac2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/a4term/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, libtickit +, libvterm-neovim +}: + +stdenv.mkDerivation rec { + pname = "a4term"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "rpmohn"; + repo = "a4"; + rev = "v${version}"; + hash = "sha256-hsAEiPOZBqjvmSZEmZwfDqHZV/8ym62RZPxl3DG4ntQ="; + }; + + buildInputs = [ + libtickit + libvterm-neovim + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A dynamic terminal window manager"; + homepage = "https://www.a4term.com/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onemoresuza ]; + platforms = lib.platforms.linux; + mainProgram = "a4"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/alt-server/default.nix b/third_party/nixpkgs/pkgs/tools/misc/alt-server/default.nix new file mode 100644 index 0000000000..5a9de8cf3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/alt-server/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchurl +, lib +, autoPatchelfHook +, avahi-compat +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "AltServer-Linux"; + version = "0.0.5"; + + src = fetchurl { + url = "https://github.com/NyaMisty/AltServer-Linux/releases/download/v${finalAttrs.version}/AltServer-x86_64"; + hash = "sha256-C+fDrcaewRd6FQMrO443xdDk/vtHycQ5zWLCOLPqF/s="; + }; + + buildInputs = [ + avahi-compat + ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $src $out/bin/alt-server + chmod u+rx $out/bin/alt-server + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/NyaMisty/AltServer-Linux"; + description = "AltServer for AltStore, but on-device. Requires root privileges as well as running a custom anisette server currently."; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ max-amb ]; + }; +}) + diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix index 53bc534e11..40a22836f7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -41,7 +41,10 @@ python3.pkgs.buildPythonApplication rec { # see https://github.com/phillipberndt/autorandr/issues/197 installShellCompletion --cmd autorandr \ --bash contrib/bash_completion/autorandr \ - --zsh contrib/zsh_completion/_autorandr + --zsh contrib/zsh_completion/_autorandr \ + --fish contrib/fish_copletion/autorandr.fish + # In the line above there's a typo that needs to be fixed in the next + # release make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix index bed3776633..f310b99f81 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.4.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - hash = "sha256-K5y5C+K/fMhgOcSsCMaIgY6ce9UUPszoyumsfNHKjBo="; + hash = "sha256-5mecCg5c+fu6WUgmNEL4BR+JCild02YAuYgLwO1MGnI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix index 3cb5aa81a1..0863ebde2a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix @@ -28,13 +28,13 @@ let # This includes the complete source so the per-script derivations can run the tests. core = stdenv.mkDerivation rec { pname = "bat-extras"; - version = "2023.03.21"; + version = "2023.06.15"; src = fetchFromGitHub { owner = "eth-p"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0Ged4qBeGi0p29unXrnQjoxWc6Fcl2oJThxkfL+t50A="; + sha256 = "sha256-dBrnUIG3EuEgDZBbzrspP5UReiUKjrMSYIe5QtZ0/tU="; fetchSubmodules = true; }; @@ -112,7 +112,7 @@ let dontBuild = true; # we've already built doCheck = true; - nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bat bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); checkPhase = '' runHook preCheck bash ./test.sh --compiled --suite ${name} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index 31f86098a0..400aec1cd7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sharkdp"; - repo = pname; + repo = "bat"; rev = "v${version}"; hash = "sha256-cGHxB3Wp8yEcJBMtSOec6l7iBsMLhUtJ7nh5fijnWZs="; }; @@ -58,6 +58,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/bat"; changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; + mainProgram = "bat"; maintainers = with maintainers; [ dywedir lilyball zowoq SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index 1a75c2ff0a..fdcdde0c04 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.221"; + version = "1.222"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "XaNAF5+TM1F0qyX/PEwRoiEvO8qmPuMWs+mkWSaHNGg="; + sha256 = "sha256-zGd2t2Qtec8Up1SHAizZp8l/fhFpa0Y1UJbB8XanX6Q="; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bitwise/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bitwise/default.nix index fc6f58ca2f..e9443f25c0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bitwise/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bitwise/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bitwise"; - version = "0.43"; + version = "0.50"; src = fetchFromGitHub { owner = "mellowcandle"; repo = "bitwise"; rev = "v${version}"; - sha256 = "18sz7bfpq83s2zhw7c35snz6k3b6rzad2mmfq2qwmyqwypbp1g7l"; + sha256 = "sha256-x+ky1X0c0bQZnkNvNNuXN2BoMDtDSCt/8dBAG92jCCQ="; }; buildInputs = [ ncurses readline ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index a53b833d7d..0bf96a6d63 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.23.0"; + version = "1.24.2"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-OoZO6YZ0ysPS4ZXh/AnYIo24J4cBlRxi5sIWWYrpR7c="; + hash = "sha256-SdQOoixfSQdSS9SOc/U0Ay9VIRfsrgALhLT4cESgSLo="; }; - cargoHash = "sha256-kcfBjQckFv0KhfXvGz3fimCSfLD9n1yGI7azmobG6Kw="; + cargoHash = "sha256-MZyNSgsz1pngEuYxmG/GUqQeTmA5D6Y0tcToafFu1F8="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/charasay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/charasay/default.nix index 986e3d45ec..84247a147c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/charasay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/charasay/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "charasay"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "latipun7"; repo = pname; rev = "v${version}"; - hash = "sha256-LijIteY0RZxNf6RI61bm1Ug4+GFsoWr6icNu1p2pa2s="; + hash = "sha256-Cq7pHW4CYGHdVAhscyiOHSdi5Lefk5ve32EOqS2oSRk="; }; - cargoHash = "sha256-sG+tyCYur2UR1U9g5tWOyuU2mJ14PdayBqMdNGOwIrA="; + cargoHash = "sha256-/9ex5rIYtJVsuwpOpCZLgFSHEdntbnkOX1oRaZ02AOg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 1a4c9b36fb..688725a78a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.34.3"; + version = "2.36.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-Cy2mRcx8UZp9+7O824sosQ8ld9ppl2YvCssvL16aBsA="; + hash = "sha256-OZrQxF5fuKpauy3wk6q3bUh1uUw14nkEldrzYPiOVIQ="; }; - vendorHash = "sha256-Z812v+UTaAi3tA2hWtZkQXrtlXhQzlawYtbQdX1HHN0="; + vendorHash = "sha256-H7sbpDZMkPF5qw9urb/Gfmy8b9T4UEsnl6CGlZ1LThQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix index e95535056b..9cebe31dd7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/clipboard-jh/default.nix @@ -9,17 +9,18 @@ , xorg , darwin , nix-update-script +, alsa-lib }: stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-1HWWrBI96znHctoMhQyO46Jmbg1jXPcvkDdwiWwp4KE="; + hash = "sha256-UlN2BjtzS54oImAGM2Kl+j/LwfAyDXtbEMhsijBh/yg="; }; postPatch = '' @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { wayland-protocols wayland xorg.libX11 + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 49dc167a09..1b33f15ce2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,29 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.31.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; - repo = "cloudsql-proxy"; + repo = "cloud-sql-proxy"; rev = "v${version}"; - sha256 = "sha256-wlMwl1S9WKtCoruKhMVK1197/3/OWhvvXTT1tH/yPlI="; + hash = "sha256-/mXaNRTRIBIPUHY/MOHpGmpB8wBp18wwftn/EdmoffQ="; }; - subPackages = [ "cmd/cloud_sql_proxy" ]; + subPackages = [ "." ]; - vendorSha256 = "sha256-OMvu0LCYv0Z03ZM2o8UZx/Su2rdvTJp5DUZa8/MtQSc="; + vendorSha256 = "sha256-VadE9E4B8BIIHGl+PN4oDl0H56xE3GQn0MxGw5fGsvM="; preCheck = '' buildFlagsArray+="-short" ''; meta = with lib; { - description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; + description = "Utility for ensuring secure connections to Google Cloud SQL instances"; + homepage = "https://github.com/GoogleCloudPlatform/cloud-sql-proxy"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski ]; - mainProgram = "cloud_sql_proxy"; + maintainers = with maintainers; [ nicknovitski totoroot ]; + mainProgram = "cloud-sql-proxy"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/cope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cope/default.nix index 9facf9816b..7e65c854f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cope/default.nix @@ -23,6 +23,6 @@ perlPackages.buildPerlPackage rec { description = "A colourful wrapper for terminal programs"; homepage = "https://github.com/lotrfan/cope"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix index 1ba4c0aee9..b96ccfd6fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreboot-utils/default.nix @@ -65,6 +65,7 @@ let nvramtool = generic { pname = "nvramtool"; meta.description = "Read and write coreboot parameters and display information from the coreboot table in CMOS/NVRAM"; + meta.mainProgram = "nvramtool"; }; superiotool = generic { pname = "superiotool"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix new file mode 100644 index 0000000000..b734008fad --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix @@ -0,0 +1,33 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cp210x-program"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "VCTLabs"; + repo = "cp210x-program"; + rev = "refs/tags/${version}"; + sha256 = "sha256-IjKshP12WfFly9cPm6svD4qZW6cT8C7lOVrGenSqbfY="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + hexdump + pyusb + ]; + + postInstall = '' + ln -s $out/bin/cp210x-program{.py,} + ''; + + meta = with lib; { + description = "EEPROM tool for Silabs CP210x USB-Serial adapter"; + homepage = "https://github.com/VCTLabs/cp210x-program"; + license = licenses.lgpl21Only; # plus/only status unclear + maintainers = with maintainers; [ ckie ]; + mainProgram = "cp210x-program"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix index b60077b992..d93f8adca1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.4.0"; + version = "10.5.2"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-BjdeOTVZUMitmInL/kE6a/aw/lH4YwKNWxdi0B51xzc="; + sha256 = "sha256-sN8dCgmLj0jHfoaUNk2ml/iEJy8/QFfCTRCn9tyTz78="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 408e5b9f7b..6506101908 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -8,6 +9,7 @@ , gdk-pixbuf , atk , gtk4 +, Foundation , wrapGAppsHook4 , gobject-introspection , xvfb-run @@ -41,6 +43,8 @@ rustPlatform.buildRustPackage rec { gdk-pixbuf atk gtk4 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Foundation ]; nativeCheckInputs = [ @@ -53,6 +57,9 @@ rustPlatform.buildRustPackage rec { runHook postCheck ''; + doCheck = stdenv.hostPlatform.isLinux + && (stdenv.hostPlatform == stdenv.buildPlatform); + passthru.tests.version = testers.testVersion { package = czkawka; command = "czkawka_cli --version"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix index 6109ef3b0c..e1ee9757fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debian-devscripts/default.nix @@ -76,6 +76,6 @@ in stdenv.mkDerivation rec { description = "Debian package maintenance scripts"; license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with maintainers; [raskin]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index d4e8c538b8..e736ce1468 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -18,7 +18,6 @@ , dtc , e2fsprogs , enableBloat ? true -, enableUnfree ? false , enjarify , fetchurl , file @@ -79,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "243"; + version = "246"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-lqI9MOZJxgHZ87kax343t6Wylzv1NWcQZ1cMWgmpnRo="; + hash = "sha256-z7wrc8hveKqMJsJMLQXO3z+wcJxpY8QFoYxTBUzfGPg="; }; outputs = [ @@ -174,6 +173,7 @@ python3.pkgs.buildPythonApplication rec { abootimg apksigcopier apksigner + apktool cbfstool colord enjarify @@ -214,8 +214,6 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals stdenv.isLinux [ oggvideotools ] # This doesn't work on aarch64-darwin ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] - # apktool depend on build-tools which requires Android SDK acceptance, therefore, the whole thing is unfree - ++ lib.optionals enableUnfree [ apktool ] )); nativeCheckInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index 88a07cd07a..179e719528 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -50,5 +50,6 @@ buildGoModule rec { homepage = "https://direnv.net"; license = licenses.mit; maintainers = teams.numtide.members; + mainProgram = "direnv"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix index 1fd1d3422a..0ea4106ab0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix @@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec { description = "Terminal disk space navigator"; homepage = "https://github.com/imsnif/diskonaut"; license = licenses.mit; - maintainers = with maintainers; [ evanjs SuperSandro2000 ]; + maintainers = with maintainers; [ evanjs figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix index 6bf8982c86..1356a3908d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.12.15"; + version = "0.13.0"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-quMEwg/B4ey6zoxDZO2ce3/s1FX5xxmJfyAlt4YvFqE="; + hash = "sha256-mAvTy/11a9RGSQpElhpKMzsMC7vA7cbeHsNRy9MnIjw="; }; - cargoHash = "sha256-D8H95dE+th1mMzlLmd+fqU5VdlxdOSBHKSjvh21JhnE="; + cargoHash = "sha256-XsDp/ssoNVdTHDTPm2ucgBeYmFgbeBIxQ/NsGjCl5Qg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix index 5416f0c87c..62c873ccfc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; - maintainers = with maintainers; [ penguwin SuperSandro2000 ]; + maintainers = with maintainers; [ figsoda penguwin ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix index 2e08e0654f..3851a026a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; - maintainers = with maintainers; [ infinisil SuperSandro2000 ]; + maintainers = with maintainers; [ infinisil ]; mainProgram = "dust"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/engage/default.nix b/third_party/nixpkgs/pkgs/tools/misc/engage/default.nix index c01dcc2e68..f9b0f411ee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/engage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/engage/default.nix @@ -1,4 +1,5 @@ { lib +, installShellFiles , rustPlatform , fetchgit }: @@ -19,6 +20,22 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-+4uqC0VoBSmkS9hYC1lzWeJmK873slZT04TljHPE+Eo="; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = "installShellCompletion --cmd ${pname} " + + builtins.concatStringsSep + " " + (builtins.map + (shell: "--${shell} <($out/bin/${pname} self completions ${shell})") + [ + "bash" + "fish" + "zsh" + ] + ); + meta = { description = "A task runner with DAG-based parallelism"; homepage = "https://or.computer.surgery/charles/engage"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix index 13808b91d0..1828ddce7a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Tool for translating Dalvik bytecode to equivalent Java bytecode"; homepage = "https://github.com/google/enjarify/"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index 4bcfe52099..7d4fd4cb71 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20230621.0"; + version = "20230711.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e5nAhtM5Yc2KNmH6a041o6i6SnVCbaONulBe1ZCF0+w="; + hash = "sha256-00JenOcGttrDDvIIK/iERboiRr7dsg2ibbNAmB4LItU="; }; # no tests diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index b0366fa75f..c08d03ef16 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.6.5"; + version = "2023.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3CuIAzw4AxvpUw69WEq99XIv0D+TqwejqEGPvG2Zdpw="; + hash = "sha256-zJ00Ypb//b+SndzMC/QGzxtu9GZefaJvr5tKYp68hhc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix index 91d0b1c49d..d22303e150 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/exa/default.nix @@ -58,5 +58,6 @@ rustPlatform.buildRustPackage { homepage = "https://the.exa.website"; license = licenses.mit; maintainers = with maintainers; [ ehegnes lilyball globin fortuneteller2k ]; + mainProgram = "exa"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/eza/default.nix b/third_party/nixpkgs/pkgs/tools/misc/eza/default.nix new file mode 100644 index 0000000000..f3b2fa0e52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/eza/default.nix @@ -0,0 +1,61 @@ +{ lib +, gitSupport ? true +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pandoc +, pkg-config +, zlib +, Security +, libiconv +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "eza"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "cafkafk"; + repo = "eza"; + rev = "v${version}"; + hash = "sha256-9Pw7DQ/QTRHNsCPen+Nn5HdvjX1ju08q+KyitPF9+xQ="; + }; + + cargoHash = "sha256-KveRmlgyree77ZDOB4hQA35F/u/ARKiAHRgHpjCXOow="; + + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; + buildInputs = [ zlib ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + + buildNoDefaultFeatures = true; + buildFeatures = lib.optional gitSupport "git"; + + outputs = [ "out" "man" ]; + + postInstall = '' + pandoc --standalone -f markdown -t man man/eza.1.md > man/eza.1 + pandoc --standalone -f markdown -t man man/eza_colors.5.md > man/eza_colors.5 + installManPage man/eza.1 man/eza_colors.5 + installShellCompletion \ + --bash completions/bash/eza \ + --fish completions/fish/eza.fish \ + --zsh completions/zsh/_eza + ''; + + meta = with lib; { + description = "A modern, maintained replacement for ls"; + longDescription = '' + eza is a modern replacement for ls. It uses colours for information by + default, helping you distinguish between many types of files, such as + whether you are the owner, or in the owning group. It also has extra + features not present in the original ls, such as viewing the Git status + for a directory, or recursing into directories with a tree view. eza is + written in Rust, so it’s small, fast, and portable. + ''; + homepage = "https://github.com/cafkafk/eza"; + license = licenses.mit; + maintainers = with maintainers; [ cafkafk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/farge/default.nix b/third_party/nixpkgs/pkgs/tools/misc/farge/default.nix new file mode 100644 index 0000000000..1abffc64e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/farge/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeBinaryWrapper +, bc +, libnotify +, feh +, grim +, imagemagick +, slurp +, wl-clipboard +, xcolor +, waylandSupport ? true +, x11Support ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "farge"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "sdushantha"; + repo = "farge"; + rev = "2ff6669e2350644d4f0b1bd84526efe5eae3c302"; + hash = "sha256-vCMuFMGcI4D4EzbSsXeNGKNS6nBFkfTcAmSzb9UMArc="; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + # Ensure the following programs are found within $PATH + wrapperPath = lib.makeBinPath ([ + bc + feh + #Needed to fix convert: unable to read font `(null)' @ error/annotate.c/RenderFreetype issue + (imagemagick.override { ghostscriptSupport = true;}) + libnotify #Needed for the notify-send function call from the script + ] ++ lib.optionals waylandSupport [ grim slurp wl-clipboard ] + ++ lib.optionals x11Support [ xcolor ]); + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -m755 farge $out/bin + wrapProgram $out/bin/farge \ + --prefix PATH : "${finalAttrs.wrapperPath}" + runHook postInstall + ''; + + meta = with lib; { + description = "A tool that shows the color value of a given pixel on your screen"; + homepage = "https://github.com/sdushantha/farge"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jtbx justinlime ]; + mainProgram = "farge"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix new file mode 100644 index 0000000000..39250dfca4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix @@ -0,0 +1,123 @@ +{ lib +, stdenv +, fetchFromGitHub +, chafa +, cmake +, dbus +, dconf +, glib +, imagemagick_light +, libglvnd +, libpulseaudio +, libxcb +, libXrandr +, makeBinaryWrapper +, networkmanager +, nix-update-script +, ocl-icd +, opencl-headers +, pciutils +, pkg-config +, rpm +, sqlite +, testers +, vulkan-loader +, wayland +, xfce +, zlib +, AppKit +, Cocoa +, CoreDisplay +, CoreVideo +, CoreWLAN +, DisplayServices +, Foundation +, IOBluetooth +, MediaRemote +, OpenCL +, moltenvk +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastfetch"; + version = "1.12.2"; + + src = fetchFromGitHub { + owner = "fastfetch-cli"; + repo = "fastfetch"; + rev = finalAttrs.version; + hash = "sha256-l9fIm7+dBsOqGoFUYtpYESAjDy3496rDTUDQjbNU4U0="; + }; + + nativeBuildInputs = [ + cmake + makeBinaryWrapper + pkg-config + ]; + + buildInputs = [ + chafa + imagemagick_light + sqlite + ] + ++ lib.optionals stdenv.isLinux [ + dbus + dconf + glib + libglvnd + libpulseaudio + libxcb + libXrandr + networkmanager + ocl-icd + opencl-headers + pciutils + rpm + vulkan-loader + wayland + xfce.xfconf + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + CoreDisplay + CoreVideo + CoreWLAN + DisplayServices + Foundation + IOBluetooth + MediaRemote + OpenCL + moltenvk + ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + ]; + + postInstall = '' + wrapProgram $out/bin/fastfetch \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" + wrapProgram $out/bin/flashfetch \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "fastfetch -v | cut -d '(' -f 1"; + version = "fastfetch ${finalAttrs.version}"; + }; + }; + + meta = { + description = "Like neofetch, but much faster because written in C"; + inherit (finalAttrs.src.meta) homepage; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gerg-l khaneliman ]; + platforms = lib.platforms.all; + mainProgram = "fastfetch"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix index 45f5ed9057..7fad2c381c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; license = licenses.bsd2; platforms = platforms.all; + mainProgram = "file"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index 01a29c48e6..0bf56cdba6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd, postgresql, openssl, libyaml }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, flex +, bison +, systemd +, postgresql +, openssl +, libyaml +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "2.1.6"; + version = "2.1.8"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; - rev = "v${version}"; - hash = "sha256-PPpdGLzyivsLd6I7ER9llp6fdLgtWRwEkKzLko/ehro="; + rev = "v${finalAttrs.version}"; + hash = "sha256-iWbWkKd0Rpg0EU3H//sAxth1v1S52yPwGn1AzeC9xkA="; }; nativeBuildInputs = [ cmake flex bison ]; @@ -34,12 +44,12 @@ stdenv.mkDerivation rec { --replace /lib/systemd $out/lib/systemd ''; - meta = with lib; { + meta = { + changelog = "https://github.com/fluent/fluent-bit/releases/tag/v${finalAttrs.version}"; description = "Log forwarder and processor, part of Fluentd ecosystem"; homepage = "https://fluentbit.io"; - changelog = "https://github.com/fluent/fluent-bit/releases/tag/v${version}"; - maintainers = with maintainers; [ samrose fpletz ]; - license = licenses.asl20; - platforms = platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.samrose lib.maintainers.fpletz ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix index c3cdc82899..7cb9be3ccb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix @@ -4,31 +4,39 @@ , pkg-config , libgit2 , openssl +, zlib , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "fw"; - version = "2.16.1"; + version = "2.17.1"; src = fetchFromGitHub { owner = "brocode"; - repo = pname; + repo = "fw"; rev = "v${version}"; - sha256 = "1nhkirjq2q9sxg4k2scy8vxlqa9ikvr5lid0f22vws07vif4kkfs"; + hash = "sha256-8Jq7VjTKwq8n9lrwTzazkkrq8/mNacFTwz/M+eAwBWM="; }; - cargoSha256 = "sha256-iD3SBSny0mYpmVEInYaylHn0AbtIqTOwJHdFeq3UBaM="; + cargoHash = "sha256-tIrACx4KRjfxLyxTiP32PpdN8NegaHBIkINsPGgygVQ="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + nativeBuildInputs = [ + pkg-config ]; - OPENSSL_NO_VENDOR = 1; - USER = "nixbld"; + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; meta = with lib; { description = "A workspace productivity booster"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix index 586e4033b0..d43914685d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-oFGgQa52NPNOouNHvyZoen7jDIqxckpjLFfzfbbcT/c="; + sha256 = "sha256-s2TlxksxGYvRqDwRA7eLlXAyT5uPK2DiL8ma1nNVz5Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix new file mode 100644 index 0000000000..c67289fb82 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix @@ -0,0 +1,55 @@ +{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs, python3 }: + +buildNpmPackage rec { + pname = "fx-cast-bridge"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "hensm"; + repo = "fx_cast"; + rev = "v${version}"; + hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg="; + }; + sourceRoot = "source/app"; + npmDepsHash = "sha256-GLrDRZqKcX1PDGREx+MLZ1TEjr88r9nz4TvZ9nvo40g="; + + nativeBuildInputs = [ python3 ]; + buildInputs = [ avahi-compat ]; + + postPatch = '' + substituteInPlace bin/lib/paths.js \ + --replace "../../../" "../../" + ''; + + dontNpmInstall = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/mozilla/native-messaging-hosts} + + substituteInPlace dist/app/fx_cast_bridge.json \ + --replace "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" + mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts + + rm dist/app/fx_cast_bridge.sh + mv dist/app $out/lib/fx_cast_bridge + mv node_modules $out/lib/fx_cast_bridge/node_modules + + echo "#! /bin/sh + NODE_PATH=\"$out/lib/node_modules\" \\ + exec ${nodejs}/bin/node \\ + $out/lib/fx_cast_bridge/src/main.js \\ + --_name fx_cast_bridge \"\$@\" + " >$out/bin/fx_cast_bridge + chmod +x $out/bin/fx_cast_bridge + + runHook postInstall + ''; + + meta = with lib; { + description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; + homepage = "https://hensm.github.io/fx_cast/"; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill pedrohlc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix deleted file mode 100644 index f7ca224ada..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -# How to generate a new version: -# -# Update version and hash as usual. -# -# ``` -# git clone https://github.com/hensm/fx_cast.git -# cd fx_cast/app -# # Add `"name": "fx_cast_bridge", "version": "...",` to package.json and package-lock.json -# nix run nixpkgs#nodePackages.node2nix -- -c node2nix -l package-lock.json -d -# cp -v node-*.nix package*.json ${nixpkgs_path:?}/pkgs/tools/misc/fx_cast/ -# ``` -{ pkgs, stdenv }: let - nodeEnv = import ./node-env.nix { - inherit (pkgs) nodejs stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs; - libtool = if stdenv.isDarwin then pkgs.darwin.cctools else null; - }; - nodePackages = import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; - globalBuildInputs = [pkgs.avahi-compat]; - }; -in -stdenv.mkDerivation rec { - pname = "fx_cast_bridge"; - version = "0.3.1"; - - src = pkgs.fetchFromGitHub { - owner = "hensm"; - repo = "fx_cast"; - rev = "v${version}"; - hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg="; - }; - - buildInputs = with pkgs; [ - nodejs - ]; - - buildPhase = '' - ln -vs ${nodePackages.nodeDependencies}/lib/node_modules app/node_modules - # The temporary home solves the "failed with exit code 243" - HOME="$(mktemp -d)" npm run build:app - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib/mozilla/native-messaging-hosts $out/opt - - substituteInPlace dist/app/fx_cast_bridge.json \ - --replace "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" - mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts - - echo "#! /bin/sh - NODE_PATH=${nodePackages.nodeDependencies}/lib/node_modules exec ${pkgs.nodejs}/bin/node $out/opt/fx_cast_bridge/src/main.js --_name fx_cast_bridge \"\$@\" - " >$out/bin/fx_cast_bridge - chmod +x $out/bin/fx_cast_bridge - - mv dist/app $out/opt/fx_cast_bridge - ''; - - meta = with pkgs.lib; { - description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; - homepage = "https://hensm.github.io/fx_cast/"; - license = licenses.mit; - maintainers = with maintainers; [ dtzWill kevincox ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix deleted file mode 100644 index 5dad9ec63d..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/node-env.nix +++ /dev/null @@ -1,686 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Patch the shebang lines of all the executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - patchShebangs "$file" - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.16.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz", - "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz", - "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.15.7", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" - }, - "node_modules/@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "node_modules/@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "node_modules/@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" - }, - "node_modules/@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "dependencies": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "node_modules/@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" - }, - "node_modules/@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" - }, - "node_modules/@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" - }, - "node_modules/@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" - }, - "node_modules/@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" - }, - "node_modules/@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" - }, - "node_modules/@types/mdns": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/mdns/-/mdns-0.0.34.tgz", - "integrity": "sha512-4Rrt/0wRAudtOnmhfDdoFhy5r20yHe0KiDK+/+I9RBBMW67F4S6y8tJH06AzrUDZzS/SH/U2pw1W0lrgQ+OlPg==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/mime-types": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz", - "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==", - "dev": true - }, - "node_modules/@types/minimist": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", - "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", - "dev": true - }, - "node_modules/@types/node": { - "version": "17.0.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz", - "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==" - }, - "node_modules/@types/node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==", - "dev": true, - "dependencies": { - "@types/node": "*", - "form-data": "^3.0.0" - } - }, - "node_modules/@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/yargs": { - "version": "17.0.11", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz", - "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==", - "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/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "node_modules/are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "dev": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/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/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/bindings": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=" - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bl/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/bplist-creator": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz", - "integrity": "sha512-sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg==", - "dependencies": { - "stream-buffers": "2.2.x" - } - }, - "node_modules/bplist-parser": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz", - "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==", - "dependencies": { - "big-integer": "1.6.x" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "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" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/castv2": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/castv2/-/castv2-0.1.10.tgz", - "integrity": "sha512-3QWevHrjT22KdF08Y2a217IYCDQDP7vEJaY4n0lPBeC5UBYbMFMadDfVTsaQwq7wqsEgYUHElPGm3EO1ey+TNw==", - "dependencies": { - "debug": "^4.1.1", - "protobufjs": "^6.8.8" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "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": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/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/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, - "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/data-uri-to-buffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz", - "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==", - "engines": { - "node": ">= 12" - } - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", - "dev": true, - "dependencies": { - "mimic-response": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "engines": { - "node": ">=4.0.0" - } - }, - "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/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, - "node_modules/detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true, - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "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/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dev": true, - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "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/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/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/expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "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" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "node_modules/fast-srp-hap": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/fast-srp-hap/-/fast-srp-hap-2.0.4.tgz", - "integrity": "sha512-lHRYYaaIbMrhZtsdGTwPN82UbqD9Bv8QfOlKs+Dz6YRnByZifOh93EYmf2iEWFtkOEIqR2IK8cFD0UN5wLIWBQ==", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fetch-blob": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.5.tgz", - "integrity": "sha512-N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "paypal", - "url": "https://paypal.me/jimmywarting" - } - ], - "dependencies": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - }, - "engines": { - "node": "^12.20 || >= 14.13" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "dependencies": { - "fetch-blob": "^3.1.2" - }, - "engines": { - "node": ">=12.20.0" - } - }, - "node_modules/from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "dependencies": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "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" - } - }, - "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==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", - "dev": true - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "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": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "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/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/into-stream": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz", - "integrity": "sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==", - "dev": true, - "dependencies": { - "from2": "^2.3.0", - "p-is-promise": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "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": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mdns": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mdns/-/mdns-2.7.2.tgz", - "integrity": "sha512-NBOQT22DKvuNWVY7nKNbs6w9eGRyPwnc4ZjKOsCG2G/4wNt1+IyiHvc+5yhcAUZLG46cOY321YW7Ufz3lMtrhw==", - "hasInstallScript": true, - "dependencies": { - "bindings": "~1.2.1", - "nan": "^2.14.0" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "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==", - "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==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-response": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", - "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "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/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/multistream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz", - "integrity": "sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==", - "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" - } - ], - "dependencies": { - "once": "^1.4.0", - "readable-stream": "^3.6.0" - } - }, - "node_modules/multistream/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/mustache": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", - "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", - "dev": true, - "bin": { - "mustache": "bin/mustache" - } - }, - "node_modules/nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" - }, - "node_modules/napi-build-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", - "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", - "dev": true - }, - "node_modules/node-abi": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz", - "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==", - "dev": true, - "dependencies": { - "semver": "^5.4.1" - } - }, - "node_modules/node-abi/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "github", - "url": "https://paypal.me/jimmywarting" - } - ], - "engines": { - "node": ">=10.5.0" - } - }, - "node_modules/node-fetch": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.3.tgz", - "integrity": "sha512-AXP18u4pidSZ1xYXRDPY/8jdv3RAozIt/WLNR/MBGZAz+xjtlr90RvCnsvHQRiXyWliZF/CpytExp32UU67/SA==", - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, - "node_modules/npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "dependencies": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "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": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "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/p-is-promise": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", - "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "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==", - "dev": true - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pkg": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.6.0.tgz", - "integrity": "sha512-mHrAVSQWmHA41RnUmRpC7pK9lNnMfdA16CF3cqOI22a8LZxOQzF7M8YWtA2nfs+d7I0MTDXOtkDsAsFXeCpYjg==", - "dev": true, - "dependencies": { - "@babel/parser": "7.16.2", - "@babel/types": "7.16.0", - "chalk": "^4.1.2", - "escodegen": "^2.0.0", - "fs-extra": "^9.1.0", - "globby": "^11.0.4", - "into-stream": "^6.0.0", - "minimist": "^1.2.5", - "multistream": "^4.1.0", - "pkg-fetch": "3.3.0", - "prebuild-install": "6.1.4", - "progress": "^2.0.3", - "resolve": "^1.20.0", - "stream-meter": "^1.0.4", - "tslib": "2.3.1" - }, - "bin": { - "pkg": "lib-es5/bin.js" - }, - "peerDependencies": { - "node-notifier": ">=9.0.1" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, - "node_modules/pkg-fetch": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.3.0.tgz", - "integrity": "sha512-xJnIZ1KP+8rNN+VLafwu4tEeV4m8IkFBDdCFqmAJz9K1aiXEtbARmdbEe6HlXWGSVuShSHjFXpfkKRkDBQ5kiA==", - "dev": true, - "dependencies": { - "chalk": "^4.1.2", - "fs-extra": "^9.1.0", - "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.6", - "progress": "^2.0.3", - "semver": "^7.3.5", - "tar-fs": "^2.1.1", - "yargs": "^16.2.0" - }, - "bin": { - "pkg-fetch": "lib-es5/bin.js" - } - }, - "node_modules/pkg-fetch/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-fetch/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pkg-fetch/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-fetch/node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/pkg-fetch/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-fetch/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-fetch/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "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" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pkg-fetch/node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/pkg/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/prebuild-install": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz", - "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==", - "dev": true, - "dependencies": { - "detect-libc": "^1.0.3", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^2.21.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^3.0.3", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true, - "engines": { - "node": ">= 0.8.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/protobufjs": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", - "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", - "hasInstallScript": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - }, - "bin": { - "pbjs": "bin/pbjs", - "pbts": "bin/pbts" - } - }, - "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/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "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/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", - "dev": true, - "dependencies": { - "is-core-module": "^2.8.1", - "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/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "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" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "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/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "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/simple-get": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz", - "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==", - "dev": true, - "dependencies": { - "decompress-response": "^4.2.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "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/stream-buffers": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz", - "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=", - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/stream-meter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz", - "integrity": "sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0=", - "dev": true, - "dependencies": { - "readable-stream": "^2.1.4" - } - }, - "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/string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "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/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "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": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "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==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar-stream/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/tiny-typed-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", - "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==", - "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": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, - "node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" - }, - "node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/typescript": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "node_modules/web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "node_modules/ws": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/yargs": { - "version": "17.5.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", - "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", - "dependencies": { - "cliui": "^7.0.2", - "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" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - } - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", - "dev": true - }, - "@babel/parser": { - "version": "7.16.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz", - "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==", - "dev": true - }, - "@babel/types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz", - "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.15.7", - "to-fast-properties": "^2.0.0" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" - }, - "@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" - }, - "@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "requires": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" - }, - "@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" - }, - "@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" - }, - "@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" - }, - "@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" - }, - "@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" - }, - "@types/mdns": { - "version": "0.0.34", - "resolved": "https://registry.npmjs.org/@types/mdns/-/mdns-0.0.34.tgz", - "integrity": "sha512-4Rrt/0wRAudtOnmhfDdoFhy5r20yHe0KiDK+/+I9RBBMW67F4S6y8tJH06AzrUDZzS/SH/U2pw1W0lrgQ+OlPg==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/mime-types": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz", - "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==", - "dev": true - }, - "@types/minimist": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", - "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", - "dev": true - }, - "@types/node": { - "version": "17.0.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz", - "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==" - }, - "@types/node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==", - "dev": true, - "requires": { - "@types/node": "*", - "form-data": "^3.0.0" - } - }, - "@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/yargs": { - "version": "17.0.11", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz", - "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@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 - }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "requires": { - "color-convert": "^2.0.1" - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "are-we-there-yet": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz", - "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true - }, - "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 - }, - "big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==" - }, - "bindings": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=" - }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "bplist-creator": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz", - "integrity": "sha512-sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg==", - "requires": { - "stream-buffers": "2.2.x" - } - }, - "bplist-parser": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz", - "integrity": "sha512-PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA==", - "requires": { - "big-integer": "1.6.x" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "castv2": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/castv2/-/castv2-0.1.10.tgz", - "integrity": "sha512-3QWevHrjT22KdF08Y2a217IYCDQDP7vEJaY4n0lPBeC5UBYbMFMadDfVTsaQwq7wqsEgYUHElPGm3EO1ey+TNw==", - "requires": { - "debug": "^4.1.1", - "protobufjs": "^6.8.8" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "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, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, - "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 - }, - "data-uri-to-buffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz", - "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==" - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", - "dev": true, - "requires": { - "mimic-response": "^2.0.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, - "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 - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "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, - "requires": { - "once": "^1.4.0" - } - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" - }, - "escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dev": true, - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - } - }, - "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 - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "dev": true - }, - "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - } - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "fast-srp-hap": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/fast-srp-hap/-/fast-srp-hap-2.0.4.tgz", - "integrity": "sha512-lHRYYaaIbMrhZtsdGTwPN82UbqD9Bv8QfOlKs+Dz6YRnByZifOh93EYmf2iEWFtkOEIqR2IK8cFD0UN5wLIWBQ==" - }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "fetch-blob": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.5.tgz", - "integrity": "sha512-N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg==", - "requires": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - }, - "formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "requires": { - "fetch-blob": "^3.1.2" - } - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "requires": { - "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": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, - "github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", - "dev": true - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true - }, - "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", - "dev": true - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "into-stream": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz", - "integrity": "sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==", - "dev": true, - "requires": { - "from2": "^2.3.0", - "p-is-promise": "^3.0.0" - } - }, - "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "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": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "mdns": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mdns/-/mdns-2.7.2.tgz", - "integrity": "sha512-NBOQT22DKvuNWVY7nKNbs6w9eGRyPwnc4ZjKOsCG2G/4wNt1+IyiHvc+5yhcAUZLG46cOY321YW7Ufz3lMtrhw==", - "requires": { - "bindings": "~1.2.1", - "nan": "^2.14.0" - } - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "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==", - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-response": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", - "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==", - "dev": true - }, - "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "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 - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "multistream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz", - "integrity": "sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==", - "dev": true, - "requires": { - "once": "^1.4.0", - "readable-stream": "^3.6.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "mustache": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", - "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", - "dev": true - }, - "nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" - }, - "napi-build-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", - "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", - "dev": true - }, - "node-abi": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz", - "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==", - "dev": true, - "requires": { - "semver": "^5.4.1" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, - "node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==" - }, - "node-fetch": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.3.tgz", - "integrity": "sha512-AXP18u4pidSZ1xYXRDPY/8jdv3RAozIt/WLNR/MBGZAz+xjtlr90RvCnsvHQRiXyWliZF/CpytExp32UU67/SA==", - "requires": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "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": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "requires": { - "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" - } - }, - "p-is-promise": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", - "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==", - "dev": true - }, - "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==", - "dev": true - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pkg": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.6.0.tgz", - "integrity": "sha512-mHrAVSQWmHA41RnUmRpC7pK9lNnMfdA16CF3cqOI22a8LZxOQzF7M8YWtA2nfs+d7I0MTDXOtkDsAsFXeCpYjg==", - "dev": true, - "requires": { - "@babel/parser": "7.16.2", - "@babel/types": "7.16.0", - "chalk": "^4.1.2", - "escodegen": "^2.0.0", - "fs-extra": "^9.1.0", - "globby": "^11.0.4", - "into-stream": "^6.0.0", - "minimist": "^1.2.5", - "multistream": "^4.1.0", - "pkg-fetch": "3.3.0", - "prebuild-install": "6.1.4", - "progress": "^2.0.3", - "resolve": "^1.20.0", - "stream-meter": "^1.0.4", - "tslib": "2.3.1" - }, - "dependencies": { - "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - } - } - }, - "pkg-fetch": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.3.0.tgz", - "integrity": "sha512-xJnIZ1KP+8rNN+VLafwu4tEeV4m8IkFBDdCFqmAJz9K1aiXEtbARmdbEe6HlXWGSVuShSHjFXpfkKRkDBQ5kiA==", - "dev": true, - "requires": { - "chalk": "^4.1.2", - "fs-extra": "^9.1.0", - "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.6", - "progress": "^2.0.3", - "semver": "^7.3.5", - "tar-fs": "^2.1.1", - "yargs": "^16.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "requires": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - } - }, - "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true - } - } - }, - "prebuild-install": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz", - "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==", - "dev": true, - "requires": { - "detect-libc": "^1.0.3", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^2.21.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^3.0.3", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "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 - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, - "protobufjs": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz", - "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": ">=13.7.0", - "long": "^4.0.0" - } - }, - "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, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" - }, - "resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", - "dev": true, - "requires": { - "is-core-module": "^2.8.1", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "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 - }, - "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "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 - }, - "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 - }, - "simple-get": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz", - "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==", - "dev": true, - "requires": { - "decompress-response": "^4.2.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "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 - }, - "stream-buffers": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz", - "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=" - }, - "stream-meter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz", - "integrity": "sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0=", - "dev": true, - "requires": { - "readable-stream": "^2.1.4" - } - }, - "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, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "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==", - "dev": true - }, - "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "requires": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "tiny-typed-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", - "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", - "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==" - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "typescript": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", - "dev": true - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==" - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "ws": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", - "requires": {} - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "yargs": { - "version": "17.5.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", - "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", - "requires": { - "cliui": "^7.0.2", - "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" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" - } - } -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/package.json b/third_party/nixpkgs/pkgs/tools/misc/fx_cast/package.json deleted file mode 100644 index 591b6990d0..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/fx_cast/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "fx_cast_bridge", - "version": "0.3.1", - "type": "module", - "scripts": { - "build": "node bin/build.js", - "package": "node bin/build.js --package", - "install-manifest": "node bin/install-manifest.js", - "remove-manifest": "node bin/install-manifest.js --remove" - }, - "dependencies": { - "bplist-creator": "^0.1.0", - "bplist-parser": "^0.3.1", - "castv2": "^0.1.10", - "fast-srp-hap": "^2.0.4", - "mdns": "^2.7.2", - "mime-types": "^2.1.35", - "node-fetch": "^3.2.3", - "tweetnacl": "^1.0.3", - "ws": "^8.5.0", - "yargs": "^17.5.1" - }, - "devDependencies": { - "@types/mdns": "^0.0.34", - "@types/mime-types": "^2.1.1", - "@types/minimist": "^1.2.2", - "@types/node": "^17.0.26", - "@types/node-fetch": "^2.6.1", - "@types/ws": "^8.5.3", - "@types/yargs": "^17.0.11", - "fs-extra": "^10.1.0", - "mustache": "^4.2.0", - "pkg": "^5.6.0", - "tiny-typed-emitter": "^2.1.0", - "typescript": "^4.6.3" - } -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix index 95999d79c9..6f0d3d77ce 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-QaKrn/22wrRCMJLzCVRnxBRxAhnUBjkESSRg4YQCHoc="; + hash = "sha256-ypYM/FXp+BObR2fjVCV8nDJhRuuu2Y7213haAJnzRIE="; }; vendorHash = "sha256-lOIONv+7cUUC0mGCwYkOkDn3zHreYpFeqmTbp2Ob3yM="; @@ -29,9 +29,9 @@ buildGoModule rec { }; meta = { - description = "gh extension to display a dashboard with pull requests and issues"; - homepage = "https://github.com/dlvhdr/gh-dash"; changelog = "https://github.com/dlvhdr/gh-dash/releases/tag/${src.rev}"; + description = "Github Cli extension to display a dashboard with pull requests and issues"; + homepage = "https://github.com/dlvhdr/gh-dash"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ amesgen ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix index 90eea28008..e4e34f86d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "goose"; - version = "3.13.4"; + version = "3.14.0"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-mz7kB8ygDm23bsuQy9mYnWSGF6DDGqBtvj82s2PLDR0="; + hash = "sha256-4WBYfxEmEuFZM+Qt2miw6GxuV5B2nc4XXeyDQi1IISg="; }; proxyVendor = true; - vendorHash = "sha256-lWlv6+Auj9YGxyJXr5WGbe4AWqJSpHE9RTY+9ZXyPVQ="; + vendorHash = "sha256-zsqulNAPcGVp6+ClYtRwM5U6YwRak4ttSLbgPWDxtbI="; # end-to-end tests require a docker daemon postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/grass-sass/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grass-sass/default.nix index 4b67a1cc3e..5a9193873f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grass-sass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grass-sass/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "grass"; - version = "0.13.0"; + version = "0.13.1"; src = fetchCrate { inherit pname version; - hash = "sha256-TRBbRKNr+/12dk8z7NAxAj/s+cGEQddXXuY2xmguLD8="; + hash = "sha256-IJ8kiSvuKR9f3I7TdE263cnQiARzDzfj30uL1PzdZ1s="; }; - cargoHash = "sha256-Kr/zTtZWAR0ZinhrlimoEtRMT+BrlO0MvhEJVlheXeM="; + cargoHash = "sha256-WRXoXB/HJkAnUKboCR9Gl2Au/1EivYQhF5rKr7PFe+s="; # tests require rust nightly doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix index 1c925b6e6f..d7a0fc1a74 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "pemistahl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-of6mZ0SeiFXuXmvk64WoUNv6CLoj05K2kQpDQLMLwuY="; + sha256 = "sha256-kbrBnpoVeXSgmIqElpfAnoSutYwsnFaxFJpRsJPUE8k="; }; - cargoSha256 = "sha256-BS9K/1CyNYFwC/zQXEWZcSCjQyWgLgcVNbuyez2q/Ak="; + cargoSha256 = "sha256-WO8h5JUEiCpfsROQoRZj7I6em6REcJ2PfmoGN1zKRPg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hexyl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hexyl/default.nix index 6224811ccd..29a7b32ce3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hexyl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hexyl/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - hash = "sha256-c3CMtPLo5NfKfr2meccFuDpf0ffZ3uBw995TEB5FSTs="; + hash = "sha256-+jmMy5Hi4EfMh/rBzBs5b+f48OZcR/Tw7IU1uTbwiCo="; }; - cargoHash = "sha256-2pIASIJ83lFfC7do/02MxY/OOMJG7McS6O8uRMy9kVs="; + cargoHash = "sha256-TjJ0645TRlNzduQgxYLZWz+rLFfRv12GuwXBcmNr/h8="; meta = with lib; { description = "A command-line hex viewer"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix index 59e6d17a24..6e3ad36af1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hwatch/default.nix @@ -24,19 +24,16 @@ rustPlatform.buildRustPackage rec { passthru.tests.version = testers.testVersion { package = hwatch; - command = "hwatch --version"; - version = version; }; meta = with lib; { homepage = "https://github.com/blacknon/hwatch"; - description= "Modern alternative to the watch command"; + description = "Modern alternative to the watch command"; longDescription = '' A modern alternative to the watch command, records the differences in execution results and can check this differences at after. ''; license = licenses.mit; maintainers = with maintainers; [ hamburger1984 ]; - platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ictree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ictree/default.nix new file mode 100644 index 0000000000..16093dbc4d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/ictree/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ictree"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "NikitaIvanovV"; + repo = pname; + rev = "v${version}"; + hash = "sha256-77Wo6jN8VUGTXBuGL0a9kvSIixdyEQoxqqNsHq9jcWw="; + fetchSubmodules = true; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Like tree but interactive"; + homepage = "https://github.com/NikitaIvanovV/ictree"; + platforms = platforms.unix; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix index cd3d0598ef..babda6edac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.24"; + version = "0.10.26"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-PsxQzEU2rB/+B7kk6QMssUgH9Bj/kyla6O2MzgrZzUM="; + sha256 = "sha256-Tw+peSlcnSge4xOXslsFT6UTz7NQsy1Sy89vP2YjI90="; }; - vendorHash = "sha256-rDsHIwYfsu1kTtZhd2WMNnV9kNZUSjy6lkyUKPGSPsA="; + vendorHash = "sha256-nObY/79e6I5PYso917rZxwVt6pwwI5BY0nguP/1yirc="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix index 2fe3223415..e2a5483e54 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.42.1"; + version = "2.43.1"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ScHlF5fvqBDvmI8p+o1LcQXZHXxKL5OS4AigE74AYVY="; + hash = "sha256-Ad3kcx5F6U6ucamhhD0c5st86nrJxCPX9e62u7yjPYI="; }; - vendorHash = "sha256-TTQ9cjtkcg606imz55k9bLSya7xFs2gKIqETcrPLKIQ="; + vendorHash = "sha256-iLjm8k0XbYcA05J52K8mGWleiMhSRjzzkTOrQ28UdVw="; postInstall = '' # Name the output the same way as the original build script does diff --git a/third_party/nixpkgs/pkgs/tools/misc/kalker/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/kalker/Cargo.lock deleted file mode 100644 index 7752570bd2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/kalker/Cargo.lock +++ /dev/null @@ -1,634 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[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 = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "dirs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gmp-mpfr-sys" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b560063e2ffa8ce9c2ef9bf487f2944a97deca5b8de0b5bcd0ae6437ef8b75f" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kalk" -version = "3.0.3" -dependencies = [ - "gmp-mpfr-sys", - "lazy_static", - "regex", - "rug", - "test-case", - "wasm-bindgen", - "wasm-bindgen-test", -] - -[[package]] -name = "kalker" -version = "2.0.3" -dependencies = [ - "ansi_term", - "atty", - "dirs", - "kalk", - "lazy_static", - "regex", - "rustyline", - "seahorse", - "winres", -] - -[[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.141" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "nix" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[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 = "regex" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "rug" -version = "1.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555e8b44763d034526db899c88cd56ccc4486cd38b444c8aa0e79d4e70ae5a34" -dependencies = [ - "az", - "gmp-mpfr-sys", - "libc", -] - -[[package]] -name = "rustyline" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec" -dependencies = [ - "bitflags", - "cfg-if", - "dirs-next", - "fs2", - "libc", - "log", - "memchr", - "nix", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "seahorse" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bee1fe454786f1d236a07cb3d3adcbaca96e9ba42d23bc58de059937bb059bd" - -[[package]] -name = "serde" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "test-case" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e5f048404b43e8ae66dce036163515b6057024cf58c6377be501f250bd3c6a" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -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.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[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_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[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_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml", -] diff --git a/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix index 7c9742da0e..b076ab351d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix @@ -8,32 +8,31 @@ rustPlatform.buildRustPackage rec { pname = "kalker"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pj3rcjEbUt+pnmbOZlv2JIvUhVdeiXYDKc5FED6qO7E="; + hash = "sha256-8tJi4PRGhNCndiMRdZUvCSdx/+p9OhJyJ3AbD+PucSo="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-rGy4tkjjPiV2lpdOtfqjsXgBgi/x+45K4KeUDhyfQoA="; buildInputs = [ gmp mpfr libmpc ]; outputs = [ "out" "lib" ]; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock + # Cargo.lock is outdated + preConfigure = '' + cargo metadata --offline ''; postInstall = '' moveToOutput "lib" "$lib" ''; - CARGO_FEATURE_USE_SYSTEM_LIBS = "1"; + env.CARGO_FEATURE_USE_SYSTEM_LIBS = "1"; meta = with lib; { homepage = "https://kalker.strct.net"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/keychain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/keychain/default.nix index 826c9d8557..dacffc30a2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/keychain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/keychain/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://www.funtoo.org/Keychain"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ sigma SuperSandro2000 ]; + maintainers = with maintainers; [ sigma ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/killport/default.nix b/third_party/nixpkgs/pkgs/tools/misc/killport/default.nix index 44484c17ef..714beb78dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/killport/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/killport/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "killport"; - version = "0.9.0"; + version = "0.9.1"; src = fetchCrate { inherit pname version; - hash = "sha256-aGnjLgDn86OUFQGj7K7+DUSGJuNEIL52yXJz/Mt5DT0="; + hash = "sha256-aaKvrWJGZ26wyqoblAcUkGUPkbt8XNx9Z4xT+qI2B3o="; }; - cargoHash = "sha256-Z3+hqssm5g7rl3XCnrmjuPhsG8E0Yc2Qg8/mjGlnaT4="; + cargoHash = "sha256-4CUMt5aDHq943uU5PAY1TJtmCqlBvgOruGQ69OG5fB4="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix index 68aa12eeb6..09cb91d9a1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-P03L3UbXAlNUUwAwDqsIIs/ECB6s3GqCESbPK4AgnYg="; + sha256 = "sha256-CALMpedDCBlsYt31JOlwH1SOEhy/DFP6SdjoVkQ2KOs="; }; - vendorSha256 = null; + vendorHash = null; postPatch = '' rm -f pkg/config/app_config_test.go diff --git a/third_party/nixpkgs/pkgs/tools/misc/license-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/license-cli/default.nix index bd90516daa..bf3de443e3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/license-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/license-cli/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "license-cli"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromSourcehut { owner = "~zethra"; repo = "license"; rev = version; - hash = "sha256-M5ypymJ99T4Vc7XSmqNb69yBLgSYu9I+6FEQvtFGUf0="; + hash = "sha256-OGS26mE5rjxlZOaBWhYc7C8aM3Lq2xX0f31LgckjJF8="; }; - cargoHash = "sha256-me4xPP6fO1D+vvR9XZg2EHieY7OU2HHQ4P0nkk/IKpE="; + cargoHash = "sha256-Zj9t/e6QhiOxU8mlVRBKEbviSTKXM4WQ3lqtoCcMbMI="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mastotool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mastotool/default.nix new file mode 100644 index 0000000000..3fb0c0034c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/mastotool/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mastotool"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "mastotool"; + rev = "v${version}"; + hash = "sha256-KmYUt2WXLY6i17dZ+o5HOTyMwbQnynY7IT43LIEN3B0="; + }; + + vendorHash = "sha256-uQgLwH8Z8rBfyKHMm2JHO+H1gsHK25+c34bOnMcmquA="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "A collection of command-line tools to work with your Mastodon account"; + homepage = "https://github.com/muesli/mastotool"; + changelog = "https://github.com/muesli/mastotool/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix index 095e7f35fe..c3d5afa9a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mdr/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { description = "MarkDown Renderer for the terminal"; homepage = "https://github.com/MichaelMure/mdr"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix b/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix index d17f8ef6f0..7f3f7f29f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "melody"; - version = "0.18.1"; + version = "0.19.0"; src = fetchCrate { pname = "melody_cli"; inherit version; - sha256 = "sha256-Az1pGRty7wAC5fN7RlO/etaW5w5TrsO6VVXv5M7NUfU="; + sha256 = "sha256-sJVZ4dRP6mAx9g7iqwI3L2cMa5x4qQuzKWPXvOOq6q8="; }; - cargoSha256 = "sha256-EhPrARdDnwdxfK1JHuuHVrxSDZhuE+kTBQr45JxluUA="; + cargoHash = "sha256-8UWz+gYUxf2UNWZCnhQlGiSX6kPsHPlYcdl7wD3Rchs="; meta = with lib; { description = "Language that compiles to regular expressions"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index 547bbba890..53f9efac5f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "6.10"; + version = "6.20"; src = fetchFromGitHub { owner = "memtest86plus"; repo = "memtest86plus"; rev = "v${finalAttrs.version}"; - hash = "sha256-f40blxh/On/mC4m+eLNeWzdYzYoYpFOSBndVnREx68U="; + hash = "sha256-JzQJrAnPsa3GKNdy1PidOAZk7IQvRBi/YtmK2O9rWfM="; }; # Binaries are booted directly by BIOS/UEFI or bootloader diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mmv/default.nix index c241ba5b8c..253c0df937 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mmv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mmv/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mmv"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-0Zj58su/4XRjK2KuzIIzTLbXgKa0WSa1mBH2q4pLTrI="; + sha256 = "sha256-tQk3AwmUuhbxvFm9wiO7BM2GChGopvpCZAp8J9XCDF0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 49c5a127d6..d10955f214 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.38.2"; + version = "1.39.0"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-pDJMFJ/pfFlgHIJTATDW5gwRwRFoYHH6YNvtJJxDu60="; + sha256 = "sha256-4qp4Z0PkfWuEKtn6G8NppMVk3TOpi8kt3vL0DsvnbLA="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix new file mode 100644 index 0000000000..93817ff847 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix @@ -0,0 +1,72 @@ +{ lib +, python3 +, fetchFromGitHub +, resvg +, pngquant +}: +python3.pkgs.buildPythonApplication rec { + pname = "nanoemoji"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "v${version}"; + hash = "sha256-P/lT0PnjTdYzyttICzszu4OL5kj+X8GHZ8doL3tpXQM="; + }; + patches = [ + # this is necessary because the tests clear PATH/PYTHONPATH otherwise + ./test-pythonpath.patch + # minor difference in the test output, most likely due to different dependency versions + ./fix-test.patch + ]; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + pythonRelaxDepsHook + + pngquant + resvg + ]; + + # these two packages are just prebuilt wheels containing the respective binaries + pythonRemoveDeps = [ "pngquant-cli" "resvg-cli" ]; + + propagatedBuildInputs = with python3.pkgs; [ + absl-py + fonttools + lxml + ninja-python + picosvg + pillow + regex + toml + tomlkit + ufo2ft + ufoLib2 + zopfli + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + + ninja-python + picosvg + ]; + + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ pngquant resvg ]}" + ]; + + preCheck = '' + # make sure the built binaries (nanoemoji/maximum_color) can be found by the test + export PATH="$out/bin:$PATH" + ''; + + meta = with lib; { + description = "A wee tool to build color fonts"; + homepage = "https://github.com/googlefonts/nanoemoji"; + license = licenses.asl20; + maintainers = with maintainers; [ _999eagle ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/fix-test.patch b/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/fix-test.patch new file mode 100644 index 0000000000..4582df9ea5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/fix-test.patch @@ -0,0 +1,24 @@ +--- a/tests/proportional_cbdt.ttx ++++ b/tests/proportional_cbdt.ttx +@@ -13,7 +13,7 @@ + + + +- ++ + + + +@@ -79,10 +79,10 @@ + + + +- ++ + + +- ++ + + + diff --git a/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/test-pythonpath.patch b/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/test-pythonpath.patch new file mode 100644 index 0000000000..1273322456 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/nanoemoji/test-pythonpath.patch @@ -0,0 +1,14 @@ +--- a/tests/test_helper.py ++++ b/tests/test_helper.py +@@ -269,9 +269,9 @@ + print("subprocess:", " ".join(cmd)) # very useful on failure + env = { + # We may need to find nanoemoji and other pip-installed cli tools +- "PATH": str(Path(shutil.which("nanoemoji")).parent), ++ "PATH": str(Path(shutil.which("nanoemoji")).parent) + ":" + os.environ["PATH"], + # We may need to find test modules +- "PYTHONPATH": os.pathsep.join((str(Path(__file__).parent),)), ++ "PYTHONPATH": os.pathsep.join((str(Path(__file__).parent),)) + ":" + os.environ["PYTHONPATH"], + } + # Needed for windows CI to function; ref https://github.com/appveyor/ci/issues/1995 + if "SYSTEMROOT" in os.environ: diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu/1.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/1.nix index d1c185c0f2..742ef58713 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ncdu/1.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/1.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ pSub SuperSandro2000 ]; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix index d535061cde..10a80d32cd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ pSub SuperSandro2000 rodrgz ]; + maintainers = with maintainers; [ pSub rodrgz ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix index 2c7e5da539..de5063135f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix @@ -1,29 +1,37 @@ -{ lib, pkgs, stdenv, buildGoModule, fetchFromGitHub, nixosTests -, nodejs, debianutils, mkdocs, python3, python3Packages -, pkg-config, pixman, cairo, pango }: +{ lib, buildGoModule, fetchFromGitHub, buildNpmPackage +, nixosTests, debianutils, mkdocs, python3, python3Packages +}: -let - nodeDependencies = (import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }).nodeDependencies.override { - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pixman cairo pango ]; - }; -in buildGoModule rec { pname = "ntfy-sh"; - version = "2.5.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-C7Ko7JBiQoafos7TbVTqq6pn7NnuLOZo7Dcf6ob2IzI="; + hash = "sha256-VX5QXJqHvYE8n/TcSBIg8vuLx2OCe6rM87G1PXBiKRI="; }; - vendorSha256 = "sha256-9mhMeGcAdFjzLJdsGnoTArtxVEaUznpN64j5SMBYHv8="; + vendorHash = "sha256-KcA35MVtF/bHtdiMqofs9gSnjl6oYedgqpKZtnFce20="; + + ui = buildNpmPackage { + inherit src version; + pname = "ntfy-sh-ui"; + npmDepsHash = "sha256-JvoTssXiBnl/H4odFqRoGtQz2pGwQL4BGxX8Vp/PBwY="; + + prePatch = '' + cd web/ + ''; + + installPhase = '' + mv build/index.html build/app.html + rm build/config.js + mkdir -p $out + mv build/ $out/site + ''; + }; doCheck = false; @@ -32,7 +40,6 @@ buildGoModule rec { nativeBuildInputs = [ debianutils mkdocs - nodejs python3 python3Packages.mkdocs-material python3Packages.mkdocs-minify @@ -44,8 +51,8 @@ buildGoModule rec { ''; preBuild = '' - ln -s ${nodeDependencies}/lib/node_modules web/node_modules - DISABLE_ESLINT_PLUGIN=true npm_config_offline=true make web-build docs-build + cp -r ${ui}/site/ server/ + make docs-build ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh deleted file mode 100755 index e4d7918368..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/generate-dependencies.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)" - -$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ - --nodejs-18 \ - --node-env ../../../development/node-packages/node-env.nix \ - --output node-packages.nix \ - --composition node-composition.nix -# removed temporarily because of https://github.com/svanderburg/node2nix/issues/312 -# --lock ./package-lock-temp.json \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-composition.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-composition.nix deleted file mode 100644 index a8d0b3e075..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-packages.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-packages.nix deleted file mode 100644 index eddab8e3da..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/node-packages.nix +++ /dev/null @@ -1,15694 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@alloc/quick-lru-5.2.0" = { - name = "_at_alloc_slash_quick-lru"; - packageName = "@alloc/quick-lru"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"; - sha512 = "UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="; - }; - }; - "@ampproject/remapping-2.2.1" = { - name = "_at_ampproject_slash_remapping"; - packageName = "@ampproject/remapping"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz"; - sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; - }; - }; - "@apideck/better-ajv-errors-0.3.6" = { - name = "_at_apideck_slash_better-ajv-errors"; - packageName = "@apideck/better-ajv-errors"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz"; - sha512 = "P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA=="; - }; - }; - "@babel/code-frame-7.21.4" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz"; - sha512 = "LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g=="; - }; - }; - "@babel/compat-data-7.21.7" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.21.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz"; - sha512 = "KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA=="; - }; - }; - "@babel/core-7.21.8" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.21.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz"; - sha512 = "YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ=="; - }; - }; - "@babel/eslint-parser-7.21.8" = { - name = "_at_babel_slash_eslint-parser"; - packageName = "@babel/eslint-parser"; - version = "7.21.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.21.8.tgz"; - sha512 = "HLhI+2q+BP3sf78mFUZNCGc10KEmoUqtUT1OCdMZsN+qr4qFeLUod62/zAnF3jNQstwyasDkZnVXwfK2Bml7MQ=="; - }; - }; - "@babel/generator-7.21.5" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz"; - sha512 = "SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w=="; - }; - }; - "@babel/helper-annotate-as-pure-7.18.6" = { - name = "_at_babel_slash_helper-annotate-as-pure"; - packageName = "@babel/helper-annotate-as-pure"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; - sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; - }; - }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.21.5" = { - name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; - packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz"; - sha512 = "uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g=="; - }; - }; - "@babel/helper-compilation-targets-7.21.5" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz"; - sha512 = "1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w=="; - }; - }; - "@babel/helper-create-class-features-plugin-7.21.8" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.21.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz"; - sha512 = "+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw=="; - }; - }; - "@babel/helper-create-regexp-features-plugin-7.21.8" = { - name = "_at_babel_slash_helper-create-regexp-features-plugin"; - packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.21.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz"; - sha512 = "zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g=="; - }; - }; - "@babel/helper-define-polyfill-provider-0.3.3" = { - name = "_at_babel_slash_helper-define-polyfill-provider"; - packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz"; - sha512 = "z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww=="; - }; - }; - "@babel/helper-environment-visitor-7.21.5" = { - name = "_at_babel_slash_helper-environment-visitor"; - packageName = "@babel/helper-environment-visitor"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz"; - sha512 = "IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="; - }; - }; - "@babel/helper-function-name-7.21.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"; - sha512 = "HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg=="; - }; - }; - "@babel/helper-hoist-variables-7.18.6" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; - sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.21.5" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz"; - sha512 = "nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg=="; - }; - }; - "@babel/helper-module-imports-7.21.4" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz"; - sha512 = "orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg=="; - }; - }; - "@babel/helper-module-transforms-7.21.5" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz"; - sha512 = "bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw=="; - }; - }; - "@babel/helper-optimise-call-expression-7.18.6" = { - name = "_at_babel_slash_helper-optimise-call-expression"; - packageName = "@babel/helper-optimise-call-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; - sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; - }; - }; - "@babel/helper-plugin-utils-7.21.5" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz"; - sha512 = "0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.18.9" = { - name = "_at_babel_slash_helper-remap-async-to-generator"; - packageName = "@babel/helper-remap-async-to-generator"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; - sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; - }; - }; - "@babel/helper-replace-supers-7.21.5" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz"; - sha512 = "/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg=="; - }; - }; - "@babel/helper-simple-access-7.21.5" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz"; - sha512 = "ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg=="; - }; - }; - "@babel/helper-skip-transparent-expression-wrappers-7.20.0" = { - name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; - packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"; - sha512 = "5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg=="; - }; - }; - "@babel/helper-split-export-declaration-7.18.6" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; - sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; - }; - }; - "@babel/helper-string-parser-7.21.5" = { - name = "_at_babel_slash_helper-string-parser"; - packageName = "@babel/helper-string-parser"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz"; - sha512 = "5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="; - }; - }; - "@babel/helper-validator-identifier-7.19.1" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - }; - "@babel/helper-validator-option-7.21.0" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"; - sha512 = "rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="; - }; - }; - "@babel/helper-wrap-function-7.20.5" = { - name = "_at_babel_slash_helper-wrap-function"; - packageName = "@babel/helper-wrap-function"; - version = "7.20.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz"; - sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; - }; - }; - "@babel/helpers-7.21.5" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz"; - sha512 = "BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA=="; - }; - }; - "@babel/highlight-7.18.6" = { - name = "_at_babel_slash_highlight"; - packageName = "@babel/highlight"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; - }; - }; - "@babel/parser-7.21.8" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.21.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz"; - sha512 = "6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="; - }; - }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { - name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@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=="; - }; - }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" = { - name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz"; - sha512 = "sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ=="; - }; - }; - "@babel/plugin-proposal-async-generator-functions-7.20.7" = { - name = "_at_babel_slash_plugin-proposal-async-generator-functions"; - packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz"; - sha512 = "xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA=="; - }; - }; - "@babel/plugin-proposal-class-properties-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-class-properties"; - packageName = "@babel/plugin-proposal-class-properties"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; - sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; - }; - }; - "@babel/plugin-proposal-class-static-block-7.21.0" = { - name = "_at_babel_slash_plugin-proposal-class-static-block"; - packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz"; - sha512 = "XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw=="; - }; - }; - "@babel/plugin-proposal-decorators-7.21.0" = { - name = "_at_babel_slash_plugin-proposal-decorators"; - packageName = "@babel/plugin-proposal-decorators"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz"; - sha512 = "MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w=="; - }; - }; - "@babel/plugin-proposal-dynamic-import-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-dynamic-import"; - packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; - sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; - }; - }; - "@babel/plugin-proposal-export-namespace-from-7.18.9" = { - name = "_at_babel_slash_plugin-proposal-export-namespace-from"; - packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; - sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; - }; - }; - "@babel/plugin-proposal-json-strings-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-json-strings"; - packageName = "@babel/plugin-proposal-json-strings"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; - sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; - }; - }; - "@babel/plugin-proposal-logical-assignment-operators-7.20.7" = { - name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; - packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz"; - sha512 = "y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug=="; - }; - }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; - packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; - sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; - }; - }; - "@babel/plugin-proposal-numeric-separator-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-numeric-separator"; - packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; - sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; - }; - }; - "@babel/plugin-proposal-object-rest-spread-7.20.7" = { - name = "_at_babel_slash_plugin-proposal-object-rest-spread"; - packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz"; - sha512 = "d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg=="; - }; - }; - "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; - packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; - sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; - }; - }; - "@babel/plugin-proposal-optional-chaining-7.21.0" = { - name = "_at_babel_slash_plugin-proposal-optional-chaining"; - packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz"; - sha512 = "p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA=="; - }; - }; - "@babel/plugin-proposal-private-methods-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-private-methods"; - packageName = "@babel/plugin-proposal-private-methods"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; - sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; - }; - }; - "@babel/plugin-proposal-private-property-in-object-7.21.0" = { - name = "_at_babel_slash_plugin-proposal-private-property-in-object"; - packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz"; - sha512 = "ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw=="; - }; - }; - "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { - name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; - packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; - sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; - }; - }; - "@babel/plugin-syntax-async-generators-7.8.4" = { - name = "_at_babel_slash_plugin-syntax-async-generators"; - packageName = "@babel/plugin-syntax-async-generators"; - version = "7.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; - }; - }; - "@babel/plugin-syntax-bigint-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-bigint"; - packageName = "@babel/plugin-syntax-bigint"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; - sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; - }; - }; - "@babel/plugin-syntax-class-properties-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-class-properties"; - packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; - }; - }; - "@babel/plugin-syntax-class-static-block-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-class-static-block"; - packageName = "@babel/plugin-syntax-class-static-block"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; - sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; - }; - }; - "@babel/plugin-syntax-decorators-7.21.0" = { - name = "_at_babel_slash_plugin-syntax-decorators"; - packageName = "@babel/plugin-syntax-decorators"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz"; - sha512 = "tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w=="; - }; - }; - "@babel/plugin-syntax-dynamic-import-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-dynamic-import"; - packageName = "@babel/plugin-syntax-dynamic-import"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; - sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; - }; - }; - "@babel/plugin-syntax-export-namespace-from-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-export-namespace-from"; - packageName = "@babel/plugin-syntax-export-namespace-from"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; - sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; - }; - }; - "@babel/plugin-syntax-flow-7.21.4" = { - name = "_at_babel_slash_plugin-syntax-flow"; - packageName = "@babel/plugin-syntax-flow"; - version = "7.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.21.4.tgz"; - sha512 = "l9xd3N+XG4fZRxEP3vXdK6RW7vN1Uf5dxzRC/09wV86wqZ/YYQooBIGNsiRdfNR3/q2/5pPzV4B54J/9ctX5jw=="; - }; - }; - "@babel/plugin-syntax-import-assertions-7.20.0" = { - name = "_at_babel_slash_plugin-syntax-import-assertions"; - packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"; - sha512 = "IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ=="; - }; - }; - "@babel/plugin-syntax-import-meta-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-import-meta"; - packageName = "@babel/plugin-syntax-import-meta"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; - sha512 = "Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="; - }; - }; - "@babel/plugin-syntax-json-strings-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-json-strings"; - packageName = "@babel/plugin-syntax-json-strings"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; - }; - }; - "@babel/plugin-syntax-jsx-7.21.4" = { - name = "_at_babel_slash_plugin-syntax-jsx"; - packageName = "@babel/plugin-syntax-jsx"; - version = "7.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz"; - sha512 = "5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ=="; - }; - }; - "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; - packageName = "@babel/plugin-syntax-logical-assignment-operators"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; - }; - }; - "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; - packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; - }; - }; - "@babel/plugin-syntax-numeric-separator-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-numeric-separator"; - packageName = "@babel/plugin-syntax-numeric-separator"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; - }; - }; - "@babel/plugin-syntax-object-rest-spread-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-object-rest-spread"; - packageName = "@babel/plugin-syntax-object-rest-spread"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; - }; - }; - "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; - packageName = "@babel/plugin-syntax-optional-catch-binding"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; - }; - }; - "@babel/plugin-syntax-optional-chaining-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-chaining"; - packageName = "@babel/plugin-syntax-optional-chaining"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; - }; - }; - "@babel/plugin-syntax-private-property-in-object-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-private-property-in-object"; - packageName = "@babel/plugin-syntax-private-property-in-object"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; - sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; - }; - }; - "@babel/plugin-syntax-top-level-await-7.14.5" = { - name = "_at_babel_slash_plugin-syntax-top-level-await"; - packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; - sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; - }; - }; - "@babel/plugin-syntax-typescript-7.21.4" = { - name = "_at_babel_slash_plugin-syntax-typescript"; - packageName = "@babel/plugin-syntax-typescript"; - version = "7.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz"; - sha512 = "xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA=="; - }; - }; - "@babel/plugin-transform-arrow-functions-7.21.5" = { - name = "_at_babel_slash_plugin-transform-arrow-functions"; - packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz"; - sha512 = "wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA=="; - }; - }; - "@babel/plugin-transform-async-to-generator-7.20.7" = { - name = "_at_babel_slash_plugin-transform-async-to-generator"; - packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz"; - sha512 = "Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q=="; - }; - }; - "@babel/plugin-transform-block-scoped-functions-7.18.6" = { - name = "_at_babel_slash_plugin-transform-block-scoped-functions"; - packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; - sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; - }; - }; - "@babel/plugin-transform-block-scoping-7.21.0" = { - name = "_at_babel_slash_plugin-transform-block-scoping"; - packageName = "@babel/plugin-transform-block-scoping"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"; - sha512 = "Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ=="; - }; - }; - "@babel/plugin-transform-classes-7.21.0" = { - name = "_at_babel_slash_plugin-transform-classes"; - packageName = "@babel/plugin-transform-classes"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"; - sha512 = "RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ=="; - }; - }; - "@babel/plugin-transform-computed-properties-7.21.5" = { - name = "_at_babel_slash_plugin-transform-computed-properties"; - packageName = "@babel/plugin-transform-computed-properties"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz"; - sha512 = "TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q=="; - }; - }; - "@babel/plugin-transform-destructuring-7.21.3" = { - name = "_at_babel_slash_plugin-transform-destructuring"; - packageName = "@babel/plugin-transform-destructuring"; - version = "7.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz"; - sha512 = "bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA=="; - }; - }; - "@babel/plugin-transform-dotall-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-dotall-regex"; - packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; - sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; - }; - }; - "@babel/plugin-transform-duplicate-keys-7.18.9" = { - name = "_at_babel_slash_plugin-transform-duplicate-keys"; - packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; - sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; - }; - }; - "@babel/plugin-transform-exponentiation-operator-7.18.6" = { - name = "_at_babel_slash_plugin-transform-exponentiation-operator"; - packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; - sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; - }; - }; - "@babel/plugin-transform-flow-strip-types-7.21.0" = { - name = "_at_babel_slash_plugin-transform-flow-strip-types"; - packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.21.0.tgz"; - sha512 = "FlFA2Mj87a6sDkW4gfGrQQqwY/dLlBAyJa2dJEZ+FHXUVHBflO2wyKvg+OOEzXfrKYIa4HWl0mgmbCzt0cMb7w=="; - }; - }; - "@babel/plugin-transform-for-of-7.21.5" = { - name = "_at_babel_slash_plugin-transform-for-of"; - packageName = "@babel/plugin-transform-for-of"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz"; - sha512 = "nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ=="; - }; - }; - "@babel/plugin-transform-function-name-7.18.9" = { - name = "_at_babel_slash_plugin-transform-function-name"; - packageName = "@babel/plugin-transform-function-name"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; - sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; - }; - }; - "@babel/plugin-transform-literals-7.18.9" = { - name = "_at_babel_slash_plugin-transform-literals"; - packageName = "@babel/plugin-transform-literals"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; - sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; - }; - }; - "@babel/plugin-transform-member-expression-literals-7.18.6" = { - name = "_at_babel_slash_plugin-transform-member-expression-literals"; - packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; - sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; - }; - }; - "@babel/plugin-transform-modules-amd-7.20.11" = { - name = "_at_babel_slash_plugin-transform-modules-amd"; - packageName = "@babel/plugin-transform-modules-amd"; - version = "7.20.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz"; - sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g=="; - }; - }; - "@babel/plugin-transform-modules-commonjs-7.21.5" = { - name = "_at_babel_slash_plugin-transform-modules-commonjs"; - packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz"; - sha512 = "OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ=="; - }; - }; - "@babel/plugin-transform-modules-systemjs-7.20.11" = { - name = "_at_babel_slash_plugin-transform-modules-systemjs"; - packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.20.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz"; - sha512 = "vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw=="; - }; - }; - "@babel/plugin-transform-modules-umd-7.18.6" = { - name = "_at_babel_slash_plugin-transform-modules-umd"; - packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; - sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; - }; - }; - "@babel/plugin-transform-named-capturing-groups-regex-7.20.5" = { - name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; - packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.20.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz"; - sha512 = "mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA=="; - }; - }; - "@babel/plugin-transform-new-target-7.18.6" = { - name = "_at_babel_slash_plugin-transform-new-target"; - packageName = "@babel/plugin-transform-new-target"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; - sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; - }; - }; - "@babel/plugin-transform-object-super-7.18.6" = { - name = "_at_babel_slash_plugin-transform-object-super"; - packageName = "@babel/plugin-transform-object-super"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; - sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; - }; - }; - "@babel/plugin-transform-parameters-7.21.3" = { - name = "_at_babel_slash_plugin-transform-parameters"; - packageName = "@babel/plugin-transform-parameters"; - version = "7.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz"; - sha512 = "Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ=="; - }; - }; - "@babel/plugin-transform-property-literals-7.18.6" = { - name = "_at_babel_slash_plugin-transform-property-literals"; - packageName = "@babel/plugin-transform-property-literals"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; - sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; - }; - }; - "@babel/plugin-transform-react-constant-elements-7.21.3" = { - name = "_at_babel_slash_plugin-transform-react-constant-elements"; - packageName = "@babel/plugin-transform-react-constant-elements"; - version = "7.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.21.3.tgz"; - sha512 = "4DVcFeWe/yDYBLp0kBmOGFJ6N2UYg7coGid1gdxb4co62dy/xISDMaYBXBVXEDhfgMk7qkbcYiGtwd5Q/hwDDQ=="; - }; - }; - "@babel/plugin-transform-react-display-name-7.18.6" = { - name = "_at_babel_slash_plugin-transform-react-display-name"; - packageName = "@babel/plugin-transform-react-display-name"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz"; - sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; - }; - }; - "@babel/plugin-transform-react-jsx-7.21.5" = { - name = "_at_babel_slash_plugin-transform-react-jsx"; - packageName = "@babel/plugin-transform-react-jsx"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.5.tgz"; - sha512 = "ELdlq61FpoEkHO6gFRpfj0kUgSwQTGoaEU8eMRoS8Dv3v6e7BjEAj5WMtIBRdHUeAioMhKP5HyxNzNnP+heKbA=="; - }; - }; - "@babel/plugin-transform-react-jsx-development-7.18.6" = { - name = "_at_babel_slash_plugin-transform-react-jsx-development"; - packageName = "@babel/plugin-transform-react-jsx-development"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz"; - sha512 = "SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA=="; - }; - }; - "@babel/plugin-transform-react-pure-annotations-7.18.6" = { - name = "_at_babel_slash_plugin-transform-react-pure-annotations"; - packageName = "@babel/plugin-transform-react-pure-annotations"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz"; - sha512 = "I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ=="; - }; - }; - "@babel/plugin-transform-regenerator-7.21.5" = { - name = "_at_babel_slash_plugin-transform-regenerator"; - packageName = "@babel/plugin-transform-regenerator"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz"; - sha512 = "ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w=="; - }; - }; - "@babel/plugin-transform-reserved-words-7.18.6" = { - name = "_at_babel_slash_plugin-transform-reserved-words"; - packageName = "@babel/plugin-transform-reserved-words"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; - sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; - }; - }; - "@babel/plugin-transform-runtime-7.21.4" = { - name = "_at_babel_slash_plugin-transform-runtime"; - packageName = "@babel/plugin-transform-runtime"; - version = "7.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz"; - sha512 = "1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA=="; - }; - }; - "@babel/plugin-transform-shorthand-properties-7.18.6" = { - name = "_at_babel_slash_plugin-transform-shorthand-properties"; - packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; - sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; - }; - }; - "@babel/plugin-transform-spread-7.20.7" = { - name = "_at_babel_slash_plugin-transform-spread"; - packageName = "@babel/plugin-transform-spread"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz"; - sha512 = "ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw=="; - }; - }; - "@babel/plugin-transform-sticky-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-sticky-regex"; - packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; - sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; - }; - }; - "@babel/plugin-transform-template-literals-7.18.9" = { - name = "_at_babel_slash_plugin-transform-template-literals"; - packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; - sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; - }; - }; - "@babel/plugin-transform-typeof-symbol-7.18.9" = { - name = "_at_babel_slash_plugin-transform-typeof-symbol"; - packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.18.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; - sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; - }; - }; - "@babel/plugin-transform-typescript-7.21.3" = { - name = "_at_babel_slash_plugin-transform-typescript"; - packageName = "@babel/plugin-transform-typescript"; - version = "7.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz"; - sha512 = "RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw=="; - }; - }; - "@babel/plugin-transform-unicode-escapes-7.21.5" = { - name = "_at_babel_slash_plugin-transform-unicode-escapes"; - packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz"; - sha512 = "LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg=="; - }; - }; - "@babel/plugin-transform-unicode-regex-7.18.6" = { - name = "_at_babel_slash_plugin-transform-unicode-regex"; - packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; - sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; - }; - }; - "@babel/preset-env-7.21.5" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.5.tgz"; - sha512 = "wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg=="; - }; - }; - "@babel/preset-modules-0.1.5" = { - name = "_at_babel_slash_preset-modules"; - packageName = "@babel/preset-modules"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; - sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; - }; - }; - "@babel/preset-react-7.18.6" = { - name = "_at_babel_slash_preset-react"; - packageName = "@babel/preset-react"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz"; - sha512 = "zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg=="; - }; - }; - "@babel/preset-typescript-7.21.5" = { - name = "_at_babel_slash_preset-typescript"; - packageName = "@babel/preset-typescript"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.5.tgz"; - sha512 = "iqe3sETat5EOrORXiQ6rWfoOg2y68Cs75B9wNxdPW4kixJxh7aXQE1KPdWLDniC24T/6dSnguF33W9j/ZZQcmA=="; - }; - }; - "@babel/regjsgen-0.8.0" = { - name = "_at_babel_slash_regjsgen"; - packageName = "@babel/regjsgen"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz"; - sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; - }; - }; - "@babel/runtime-7.21.5" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz"; - sha512 = "8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q=="; - }; - }; - "@babel/template-7.20.7" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; - sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; - }; - }; - "@babel/traverse-7.21.5" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz"; - sha512 = "AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw=="; - }; - }; - "@babel/types-7.21.5" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz"; - sha512 = "m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q=="; - }; - }; - "@bcoe/v8-coverage-0.2.3" = { - name = "_at_bcoe_slash_v8-coverage"; - packageName = "@bcoe/v8-coverage"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; - sha512 = "0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="; - }; - }; - "@bufbuild/protobuf-1.2.0" = { - name = "_at_bufbuild_slash_protobuf"; - packageName = "@bufbuild/protobuf"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.2.0.tgz"; - sha512 = "MBVuQMOBHxgGnZ9XCUIi8WOy5O/T4ma3TduCRhRvndv3UDbG9cHgd8h6nOYSGyBYPEvXf1z9nTwhp8mVIDbq2g=="; - }; - }; - "@cspotcode/source-map-support-0.8.1" = { - name = "_at_cspotcode_slash_source-map-support"; - packageName = "@cspotcode/source-map-support"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"; - sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; - }; - }; - "@csstools/normalize.css-12.0.0" = { - name = "_at_csstools_slash_normalize.css"; - packageName = "@csstools/normalize.css"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz"; - sha512 = "M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="; - }; - }; - "@csstools/postcss-cascade-layers-1.1.1" = { - name = "_at_csstools_slash_postcss-cascade-layers"; - packageName = "@csstools/postcss-cascade-layers"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz"; - sha512 = "+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA=="; - }; - }; - "@csstools/postcss-color-function-1.1.1" = { - name = "_at_csstools_slash_postcss-color-function"; - packageName = "@csstools/postcss-color-function"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz"; - sha512 = "Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw=="; - }; - }; - "@csstools/postcss-font-format-keywords-1.0.1" = { - name = "_at_csstools_slash_postcss-font-format-keywords"; - packageName = "@csstools/postcss-font-format-keywords"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz"; - sha512 = "ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg=="; - }; - }; - "@csstools/postcss-hwb-function-1.0.2" = { - name = "_at_csstools_slash_postcss-hwb-function"; - packageName = "@csstools/postcss-hwb-function"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz"; - sha512 = "YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w=="; - }; - }; - "@csstools/postcss-ic-unit-1.0.1" = { - name = "_at_csstools_slash_postcss-ic-unit"; - packageName = "@csstools/postcss-ic-unit"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz"; - sha512 = "Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw=="; - }; - }; - "@csstools/postcss-is-pseudo-class-2.0.7" = { - name = "_at_csstools_slash_postcss-is-pseudo-class"; - packageName = "@csstools/postcss-is-pseudo-class"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz"; - sha512 = "7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA=="; - }; - }; - "@csstools/postcss-nested-calc-1.0.0" = { - name = "_at_csstools_slash_postcss-nested-calc"; - packageName = "@csstools/postcss-nested-calc"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz"; - sha512 = "JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ=="; - }; - }; - "@csstools/postcss-normalize-display-values-1.0.1" = { - name = "_at_csstools_slash_postcss-normalize-display-values"; - packageName = "@csstools/postcss-normalize-display-values"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz"; - sha512 = "jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw=="; - }; - }; - "@csstools/postcss-oklab-function-1.1.1" = { - name = "_at_csstools_slash_postcss-oklab-function"; - packageName = "@csstools/postcss-oklab-function"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz"; - sha512 = "nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA=="; - }; - }; - "@csstools/postcss-progressive-custom-properties-1.3.0" = { - name = "_at_csstools_slash_postcss-progressive-custom-properties"; - packageName = "@csstools/postcss-progressive-custom-properties"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz"; - sha512 = "ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA=="; - }; - }; - "@csstools/postcss-stepped-value-functions-1.0.1" = { - name = "_at_csstools_slash_postcss-stepped-value-functions"; - packageName = "@csstools/postcss-stepped-value-functions"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz"; - sha512 = "dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ=="; - }; - }; - "@csstools/postcss-text-decoration-shorthand-1.0.0" = { - name = "_at_csstools_slash_postcss-text-decoration-shorthand"; - packageName = "@csstools/postcss-text-decoration-shorthand"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz"; - sha512 = "c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw=="; - }; - }; - "@csstools/postcss-trigonometric-functions-1.0.2" = { - name = "_at_csstools_slash_postcss-trigonometric-functions"; - packageName = "@csstools/postcss-trigonometric-functions"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz"; - sha512 = "woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og=="; - }; - }; - "@csstools/postcss-unset-value-1.0.2" = { - name = "_at_csstools_slash_postcss-unset-value"; - packageName = "@csstools/postcss-unset-value"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz"; - sha512 = "c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g=="; - }; - }; - "@csstools/selector-specificity-2.2.0" = { - name = "_at_csstools_slash_selector-specificity"; - packageName = "@csstools/selector-specificity"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"; - sha512 = "+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw=="; - }; - }; - "@emotion/babel-plugin-11.11.0" = { - name = "_at_emotion_slash_babel-plugin"; - packageName = "@emotion/babel-plugin"; - version = "11.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz"; - sha512 = "m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ=="; - }; - }; - "@emotion/cache-11.11.0" = { - name = "_at_emotion_slash_cache"; - packageName = "@emotion/cache"; - version = "11.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz"; - sha512 = "P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ=="; - }; - }; - "@emotion/hash-0.9.1" = { - name = "_at_emotion_slash_hash"; - packageName = "@emotion/hash"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz"; - sha512 = "gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="; - }; - }; - "@emotion/is-prop-valid-1.2.1" = { - name = "_at_emotion_slash_is-prop-valid"; - packageName = "@emotion/is-prop-valid"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz"; - sha512 = "61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw=="; - }; - }; - "@emotion/memoize-0.8.1" = { - name = "_at_emotion_slash_memoize"; - packageName = "@emotion/memoize"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz"; - sha512 = "W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="; - }; - }; - "@emotion/react-11.11.0" = { - name = "_at_emotion_slash_react"; - packageName = "@emotion/react"; - version = "11.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/react/-/react-11.11.0.tgz"; - sha512 = "ZSK3ZJsNkwfjT3JpDAWJZlrGD81Z3ytNDsxw1LKq1o+xkmO5pnWfr6gmCC8gHEFf3nSSX/09YrG67jybNPxSUw=="; - }; - }; - "@emotion/serialize-1.1.2" = { - name = "_at_emotion_slash_serialize"; - packageName = "@emotion/serialize"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz"; - sha512 = "zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA=="; - }; - }; - "@emotion/sheet-1.2.2" = { - name = "_at_emotion_slash_sheet"; - packageName = "@emotion/sheet"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz"; - sha512 = "0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="; - }; - }; - "@emotion/styled-11.11.0" = { - name = "_at_emotion_slash_styled"; - packageName = "@emotion/styled"; - version = "11.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.0.tgz"; - sha512 = "hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng=="; - }; - }; - "@emotion/unitless-0.8.1" = { - name = "_at_emotion_slash_unitless"; - packageName = "@emotion/unitless"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz"; - sha512 = "KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="; - }; - }; - "@emotion/use-insertion-effect-with-fallbacks-1.0.1" = { - name = "_at_emotion_slash_use-insertion-effect-with-fallbacks"; - packageName = "@emotion/use-insertion-effect-with-fallbacks"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz"; - sha512 = "jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw=="; - }; - }; - "@emotion/utils-1.2.1" = { - name = "_at_emotion_slash_utils"; - packageName = "@emotion/utils"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz"; - sha512 = "Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="; - }; - }; - "@emotion/weak-memoize-0.3.1" = { - name = "_at_emotion_slash_weak-memoize"; - packageName = "@emotion/weak-memoize"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz"; - sha512 = "EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="; - }; - }; - "@eslint-community/eslint-utils-4.4.0" = { - name = "_at_eslint-community_slash_eslint-utils"; - packageName = "@eslint-community/eslint-utils"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"; - sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="; - }; - }; - "@eslint-community/regexpp-4.5.1" = { - name = "_at_eslint-community_slash_regexpp"; - packageName = "@eslint-community/regexpp"; - version = "4.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz"; - sha512 = "Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ=="; - }; - }; - "@eslint/eslintrc-2.0.3" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz"; - sha512 = "+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ=="; - }; - }; - "@eslint/js-8.41.0" = { - name = "_at_eslint_slash_js"; - packageName = "@eslint/js"; - version = "8.41.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.41.0.tgz"; - sha512 = "LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA=="; - }; - }; - "@gar/promisify-1.1.3" = { - name = "_at_gar_slash_promisify"; - packageName = "@gar/promisify"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; - sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; - }; - }; - "@humanwhocodes/config-array-0.11.8" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; - sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; - }; - }; - "@humanwhocodes/module-importer-1.0.1" = { - name = "_at_humanwhocodes_slash_module-importer"; - packageName = "@humanwhocodes/module-importer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; - sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; - }; - }; - "@humanwhocodes/object-schema-1.2.1" = { - name = "_at_humanwhocodes_slash_object-schema"; - packageName = "@humanwhocodes/object-schema"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - }; - "@istanbuljs/load-nyc-config-1.1.0" = { - name = "_at_istanbuljs_slash_load-nyc-config"; - packageName = "@istanbuljs/load-nyc-config"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; - sha512 = "VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ=="; - }; - }; - "@istanbuljs/schema-0.1.3" = { - name = "_at_istanbuljs_slash_schema"; - packageName = "@istanbuljs/schema"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"; - sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; - }; - }; - "@jest/console-27.5.1" = { - name = "_at_jest_slash_console"; - packageName = "@jest/console"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz"; - sha512 = "kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg=="; - }; - }; - "@jest/console-28.1.3" = { - name = "_at_jest_slash_console"; - packageName = "@jest/console"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz"; - sha512 = "QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw=="; - }; - }; - "@jest/core-27.5.1" = { - name = "_at_jest_slash_core"; - packageName = "@jest/core"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz"; - sha512 = "AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ=="; - }; - }; - "@jest/environment-27.5.1" = { - name = "_at_jest_slash_environment"; - packageName = "@jest/environment"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz"; - sha512 = "/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA=="; - }; - }; - "@jest/fake-timers-27.5.1" = { - name = "_at_jest_slash_fake-timers"; - packageName = "@jest/fake-timers"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz"; - sha512 = "/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ=="; - }; - }; - "@jest/globals-27.5.1" = { - name = "_at_jest_slash_globals"; - packageName = "@jest/globals"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz"; - sha512 = "ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q=="; - }; - }; - "@jest/reporters-27.5.1" = { - name = "_at_jest_slash_reporters"; - packageName = "@jest/reporters"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz"; - sha512 = "cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw=="; - }; - }; - "@jest/schemas-28.1.3" = { - name = "_at_jest_slash_schemas"; - packageName = "@jest/schemas"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz"; - sha512 = "/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg=="; - }; - }; - "@jest/source-map-27.5.1" = { - name = "_at_jest_slash_source-map"; - packageName = "@jest/source-map"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz"; - sha512 = "y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg=="; - }; - }; - "@jest/test-result-27.5.1" = { - name = "_at_jest_slash_test-result"; - packageName = "@jest/test-result"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz"; - sha512 = "EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag=="; - }; - }; - "@jest/test-result-28.1.3" = { - name = "_at_jest_slash_test-result"; - packageName = "@jest/test-result"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz"; - sha512 = "kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg=="; - }; - }; - "@jest/test-sequencer-27.5.1" = { - name = "_at_jest_slash_test-sequencer"; - packageName = "@jest/test-sequencer"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz"; - sha512 = "LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ=="; - }; - }; - "@jest/transform-27.5.1" = { - name = "_at_jest_slash_transform"; - packageName = "@jest/transform"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz"; - sha512 = "ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw=="; - }; - }; - "@jest/types-27.5.1" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz"; - sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; - }; - }; - "@jest/types-28.1.3" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz"; - sha512 = "RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ=="; - }; - }; - "@jridgewell/gen-mapping-0.3.3" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"; - sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; - }; - }; - "@jridgewell/resolve-uri-3.1.0" = { - name = "_at_jridgewell_slash_resolve-uri"; - packageName = "@jridgewell/resolve-uri"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; - }; - }; - "@jridgewell/set-array-1.1.2" = { - name = "_at_jridgewell_slash_set-array"; - packageName = "@jridgewell/set-array"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; - }; - }; - "@jridgewell/source-map-0.3.3" = { - name = "_at_jridgewell_slash_source-map"; - packageName = "@jridgewell/source-map"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz"; - sha512 = "b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.14" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.15" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"; - sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; - }; - }; - "@jridgewell/trace-mapping-0.3.18" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.3.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"; - sha512 = "w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA=="; - }; - }; - "@jridgewell/trace-mapping-0.3.9" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; - sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; - }; - }; - "@leichtgewicht/ip-codec-2.0.4" = { - name = "_at_leichtgewicht_slash_ip-codec"; - packageName = "@leichtgewicht/ip-codec"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"; - sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; - }; - }; - "@mapbox/node-pre-gyp-1.0.10" = { - name = "_at_mapbox_slash_node-pre-gyp"; - packageName = "@mapbox/node-pre-gyp"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz"; - sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; - }; - }; - "@mui/base-5.0.0-beta.1" = { - name = "_at_mui_slash_base"; - packageName = "@mui/base"; - version = "5.0.0-beta.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.1.tgz"; - sha512 = "xrkDCeu3JQE+JjJUnJnOrdQJMXwKhbV4AW+FRjMIj5i9cHK3BAuatG/iqbf1M+jklVWLk0KdbgioKwK+03aYbA=="; - }; - }; - "@mui/core-downloads-tracker-5.13.1" = { - name = "_at_mui_slash_core-downloads-tracker"; - packageName = "@mui/core-downloads-tracker"; - version = "5.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.13.1.tgz"; - sha512 = "qDHtNDO72NcBQMhaWBt9EZMvNiO+OXjPg5Sdk/6LgRDw6Zr3HdEZ5n2FJ/qtYsaT/okGyCuQavQkcZCOCEVf/g=="; - }; - }; - "@mui/icons-material-5.11.16" = { - name = "_at_mui_slash_icons-material"; - packageName = "@mui/icons-material"; - version = "5.11.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.16.tgz"; - sha512 = "oKkx9z9Kwg40NtcIajF9uOXhxiyTZrrm9nmIJ4UjkU2IdHpd4QVLbCc/5hZN/y0C6qzi2Zlxyr9TGddQx2vx2A=="; - }; - }; - "@mui/material-5.13.1" = { - name = "_at_mui_slash_material"; - packageName = "@mui/material"; - version = "5.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/material/-/material-5.13.1.tgz"; - sha512 = "qSnbJZer8lIuDYFDv19/t3s0AXYY9SxcOdhCnGvetRSfOG4gy3TkiFXNCdW5OLNveTieiMpOuv46eXUmE3ZA6A=="; - }; - }; - "@mui/private-theming-5.13.1" = { - name = "_at_mui_slash_private-theming"; - packageName = "@mui/private-theming"; - version = "5.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.13.1.tgz"; - sha512 = "HW4npLUD9BAkVppOUZHeO1FOKUJWAwbpy0VQoGe3McUYTlck1HezGHQCfBQ5S/Nszi7EViqiimECVl9xi+/WjQ=="; - }; - }; - "@mui/styled-engine-5.12.3" = { - name = "_at_mui_slash_styled-engine"; - packageName = "@mui/styled-engine"; - version = "5.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.12.3.tgz"; - sha512 = "AhZtiRyT8Bjr7fufxE/mLS+QJ3LxwX1kghIcM2B2dvJzSSg9rnIuXDXM959QfUVIM3C8U4x3mgVoPFMQJvc4/g=="; - }; - }; - "@mui/system-5.13.1" = { - name = "_at_mui_slash_system"; - packageName = "@mui/system"; - version = "5.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/system/-/system-5.13.1.tgz"; - sha512 = "BsDUjhiO6ZVAvzKhnWBHLZ5AtPJcdT+62VjnRLyA4isboqDKLg4fmYIZXq51yndg/soDK9RkY5lYZwEDku13Ow=="; - }; - }; - "@mui/types-7.2.4" = { - name = "_at_mui_slash_types"; - packageName = "@mui/types"; - version = "7.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/types/-/types-7.2.4.tgz"; - sha512 = "LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA=="; - }; - }; - "@mui/utils-5.13.1" = { - name = "_at_mui_slash_utils"; - packageName = "@mui/utils"; - version = "5.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@mui/utils/-/utils-5.13.1.tgz"; - sha512 = "6lXdWwmlUbEU2jUI8blw38Kt+3ly7xkmV9ljzY4Q20WhsJMWiNry9CX8M+TaP/HbtuyR8XKsdMgQW7h7MM3n3A=="; - }; - }; - "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { - name = "_at_nicolo-ribaudo_slash_eslint-scope-5-internals"; - packageName = "@nicolo-ribaudo/eslint-scope-5-internals"; - version = "5.1.1-v1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz"; - sha512 = "54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg=="; - }; - }; - "@nodelib/fs.scandir-2.1.5" = { - name = "_at_nodelib_slash_fs.scandir"; - packageName = "@nodelib/fs.scandir"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - }; - "@nodelib/fs.stat-2.0.5" = { - name = "_at_nodelib_slash_fs.stat"; - packageName = "@nodelib/fs.stat"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - }; - "@nodelib/fs.walk-1.2.8" = { - name = "_at_nodelib_slash_fs.walk"; - packageName = "@nodelib/fs.walk"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; - }; - }; - "@npmcli/fs-1.1.1" = { - name = "_at_npmcli_slash_fs"; - packageName = "@npmcli/fs"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"; - sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; - }; - }; - "@npmcli/move-file-1.1.2" = { - name = "_at_npmcli_slash_move-file"; - packageName = "@npmcli/move-file"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; - sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; - }; - }; - "@pmmmwh/react-refresh-webpack-plugin-0.5.10" = { - name = "_at_pmmmwh_slash_react-refresh-webpack-plugin"; - packageName = "@pmmmwh/react-refresh-webpack-plugin"; - version = "0.5.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz"; - sha512 = "j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA=="; - }; - }; - "@popperjs/core-2.11.7" = { - name = "_at_popperjs_slash_core"; - packageName = "@popperjs/core"; - version = "2.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz"; - sha512 = "Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw=="; - }; - }; - "@remix-run/router-1.6.2" = { - name = "_at_remix-run_slash_router"; - packageName = "@remix-run/router"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.6.2.tgz"; - sha512 = "LzqpSrMK/3JBAVBI9u3NWtOhWNw5AMQfrUFYB0+bDHTSw17z++WJLsPsxAuK+oSddsxk4d7F/JcdDPM1M5YAhA=="; - }; - }; - "@rollup/plugin-babel-5.3.1" = { - name = "_at_rollup_slash_plugin-babel"; - packageName = "@rollup/plugin-babel"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz"; - sha512 = "WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q=="; - }; - }; - "@rollup/plugin-node-resolve-11.2.1" = { - name = "_at_rollup_slash_plugin-node-resolve"; - packageName = "@rollup/plugin-node-resolve"; - version = "11.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz"; - sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; - }; - }; - "@rollup/plugin-replace-2.4.2" = { - name = "_at_rollup_slash_plugin-replace"; - packageName = "@rollup/plugin-replace"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz"; - sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg=="; - }; - }; - "@rollup/pluginutils-3.1.0" = { - name = "_at_rollup_slash_pluginutils"; - packageName = "@rollup/pluginutils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; - }; - }; - "@rushstack/eslint-patch-1.2.0" = { - name = "_at_rushstack_slash_eslint-patch"; - packageName = "@rushstack/eslint-patch"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"; - sha512 = "sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="; - }; - }; - "@sinclair/typebox-0.24.51" = { - name = "_at_sinclair_slash_typebox"; - packageName = "@sinclair/typebox"; - version = "0.24.51"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz"; - sha512 = "1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="; - }; - }; - "@sinonjs/commons-1.8.6" = { - name = "_at_sinonjs_slash_commons"; - packageName = "@sinonjs/commons"; - version = "1.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz"; - sha512 = "Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="; - }; - }; - "@sinonjs/fake-timers-8.1.0" = { - name = "_at_sinonjs_slash_fake-timers"; - packageName = "@sinonjs/fake-timers"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz"; - sha512 = "OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg=="; - }; - }; - "@surma/rollup-plugin-off-main-thread-2.2.3" = { - name = "_at_surma_slash_rollup-plugin-off-main-thread"; - packageName = "@surma/rollup-plugin-off-main-thread"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz"; - sha512 = "lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ=="; - }; - }; - "@svgr/babel-plugin-add-jsx-attribute-5.4.0" = { - name = "_at_svgr_slash_babel-plugin-add-jsx-attribute"; - packageName = "@svgr/babel-plugin-add-jsx-attribute"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz"; - sha512 = "ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg=="; - }; - }; - "@svgr/babel-plugin-remove-jsx-attribute-5.4.0" = { - name = "_at_svgr_slash_babel-plugin-remove-jsx-attribute"; - packageName = "@svgr/babel-plugin-remove-jsx-attribute"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz"; - sha512 = "yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg=="; - }; - }; - "@svgr/babel-plugin-remove-jsx-empty-expression-5.0.1" = { - name = "_at_svgr_slash_babel-plugin-remove-jsx-empty-expression"; - packageName = "@svgr/babel-plugin-remove-jsx-empty-expression"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz"; - sha512 = "LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA=="; - }; - }; - "@svgr/babel-plugin-replace-jsx-attribute-value-5.0.1" = { - name = "_at_svgr_slash_babel-plugin-replace-jsx-attribute-value"; - packageName = "@svgr/babel-plugin-replace-jsx-attribute-value"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz"; - sha512 = "PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ=="; - }; - }; - "@svgr/babel-plugin-svg-dynamic-title-5.4.0" = { - name = "_at_svgr_slash_babel-plugin-svg-dynamic-title"; - packageName = "@svgr/babel-plugin-svg-dynamic-title"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz"; - sha512 = "zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg=="; - }; - }; - "@svgr/babel-plugin-svg-em-dimensions-5.4.0" = { - name = "_at_svgr_slash_babel-plugin-svg-em-dimensions"; - packageName = "@svgr/babel-plugin-svg-em-dimensions"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz"; - sha512 = "cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw=="; - }; - }; - "@svgr/babel-plugin-transform-react-native-svg-5.4.0" = { - name = "_at_svgr_slash_babel-plugin-transform-react-native-svg"; - packageName = "@svgr/babel-plugin-transform-react-native-svg"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz"; - sha512 = "3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q=="; - }; - }; - "@svgr/babel-plugin-transform-svg-component-5.5.0" = { - name = "_at_svgr_slash_babel-plugin-transform-svg-component"; - packageName = "@svgr/babel-plugin-transform-svg-component"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz"; - sha512 = "q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ=="; - }; - }; - "@svgr/babel-preset-5.5.0" = { - name = "_at_svgr_slash_babel-preset"; - packageName = "@svgr/babel-preset"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz"; - sha512 = "4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig=="; - }; - }; - "@svgr/core-5.5.0" = { - name = "_at_svgr_slash_core"; - packageName = "@svgr/core"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz"; - sha512 = "q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ=="; - }; - }; - "@svgr/hast-util-to-babel-ast-5.5.0" = { - name = "_at_svgr_slash_hast-util-to-babel-ast"; - packageName = "@svgr/hast-util-to-babel-ast"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz"; - sha512 = "cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ=="; - }; - }; - "@svgr/plugin-jsx-5.5.0" = { - name = "_at_svgr_slash_plugin-jsx"; - packageName = "@svgr/plugin-jsx"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz"; - sha512 = "V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA=="; - }; - }; - "@svgr/plugin-svgo-5.5.0" = { - name = "_at_svgr_slash_plugin-svgo"; - packageName = "@svgr/plugin-svgo"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz"; - sha512 = "r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ=="; - }; - }; - "@svgr/webpack-5.5.0" = { - name = "_at_svgr_slash_webpack"; - packageName = "@svgr/webpack"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz"; - sha512 = "DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g=="; - }; - }; - "@swc/core-1.3.59" = { - name = "_at_swc_slash_core"; - packageName = "@swc/core"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.59.tgz"; - sha512 = "ZBw31zd2E5SXiodwGvjQdx5ZC90b2uyX/i2LeMMs8LKfXD86pfOfQac+JVrnyEKDhASXj9icgsF9NXBhaMr3Kw=="; - }; - }; - "@swc/core-darwin-arm64-1.3.59" = { - name = "_at_swc_slash_core-darwin-arm64"; - packageName = "@swc/core-darwin-arm64"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.59.tgz"; - sha512 = "AnqWFBgEKHP0jb4iZqx7eVQT9/rX45+DE4Ox7GpwCahUKxxrsDLyXzKhwLwQuAjUvtu5JcSB77szKpPGDM49fQ=="; - }; - }; - "@swc/core-darwin-x64-1.3.59" = { - name = "_at_swc_slash_core-darwin-x64"; - packageName = "@swc/core-darwin-x64"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.59.tgz"; - sha512 = "iqDs+yii9mOsmpJez82SEi4d4prWDRlapHxKnDVJ0x1AqRo41vIq8t3fujrvCHYU5VQgOYGh4ooXQpaP2H3B2A=="; - }; - }; - "@swc/core-linux-arm-gnueabihf-1.3.59" = { - name = "_at_swc_slash_core-linux-arm-gnueabihf"; - packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.59.tgz"; - sha512 = "PB0PP+SgkCSd/kYmltnPiGv42cOSaih1OjXCEjxvNwUFEmWqluW6uGdWaNiR1LoYMxhcHZTc336jL2+O3l6p0Q=="; - }; - }; - "@swc/core-linux-arm64-gnu-1.3.59" = { - name = "_at_swc_slash_core-linux-arm64-gnu"; - packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.59.tgz"; - sha512 = "Ol/JPszWZ+OZ44FOdJe35TfJ1ckG4pYaisZJ4E7PzfwfVe2ygX85C5WWR4e5L0Y1zFvzpcI7gdyC2wzcXk4Cig=="; - }; - }; - "@swc/core-linux-arm64-musl-1.3.59" = { - name = "_at_swc_slash_core-linux-arm64-musl"; - packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.59.tgz"; - sha512 = "PtTTtGbj9GiY5gJdoSFL2A0vL6BRaS1haAhp6g3hZvLDkTTg+rJURmzwBMMjaQlnGC62x/lLf6MoszHG/05//Q=="; - }; - }; - "@swc/core-linux-x64-gnu-1.3.59" = { - name = "_at_swc_slash_core-linux-x64-gnu"; - packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.59.tgz"; - sha512 = "XBW9AGi0YsIN76IfesnDSBn/5sjR69J75KUNte8sH6seYlHJ0/kblqUMbUcfr0CiGoJadbzAZeKZZmfN7EsHpg=="; - }; - }; - "@swc/core-linux-x64-musl-1.3.59" = { - name = "_at_swc_slash_core-linux-x64-musl"; - packageName = "@swc/core-linux-x64-musl"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.59.tgz"; - sha512 = "Cy5E939SdWPQ34cg6UABNO0RyEe0FuWqzZ/GLKtK11Ir4fjttVlucZiY59uQNyUVUc8T2qE0VBFCyD/zYGuHtg=="; - }; - }; - "@swc/core-win32-arm64-msvc-1.3.59" = { - name = "_at_swc_slash_core-win32-arm64-msvc"; - packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.59.tgz"; - sha512 = "z5ZJxizRvRoSAaevRIi3YjQh74OFWEIhonSDWNdqDL7RbjEivcatYcG7OikH6s+rtPhOcwNm3PbGV2Prcgh/gg=="; - }; - }; - "@swc/core-win32-ia32-msvc-1.3.59" = { - name = "_at_swc_slash_core-win32-ia32-msvc"; - packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.59.tgz"; - sha512 = "vxpsn+hrKAhi5YusQfB/JXUJJVX40rIRE/L49ilBEqdbH8Khkoego6AD+2vWqTdJcUHo1WiAIAEZ0rTsjyorLQ=="; - }; - }; - "@swc/core-win32-x64-msvc-1.3.59" = { - name = "_at_swc_slash_core-win32-x64-msvc"; - packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.59.tgz"; - sha512 = "Ris/cJbURylcLwqz4RZUUBCEGsuaIHOJsvf69W5pGKHKBryVoOTNhBKpo3Km2hoAi5qFQ/ou0trAT4hBsVPZvQ=="; - }; - }; - "@swc/helpers-0.5.1" = { - name = "_at_swc_slash_helpers"; - packageName = "@swc/helpers"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz"; - sha512 = "sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg=="; - }; - }; - "@swc/wasm-1.3.59" = { - name = "_at_swc_slash_wasm"; - packageName = "@swc/wasm"; - version = "1.3.59"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.59.tgz"; - sha512 = "HMC6y2rqtomrspvHwEZZuQb8kzw1GZSmaZ8fbbjSRvvvtOHLbIetuFWGVJ6dgthkt10YII21AMZcvxvrTC6H/Q=="; - }; - }; - "@tootallnate/once-1.1.2" = { - name = "_at_tootallnate_slash_once"; - packageName = "@tootallnate/once"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; - sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; - }; - }; - "@trysound/sax-0.2.0" = { - name = "_at_trysound_slash_sax"; - packageName = "@trysound/sax"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"; - sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; - }; - }; - "@tsconfig/node10-1.0.9" = { - name = "_at_tsconfig_slash_node10"; - packageName = "@tsconfig/node10"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz"; - sha512 = "jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA=="; - }; - }; - "@tsconfig/node12-1.0.11" = { - name = "_at_tsconfig_slash_node12"; - packageName = "@tsconfig/node12"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz"; - sha512 = "cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="; - }; - }; - "@tsconfig/node14-1.0.3" = { - name = "_at_tsconfig_slash_node14"; - packageName = "@tsconfig/node14"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz"; - sha512 = "ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="; - }; - }; - "@tsconfig/node16-1.0.4" = { - name = "_at_tsconfig_slash_node16"; - packageName = "@tsconfig/node16"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz"; - sha512 = "vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA=="; - }; - }; - "@types/babel__core-7.20.0" = { - name = "_at_types_slash_babel__core"; - packageName = "@types/babel__core"; - version = "7.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz"; - sha512 = "+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ=="; - }; - }; - "@types/babel__generator-7.6.4" = { - name = "_at_types_slash_babel__generator"; - packageName = "@types/babel__generator"; - version = "7.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz"; - sha512 = "tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg=="; - }; - }; - "@types/babel__template-7.4.1" = { - name = "_at_types_slash_babel__template"; - packageName = "@types/babel__template"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz"; - sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; - }; - }; - "@types/babel__traverse-7.18.5" = { - name = "_at_types_slash_babel__traverse"; - packageName = "@types/babel__traverse"; - version = "7.18.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.5.tgz"; - sha512 = "enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q=="; - }; - }; - "@types/body-parser-1.19.2" = { - name = "_at_types_slash_body-parser"; - packageName = "@types/body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; - }; - }; - "@types/bonjour-3.5.10" = { - name = "_at_types_slash_bonjour"; - packageName = "@types/bonjour"; - version = "3.5.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz"; - sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; - }; - }; - "@types/connect-3.4.35" = { - name = "_at_types_slash_connect"; - packageName = "@types/connect"; - version = "3.4.35"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; - sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; - }; - }; - "@types/connect-history-api-fallback-1.5.0" = { - name = "_at_types_slash_connect-history-api-fallback"; - packageName = "@types/connect-history-api-fallback"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz"; - sha512 = "4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig=="; - }; - }; - "@types/eslint-8.37.0" = { - name = "_at_types_slash_eslint"; - packageName = "@types/eslint"; - version = "8.37.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz"; - sha512 = "Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ=="; - }; - }; - "@types/eslint-scope-3.7.4" = { - name = "_at_types_slash_eslint-scope"; - packageName = "@types/eslint-scope"; - version = "3.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; - sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; - }; - }; - "@types/estree-0.0.39" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; - }; - }; - "@types/estree-1.0.1" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz"; - sha512 = "LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="; - }; - }; - "@types/express-4.17.17" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; - sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; - }; - }; - "@types/express-serve-static-core-4.17.35" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.35"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz"; - sha512 = "wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg=="; - }; - }; - "@types/graceful-fs-4.1.6" = { - name = "_at_types_slash_graceful-fs"; - packageName = "@types/graceful-fs"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha512 = "Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw=="; - }; - }; - "@types/html-minifier-terser-6.1.0" = { - name = "_at_types_slash_html-minifier-terser"; - packageName = "@types/html-minifier-terser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; - }; - }; - "@types/http-proxy-1.17.11" = { - name = "_at_types_slash_http-proxy"; - packageName = "@types/http-proxy"; - version = "1.17.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz"; - sha512 = "HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA=="; - }; - }; - "@types/istanbul-lib-coverage-2.0.4" = { - name = "_at_types_slash_istanbul-lib-coverage"; - packageName = "@types/istanbul-lib-coverage"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"; - sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; - }; - }; - "@types/istanbul-lib-report-3.0.0" = { - name = "_at_types_slash_istanbul-lib-report"; - packageName = "@types/istanbul-lib-report"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; - }; - }; - "@types/istanbul-reports-3.0.1" = { - name = "_at_types_slash_istanbul-reports"; - packageName = "@types/istanbul-reports"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; - sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; - }; - }; - "@types/json-schema-7.0.11" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; - sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; - }; - }; - "@types/json5-0.0.29" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - }; - "@types/mime-1.3.2" = { - name = "_at_types_slash_mime"; - packageName = "@types/mime"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; - sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; - }; - }; - "@types/minimist-1.2.2" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; - sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; - }; - }; - "@types/node-20.2.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "20.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz"; - sha512 = "DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg=="; - }; - }; - "@types/normalize-package-data-2.4.1" = { - name = "_at_types_slash_normalize-package-data"; - packageName = "@types/normalize-package-data"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; - sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; - }; - }; - "@types/parse-json-4.0.0" = { - name = "_at_types_slash_parse-json"; - packageName = "@types/parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - }; - "@types/prettier-2.7.2" = { - name = "_at_types_slash_prettier"; - packageName = "@types/prettier"; - version = "2.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz"; - sha512 = "KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg=="; - }; - }; - "@types/prop-types-15.7.5" = { - name = "_at_types_slash_prop-types"; - packageName = "@types/prop-types"; - version = "15.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz"; - sha512 = "JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="; - }; - }; - "@types/q-1.5.5" = { - name = "_at_types_slash_q"; - packageName = "@types/q"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz"; - sha512 = "L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="; - }; - }; - "@types/qs-6.9.7" = { - name = "_at_types_slash_qs"; - packageName = "@types/qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; - sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; - }; - }; - "@types/range-parser-1.2.4" = { - name = "_at_types_slash_range-parser"; - packageName = "@types/range-parser"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; - }; - }; - "@types/react-18.2.6" = { - name = "_at_types_slash_react"; - packageName = "@types/react"; - version = "18.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.6.tgz"; - sha512 = "wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA=="; - }; - }; - "@types/react-is-18.2.0" = { - name = "_at_types_slash_react-is"; - packageName = "@types/react-is"; - version = "18.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/react-is/-/react-is-18.2.0.tgz"; - sha512 = "1vz2yObaQkLL7YFe/pme2cpvDsCwI1WXIfL+5eLz0MI9gFG24Re16RzUsI8t9XZn9ZWvgLNDrJBmrqXJO7GNQQ=="; - }; - }; - "@types/react-transition-group-4.4.6" = { - name = "_at_types_slash_react-transition-group"; - packageName = "@types/react-transition-group"; - version = "4.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz"; - sha512 = "VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew=="; - }; - }; - "@types/resolve-1.17.1" = { - name = "_at_types_slash_resolve"; - packageName = "@types/resolve"; - version = "1.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"; - sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; - }; - }; - "@types/retry-0.12.0" = { - name = "_at_types_slash_retry"; - packageName = "@types/retry"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"; - sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; - }; - }; - "@types/scheduler-0.16.3" = { - name = "_at_types_slash_scheduler"; - packageName = "@types/scheduler"; - version = "0.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz"; - sha512 = "5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="; - }; - }; - "@types/semver-7.5.0" = { - name = "_at_types_slash_semver"; - packageName = "@types/semver"; - version = "7.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz"; - sha512 = "G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="; - }; - }; - "@types/send-0.17.1" = { - name = "_at_types_slash_send"; - packageName = "@types/send"; - version = "0.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz"; - sha512 = "Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q=="; - }; - }; - "@types/serve-index-1.9.1" = { - name = "_at_types_slash_serve-index"; - packageName = "@types/serve-index"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; - }; - }; - "@types/serve-static-1.15.1" = { - name = "_at_types_slash_serve-static"; - packageName = "@types/serve-static"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz"; - sha512 = "NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ=="; - }; - }; - "@types/sockjs-0.3.33" = { - name = "_at_types_slash_sockjs"; - packageName = "@types/sockjs"; - version = "0.3.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz"; - sha512 = "f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw=="; - }; - }; - "@types/stack-utils-2.0.1" = { - name = "_at_types_slash_stack-utils"; - packageName = "@types/stack-utils"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz"; - sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; - }; - }; - "@types/trusted-types-2.0.3" = { - name = "_at_types_slash_trusted-types"; - packageName = "@types/trusted-types"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz"; - sha512 = "NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="; - }; - }; - "@types/webpack-5.28.1" = { - name = "_at_types_slash_webpack"; - packageName = "@types/webpack"; - version = "5.28.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.1.tgz"; - sha512 = "qw1MqGZclCoBrpiSe/hokSgQM/su8Ocpl3L/YHE0L6moyaypg4+5F7Uzq7NgaPKPxUxUbQ4fLPLpDWdR27bCZw=="; - }; - }; - "@types/ws-8.5.4" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz"; - sha512 = "zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg=="; - }; - }; - "@types/yargs-16.0.5" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "16.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz"; - sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; - }; - }; - "@types/yargs-17.0.24" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "17.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz"; - sha512 = "6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw=="; - }; - }; - "@types/yargs-parser-21.0.0" = { - name = "_at_types_slash_yargs-parser"; - packageName = "@types/yargs-parser"; - version = "21.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; - }; - }; - "@typescript-eslint/eslint-plugin-5.59.6" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.6.tgz"; - sha512 = "sXtOgJNEuRU5RLwPUb1jxtToZbgvq3M6FPpY4QENxoOggK+UpTxUBpj6tD8+Qh2g46Pi9We87E+eHnUw8YcGsw=="; - }; - }; - "@typescript-eslint/experimental-utils-5.59.6" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.6.tgz"; - sha512 = "UIVfEaaHggOuhgqdpFlFQ7IN9UFMCiBR/N7uPBUyUlwNdJzYfAu9m4wbOj0b59oI/HSPW1N63Q7lsvfwTQY13w=="; - }; - }; - "@typescript-eslint/parser-5.59.6" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.6.tgz"; - sha512 = "7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA=="; - }; - }; - "@typescript-eslint/scope-manager-5.59.6" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.6.tgz"; - sha512 = "gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ=="; - }; - }; - "@typescript-eslint/type-utils-5.59.6" = { - name = "_at_typescript-eslint_slash_type-utils"; - packageName = "@typescript-eslint/type-utils"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.6.tgz"; - sha512 = "A4tms2Mp5yNvLDlySF+kAThV9VTBPCvGf0Rp8nl/eoDX9Okun8byTKoj3fJ52IJitjWOk0fKPNQhXEB++eNozQ=="; - }; - }; - "@typescript-eslint/types-5.59.6" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.6.tgz"; - sha512 = "tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA=="; - }; - }; - "@typescript-eslint/typescript-estree-5.59.6" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.6.tgz"; - sha512 = "vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA=="; - }; - }; - "@typescript-eslint/utils-5.59.6" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.6.tgz"; - sha512 = "vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg=="; - }; - }; - "@typescript-eslint/visitor-keys-5.59.6" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.59.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.6.tgz"; - sha512 = "zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q=="; - }; - }; - "@webassemblyjs/ast-1.11.6" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz"; - sha512 = "IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q=="; - }; - }; - "@webassemblyjs/floating-point-hex-parser-1.11.6" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz"; - sha512 = "ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="; - }; - }; - "@webassemblyjs/helper-api-error-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz"; - sha512 = "o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="; - }; - }; - "@webassemblyjs/helper-buffer-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz"; - sha512 = "z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="; - }; - }; - "@webassemblyjs/helper-numbers-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-numbers"; - packageName = "@webassemblyjs/helper-numbers"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz"; - sha512 = "vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g=="; - }; - }; - "@webassemblyjs/helper-wasm-bytecode-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz"; - sha512 = "sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="; - }; - }; - "@webassemblyjs/helper-wasm-section-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz"; - sha512 = "LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g=="; - }; - }; - "@webassemblyjs/ieee754-1.11.6" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz"; - sha512 = "LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg=="; - }; - }; - "@webassemblyjs/leb128-1.11.6" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz"; - sha512 = "m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ=="; - }; - }; - "@webassemblyjs/utf8-1.11.6" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz"; - sha512 = "vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="; - }; - }; - "@webassemblyjs/wasm-edit-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz"; - sha512 = "Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw=="; - }; - }; - "@webassemblyjs/wasm-gen-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz"; - sha512 = "3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA=="; - }; - }; - "@webassemblyjs/wasm-opt-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz"; - sha512 = "cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g=="; - }; - }; - "@webassemblyjs/wasm-parser-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz"; - sha512 = "6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ=="; - }; - }; - "@webassemblyjs/wast-printer-1.11.6" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz"; - sha512 = "JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A=="; - }; - }; - "@xtuc/ieee754-1.2.0" = { - name = "_at_xtuc_slash_ieee754"; - packageName = "@xtuc/ieee754"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - }; - "@xtuc/long-4.2.2" = { - name = "_at_xtuc_slash_long"; - packageName = "@xtuc/long"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - }; - "abab-2.0.6" = { - name = "abab"; - packageName = "abab"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz"; - sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; - }; - }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; - "accepts-1.3.8" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - }; - "acorn-7.4.1" = { - name = "acorn"; - packageName = "acorn"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - }; - "acorn-8.8.2" = { - name = "acorn"; - packageName = "acorn"; - version = "8.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; - sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; - }; - }; - "acorn-globals-6.0.0" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz"; - sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; - }; - }; - "acorn-import-assertions-1.9.0" = { - name = "acorn-import-assertions"; - packageName = "acorn-import-assertions"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz"; - sha512 = "cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA=="; - }; - }; - "acorn-jsx-5.3.2" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - }; - "acorn-walk-7.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; - }; - }; - "acorn-walk-8.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; - sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; - }; - }; - "address-1.2.2" = { - name = "address"; - packageName = "address"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.2.2.tgz"; - sha512 = "4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="; - }; - }; - "adjust-sourcemap-loader-4.0.0" = { - name = "adjust-sourcemap-loader"; - packageName = "adjust-sourcemap-loader"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz"; - sha512 = "OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A=="; - }; - }; - "agent-base-6.0.2" = { - name = "agent-base"; - packageName = "agent-base"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - }; - "agentkeepalive-4.3.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz"; - sha512 = "7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg=="; - }; - }; - "aggregate-error-3.1.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; - }; - }; - "ajv-6.12.6" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - }; - "ajv-8.12.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; - sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; - }; - }; - "ajv-formats-2.1.1" = { - name = "ajv-formats"; - packageName = "ajv-formats"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"; - sha512 = "Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="; - }; - }; - "ajv-keywords-3.5.2" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; - }; - }; - "ajv-keywords-5.1.0" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"; - sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; - }; - }; - "ansi-escapes-4.3.2" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; - }; - }; - "ansi-html-community-0.0.8" = { - name = "ansi-html-community"; - packageName = "ansi-html-community"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"; - sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "ansi-regex-6.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; - }; - }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - }; - "ansi-styles-4.3.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - }; - "ansi-styles-5.2.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz"; - sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; - }; - }; - "anymatch-3.1.3" = { - name = "anymatch"; - packageName = "anymatch"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"; - sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; - }; - }; - "aproba-2.0.0" = { - name = "aproba"; - packageName = "aproba"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; - sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; - }; - }; - "are-we-there-yet-2.0.0" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; - sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; - }; - }; - "are-we-there-yet-3.0.1" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; - sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; - }; - }; - "arg-4.1.3" = { - name = "arg"; - packageName = "arg"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; - sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; - }; - }; - "arg-5.0.2" = { - name = "arg"; - packageName = "arg"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz"; - sha512 = "PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="; - }; - }; - "argparse-1.0.10" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - }; - "argparse-2.0.1" = { - name = "argparse"; - packageName = "argparse"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - }; - "aria-query-5.1.3" = { - name = "aria-query"; - packageName = "aria-query"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz"; - sha512 = "R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ=="; - }; - }; - "array-buffer-byte-length-1.0.0" = { - name = "array-buffer-byte-length"; - packageName = "array-buffer-byte-length"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; - sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; - "array-flatten-2.1.2" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; - sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; - }; - }; - "array-includes-3.1.6" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"; - sha512 = "sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw=="; - }; - }; - "array-union-2.1.0" = { - name = "array-union"; - packageName = "array-union"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - }; - "array.prototype.flat-1.3.1" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"; - sha512 = "roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA=="; - }; - }; - "array.prototype.flatmap-1.3.1" = { - name = "array.prototype.flatmap"; - packageName = "array.prototype.flatmap"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"; - sha512 = "8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ=="; - }; - }; - "array.prototype.reduce-1.0.5" = { - name = "array.prototype.reduce"; - packageName = "array.prototype.reduce"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"; - sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; - }; - }; - "array.prototype.tosorted-1.1.1" = { - name = "array.prototype.tosorted"; - packageName = "array.prototype.tosorted"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz"; - sha512 = "pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ=="; - }; - }; - "arrify-1.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha512 = "3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="; - }; - }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; - }; - }; - "asn1-0.2.6" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; - sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; - }; - }; - "ast-types-flow-0.0.7" = { - name = "ast-types-flow"; - packageName = "ast-types-flow"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"; - sha512 = "eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="; - }; - }; - "async-3.2.4" = { - name = "async"; - packageName = "async"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - }; - "async-foreach-0.1.3" = { - name = "async-foreach"; - packageName = "async-foreach"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"; - sha512 = "VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - }; - "at-least-node-1.0.0" = { - name = "at-least-node"; - packageName = "at-least-node"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - }; - "atob-2.1.2" = { - name = "atob"; - packageName = "atob"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; - sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; - }; - }; - "autoprefixer-10.4.14" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "10.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz"; - sha512 = "FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ=="; - }; - }; - "available-typed-arrays-1.0.5" = { - name = "available-typed-arrays"; - packageName = "available-typed-arrays"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; - sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; - }; - }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; - }; - }; - "aws4-1.12.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; - sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; - }; - }; - "axe-core-4.7.1" = { - name = "axe-core"; - packageName = "axe-core"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axe-core/-/axe-core-4.7.1.tgz"; - sha512 = "sCXXUhA+cljomZ3ZAwb8i1p3oOlkABzPy08ZDAoGcYuvtBPlQ1Ytde129ArXyHWDhfeewq7rlx9F+cUx2SSlkg=="; - }; - }; - "axobject-query-3.1.1" = { - name = "axobject-query"; - packageName = "axobject-query"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz"; - sha512 = "goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg=="; - }; - }; - "babel-jest-27.5.1" = { - name = "babel-jest"; - packageName = "babel-jest"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz"; - sha512 = "cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg=="; - }; - }; - "babel-loader-8.3.0" = { - name = "babel-loader"; - packageName = "babel-loader"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz"; - sha512 = "H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q=="; - }; - }; - "babel-plugin-istanbul-6.1.1" = { - name = "babel-plugin-istanbul"; - packageName = "babel-plugin-istanbul"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"; - sha512 = "Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="; - }; - }; - "babel-plugin-jest-hoist-27.5.1" = { - name = "babel-plugin-jest-hoist"; - packageName = "babel-plugin-jest-hoist"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz"; - sha512 = "50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ=="; - }; - }; - "babel-plugin-macros-3.1.0" = { - name = "babel-plugin-macros"; - packageName = "babel-plugin-macros"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz"; - sha512 = "Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg=="; - }; - }; - "babel-plugin-named-asset-import-0.3.8" = { - name = "babel-plugin-named-asset-import"; - packageName = "babel-plugin-named-asset-import"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz"; - sha512 = "WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q=="; - }; - }; - "babel-plugin-polyfill-corejs2-0.3.3" = { - name = "babel-plugin-polyfill-corejs2"; - packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz"; - sha512 = "8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q=="; - }; - }; - "babel-plugin-polyfill-corejs3-0.6.0" = { - name = "babel-plugin-polyfill-corejs3"; - packageName = "babel-plugin-polyfill-corejs3"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz"; - sha512 = "+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA=="; - }; - }; - "babel-plugin-polyfill-regenerator-0.4.1" = { - name = "babel-plugin-polyfill-regenerator"; - packageName = "babel-plugin-polyfill-regenerator"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz"; - sha512 = "NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw=="; - }; - }; - "babel-plugin-transform-react-remove-prop-types-0.4.24" = { - name = "babel-plugin-transform-react-remove-prop-types"; - packageName = "babel-plugin-transform-react-remove-prop-types"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz"; - sha512 = "eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="; - }; - }; - "babel-preset-current-node-syntax-1.0.1" = { - name = "babel-preset-current-node-syntax"; - packageName = "babel-preset-current-node-syntax"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz"; - sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ=="; - }; - }; - "babel-preset-jest-27.5.1" = { - name = "babel-preset-jest"; - packageName = "babel-preset-jest"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz"; - sha512 = "Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag=="; - }; - }; - "babel-preset-react-app-10.0.1" = { - name = "babel-preset-react-app"; - packageName = "babel-preset-react-app"; - version = "10.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz"; - sha512 = "b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "batch-0.6.1" = { - name = "batch"; - packageName = "batch"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; - sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; - }; - }; - "bcrypt-pbkdf-1.0.2" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; - }; - }; - "bfj-7.0.2" = { - name = "bfj"; - packageName = "bfj"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz"; - sha512 = "+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw=="; - }; - }; - "big.js-5.2.2" = { - name = "big.js"; - packageName = "big.js"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; - }; - }; - "binary-extensions-2.2.0" = { - name = "binary-extensions"; - packageName = "binary-extensions"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; - }; - }; - "bluebird-3.7.2" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - }; - "body-parser-1.20.1" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; - sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; - }; - }; - "bonjour-service-1.1.1" = { - name = "bonjour-service"; - packageName = "bonjour-service"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"; - sha512 = "Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg=="; - }; - }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "brace-expansion-2.0.1" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - }; - "braces-3.0.2" = { - name = "braces"; - packageName = "braces"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - }; - "browser-process-hrtime-1.0.0" = { - name = "browser-process-hrtime"; - packageName = "browser-process-hrtime"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; - sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; - }; - }; - "browserslist-4.21.5" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz"; - sha512 = "tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w=="; - }; - }; - "bser-2.1.1" = { - name = "bser"; - packageName = "bser"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"; - sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; - }; - }; - "buffer-builder-0.2.0" = { - name = "buffer-builder"; - packageName = "buffer-builder"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz"; - sha512 = "7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg=="; - }; - }; - "buffer-from-1.1.2" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - }; - "bufferutil-4.0.7" = { - name = "bufferutil"; - packageName = "bufferutil"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz"; - sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; - }; - }; - "builtin-modules-3.3.0" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz"; - sha512 = "zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - }; - "bytes-3.1.2" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; - }; - }; - "cacache-15.3.0" = { - name = "cacache"; - packageName = "cacache"; - version = "15.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"; - sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; - }; - }; - "cache-content-type-1.0.1" = { - name = "cache-content-type"; - packageName = "cache-content-type"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz"; - sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA=="; - }; - }; - "call-bind-1.0.2" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - }; - "callsites-3.1.0" = { - name = "callsites"; - packageName = "callsites"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - }; - "camel-case-4.1.2" = { - name = "camel-case"; - packageName = "camel-case"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"; - sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; - }; - }; - "camelcase-5.3.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - }; - "camelcase-6.3.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - }; - "camelcase-css-2.0.1" = { - name = "camelcase-css"; - packageName = "camelcase-css"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz"; - sha512 = "QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="; - }; - }; - "camelcase-keys-6.2.2" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "6.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; - sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; - }; - }; - "caniuse-api-3.0.0" = { - name = "caniuse-api"; - packageName = "caniuse-api"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; - }; - }; - "caniuse-lite-1.0.30001488" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001488"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz"; - sha512 = "NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ=="; - }; - }; - "canvas-2.11.2" = { - name = "canvas"; - packageName = "canvas"; - version = "2.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz"; - sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw=="; - }; - }; - "case-sensitive-paths-webpack-plugin-2.4.0" = { - name = "case-sensitive-paths-webpack-plugin"; - packageName = "case-sensitive-paths-webpack-plugin"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"; - sha512 = "roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; - }; - }; - "chalk-2.4.2" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "char-regex-1.0.2" = { - name = "char-regex"; - packageName = "char-regex"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"; - sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; - }; - }; - "char-regex-2.0.1" = { - name = "char-regex"; - packageName = "char-regex"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz"; - sha512 = "oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="; - }; - }; - "check-types-11.2.2" = { - name = "check-types"; - packageName = "check-types"; - version = "11.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/check-types/-/check-types-11.2.2.tgz"; - sha512 = "HBiYvXvn9Z70Z88XKjz3AEKd4HJhBXsa3j7xFnITAzoS8+q6eIGi8qDB8FKPBAjtuxjI/zFpwuiCb8oDtKOYrA=="; - }; - }; - "chokidar-3.5.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; - sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; - }; - }; - "chownr-2.0.0" = { - name = "chownr"; - packageName = "chownr"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; - sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; - }; - }; - "chrome-trace-event-1.0.3" = { - name = "chrome-trace-event"; - packageName = "chrome-trace-event"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; - }; - }; - "ci-info-3.8.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz"; - sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="; - }; - }; - "cjs-module-lexer-1.2.2" = { - name = "cjs-module-lexer"; - packageName = "cjs-module-lexer"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz"; - sha512 = "cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="; - }; - }; - "clean-css-5.3.2" = { - name = "clean-css"; - packageName = "clean-css"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz"; - sha512 = "JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww=="; - }; - }; - "clean-stack-2.2.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; - sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; - }; - }; - "cliui-7.0.4" = { - name = "cliui"; - packageName = "cliui"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; - }; - }; - "cliui-8.0.1" = { - name = "cliui"; - packageName = "cliui"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"; - sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; - }; - }; - "clsx-1.2.1" = { - name = "clsx"; - packageName = "clsx"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"; - sha512 = "EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="; - }; - }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; - }; - }; - "coa-2.0.2" = { - name = "coa"; - packageName = "coa"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"; - sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; - }; - }; - "collect-v8-coverage-1.0.1" = { - name = "collect-v8-coverage"; - packageName = "collect-v8-coverage"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; - sha512 = "iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - }; - "color-convert-2.0.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - }; - "color-support-1.1.3" = { - name = "color-support"; - packageName = "color-support"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; - sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; - }; - }; - "colord-2.9.3" = { - name = "colord"; - packageName = "colord"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"; - sha512 = "jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="; - }; - }; - "colorette-2.0.20" = { - name = "colorette"; - packageName = "colorette"; - version = "2.0.20"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"; - sha512 = "IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="; - }; - }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; - "commander-4.1.1" = { - name = "commander"; - packageName = "commander"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; - sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; - }; - }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; - "commander-8.3.0" = { - name = "commander"; - packageName = "commander"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - }; - "common-path-prefix-3.0.0" = { - name = "common-path-prefix"; - packageName = "common-path-prefix"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz"; - sha512 = "QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="; - }; - }; - "common-tags-1.8.2" = { - name = "common-tags"; - packageName = "common-tags"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"; - sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; - }; - }; - "commondir-1.0.1" = { - name = "commondir"; - packageName = "commondir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; - sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; - }; - }; - "compressible-2.0.18" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - }; - "compression-1.7.4" = { - name = "compression"; - packageName = "compression"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "confusing-browser-globals-1.0.11" = { - name = "confusing-browser-globals"; - packageName = "confusing-browser-globals"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz"; - sha512 = "JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="; - }; - }; - "connect-history-api-fallback-1.6.0" = { - name = "connect-history-api-fallback"; - packageName = "connect-history-api-fallback"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; - }; - }; - "connect-history-api-fallback-2.0.0" = { - name = "connect-history-api-fallback"; - packageName = "connect-history-api-fallback"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"; - sha512 = "U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="; - }; - }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; - }; - }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; - "content-type-1.0.5" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; - sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; - }; - }; - "convert-source-map-0.3.5" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz"; - sha512 = "+4nRk0k3oEpwUB7/CalD7xE2z4VmtEnnq0GO2IPTkrooTrAhEsWvuLF5iWP1dXrwluki/azwXV1ve7gtYuPldg=="; - }; - }; - "convert-source-map-1.9.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"; - sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; - }; - }; - "cookie-0.5.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; - "cookies-0.8.0" = { - name = "cookies"; - packageName = "cookies"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz"; - sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow=="; - }; - }; - "core-js-3.30.2" = { - name = "core-js"; - packageName = "core-js"; - version = "3.30.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz"; - sha512 = "uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg=="; - }; - }; - "core-js-compat-3.30.2" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.30.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz"; - sha512 = "nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA=="; - }; - }; - "core-js-pure-3.30.2" = { - name = "core-js-pure"; - packageName = "core-js-pure"; - version = "3.30.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.30.2.tgz"; - sha512 = "p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg=="; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; - }; - }; - "cosmiconfig-6.0.0" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; - sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; - }; - }; - "cosmiconfig-7.1.0" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"; - sha512 = "AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA=="; - }; - }; - "create-require-1.1.1" = { - name = "create-require"; - packageName = "create-require"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"; - sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; - }; - }; - "cross-fetch-3.1.5" = { - name = "cross-fetch"; - packageName = "cross-fetch"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz"; - sha512 = "lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "crypto-random-string-2.0.0" = { - name = "crypto-random-string"; - packageName = "crypto-random-string"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; - }; - }; - "css-2.2.4" = { - name = "css"; - packageName = "css"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz"; - sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw=="; - }; - }; - "css-blank-pseudo-3.0.3" = { - name = "css-blank-pseudo"; - packageName = "css-blank-pseudo"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz"; - sha512 = "VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ=="; - }; - }; - "css-declaration-sorter-6.4.0" = { - name = "css-declaration-sorter"; - packageName = "css-declaration-sorter"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"; - sha512 = "jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew=="; - }; - }; - "css-has-pseudo-3.0.4" = { - name = "css-has-pseudo"; - packageName = "css-has-pseudo"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz"; - sha512 = "Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw=="; - }; - }; - "css-loader-6.7.4" = { - name = "css-loader"; - packageName = "css-loader"; - version = "6.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.4.tgz"; - sha512 = "0Y5uHtK5BswfaGJ+jrO+4pPg1msFBc0pwPIE1VqfpmVn6YbDfYfXMj8rfd7nt+4goAhJueO+H/I40VWJfcP1mQ=="; - }; - }; - "css-minimizer-webpack-plugin-3.4.1" = { - name = "css-minimizer-webpack-plugin"; - packageName = "css-minimizer-webpack-plugin"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; - sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; - }; - }; - "css-prefers-color-scheme-6.0.3" = { - name = "css-prefers-color-scheme"; - packageName = "css-prefers-color-scheme"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz"; - sha512 = "4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA=="; - }; - }; - "css-select-2.1.0" = { - name = "css-select"; - packageName = "css-select"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; - sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; - }; - }; - "css-select-4.3.0" = { - name = "css-select"; - packageName = "css-select"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"; - sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; - }; - }; - "css-select-base-adapter-0.1.1" = { - name = "css-select-base-adapter"; - packageName = "css-select-base-adapter"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; - sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; - }; - }; - "css-tree-1.0.0-alpha.37" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.0.0-alpha.37"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; - sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; - }; - }; - "css-tree-1.1.3" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"; - sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; - }; - }; - "css-what-3.4.2" = { - name = "css-what"; - packageName = "css-what"; - version = "3.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz"; - sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; - }; - }; - "css-what-6.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"; - sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; - }; - }; - "cssdb-7.6.0" = { - name = "cssdb"; - packageName = "cssdb"; - version = "7.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssdb/-/cssdb-7.6.0.tgz"; - sha512 = "Nna7rph8V0jC6+JBY4Vk4ndErUmfJfV6NJCaZdurL0omggabiy+QB2HCQtu5c/ACLZ0I7REv7A4QyPIoYzZx0w=="; - }; - }; - "cssesc-3.0.0" = { - name = "cssesc"; - packageName = "cssesc"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; - }; - }; - "cssnano-5.1.15" = { - name = "cssnano"; - packageName = "cssnano"; - version = "5.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz"; - sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw=="; - }; - }; - "cssnano-preset-default-5.2.14" = { - name = "cssnano-preset-default"; - packageName = "cssnano-preset-default"; - version = "5.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz"; - sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A=="; - }; - }; - "cssnano-utils-3.1.0" = { - name = "cssnano-utils"; - packageName = "cssnano-utils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; - sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; - }; - }; - "csso-4.2.0" = { - name = "csso"; - packageName = "csso"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; - sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; - }; - }; - "cssom-0.3.8" = { - name = "cssom"; - packageName = "cssom"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"; - sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; - }; - }; - "cssom-0.4.4" = { - name = "cssom"; - packageName = "cssom"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz"; - sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; - }; - }; - "cssstyle-2.3.0" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"; - sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; - }; - }; - "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=="; - }; - }; - "damerau-levenshtein-1.0.8" = { - name = "damerau-levenshtein"; - packageName = "damerau-levenshtein"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"; - sha512 = "sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; - }; - }; - "data-urls-2.0.0" = { - name = "data-urls"; - packageName = "data-urls"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz"; - sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; - }; - }; - "de-indent-1.0.2" = { - name = "de-indent"; - packageName = "de-indent"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; - sha512 = "e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; - }; - }; - "decamelize-keys-1.1.1" = { - name = "decamelize-keys"; - packageName = "decamelize-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz"; - sha512 = "WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg=="; - }; - }; - "decimal.js-10.4.3" = { - name = "decimal.js"; - packageName = "decimal.js"; - version = "10.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz"; - sha512 = "VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="; - }; - }; - "decode-uri-component-0.2.2" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; - sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; - }; - }; - "decompress-response-4.2.1" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz"; - sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; - }; - }; - "dedent-0.7.0" = { - name = "dedent"; - packageName = "dedent"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; - sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; - }; - }; - "deep-equal-1.0.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; - sha512 = "bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw=="; - }; - }; - "deep-equal-2.2.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz"; - sha512 = "lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ=="; - }; - }; - "deep-is-0.1.4" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - }; - "deepmerge-4.3.1" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"; - sha512 = "3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="; - }; - }; - "default-gateway-6.0.3" = { - name = "default-gateway"; - packageName = "default-gateway"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"; - sha512 = "fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg=="; - }; - }; - "define-lazy-prop-2.0.0" = { - name = "define-lazy-prop"; - packageName = "define-lazy-prop"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; - sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; - }; - }; - "define-properties-1.2.0" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; - sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; - }; - }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; - }; - }; - "depd-2.0.0" = { - name = "depd"; - packageName = "depd"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; - }; - }; - "destroy-1.2.0" = { - name = "destroy"; - packageName = "destroy"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; - sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; - }; - }; - "detect-libc-1.0.3" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="; - }; - }; - "detect-libc-2.0.1" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; - sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; - }; - }; - "detect-newline-3.1.0" = { - name = "detect-newline"; - packageName = "detect-newline"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"; - sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; - }; - }; - "detect-node-2.1.0" = { - name = "detect-node"; - packageName = "detect-node"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"; - sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; - }; - }; - "detect-port-alt-1.1.6" = { - name = "detect-port-alt"; - packageName = "detect-port-alt"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; - sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; - }; - }; - "dexie-3.2.3" = { - name = "dexie"; - packageName = "dexie"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dexie/-/dexie-3.2.3.tgz"; - sha512 = "iHayBd4UYryDCVUNa3PMsJMEnd8yjyh5p7a+RFeC8i8n476BC9wMhVvqiImq5zJZJf5Tuer+s4SSj+AA3x+ZbQ=="; - }; - }; - "dexie-react-hooks-1.1.3" = { - name = "dexie-react-hooks"; - packageName = "dexie-react-hooks"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dexie-react-hooks/-/dexie-react-hooks-1.1.3.tgz"; - sha512 = "bXXE1gfYtfuVYTNiOlyam+YVaO8KaqacgRuxFuP37YtpS6o/jxT6KOl5h+hhqY36s0UavlHWbL+HWJFMcQumIg=="; - }; - }; - "didyoumean-1.2.2" = { - name = "didyoumean"; - packageName = "didyoumean"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz"; - sha512 = "gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="; - }; - }; - "diff-4.0.2" = { - name = "diff"; - packageName = "diff"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; - sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; - }; - }; - "diff-sequences-27.5.1" = { - name = "diff-sequences"; - packageName = "diff-sequences"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz"; - sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="; - }; - }; - "dir-glob-3.0.1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - }; - "dlv-1.1.3" = { - name = "dlv"; - packageName = "dlv"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz"; - sha512 = "+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="; - }; - }; - "dns-equal-1.0.0" = { - name = "dns-equal"; - packageName = "dns-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; - sha512 = "z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="; - }; - }; - "dns-packet-5.6.0" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.0.tgz"; - sha512 = "rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ=="; - }; - }; - "doctrine-2.1.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - }; - "doctrine-3.0.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - }; - "dom-converter-0.2.0" = { - name = "dom-converter"; - packageName = "dom-converter"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; - sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; - }; - }; - "dom-helpers-5.2.1" = { - name = "dom-helpers"; - packageName = "dom-helpers"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz"; - sha512 = "nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="; - }; - }; - "dom-serializer-0.2.2" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; - }; - }; - "dom-serializer-1.4.1" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; - sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; - }; - }; - "domelementtype-1.3.1" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; - }; - }; - "domelementtype-2.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; - sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; - }; - }; - "domexception-2.0.1" = { - name = "domexception"; - packageName = "domexception"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz"; - sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; - }; - }; - "domhandler-4.3.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; - sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; - }; - }; - "domutils-1.7.0" = { - name = "domutils"; - packageName = "domutils"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; - }; - }; - "domutils-2.8.0" = { - name = "domutils"; - packageName = "domutils"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; - sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; - }; - }; - "dot-case-3.0.4" = { - name = "dot-case"; - packageName = "dot-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - }; - "dotenv-10.0.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"; - sha512 = "rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="; - }; - }; - "dotenv-expand-5.1.0" = { - name = "dotenv-expand"; - packageName = "dotenv-expand"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; - }; - }; - "duplexer-0.1.2" = { - name = "duplexer"; - packageName = "duplexer"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; - sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; - }; - }; - "ecc-jsbn-0.1.2" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - }; - "ejs-3.1.9" = { - name = "ejs"; - packageName = "ejs"; - version = "3.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz"; - sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; - }; - }; - "electron-to-chromium-1.4.402" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.402"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.402.tgz"; - sha512 = "gWYvJSkohOiBE6ecVYXkrDgNaUjo47QEKK0kQzmWyhkH+yoYiG44bwuicTGNSIQRG3WDMsWVZJLRnJnLNkbWvA=="; - }; - }; - "emittery-0.10.2" = { - name = "emittery"; - packageName = "emittery"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz"; - sha512 = "aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="; - }; - }; - "emittery-0.8.1" = { - name = "emittery"; - packageName = "emittery"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz"; - sha512 = "uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="; - }; - }; - "emoji-regex-8.0.0" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - }; - "emoji-regex-9.2.2" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"; - sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; - }; - }; - "emojis-list-3.0.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - }; - "encoding-0.1.13" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; - sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "enhanced-resolve-5.14.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "5.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz"; - sha512 = "+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw=="; - }; - }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; - }; - }; - "env-paths-2.2.1" = { - name = "env-paths"; - packageName = "env-paths"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"; - sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; - }; - }; - "err-code-2.0.3" = { - name = "err-code"; - packageName = "err-code"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"; - sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; - }; - }; - "error-ex-1.3.2" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - }; - "error-stack-parser-2.1.4" = { - name = "error-stack-parser"; - packageName = "error-stack-parser"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"; - sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; - }; - }; - "es-abstract-1.21.2" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.21.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"; - sha512 = "y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg=="; - }; - }; - "es-array-method-boxes-properly-1.0.0" = { - name = "es-array-method-boxes-properly"; - packageName = "es-array-method-boxes-properly"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; - sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; - }; - }; - "es-get-iterator-1.1.3" = { - name = "es-get-iterator"; - packageName = "es-get-iterator"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz"; - sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; - }; - }; - "es-module-lexer-1.2.1" = { - name = "es-module-lexer"; - packageName = "es-module-lexer"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz"; - sha512 = "9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg=="; - }; - }; - "es-set-tostringtag-2.0.1" = { - name = "es-set-tostringtag"; - packageName = "es-set-tostringtag"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; - sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; - }; - }; - "es-shim-unscopables-1.0.0" = { - name = "es-shim-unscopables"; - packageName = "es-shim-unscopables"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - }; - "escape-string-regexp-2.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; - }; - }; - "escape-string-regexp-4.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - }; - "escodegen-2.0.0" = { - name = "escodegen"; - packageName = "escodegen"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"; - sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; - }; - }; - "eslint-8.41.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.41.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.41.0.tgz"; - sha512 = "WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q=="; - }; - }; - "eslint-config-react-app-7.0.1" = { - name = "eslint-config-react-app"; - packageName = "eslint-config-react-app"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz"; - sha512 = "K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA=="; - }; - }; - "eslint-import-resolver-node-0.3.7" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"; - sha512 = "gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA=="; - }; - }; - "eslint-module-utils-2.8.0" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz"; - sha512 = "aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw=="; - }; - }; - "eslint-plugin-flowtype-8.0.3" = { - name = "eslint-plugin-flowtype"; - packageName = "eslint-plugin-flowtype"; - version = "8.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz"; - sha512 = "dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ=="; - }; - }; - "eslint-plugin-import-2.27.5" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.27.5"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"; - sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow=="; - }; - }; - "eslint-plugin-jest-25.7.0" = { - name = "eslint-plugin-jest"; - packageName = "eslint-plugin-jest"; - version = "25.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz"; - sha512 = "PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ=="; - }; - }; - "eslint-plugin-jsx-a11y-6.7.1" = { - name = "eslint-plugin-jsx-a11y"; - packageName = "eslint-plugin-jsx-a11y"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz"; - sha512 = "63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA=="; - }; - }; - "eslint-plugin-react-7.32.2" = { - name = "eslint-plugin-react"; - packageName = "eslint-plugin-react"; - version = "7.32.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz"; - sha512 = "t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg=="; - }; - }; - "eslint-plugin-react-hooks-4.6.0" = { - name = "eslint-plugin-react-hooks"; - packageName = "eslint-plugin-react-hooks"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz"; - sha512 = "oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g=="; - }; - }; - "eslint-plugin-testing-library-5.11.0" = { - name = "eslint-plugin-testing-library"; - packageName = "eslint-plugin-testing-library"; - version = "5.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.0.tgz"; - sha512 = "ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q=="; - }; - }; - "eslint-scope-5.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; - }; - }; - "eslint-scope-7.2.0" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz"; - sha512 = "DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw=="; - }; - }; - "eslint-visitor-keys-2.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - }; - "eslint-visitor-keys-3.4.1" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"; - sha512 = "pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="; - }; - }; - "eslint-webpack-plugin-3.2.0" = { - name = "eslint-webpack-plugin"; - packageName = "eslint-webpack-plugin"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz"; - sha512 = "avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w=="; - }; - }; - "espree-9.5.2" = { - name = "espree"; - packageName = "espree"; - version = "9.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz"; - sha512 = "7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw=="; - }; - }; - "esprima-4.0.1" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - }; - "esquery-1.5.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"; - sha512 = "YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg=="; - }; - }; - "esrecurse-4.3.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - }; - "estraverse-4.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - }; - "estraverse-5.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - }; - "estree-walker-1.0.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; - }; - }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - }; - "eventemitter3-4.0.7" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; - }; - }; - "events-3.3.0" = { - name = "events"; - packageName = "events"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - }; - "eventsource-2.0.2" = { - name = "eventsource"; - packageName = "eventsource"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz"; - sha512 = "IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA=="; - }; - }; - "execa-4.1.0" = { - name = "execa"; - packageName = "execa"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; - sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; - }; - }; - "execa-5.1.1" = { - name = "execa"; - packageName = "execa"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; - sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; - }; - }; - "exit-0.1.2" = { - name = "exit"; - packageName = "exit"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; - sha512 = "Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="; - }; - }; - "expect-27.5.1" = { - name = "expect"; - packageName = "expect"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz"; - sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; - }; - }; - "express-4.18.2" = { - name = "express"; - packageName = "express"; - version = "4.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; - sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; - }; - }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; - }; - }; - "fast-deep-equal-3.1.3" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - }; - "fast-glob-3.2.12" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"; - sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; - }; - }; - "fast-json-stable-stringify-2.1.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - }; - "fastq-1.15.0" = { - name = "fastq"; - packageName = "fastq"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"; - sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; - }; - }; - "faye-websocket-0.11.4" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"; - sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; - }; - }; - "fb-watchman-2.0.2" = { - name = "fb-watchman"; - packageName = "fb-watchman"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz"; - sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; - }; - }; - "fibers-5.0.3" = { - name = "fibers"; - packageName = "fibers"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fibers/-/fibers-5.0.3.tgz"; - sha512 = "/qYTSoZydQkM21qZpGLDLuCq8c+B8KhuCQ1kLPvnRNhxhVbvrpmH9l2+Lblf5neDuEsY4bfT7LeO553TXQDvJw=="; - }; - }; - "file-entry-cache-6.0.1" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - }; - "file-loader-6.2.0" = { - name = "file-loader"; - packageName = "file-loader"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; - sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; - }; - }; - "filelist-1.0.4" = { - name = "filelist"; - packageName = "filelist"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz"; - sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; - }; - }; - "filesize-8.0.7" = { - name = "filesize"; - packageName = "filesize"; - version = "8.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz"; - sha512 = "pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="; - }; - }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - }; - "finalhandler-1.2.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; - }; - }; - "find-cache-dir-3.3.2" = { - name = "find-cache-dir"; - packageName = "find-cache-dir"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; - sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; - }; - }; - "find-root-1.1.0" = { - name = "find-root"; - packageName = "find-root"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"; - sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; - }; - }; - "find-up-3.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; - }; - }; - "find-up-4.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - }; - "find-up-5.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"; - sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; - }; - }; - "flat-cache-3.0.4" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - }; - "flatted-3.2.7" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"; - sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; - }; - }; - "follow-redirects-1.15.2" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; - }; - }; - "for-each-0.3.3" = { - name = "for-each"; - packageName = "for-each"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; - sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; - }; - }; - "fork-ts-checker-webpack-plugin-6.5.3" = { - name = "fork-ts-checker-webpack-plugin"; - packageName = "fork-ts-checker-webpack-plugin"; - version = "6.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz"; - sha512 = "SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ=="; - }; - }; - "form-data-2.3.3" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; - }; - }; - "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=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fraction.js-4.2.0" = { - name = "fraction.js"; - packageName = "fraction.js"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"; - sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - }; - "fs-extra-10.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - }; - "fs-extra-9.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - }; - "fs-minipass-2.1.0" = { - name = "fs-minipass"; - packageName = "fs-minipass"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; - }; - }; - "fs-monkey-1.0.3" = { - name = "fs-monkey"; - packageName = "fs-monkey"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz"; - sha512 = "cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "fsevents-2.3.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - }; - "function.prototype.name-1.1.5" = { - name = "function.prototype.name"; - packageName = "function.prototype.name"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - }; - "functions-have-names-1.2.3" = { - name = "functions-have-names"; - packageName = "functions-have-names"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - }; - "gauge-3.0.2" = { - name = "gauge"; - packageName = "gauge"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz"; - sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; - }; - }; - "gauge-4.0.4" = { - name = "gauge"; - packageName = "gauge"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz"; - sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; - }; - }; - "gaze-1.1.3" = { - name = "gaze"; - packageName = "gaze"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz"; - sha512 = "BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g=="; - }; - }; - "gensync-1.0.0-beta.2" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - }; - "get-caller-file-2.0.5" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - }; - "get-intrinsic-1.2.1" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; - sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; - }; - }; - "get-own-enumerable-property-symbols-3.0.2" = { - name = "get-own-enumerable-property-symbols"; - packageName = "get-own-enumerable-property-symbols"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; - }; - }; - "get-package-type-0.1.0" = { - name = "get-package-type"; - packageName = "get-package-type"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"; - sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha512 = "F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="; - }; - }; - "get-stream-5.2.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; - sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; - }; - }; - "get-stream-6.0.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"; - sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; - }; - }; - "get-symbol-description-1.0.0" = { - name = "get-symbol-description"; - packageName = "get-symbol-description"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; - }; - }; - "glob-7.1.6" = { - name = "glob"; - packageName = "glob"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; - }; - }; - "glob-7.1.7" = { - name = "glob"; - packageName = "glob"; - version = "7.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "glob-parent-5.1.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - }; - "glob-parent-6.0.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - }; - "glob-to-regexp-0.4.1" = { - name = "glob-to-regexp"; - packageName = "glob-to-regexp"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; - sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; - }; - }; - "global-modules-2.0.0" = { - name = "global-modules"; - packageName = "global-modules"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz"; - sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; - }; - }; - "global-prefix-3.0.0" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz"; - sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; - }; - }; - "globals-11.12.0" = { - name = "globals"; - packageName = "globals"; - version = "11.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - }; - "globals-13.20.0" = { - name = "globals"; - packageName = "globals"; - version = "13.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; - sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; - }; - }; - "globalthis-1.0.3" = { - name = "globalthis"; - packageName = "globalthis"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; - }; - }; - "globby-11.1.0" = { - name = "globby"; - packageName = "globby"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; - }; - }; - "globule-1.3.4" = { - name = "globule"; - packageName = "globule"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz"; - sha512 = "OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg=="; - }; - }; - "gopd-1.0.1" = { - name = "gopd"; - packageName = "gopd"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; - sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; - }; - }; - "graceful-fs-4.2.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; - sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; - }; - }; - "grapheme-splitter-1.0.4" = { - name = "grapheme-splitter"; - packageName = "grapheme-splitter"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; - sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; - }; - }; - "graphemer-1.4.0" = { - name = "graphemer"; - packageName = "graphemer"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz"; - sha512 = "EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="; - }; - }; - "growly-1.3.0" = { - name = "growly"; - packageName = "growly"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"; - sha512 = "+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw=="; - }; - }; - "gzip-size-6.0.0" = { - name = "gzip-size"; - packageName = "gzip-size"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"; - sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; - }; - }; - "handle-thing-2.0.1" = { - name = "handle-thing"; - packageName = "handle-thing"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; - sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; - }; - }; - "har-validator-5.1.5" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; - sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; - }; - }; - "hard-rejection-2.1.0" = { - name = "hard-rejection"; - packageName = "hard-rejection"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"; - sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; - }; - }; - "harmony-reflect-1.6.2" = { - name = "harmony-reflect"; - packageName = "harmony-reflect"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz"; - sha512 = "HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="; - }; - }; - "has-1.0.3" = { - name = "has"; - packageName = "has"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - }; - "has-bigints-1.0.2" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "has-property-descriptors-1.0.0" = { - name = "has-property-descriptors"; - packageName = "has-property-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - }; - "has-proto-1.0.1" = { - name = "has-proto"; - packageName = "has-proto"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; - sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; - }; - }; - "he-1.2.0" = { - name = "he"; - packageName = "he"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; - }; - }; - "hoist-non-react-statics-3.3.2" = { - name = "hoist-non-react-statics"; - packageName = "hoist-non-react-statics"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; - sha512 = "/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="; - }; - }; - "hoopy-0.1.4" = { - name = "hoopy"; - packageName = "hoopy"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz"; - sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; - }; - }; - "hosted-git-info-2.8.9" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; - sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; - }; - }; - "hosted-git-info-4.1.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; - sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; - }; - }; - "hpack.js-2.1.6" = { - name = "hpack.js"; - packageName = "hpack.js"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; - sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; - }; - }; - "html-encoding-sniffer-2.0.1" = { - name = "html-encoding-sniffer"; - packageName = "html-encoding-sniffer"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; - sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; - }; - }; - "html-entities-2.3.3" = { - name = "html-entities"; - packageName = "html-entities"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"; - sha512 = "DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="; - }; - }; - "html-escaper-2.0.2" = { - name = "html-escaper"; - packageName = "html-escaper"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"; - sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; - }; - }; - "html-minifier-terser-6.1.0" = { - name = "html-minifier-terser"; - packageName = "html-minifier-terser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"; - sha512 = "YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw=="; - }; - }; - "html-parse-stringify-3.0.1" = { - name = "html-parse-stringify"; - packageName = "html-parse-stringify"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz"; - sha512 = "KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg=="; - }; - }; - "html-webpack-plugin-5.5.1" = { - name = "html-webpack-plugin"; - packageName = "html-webpack-plugin"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.1.tgz"; - sha512 = "cTUzZ1+NqjGEKjmVgZKLMdiFg3m9MdRXkZW2OEe69WYVi5ONLMmlnSZdXzGGMOq0C8jGDrL6EWyEDDUioHO/pA=="; - }; - }; - "htmlparser2-6.1.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; - sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; - }; - }; - "http-assert-1.5.0" = { - name = "http-assert"; - packageName = "http-assert"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz"; - sha512 = "uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w=="; - }; - }; - "http-cache-semantics-4.1.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; - sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; - }; - }; - "http-deceiver-1.2.7" = { - name = "http-deceiver"; - packageName = "http-deceiver"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; - sha512 = "LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="; - }; - }; - "http-errors-1.6.3" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha512 = "lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="; - }; - }; - "http-errors-1.8.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - }; - "http-errors-2.0.0" = { - name = "http-errors"; - packageName = "http-errors"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; - sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; - }; - }; - "http-parser-js-0.5.8" = { - name = "http-parser-js"; - packageName = "http-parser-js"; - version = "0.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"; - sha512 = "SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="; - }; - }; - "http-proxy-1.18.1" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; - sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; - }; - }; - "http-proxy-agent-4.0.1" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; - sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; - }; - }; - "http-proxy-middleware-1.3.1" = { - name = "http-proxy-middleware"; - packageName = "http-proxy-middleware"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; - sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; - }; - }; - "http-proxy-middleware-2.0.6" = { - name = "http-proxy-middleware"; - packageName = "http-proxy-middleware"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"; - sha512 = "ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw=="; - }; - }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; - }; - }; - "https-proxy-agent-5.0.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; - }; - }; - "human-signals-1.1.1" = { - name = "human-signals"; - packageName = "human-signals"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; - sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; - }; - }; - "human-signals-2.1.0" = { - name = "human-signals"; - packageName = "human-signals"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"; - sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; - }; - }; - "humanize-duration-3.28.0" = { - name = "humanize-duration"; - packageName = "humanize-duration"; - version = "3.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz"; - sha512 = "jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A=="; - }; - }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; - }; - }; - "i18next-21.10.0" = { - name = "i18next"; - packageName = "i18next"; - version = "21.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz"; - sha512 = "YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg=="; - }; - }; - "i18next-browser-languagedetector-6.1.8" = { - name = "i18next-browser-languagedetector"; - packageName = "i18next-browser-languagedetector"; - version = "6.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.8.tgz"; - sha512 = "Svm+MduCElO0Meqpj1kJAriTC6OhI41VhlT/A0UPjGoPZBhAHIaGE5EfsHlTpgdH09UVX7rcc72pSDDBeKSQQA=="; - }; - }; - "i18next-http-backend-1.4.5" = { - name = "i18next-http-backend"; - packageName = "i18next-http-backend"; - version = "1.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-1.4.5.tgz"; - sha512 = "tLuHWuLWl6CmS07o+UB6EcQCaUjrZ1yhdseIN7sfq0u7phsMePJ8pqlGhIAdRDPF/q7ooyo5MID5DRFBCH+x5w=="; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "iconv-lite-0.6.3" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - }; - "icss-utils-5.1.0" = { - name = "icss-utils"; - packageName = "icss-utils"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; - sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; - }; - }; - "idb-7.1.1" = { - name = "idb"; - packageName = "idb"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz"; - sha512 = "gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="; - }; - }; - "identity-obj-proxy-3.0.0" = { - name = "identity-obj-proxy"; - packageName = "identity-obj-proxy"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz"; - sha512 = "00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA=="; - }; - }; - "ignore-5.2.4" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"; - sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; - }; - }; - "immer-9.0.21" = { - name = "immer"; - packageName = "immer"; - version = "9.0.21"; - src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz"; - sha512 = "bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="; - }; - }; - "immutable-4.3.0" = { - name = "immutable"; - packageName = "immutable"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"; - sha512 = "0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg=="; - }; - }; - "import-fresh-3.3.0" = { - name = "import-fresh"; - packageName = "import-fresh"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - }; - "import-local-3.1.0" = { - name = "import-local"; - packageName = "import-local"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"; - sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - }; - "indent-string-4.0.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; - sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; - }; - }; - "infer-owner-1.0.4" = { - name = "infer-owner"; - packageName = "infer-owner"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "ini-1.3.8" = { - name = "ini"; - packageName = "ini"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - }; - "internal-slot-1.0.5" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; - sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; - }; - }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; - }; - }; - "ipaddr.js-1.9.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "ipaddr.js-2.0.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"; - sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; - }; - }; - "is-arguments-1.1.1" = { - name = "is-arguments"; - packageName = "is-arguments"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; - sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; - }; - }; - "is-array-buffer-3.0.2" = { - name = "is-array-buffer"; - packageName = "is-array-buffer"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; - sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; - }; - }; - "is-bigint-1.0.4" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - }; - "is-binary-path-2.1.0" = { - name = "is-binary-path"; - packageName = "is-binary-path"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; - }; - }; - "is-boolean-object-1.1.2" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - }; - "is-callable-1.2.7" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; - sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; - }; - }; - "is-core-module-2.12.1" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz"; - sha512 = "Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg=="; - }; - }; - "is-date-object-1.0.5" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - }; - "is-docker-2.2.1" = { - name = "is-docker"; - packageName = "is-docker"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; - sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - }; - "is-fullwidth-code-point-3.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - }; - "is-generator-fn-2.1.0" = { - name = "is-generator-fn"; - packageName = "is-generator-fn"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; - sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="; - }; - }; - "is-generator-function-1.0.10" = { - name = "is-generator-function"; - packageName = "is-generator-function"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; - sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; - }; - }; - "is-glob-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; - "is-lambda-1.0.1" = { - name = "is-lambda"; - packageName = "is-lambda"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; - sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; - }; - }; - "is-map-2.0.2" = { - name = "is-map"; - packageName = "is-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; - sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; - }; - }; - "is-module-1.0.0" = { - name = "is-module"; - packageName = "is-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"; - sha512 = "51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="; - }; - }; - "is-negative-zero-2.0.2" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - }; - "is-number-object-1.0.7" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha512 = "l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="; - }; - }; - "is-path-cwd-2.2.0" = { - name = "is-path-cwd"; - packageName = "is-path-cwd"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; - }; - }; - "is-path-inside-3.0.3" = { - name = "is-path-inside"; - packageName = "is-path-inside"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; - }; - }; - "is-plain-obj-3.0.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"; - sha512 = "gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="; - }; - }; - "is-potential-custom-element-name-1.0.1" = { - name = "is-potential-custom-element-name"; - packageName = "is-potential-custom-element-name"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; - sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="; - }; - }; - "is-promise-4.0.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz"; - sha512 = "hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "is-regexp-1.0.0" = { - name = "is-regexp"; - packageName = "is-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; - sha512 = "7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="; - }; - }; - "is-root-2.1.0" = { - name = "is-root"; - packageName = "is-root"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz"; - sha512 = "AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="; - }; - }; - "is-set-2.0.2" = { - name = "is-set"; - packageName = "is-set"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; - sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; - }; - }; - "is-shared-array-buffer-1.0.2" = { - name = "is-shared-array-buffer"; - packageName = "is-shared-array-buffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - }; - "is-stream-2.0.1" = { - name = "is-stream"; - packageName = "is-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; - sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; - }; - }; - "is-string-1.0.7" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - }; - "is-symbol-1.0.4" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - }; - "is-typed-array-1.1.10" = { - name = "is-typed-array"; - packageName = "is-typed-array"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"; - sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - }; - "is-weakmap-2.0.1" = { - name = "is-weakmap"; - packageName = "is-weakmap"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; - sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; - }; - }; - "is-weakref-1.0.2" = { - name = "is-weakref"; - packageName = "is-weakref"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - }; - "is-weakset-2.0.2" = { - name = "is-weakset"; - packageName = "is-weakset"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; - sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; - }; - }; - "is-wsl-2.2.0" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha512 = "D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "isarray-2.0.5" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; - sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; - }; - }; - "istanbul-lib-coverage-3.2.0" = { - name = "istanbul-lib-coverage"; - packageName = "istanbul-lib-coverage"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; - sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; - }; - }; - "istanbul-lib-instrument-5.2.1" = { - name = "istanbul-lib-instrument"; - packageName = "istanbul-lib-instrument"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"; - sha512 = "pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg=="; - }; - }; - "istanbul-lib-report-3.0.0" = { - name = "istanbul-lib-report"; - packageName = "istanbul-lib-report"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; - }; - }; - "istanbul-lib-source-maps-4.0.1" = { - name = "istanbul-lib-source-maps"; - packageName = "istanbul-lib-source-maps"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"; - sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; - }; - }; - "istanbul-reports-3.1.5" = { - name = "istanbul-reports"; - packageName = "istanbul-reports"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"; - sha512 = "nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w=="; - }; - }; - "jake-10.8.6" = { - name = "jake"; - packageName = "jake"; - version = "10.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.8.6.tgz"; - sha512 = "G43Ub9IYEFfu72sua6rzooi8V8Gz2lkfk48rW20vEWCGizeaEPlKB1Kh8JIA84yQbiAEfqlPmSpGgCKKxH3rDA=="; - }; - }; - "jest-27.5.1" = { - name = "jest"; - packageName = "jest"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz"; - sha512 = "Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ=="; - }; - }; - "jest-changed-files-27.5.1" = { - name = "jest-changed-files"; - packageName = "jest-changed-files"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz"; - sha512 = "buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw=="; - }; - }; - "jest-circus-27.5.1" = { - name = "jest-circus"; - packageName = "jest-circus"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz"; - sha512 = "D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw=="; - }; - }; - "jest-cli-27.5.1" = { - name = "jest-cli"; - packageName = "jest-cli"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz"; - sha512 = "Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw=="; - }; - }; - "jest-config-27.5.1" = { - name = "jest-config"; - packageName = "jest-config"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz"; - sha512 = "5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA=="; - }; - }; - "jest-diff-27.5.1" = { - name = "jest-diff"; - packageName = "jest-diff"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz"; - sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw=="; - }; - }; - "jest-docblock-27.5.1" = { - name = "jest-docblock"; - packageName = "jest-docblock"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz"; - sha512 = "rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ=="; - }; - }; - "jest-each-27.5.1" = { - name = "jest-each"; - packageName = "jest-each"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz"; - sha512 = "1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ=="; - }; - }; - "jest-environment-jsdom-27.5.1" = { - name = "jest-environment-jsdom"; - packageName = "jest-environment-jsdom"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz"; - sha512 = "TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw=="; - }; - }; - "jest-environment-node-27.5.1" = { - name = "jest-environment-node"; - packageName = "jest-environment-node"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz"; - sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; - }; - }; - "jest-get-type-27.5.1" = { - name = "jest-get-type"; - packageName = "jest-get-type"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz"; - sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; - }; - }; - "jest-haste-map-27.5.1" = { - name = "jest-haste-map"; - packageName = "jest-haste-map"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz"; - sha512 = "7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng=="; - }; - }; - "jest-jasmine2-27.5.1" = { - name = "jest-jasmine2"; - packageName = "jest-jasmine2"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz"; - sha512 = "jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ=="; - }; - }; - "jest-leak-detector-27.5.1" = { - name = "jest-leak-detector"; - packageName = "jest-leak-detector"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz"; - sha512 = "POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ=="; - }; - }; - "jest-matcher-utils-27.5.1" = { - name = "jest-matcher-utils"; - packageName = "jest-matcher-utils"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz"; - sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw=="; - }; - }; - "jest-message-util-27.5.1" = { - name = "jest-message-util"; - packageName = "jest-message-util"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz"; - sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; - }; - }; - "jest-message-util-28.1.3" = { - name = "jest-message-util"; - packageName = "jest-message-util"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz"; - sha512 = "PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g=="; - }; - }; - "jest-mock-27.5.1" = { - name = "jest-mock"; - packageName = "jest-mock"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz"; - sha512 = "K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og=="; - }; - }; - "jest-pnp-resolver-1.2.3" = { - name = "jest-pnp-resolver"; - packageName = "jest-pnp-resolver"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz"; - sha512 = "+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w=="; - }; - }; - "jest-regex-util-27.5.1" = { - name = "jest-regex-util"; - packageName = "jest-regex-util"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz"; - sha512 = "4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="; - }; - }; - "jest-regex-util-28.0.2" = { - name = "jest-regex-util"; - packageName = "jest-regex-util"; - version = "28.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz"; - sha512 = "4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="; - }; - }; - "jest-resolve-27.5.1" = { - name = "jest-resolve"; - packageName = "jest-resolve"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz"; - sha512 = "FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw=="; - }; - }; - "jest-resolve-dependencies-27.5.1" = { - name = "jest-resolve-dependencies"; - packageName = "jest-resolve-dependencies"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz"; - sha512 = "QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg=="; - }; - }; - "jest-runner-27.5.1" = { - name = "jest-runner"; - packageName = "jest-runner"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz"; - sha512 = "g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ=="; - }; - }; - "jest-runtime-27.5.1" = { - name = "jest-runtime"; - packageName = "jest-runtime"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz"; - sha512 = "o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A=="; - }; - }; - "jest-serializer-27.5.1" = { - name = "jest-serializer"; - packageName = "jest-serializer"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz"; - sha512 = "jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w=="; - }; - }; - "jest-snapshot-27.5.1" = { - name = "jest-snapshot"; - packageName = "jest-snapshot"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz"; - sha512 = "yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA=="; - }; - }; - "jest-util-27.5.1" = { - name = "jest-util"; - packageName = "jest-util"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz"; - sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; - }; - }; - "jest-util-28.1.3" = { - name = "jest-util"; - packageName = "jest-util"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz"; - sha512 = "XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ=="; - }; - }; - "jest-validate-27.5.1" = { - name = "jest-validate"; - packageName = "jest-validate"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz"; - sha512 = "thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ=="; - }; - }; - "jest-watch-typeahead-1.1.0" = { - name = "jest-watch-typeahead"; - packageName = "jest-watch-typeahead"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz"; - sha512 = "Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw=="; - }; - }; - "jest-watcher-27.5.1" = { - name = "jest-watcher"; - packageName = "jest-watcher"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz"; - sha512 = "z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw=="; - }; - }; - "jest-watcher-28.1.3" = { - name = "jest-watcher"; - packageName = "jest-watcher"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz"; - sha512 = "t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g=="; - }; - }; - "jest-worker-26.6.2" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "26.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; - }; - }; - "jest-worker-27.5.1" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"; - sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; - }; - }; - "jest-worker-28.1.3" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz"; - sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g=="; - }; - }; - "jiti-1.18.2" = { - name = "jiti"; - packageName = "jiti"; - version = "1.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz"; - sha512 = "QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg=="; - }; - }; - "js-base64-2.6.4" = { - name = "js-base64"; - packageName = "js-base64"; - version = "2.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz"; - sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; - }; - }; - "js-base64-3.7.5" = { - name = "js-base64"; - packageName = "js-base64"; - version = "3.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz"; - sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; - }; - }; - "js-tokens-4.0.0" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - }; - "js-yaml-3.14.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; - sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; - }; - }; - "jsdom-16.7.0" = { - name = "jsdom"; - packageName = "jsdom"; - version = "16.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz"; - sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; - }; - }; - "jsesc-0.5.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; - }; - }; - "jsesc-2.5.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - }; - "json-parse-even-better-errors-2.3.1" = { - name = "json-parse-even-better-errors"; - packageName = "json-parse-even-better-errors"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - }; - "json-schema-0.4.0" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; - sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - }; - "json-schema-traverse-1.0.0" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; - }; - }; - "json-stable-stringify-without-jsonify-1.0.1" = { - name = "json-stable-stringify-without-jsonify"; - packageName = "json-stable-stringify-without-jsonify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; - }; - }; - "json5-1.0.2" = { - name = "json5"; - packageName = "json5"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"; - sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="; - }; - }; - "json5-2.2.3" = { - name = "json5"; - packageName = "json5"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; - sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; - }; - }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; - "jsonpointer-5.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz"; - sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; - }; - }; - "jsprim-1.4.2" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; - sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; - }; - }; - "jsx-ast-utils-3.3.3" = { - name = "jsx-ast-utils"; - packageName = "jsx-ast-utils"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz"; - sha512 = "fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw=="; - }; - }; - "keygrip-1.1.0" = { - name = "keygrip"; - packageName = "keygrip"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz"; - sha512 = "iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ=="; - }; - }; - "kind-of-6.0.3" = { - name = "kind-of"; - packageName = "kind-of"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; - }; - }; - "kleur-3.0.3" = { - name = "kleur"; - packageName = "kleur"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"; - sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; - }; - }; - "klona-2.0.6" = { - name = "klona"; - packageName = "klona"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz"; - sha512 = "dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="; - }; - }; - "koa-2.14.2" = { - name = "koa"; - packageName = "koa"; - version = "2.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/koa/-/koa-2.14.2.tgz"; - sha512 = "VFI2bpJaodz6P7x2uyLiX6RLYpZmOJqNmoCst/Yyd7hQlszyPwG/I9CQJ63nOtKSxpt5M7NH67V6nJL2BwCl7g=="; - }; - }; - "koa-compose-4.2.0" = { - name = "koa-compose"; - packageName = "koa-compose"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.2.0.tgz"; - sha512 = "/Io2dpt3uU/wWkn2pkRBj3vudzsi6hMssGkREZCxLIczAIvLWy5Jw9PW7ctTxvcfXKCisbgsMLsgE1BvSZB6Kw=="; - }; - }; - "koa-compress-5.1.1" = { - name = "koa-compress"; - packageName = "koa-compress"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-compress/-/koa-compress-5.1.1.tgz"; - sha512 = "UgMIN7ZoEP2DuoSQmD6CYvFSLt0NReGlc2qSY4bO4Oq0L56OiD9pDG41Kj/zFmVY/A3Wvmn4BqKcfq5H30LGIg=="; - }; - }; - "koa-connect-2.1.0" = { - name = "koa-connect"; - packageName = "koa-connect"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-connect/-/koa-connect-2.1.0.tgz"; - sha512 = "O9pcFafHk0oQsBevlbTBlB9co+2RUQJ4zCzu3qJPmGlGoeEZkne+7gWDkecqDPSbCtED6LmhlQladxs6NjOnMQ=="; - }; - }; - "koa-convert-2.0.0" = { - name = "koa-convert"; - packageName = "koa-convert"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz"; - sha512 = "asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA=="; - }; - }; - "koa-is-json-1.0.0" = { - name = "koa-is-json"; - packageName = "koa-is-json"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz"; - sha512 = "+97CtHAlWDx0ndt0J8y3P12EWLwTLMXIfMnYDev3wOTwH/RpBGMlfn4bDXlMEg1u73K6XRE9BbUp+5ZAYoRYWw=="; - }; - }; - "koa-route-3.2.0" = { - name = "koa-route"; - packageName = "koa-route"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-route/-/koa-route-3.2.0.tgz"; - sha512 = "8FsuWw/L+CUWJfpgN6vrlYUDNTheEinG8Zkm97GyuLJNyWjCVUs9p10Ih3jTIWwmDVQcz6827l0RKadAS5ibqA=="; - }; - }; - "koa-send-5.0.1" = { - name = "koa-send"; - packageName = "koa-send"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz"; - sha512 = "tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ=="; - }; - }; - "koa-static-5.0.0" = { - name = "koa-static"; - packageName = "koa-static"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz"; - sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ=="; - }; - }; - "language-subtag-registry-0.3.22" = { - name = "language-subtag-registry"; - packageName = "language-subtag-registry"; - version = "0.3.22"; - src = fetchurl { - url = "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"; - sha512 = "tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="; - }; - }; - "language-tags-1.0.5" = { - name = "language-tags"; - packageName = "language-tags"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz"; - sha512 = "qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ=="; - }; - }; - "launch-editor-2.6.0" = { - name = "launch-editor"; - packageName = "launch-editor"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz"; - sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="; - }; - }; - "leven-3.1.0" = { - name = "leven"; - packageName = "leven"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; - sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; - }; - }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - }; - "levn-0.4.1" = { - name = "levn"; - packageName = "levn"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - }; - "lilconfig-2.1.0" = { - name = "lilconfig"; - packageName = "lilconfig"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"; - sha512 = "utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="; - }; - }; - "lines-and-columns-1.2.4" = { - name = "lines-and-columns"; - packageName = "lines-and-columns"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - }; - "loader-runner-4.3.0" = { - name = "loader-runner"; - packageName = "loader-runner"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"; - sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; - }; - }; - "loader-utils-2.0.4" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; - sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; - }; - }; - "loader-utils-3.2.1" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"; - sha512 = "ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="; - }; - }; - "locate-path-3.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; - }; - }; - "locate-path-5.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - }; - "locate-path-6.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"; - sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; - }; - }; - "lodash-4.17.21" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; - }; - }; - "lodash.memoize-4.1.2" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="; - }; - }; - "lodash.merge-4.6.2" = { - name = "lodash.merge"; - packageName = "lodash.merge"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - }; - "lodash.sortby-4.7.0" = { - name = "lodash.sortby"; - packageName = "lodash.sortby"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha512 = "HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; - }; - }; - "loglevelnext-4.0.1" = { - name = "loglevelnext"; - packageName = "loglevelnext"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loglevelnext/-/loglevelnext-4.0.1.tgz"; - sha512 = "/tlMUn5wqgzg9msy0PiWc+8fpVXEuYPq49c2RGyw2NAh0hSrgq6j/Z3YPnwWsILMoFJ+ZT6ePHnWUonkjDnq2Q=="; - }; - }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - }; - "lower-case-2.0.2" = { - name = "lower-case"; - packageName = "lower-case"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"; - sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; - }; - }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "magic-string-0.25.9" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.9"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; - sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; - }; - }; - "make-dir-3.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - }; - "make-error-1.3.6" = { - name = "make-error"; - packageName = "make-error"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; - }; - }; - "make-fetch-happen-9.1.0" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; - sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; - }; - }; - "makeerror-1.0.12" = { - name = "makeerror"; - packageName = "makeerror"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz"; - sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; - }; - }; - "map-obj-4.3.0" = { - name = "map-obj"; - packageName = "map-obj"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; - sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; - }; - }; - "mdn-data-2.0.14" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"; - sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; - }; - }; - "mdn-data-2.0.4" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; - sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; - "memfs-3.5.1" = { - name = "memfs"; - packageName = "memfs"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.5.1.tgz"; - sha512 = "UWbFJKvj5k+nETdteFndTpYxdeTMox/ULeqX5k/dpaQJCCFmj5EeKv3dBcyO2xmkRAx2vppRu5dVG7SOtsGOzA=="; - }; - }; - "meow-9.0.0" = { - name = "meow"; - packageName = "meow"; - version = "9.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz"; - sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; - }; - }; - "merge-stream-2.0.0" = { - name = "merge-stream"; - packageName = "merge-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; - }; - }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; - "micromatch-4.0.5" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - }; - "mime-1.6.0" = { - name = "mime"; - packageName = "mime"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - }; - "mime-db-1.52.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - }; - "mime-types-2.1.35" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.35"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - }; - "mimic-fn-2.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - }; - "mimic-response-2.1.0" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; - sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; - }; - }; - "min-indent-1.0.1" = { - name = "min-indent"; - packageName = "min-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"; - sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; - }; - }; - "mini-css-extract-plugin-2.7.6" = { - name = "mini-css-extract-plugin"; - packageName = "mini-css-extract-plugin"; - version = "2.7.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz"; - sha512 = "Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw=="; - }; - }; - "minimalistic-assert-1.0.1" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; - }; - }; - "minimatch-3.0.8" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"; - sha512 = "6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="; - }; - }; - "minimatch-3.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimatch-5.1.6" = { - name = "minimatch"; - packageName = "minimatch"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; - sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; - }; - }; - "minimist-1.2.8" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; - sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; - }; - }; - "minimist-options-4.1.0" = { - name = "minimist-options"; - packageName = "minimist-options"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"; - sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; - }; - }; - "minipass-3.3.6" = { - name = "minipass"; - packageName = "minipass"; - version = "3.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; - sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; - }; - }; - "minipass-5.0.0" = { - name = "minipass"; - packageName = "minipass"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"; - sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; - }; - }; - "minipass-collect-1.0.2" = { - name = "minipass-collect"; - packageName = "minipass-collect"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; - }; - }; - "minipass-fetch-1.4.1" = { - name = "minipass-fetch"; - packageName = "minipass-fetch"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; - sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; - }; - }; - "minipass-flush-1.0.5" = { - name = "minipass-flush"; - packageName = "minipass-flush"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; - sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; - }; - }; - "minipass-pipeline-1.2.4" = { - name = "minipass-pipeline"; - packageName = "minipass-pipeline"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; - sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; - }; - }; - "minipass-sized-1.0.3" = { - name = "minipass-sized"; - packageName = "minipass-sized"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; - sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; - }; - }; - "minizlib-2.1.2" = { - name = "minizlib"; - packageName = "minizlib"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; - sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; - }; - }; - "mkdirp-0.5.6" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; - }; - }; - "mkdirp-1.0.4" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "ms-2.1.3" = { - name = "ms"; - packageName = "ms"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - }; - "multicast-dns-7.2.5" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "7.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"; - sha512 = "2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="; - }; - }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; - }; - }; - "nan-2.17.0" = { - name = "nan"; - packageName = "nan"; - version = "2.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz"; - sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; - }; - }; - "nanoid-3.3.6" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"; - sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; - }; - }; - "natural-compare-1.4.0" = { - name = "natural-compare"; - packageName = "natural-compare"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - }; - "natural-compare-lite-1.4.0" = { - name = "natural-compare-lite"; - packageName = "natural-compare-lite"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; - sha512 = "Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="; - }; - }; - "negotiator-0.6.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; - "no-case-3.0.4" = { - name = "no-case"; - packageName = "no-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"; - sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; - }; - }; - "node-fetch-2.6.7" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; - }; - }; - "node-forge-1.3.1" = { - name = "node-forge"; - packageName = "node-forge"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"; - sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; - }; - }; - "node-gyp-8.4.1" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "8.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; - sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; - }; - }; - "node-gyp-build-4.6.0" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; - }; - }; - "node-int64-0.4.0" = { - name = "node-int64"; - packageName = "node-int64"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; - sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; - }; - }; - "node-notifier-10.0.1" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "10.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-10.0.1.tgz"; - sha512 = "YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ=="; - }; - }; - "node-releases-2.0.10" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"; - sha512 = "5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="; - }; - }; - "node-sass-7.0.3" = { - name = "node-sass"; - packageName = "node-sass"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-sass/-/node-sass-7.0.3.tgz"; - sha512 = "8MIlsY/4dXUkJDYht9pIWBhMil3uHmE8b/AdJPjmFn1nBx9X9BASzfzmsCy0uCCb8eqI3SYYzVPDswWqSx7gjw=="; - }; - }; - "nopt-5.0.0" = { - name = "nopt"; - packageName = "nopt"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; - sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; - }; - }; - "normalize-package-data-2.5.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; - }; - }; - "normalize-package-data-3.0.3" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; - sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; - }; - }; - "normalize-path-3.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - }; - "normalize-range-0.1.2" = { - name = "normalize-range"; - packageName = "normalize-range"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; - sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; - }; - }; - "normalize-url-6.1.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - }; - "npm-run-path-4.0.1" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; - }; - }; - "npmlog-5.0.1" = { - name = "npmlog"; - packageName = "npmlog"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; - sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; - }; - }; - "npmlog-6.0.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz"; - sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; - }; - }; - "nth-check-1.0.2" = { - name = "nth-check"; - packageName = "nth-check"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; - sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; - }; - }; - "nth-check-2.1.1" = { - name = "nth-check"; - packageName = "nth-check"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"; - sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; - }; - }; - "nwsapi-2.2.4" = { - name = "nwsapi"; - packageName = "nwsapi"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.4.tgz"; - sha512 = "NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g=="; - }; - }; - "oauth-sign-0.9.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "object-hash-3.0.0" = { - name = "object-hash"; - packageName = "object-hash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz"; - sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; - }; - }; - "object-inspect-1.12.3" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; - }; - }; - "object-is-1.1.5" = { - name = "object-is"; - packageName = "object-is"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; - "object.assign-4.1.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; - sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; - }; - }; - "object.entries-1.1.6" = { - name = "object.entries"; - packageName = "object.entries"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz"; - sha512 = "leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w=="; - }; - }; - "object.fromentries-2.0.6" = { - name = "object.fromentries"; - packageName = "object.fromentries"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz"; - sha512 = "VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg=="; - }; - }; - "object.getownpropertydescriptors-2.1.6" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"; - sha512 = "lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="; - }; - }; - "object.hasown-1.1.2" = { - name = "object.hasown"; - packageName = "object.hasown"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz"; - sha512 = "B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw=="; - }; - }; - "object.values-1.1.6" = { - name = "object.values"; - packageName = "object.values"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"; - sha512 = "FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="; - }; - }; - "obuf-1.1.2" = { - name = "obuf"; - packageName = "obuf"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; - sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; - }; - }; - "on-finished-2.4.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; - sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; - }; - }; - "on-headers-1.0.2" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "onetime-5.1.2" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - }; - "only-0.0.2" = { - name = "only"; - packageName = "only"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/only/-/only-0.0.2.tgz"; - sha512 = "Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ=="; - }; - }; - "open-7.4.2" = { - name = "open"; - packageName = "open"; - version = "7.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; - sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; - }; - }; - "open-8.4.2" = { - name = "open"; - packageName = "open"; - version = "8.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.2.tgz"; - sha512 = "7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="; - }; - }; - "optionator-0.8.3" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - }; - "optionator-0.9.1" = { - name = "optionator"; - packageName = "optionator"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - }; - "p-defer-3.0.0" = { - name = "p-defer"; - packageName = "p-defer"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz"; - sha512 = "ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw=="; - }; - }; - "p-limit-2.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - }; - "p-limit-3.1.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; - sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; - }; - }; - "p-locate-3.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; - }; - }; - "p-locate-4.1.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - }; - "p-locate-5.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"; - sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; - }; - }; - "p-map-4.0.0" = { - name = "p-map"; - packageName = "p-map"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; - sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; - }; - }; - "p-retry-4.6.2" = { - name = "p-retry"; - packageName = "p-retry"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"; - sha512 = "312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ=="; - }; - }; - "p-try-2.2.0" = { - name = "p-try"; - packageName = "p-try"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - }; - "param-case-3.0.4" = { - name = "param-case"; - packageName = "param-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"; - sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; - }; - }; - "parent-module-1.0.1" = { - name = "parent-module"; - packageName = "parent-module"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - }; - "parse-json-5.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - }; - "parse5-6.0.1" = { - name = "parse5"; - packageName = "parse5"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "pascal-case-3.1.2" = { - name = "pascal-case"; - packageName = "pascal-case"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"; - sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; - }; - }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="; - }; - }; - "path-exists-4.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - }; - "path-to-regexp-1.8.0" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; - sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA=="; - }; - }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; - }; - }; - "picocolors-0.2.1" = { - name = "picocolors"; - packageName = "picocolors"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"; - sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; - }; - }; - "picocolors-1.0.0" = { - name = "picocolors"; - packageName = "picocolors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - }; - "picomatch-2.3.1" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; - }; - }; - "pirates-4.0.5" = { - name = "pirates"; - packageName = "pirates"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"; - sha512 = "8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="; - }; - }; - "pkg-dir-4.2.0" = { - name = "pkg-dir"; - packageName = "pkg-dir"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; - }; - }; - "pkg-up-3.1.0" = { - name = "pkg-up"; - packageName = "pkg-up"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz"; - sha512 = "nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA=="; - }; - }; - "postcss-7.0.39" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"; - sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; - }; - }; - "postcss-8.4.23" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.23"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz"; - sha512 = "bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA=="; - }; - }; - "postcss-attribute-case-insensitive-5.0.2" = { - name = "postcss-attribute-case-insensitive"; - packageName = "postcss-attribute-case-insensitive"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"; - sha512 = "XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ=="; - }; - }; - "postcss-browser-comments-4.0.0" = { - name = "postcss-browser-comments"; - packageName = "postcss-browser-comments"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz"; - sha512 = "X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg=="; - }; - }; - "postcss-calc-8.2.4" = { - name = "postcss-calc"; - packageName = "postcss-calc"; - version = "8.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; - sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; - }; - }; - "postcss-clamp-4.1.0" = { - name = "postcss-clamp"; - packageName = "postcss-clamp"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz"; - sha512 = "ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow=="; - }; - }; - "postcss-color-functional-notation-4.2.4" = { - name = "postcss-color-functional-notation"; - packageName = "postcss-color-functional-notation"; - version = "4.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz"; - sha512 = "2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg=="; - }; - }; - "postcss-color-hex-alpha-8.0.4" = { - name = "postcss-color-hex-alpha"; - packageName = "postcss-color-hex-alpha"; - version = "8.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz"; - sha512 = "nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ=="; - }; - }; - "postcss-color-rebeccapurple-7.1.1" = { - name = "postcss-color-rebeccapurple"; - packageName = "postcss-color-rebeccapurple"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz"; - sha512 = "pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg=="; - }; - }; - "postcss-colormin-5.3.1" = { - name = "postcss-colormin"; - packageName = "postcss-colormin"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz"; - sha512 = "UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ=="; - }; - }; - "postcss-convert-values-5.1.3" = { - name = "postcss-convert-values"; - packageName = "postcss-convert-values"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz"; - sha512 = "82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA=="; - }; - }; - "postcss-custom-media-8.0.2" = { - name = "postcss-custom-media"; - packageName = "postcss-custom-media"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz"; - sha512 = "7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg=="; - }; - }; - "postcss-custom-properties-12.1.11" = { - name = "postcss-custom-properties"; - packageName = "postcss-custom-properties"; - version = "12.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz"; - sha512 = "0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ=="; - }; - }; - "postcss-custom-selectors-6.0.3" = { - name = "postcss-custom-selectors"; - packageName = "postcss-custom-selectors"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz"; - sha512 = "fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg=="; - }; - }; - "postcss-dir-pseudo-class-6.0.5" = { - name = "postcss-dir-pseudo-class"; - packageName = "postcss-dir-pseudo-class"; - version = "6.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz"; - sha512 = "eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA=="; - }; - }; - "postcss-discard-comments-5.1.2" = { - name = "postcss-discard-comments"; - packageName = "postcss-discard-comments"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"; - sha512 = "+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="; - }; - }; - "postcss-discard-duplicates-5.1.0" = { - name = "postcss-discard-duplicates"; - packageName = "postcss-discard-duplicates"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; - sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; - }; - }; - "postcss-discard-empty-5.1.1" = { - name = "postcss-discard-empty"; - packageName = "postcss-discard-empty"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; - sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; - }; - }; - "postcss-discard-overridden-5.1.0" = { - name = "postcss-discard-overridden"; - packageName = "postcss-discard-overridden"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; - sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; - }; - }; - "postcss-double-position-gradients-3.1.2" = { - name = "postcss-double-position-gradients"; - packageName = "postcss-double-position-gradients"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz"; - sha512 = "GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ=="; - }; - }; - "postcss-env-function-4.0.6" = { - name = "postcss-env-function"; - packageName = "postcss-env-function"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz"; - sha512 = "kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA=="; - }; - }; - "postcss-flexbugs-fixes-5.0.2" = { - name = "postcss-flexbugs-fixes"; - packageName = "postcss-flexbugs-fixes"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz"; - sha512 = "18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ=="; - }; - }; - "postcss-focus-visible-6.0.4" = { - name = "postcss-focus-visible"; - packageName = "postcss-focus-visible"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz"; - sha512 = "QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw=="; - }; - }; - "postcss-focus-within-5.0.4" = { - name = "postcss-focus-within"; - packageName = "postcss-focus-within"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz"; - sha512 = "vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ=="; - }; - }; - "postcss-font-variant-5.0.0" = { - name = "postcss-font-variant"; - packageName = "postcss-font-variant"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz"; - sha512 = "1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA=="; - }; - }; - "postcss-gap-properties-3.0.5" = { - name = "postcss-gap-properties"; - packageName = "postcss-gap-properties"; - version = "3.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz"; - sha512 = "IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg=="; - }; - }; - "postcss-image-set-function-4.0.7" = { - name = "postcss-image-set-function"; - packageName = "postcss-image-set-function"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz"; - sha512 = "9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw=="; - }; - }; - "postcss-import-15.1.0" = { - name = "postcss-import"; - packageName = "postcss-import"; - version = "15.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz"; - sha512 = "hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew=="; - }; - }; - "postcss-initial-4.0.1" = { - name = "postcss-initial"; - packageName = "postcss-initial"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz"; - sha512 = "0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ=="; - }; - }; - "postcss-js-4.0.1" = { - name = "postcss-js"; - packageName = "postcss-js"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz"; - sha512 = "dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw=="; - }; - }; - "postcss-lab-function-4.2.1" = { - name = "postcss-lab-function"; - packageName = "postcss-lab-function"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz"; - sha512 = "xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w=="; - }; - }; - "postcss-load-config-4.0.1" = { - name = "postcss-load-config"; - packageName = "postcss-load-config"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz"; - sha512 = "vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA=="; - }; - }; - "postcss-loader-6.2.1" = { - name = "postcss-loader"; - packageName = "postcss-loader"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz"; - sha512 = "WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q=="; - }; - }; - "postcss-logical-5.0.4" = { - name = "postcss-logical"; - packageName = "postcss-logical"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz"; - sha512 = "RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g=="; - }; - }; - "postcss-media-minmax-5.0.0" = { - name = "postcss-media-minmax"; - packageName = "postcss-media-minmax"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz"; - sha512 = "yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ=="; - }; - }; - "postcss-merge-longhand-5.1.7" = { - name = "postcss-merge-longhand"; - packageName = "postcss-merge-longhand"; - version = "5.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz"; - sha512 = "YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ=="; - }; - }; - "postcss-merge-rules-5.1.4" = { - name = "postcss-merge-rules"; - packageName = "postcss-merge-rules"; - version = "5.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz"; - sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g=="; - }; - }; - "postcss-minify-font-values-5.1.0" = { - name = "postcss-minify-font-values"; - packageName = "postcss-minify-font-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; - sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; - }; - }; - "postcss-minify-gradients-5.1.1" = { - name = "postcss-minify-gradients"; - packageName = "postcss-minify-gradients"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"; - sha512 = "VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw=="; - }; - }; - "postcss-minify-params-5.1.4" = { - name = "postcss-minify-params"; - packageName = "postcss-minify-params"; - version = "5.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz"; - sha512 = "+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw=="; - }; - }; - "postcss-minify-selectors-5.2.1" = { - name = "postcss-minify-selectors"; - packageName = "postcss-minify-selectors"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"; - sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; - }; - }; - "postcss-modules-extract-imports-3.0.0" = { - name = "postcss-modules-extract-imports"; - packageName = "postcss-modules-extract-imports"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; - sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; - }; - }; - "postcss-modules-local-by-default-4.0.1" = { - name = "postcss-modules-local-by-default"; - packageName = "postcss-modules-local-by-default"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.1.tgz"; - sha512 = "Zr/dB+IlXaEqdoslLHhhqecwj73vc3rDmOpsBNBEVk7P2aqAlz+Ijy0fFbU5Ie9PtreDOIgGa9MsLWakVGl+fA=="; - }; - }; - "postcss-modules-scope-3.0.0" = { - name = "postcss-modules-scope"; - packageName = "postcss-modules-scope"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; - sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; - }; - }; - "postcss-modules-values-4.0.0" = { - name = "postcss-modules-values"; - packageName = "postcss-modules-values"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; - sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; - }; - }; - "postcss-nested-6.0.1" = { - name = "postcss-nested"; - packageName = "postcss-nested"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz"; - sha512 = "mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ=="; - }; - }; - "postcss-nesting-10.2.0" = { - name = "postcss-nesting"; - packageName = "postcss-nesting"; - version = "10.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz"; - sha512 = "EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA=="; - }; - }; - "postcss-normalize-10.0.1" = { - name = "postcss-normalize"; - packageName = "postcss-normalize"; - version = "10.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz"; - sha512 = "+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA=="; - }; - }; - "postcss-normalize-charset-5.1.0" = { - name = "postcss-normalize-charset"; - packageName = "postcss-normalize-charset"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; - sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; - }; - }; - "postcss-normalize-display-values-5.1.0" = { - name = "postcss-normalize-display-values"; - packageName = "postcss-normalize-display-values"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; - sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; - }; - }; - "postcss-normalize-positions-5.1.1" = { - name = "postcss-normalize-positions"; - packageName = "postcss-normalize-positions"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"; - sha512 = "6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg=="; - }; - }; - "postcss-normalize-repeat-style-5.1.1" = { - name = "postcss-normalize-repeat-style"; - packageName = "postcss-normalize-repeat-style"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"; - sha512 = "mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g=="; - }; - }; - "postcss-normalize-string-5.1.0" = { - name = "postcss-normalize-string"; - packageName = "postcss-normalize-string"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; - sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; - }; - }; - "postcss-normalize-timing-functions-5.1.0" = { - name = "postcss-normalize-timing-functions"; - packageName = "postcss-normalize-timing-functions"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; - sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; - }; - }; - "postcss-normalize-unicode-5.1.1" = { - name = "postcss-normalize-unicode"; - packageName = "postcss-normalize-unicode"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz"; - sha512 = "qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA=="; - }; - }; - "postcss-normalize-url-5.1.0" = { - name = "postcss-normalize-url"; - packageName = "postcss-normalize-url"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; - sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; - }; - }; - "postcss-normalize-whitespace-5.1.1" = { - name = "postcss-normalize-whitespace"; - packageName = "postcss-normalize-whitespace"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; - sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; - }; - }; - "postcss-opacity-percentage-1.1.3" = { - name = "postcss-opacity-percentage"; - packageName = "postcss-opacity-percentage"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz"; - sha512 = "An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A=="; - }; - }; - "postcss-ordered-values-5.1.3" = { - name = "postcss-ordered-values"; - packageName = "postcss-ordered-values"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"; - sha512 = "9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ=="; - }; - }; - "postcss-overflow-shorthand-3.0.4" = { - name = "postcss-overflow-shorthand"; - packageName = "postcss-overflow-shorthand"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz"; - sha512 = "otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A=="; - }; - }; - "postcss-page-break-3.0.4" = { - name = "postcss-page-break"; - packageName = "postcss-page-break"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz"; - sha512 = "1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ=="; - }; - }; - "postcss-place-7.0.5" = { - name = "postcss-place"; - packageName = "postcss-place"; - version = "7.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz"; - sha512 = "wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g=="; - }; - }; - "postcss-preset-env-7.8.3" = { - name = "postcss-preset-env"; - packageName = "postcss-preset-env"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz"; - sha512 = "T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag=="; - }; - }; - "postcss-pseudo-class-any-link-7.1.6" = { - name = "postcss-pseudo-class-any-link"; - packageName = "postcss-pseudo-class-any-link"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz"; - sha512 = "9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w=="; - }; - }; - "postcss-reduce-initial-5.1.2" = { - name = "postcss-reduce-initial"; - packageName = "postcss-reduce-initial"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz"; - sha512 = "dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg=="; - }; - }; - "postcss-reduce-transforms-5.1.0" = { - name = "postcss-reduce-transforms"; - packageName = "postcss-reduce-transforms"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; - sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; - }; - }; - "postcss-replace-overflow-wrap-4.0.0" = { - name = "postcss-replace-overflow-wrap"; - packageName = "postcss-replace-overflow-wrap"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz"; - sha512 = "KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw=="; - }; - }; - "postcss-selector-not-6.0.1" = { - name = "postcss-selector-not"; - packageName = "postcss-selector-not"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz"; - sha512 = "1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ=="; - }; - }; - "postcss-selector-parser-6.0.13" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz"; - sha512 = "EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ=="; - }; - }; - "postcss-svgo-5.1.0" = { - name = "postcss-svgo"; - packageName = "postcss-svgo"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; - sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; - }; - }; - "postcss-unique-selectors-5.1.1" = { - name = "postcss-unique-selectors"; - packageName = "postcss-unique-selectors"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; - sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; - }; - }; - "postcss-value-parser-4.2.0" = { - name = "postcss-value-parser"; - packageName = "postcss-value-parser"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; - sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; - }; - }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - }; - "prelude-ls-1.2.1" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - }; - "pretty-bytes-5.6.0" = { - name = "pretty-bytes"; - packageName = "pretty-bytes"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; - sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; - }; - }; - "pretty-error-4.0.0" = { - name = "pretty-error"; - packageName = "pretty-error"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz"; - sha512 = "AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw=="; - }; - }; - "pretty-format-27.5.1" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"; - sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; - }; - }; - "pretty-format-28.1.3" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "28.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz"; - sha512 = "8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "promise-8.3.0" = { - name = "promise"; - packageName = "promise"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz"; - sha512 = "rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg=="; - }; - }; - "promise-inflight-1.0.1" = { - name = "promise-inflight"; - packageName = "promise-inflight"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; - }; - }; - "promise-retry-2.0.1" = { - name = "promise-retry"; - packageName = "promise-retry"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; - sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; - }; - }; - "prompts-2.4.2" = { - name = "prompts"; - packageName = "prompts"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"; - sha512 = "NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q=="; - }; - }; - "prop-types-15.8.1" = { - name = "prop-types"; - packageName = "prop-types"; - version = "15.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"; - sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "psl-1.9.0" = { - name = "psl"; - packageName = "psl"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; - sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; - }; - }; - "pump-3.0.0" = { - name = "pump"; - packageName = "pump"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - }; - "punycode-2.3.0" = { - name = "punycode"; - packageName = "punycode"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; - }; - }; - "q-1.5.1" = { - name = "q"; - packageName = "q"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; - sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; - }; - }; - "qs-6.11.0" = { - name = "qs"; - packageName = "qs"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; - sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; - }; - }; - "qs-6.5.3" = { - name = "qs"; - packageName = "qs"; - version = "6.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"; - sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; - }; - }; - "querystringify-2.2.0" = { - name = "querystringify"; - packageName = "querystringify"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"; - sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; - }; - }; - "queue-microtask-1.2.3" = { - name = "queue-microtask"; - packageName = "queue-microtask"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - }; - "quick-lru-4.0.1" = { - name = "quick-lru"; - packageName = "quick-lru"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; - sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; - }; - }; - "raf-3.4.1" = { - name = "raf"; - packageName = "raf"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz"; - sha512 = "Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA=="; - }; - }; - "randombytes-2.1.0" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.5.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - }; - "react-18.2.0" = { - name = "react"; - packageName = "react"; - version = "18.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react/-/react-18.2.0.tgz"; - sha512 = "/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="; - }; - }; - "react-app-polyfill-3.0.0" = { - name = "react-app-polyfill"; - packageName = "react-app-polyfill"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz"; - sha512 = "sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w=="; - }; - }; - "react-dev-utils-12.0.1" = { - name = "react-dev-utils"; - packageName = "react-dev-utils"; - version = "12.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz"; - sha512 = "84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ=="; - }; - }; - "react-dom-18.2.0" = { - name = "react-dom"; - packageName = "react-dom"; - version = "18.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz"; - sha512 = "6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g=="; - }; - }; - "react-error-overlay-6.0.11" = { - name = "react-error-overlay"; - packageName = "react-error-overlay"; - version = "6.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz"; - sha512 = "/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="; - }; - }; - "react-i18next-11.18.6" = { - name = "react-i18next"; - packageName = "react-i18next"; - version = "11.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz"; - sha512 = "yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA=="; - }; - }; - "react-infinite-scroll-component-6.1.0" = { - name = "react-infinite-scroll-component"; - packageName = "react-infinite-scroll-component"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-infinite-scroll-component/-/react-infinite-scroll-component-6.1.0.tgz"; - sha512 = "SQu5nCqy8DxQWpnUVLx7V7b7LcA37aM7tvoWjTLZp1dk6EJibM5/4EJKzOnl07/BsM1Y40sKLuqjCwwH/xV0TQ=="; - }; - }; - "react-is-16.13.1" = { - name = "react-is"; - packageName = "react-is"; - version = "16.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; - sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; - }; - }; - "react-is-17.0.2" = { - name = "react-is"; - packageName = "react-is"; - version = "17.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"; - sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; - }; - }; - "react-is-18.2.0" = { - name = "react-is"; - packageName = "react-is"; - version = "18.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz"; - sha512 = "xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="; - }; - }; - "react-refresh-0.11.0" = { - name = "react-refresh"; - packageName = "react-refresh"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz"; - sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="; - }; - }; - "react-router-6.11.2" = { - name = "react-router"; - packageName = "react-router"; - version = "6.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/react-router/-/react-router-6.11.2.tgz"; - sha512 = "74z9xUSaSX07t3LM+pS6Un0T55ibUE/79CzfZpy5wsPDZaea1F8QkrsiyRnA2YQ7LwE/umaydzXZV80iDCPkMg=="; - }; - }; - "react-router-dom-6.11.2" = { - name = "react-router-dom"; - packageName = "react-router-dom"; - version = "6.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.11.2.tgz"; - sha512 = "JNbKtAeh1VSJQnH6RvBDNhxNwemRj7KxCzc5jb7zvDSKRnPWIFj9pO+eXqjM69gQJ0r46hSz1x4l9y0651DKWw=="; - }; - }; - "react-scripts-5.0.1" = { - name = "react-scripts"; - packageName = "react-scripts"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz"; - sha512 = "8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ=="; - }; - }; - "react-transition-group-4.4.5" = { - name = "react-transition-group"; - packageName = "react-transition-group"; - version = "4.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz"; - sha512 = "pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g=="; - }; - }; - "read-cache-1.0.0" = { - name = "read-cache"; - packageName = "read-cache"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz"; - sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; - }; - }; - "read-pkg-5.2.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; - sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; - }; - }; - "read-pkg-up-7.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; - sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; - }; - }; - "readable-stream-2.3.8" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; - sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; - }; - }; - "readable-stream-3.6.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; - sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; - }; - }; - "readdirp-3.6.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; - sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; - }; - }; - "recursive-readdir-2.2.3" = { - name = "recursive-readdir"; - packageName = "recursive-readdir"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz"; - sha512 = "8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA=="; - }; - }; - "redent-3.0.0" = { - name = "redent"; - packageName = "redent"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"; - sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; - }; - }; - "regenerate-1.4.2" = { - name = "regenerate"; - packageName = "regenerate"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; - sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; - }; - }; - "regenerate-unicode-properties-10.1.0" = { - name = "regenerate-unicode-properties"; - packageName = "regenerate-unicode-properties"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"; - sha512 = "d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="; - }; - }; - "regenerator-runtime-0.13.11" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.11"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"; - sha512 = "kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="; - }; - }; - "regenerator-transform-0.15.1" = { - name = "regenerator-transform"; - packageName = "regenerator-transform"; - version = "0.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz"; - sha512 = "knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg=="; - }; - }; - "regex-parser-2.2.11" = { - name = "regex-parser"; - packageName = "regex-parser"; - version = "2.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz"; - sha512 = "jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="; - }; - }; - "regexp.prototype.flags-1.5.0" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"; - sha512 = "0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA=="; - }; - }; - "regexpu-core-5.3.2" = { - name = "regexpu-core"; - packageName = "regexpu-core"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"; - sha512 = "RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ=="; - }; - }; - "regjsparser-0.9.1" = { - name = "regjsparser"; - packageName = "regjsparser"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"; - sha512 = "dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ=="; - }; - }; - "relateurl-0.2.7" = { - name = "relateurl"; - packageName = "relateurl"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; - sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; - }; - }; - "renderkid-3.0.0" = { - name = "renderkid"; - packageName = "renderkid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz"; - sha512 = "q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg=="; - }; - }; - "request-2.88.2" = { - name = "request"; - packageName = "request"; - version = "2.88.2"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - }; - "require-from-string-2.0.2" = { - name = "require-from-string"; - packageName = "require-from-string"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"; - sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; - }; - }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; - }; - }; - "resolve-1.22.3" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.3"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz"; - sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw=="; - }; - }; - "resolve-2.0.0-next.4" = { - name = "resolve"; - packageName = "resolve"; - version = "2.0.0-next.4"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz"; - sha512 = "iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ=="; - }; - }; - "resolve-cwd-3.0.0" = { - name = "resolve-cwd"; - packageName = "resolve-cwd"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; - sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; - }; - }; - "resolve-from-4.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - }; - "resolve-from-5.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"; - sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; - }; - }; - "resolve-path-1.4.0" = { - name = "resolve-path"; - packageName = "resolve-path"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz"; - sha512 = "i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w=="; - }; - }; - "resolve-url-0.2.1" = { - name = "resolve-url"; - packageName = "resolve-url"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; - }; - }; - "resolve-url-loader-4.0.0" = { - name = "resolve-url-loader"; - packageName = "resolve-url-loader"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz"; - sha512 = "05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA=="; - }; - }; - "resolve.exports-1.1.1" = { - name = "resolve.exports"; - packageName = "resolve.exports"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz"; - sha512 = "/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="; - }; - }; - "retry-0.12.0" = { - name = "retry"; - packageName = "retry"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; - }; - }; - "retry-0.13.1" = { - name = "retry"; - packageName = "retry"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; - sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; - }; - }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - }; - "rework-1.0.1" = { - name = "rework"; - packageName = "rework"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz"; - sha512 = "eEjL8FdkdsxApd0yWVZgBGzfCQiT8yqSc2H1p4jpZpQdtz7ohETiDMoje5PlM8I9WgkqkreVxFUKYOiJdVWDXw=="; - }; - }; - "rework-visit-1.0.0" = { - name = "rework-visit"; - packageName = "rework-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz"; - sha512 = "W6V2fix7nCLUYX1v6eGPrBOZlc03/faqzP4sUxMAJMBMOPYhfV/RyLegTufn5gJKaOITyi+gvf0LXDZ9NzkHnQ=="; - }; - }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; - "rollup-2.79.1" = { - name = "rollup"; - packageName = "rollup"; - version = "2.79.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"; - sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; - }; - }; - "rollup-plugin-terser-7.0.2" = { - name = "rollup-plugin-terser"; - packageName = "rollup-plugin-terser"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"; - sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; - }; - }; - "run-parallel-1.2.0" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - }; - "rxjs-7.8.1" = { - name = "rxjs"; - packageName = "rxjs"; - version = "7.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"; - sha512 = "AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="; - }; - }; - "safe-array-concat-1.0.0" = { - name = "safe-array-concat"; - packageName = "safe-array-concat"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz"; - sha512 = "9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safe-regex-test-1.0.0" = { - name = "safe-regex-test"; - packageName = "safe-regex-test"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; - sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "sanitize.css-13.0.0" = { - name = "sanitize.css"; - packageName = "sanitize.css"; - version = "13.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz"; - sha512 = "ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="; - }; - }; - "sass-1.62.1" = { - name = "sass"; - packageName = "sass"; - version = "1.62.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz"; - sha512 = "NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A=="; - }; - }; - "sass-embedded-1.62.0" = { - name = "sass-embedded"; - packageName = "sass-embedded"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.62.0.tgz"; - sha512 = "SwTIG6UmrMiT94/v8G+2pPf6i+XwY4hOQxm8HZl0ld0st2KdGDj/SBXDznFl7+sJ6tFq6hvVvrB9rW5Nj7EhuQ=="; - }; - }; - "sass-embedded-darwin-arm64-1.62.0" = { - name = "sass-embedded-darwin-arm64"; - packageName = "sass-embedded-darwin-arm64"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.62.0.tgz"; - sha512 = "bYEM6DY7kteOd/aJXUisiavm8B1acRhpIn+rhzKZeTn87kUW5RzZv2nKaSmb1vUd4ZptDGaJ144qz/d20rnogQ=="; - }; - }; - "sass-embedded-darwin-x64-1.62.0" = { - name = "sass-embedded-darwin-x64"; - packageName = "sass-embedded-darwin-x64"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.62.0.tgz"; - sha512 = "2sBQ4uWjZbf8TKXF8Aq7N0p5V2tKUr4zX9gQAiKvm1NBYwsW22+m8D34heOWu50ikpIxebvt7i/z7hafH5kzKg=="; - }; - }; - "sass-embedded-linux-arm-1.62.0" = { - name = "sass-embedded-linux-arm"; - packageName = "sass-embedded-linux-arm"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.62.0.tgz"; - sha512 = "0lz9Ids/OzKiOK+fd5wo/fHBGJ5lCHbcRsjDnU0CIMWkUmMt7yhcFABWB/TUofS5XvrohYbGqs+yKP3X0oGX3g=="; - }; - }; - "sass-embedded-linux-arm64-1.62.0" = { - name = "sass-embedded-linux-arm64"; - packageName = "sass-embedded-linux-arm64"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.62.0.tgz"; - sha512 = "FexUt8aE7I7fJub3N6+NsDdbPRP/O8o400qpbEbY7BWgiWEdpr81OBulQZY/2LzZUnz9keUhfpmltNY3SNg3kg=="; - }; - }; - "sass-embedded-linux-ia32-1.62.0" = { - name = "sass-embedded-linux-ia32"; - packageName = "sass-embedded-linux-ia32"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.62.0.tgz"; - sha512 = "VpDHtMIwcoWqDsiskjhDYAle0SJV4mUiZJTXg5RkMzoX1ZyNiVz+uNaZ88kDqcGXsWpe2i0sIlljD4ryaiMAhA=="; - }; - }; - "sass-embedded-linux-x64-1.62.0" = { - name = "sass-embedded-linux-x64"; - packageName = "sass-embedded-linux-x64"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.62.0.tgz"; - sha512 = "dntYMsu0QonlerFB8VDlzxoJcpMEtN9lPHstKOQ6rk6hbSFPvcI8MqqUomlOjmpakKeVrpyZ04nm9jHrzlFmYg=="; - }; - }; - "sass-embedded-win32-ia32-1.62.0" = { - name = "sass-embedded-win32-ia32"; - packageName = "sass-embedded-win32-ia32"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.62.0.tgz"; - sha512 = "rTCZCVkQa6XcreyQ8gYqnsEG13HCzqKoN2mCvIuGwJro8IjyT2PzWauouO0M06T0FLH0pc3EvKdKaLdtijf9AQ=="; - }; - }; - "sass-embedded-win32-x64-1.62.0" = { - name = "sass-embedded-win32-x64"; - packageName = "sass-embedded-win32-x64"; - version = "1.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.62.0.tgz"; - sha512 = "g6DZBPGfIDKLBarvYRVKJ+7rJAHJXkOQQVrYSWm22klA9ZNZ0CaVyqLqejttZPKGreD8h/xh2uz/s6w/P900Sw=="; - }; - }; - "sass-graph-4.0.1" = { - name = "sass-graph"; - packageName = "sass-graph"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.1.tgz"; - sha512 = "5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA=="; - }; - }; - "sass-loader-12.6.0" = { - name = "sass-loader"; - packageName = "sass-loader"; - version = "12.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz"; - sha512 = "oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA=="; - }; - }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - }; - "saxes-5.0.1" = { - name = "saxes"; - packageName = "saxes"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz"; - sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; - }; - }; - "scheduler-0.23.0" = { - name = "scheduler"; - packageName = "scheduler"; - version = "0.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz"; - sha512 = "CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw=="; - }; - }; - "schema-utils-2.7.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; - sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; - }; - }; - "schema-utils-2.7.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; - }; - }; - "schema-utils-3.1.2" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz"; - sha512 = "pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg=="; - }; - }; - "schema-utils-4.0.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.1.tgz"; - sha512 = "lELhBAAly9NowEsX0yZBlw9ahZG+sK/1RJ21EpzdYHKEs13Vku3LJ+MIPhh4sMs0oCCeufZQEQbMekiA4vuVIQ=="; - }; - }; - "scss-tokenizer-0.4.3" = { - name = "scss-tokenizer"; - packageName = "scss-tokenizer"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz"; - sha512 = "raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw=="; - }; - }; - "select-hose-2.0.0" = { - name = "select-hose"; - packageName = "select-hose"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; - sha512 = "mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="; - }; - }; - "selfsigned-2.1.1" = { - name = "selfsigned"; - packageName = "selfsigned"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"; - sha512 = "GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="; - }; - }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; - "semver-6.3.0" = { - name = "semver"; - packageName = "semver"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - }; - "semver-7.5.1" = { - name = "semver"; - packageName = "semver"; - version = "7.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz"; - sha512 = "Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw=="; - }; - }; - "send-0.18.0" = { - name = "send"; - packageName = "send"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; - }; - }; - "serialize-javascript-4.0.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; - sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; - }; - }; - "serialize-javascript-6.0.1" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; - sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; - }; - }; - "serve-index-1.9.1" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw=="; - }; - }; - "serve-static-1.15.0" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - }; - "setprototypeof-1.1.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; - }; - }; - "setprototypeof-1.2.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "shell-quote-1.8.1" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz"; - sha512 = "6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="; - }; - }; - "shellwords-0.1.1" = { - name = "shellwords"; - packageName = "shellwords"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; - sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "simple-concat-1.0.1" = { - name = "simple-concat"; - packageName = "simple-concat"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; - sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; - }; - }; - "simple-get-3.1.1" = { - name = "simple-get"; - packageName = "simple-get"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz"; - sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA=="; - }; - }; - "sisteransi-1.0.5" = { - name = "sisteransi"; - packageName = "sisteransi"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"; - sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; - }; - }; - "slash-3.0.0" = { - name = "slash"; - packageName = "slash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - }; - "slash-4.0.0" = { - name = "slash"; - packageName = "slash"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; - sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; - }; - }; - "smart-buffer-4.2.0" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; - }; - }; - "sockjs-0.3.24" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.24"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz"; - sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; - }; - }; - "sockjs-client-1.6.1" = { - name = "sockjs-client"; - packageName = "sockjs-client"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.1.tgz"; - sha512 = "2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw=="; - }; - }; - "socks-2.7.1" = { - name = "socks"; - packageName = "socks"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; - }; - }; - "socks-proxy-agent-6.2.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz"; - sha512 = "a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ=="; - }; - }; - "source-list-map-2.0.1" = { - name = "source-list-map"; - packageName = "source-list-map"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; - sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; - }; - }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha512 = "MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA=="; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - }; - "source-map-0.7.4" = { - name = "source-map"; - packageName = "source-map"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz"; - sha512 = "l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="; - }; - }; - "source-map-0.8.0-beta.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.8.0-beta.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz"; - sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; - }; - }; - "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-loader-3.0.2" = { - name = "source-map-loader"; - packageName = "source-map-loader"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz"; - sha512 = "BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg=="; - }; - }; - "source-map-resolve-0.5.3" = { - name = "source-map-resolve"; - packageName = "source-map-resolve"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; - }; - }; - "source-map-support-0.5.21" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.21"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - }; - "source-map-url-0.4.1" = { - name = "source-map-url"; - packageName = "source-map-url"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; - sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; - }; - }; - "sourcemap-codec-1.4.8" = { - name = "sourcemap-codec"; - packageName = "sourcemap-codec"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - }; - "spdx-correct-3.2.0" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz"; - sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; - }; - }; - "spdx-exceptions-2.3.0" = { - name = "spdx-exceptions"; - packageName = "spdx-exceptions"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; - }; - }; - "spdx-expression-parse-3.0.1" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; - }; - }; - "spdx-license-ids-3.0.13" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "3.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"; - sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="; - }; - }; - "spdy-4.0.2" = { - name = "spdy"; - packageName = "spdy"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; - sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; - }; - }; - "spdy-transport-3.0.0" = { - name = "spdy-transport"; - packageName = "spdy-transport"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; - }; - }; - "sshpk-1.17.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; - sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; - }; - }; - "ssri-8.0.1" = { - name = "ssri"; - packageName = "ssri"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; - sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; - }; - }; - "stable-0.1.8" = { - name = "stable"; - packageName = "stable"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; - sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; - }; - }; - "stack-generator-2.0.10" = { - name = "stack-generator"; - packageName = "stack-generator"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz"; - sha512 = "mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ=="; - }; - }; - "stack-utils-2.0.6" = { - name = "stack-utils"; - packageName = "stack-utils"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz"; - sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; - }; - }; - "stackframe-1.3.4" = { - name = "stackframe"; - packageName = "stackframe"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"; - sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="; - }; - }; - "stacktrace-gps-3.1.2" = { - name = "stacktrace-gps"; - packageName = "stacktrace-gps"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz"; - sha512 = "GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ=="; - }; - }; - "stacktrace-js-2.0.2" = { - name = "stacktrace-js"; - packageName = "stacktrace-js"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-2.0.2.tgz"; - sha512 = "Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg=="; - }; - }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; - }; - }; - "statuses-2.0.1" = { - name = "statuses"; - packageName = "statuses"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; - sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; - }; - }; - "stdout-stream-1.4.1" = { - name = "stdout-stream"; - packageName = "stdout-stream"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz"; - sha512 = "j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA=="; - }; - }; - "stop-iteration-iterator-1.0.0" = { - name = "stop-iteration-iterator"; - packageName = "stop-iteration-iterator"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"; - sha512 = "iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ=="; - }; - }; - "string-length-4.0.2" = { - name = "string-length"; - packageName = "string-length"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz"; - sha512 = "+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ=="; - }; - }; - "string-length-5.0.1" = { - name = "string-length"; - packageName = "string-length"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz"; - sha512 = "9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow=="; - }; - }; - "string-natural-compare-3.0.1" = { - name = "string-natural-compare"; - packageName = "string-natural-compare"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz"; - sha512 = "n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="; - }; - }; - "string-width-4.2.3" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string.prototype.matchall-4.0.8" = { - name = "string.prototype.matchall"; - packageName = "string.prototype.matchall"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz"; - sha512 = "6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg=="; - }; - }; - "string.prototype.trim-1.2.7" = { - name = "string.prototype.trim"; - packageName = "string.prototype.trim"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; - sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; - }; - }; - "string.prototype.trimend-1.0.6" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; - sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; - }; - }; - "string.prototype.trimstart-1.0.6" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; - sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "string_decoder-1.3.0" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - }; - "stringify-object-3.3.0" = { - name = "stringify-object"; - packageName = "stringify-object"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-ansi-7.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz"; - sha512 = "cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw=="; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - }; - "strip-bom-4.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"; - sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; - }; - }; - "strip-comments-2.0.1" = { - name = "strip-comments"; - packageName = "strip-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz"; - sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; - }; - }; - "strip-final-newline-2.0.0" = { - name = "strip-final-newline"; - packageName = "strip-final-newline"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; - }; - }; - "strip-indent-3.0.0" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"; - sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; - }; - }; - "strip-json-comments-3.1.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - }; - "style-loader-3.3.3" = { - name = "style-loader"; - packageName = "style-loader"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz"; - sha512 = "53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw=="; - }; - }; - "stylehacks-5.1.1" = { - name = "stylehacks"; - packageName = "stylehacks"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz"; - sha512 = "sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw=="; - }; - }; - "stylis-4.2.0" = { - name = "stylis"; - packageName = "stylis"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz"; - sha512 = "Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="; - }; - }; - "sucrase-3.32.0" = { - name = "sucrase"; - packageName = "sucrase"; - version = "3.32.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz"; - sha512 = "ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ=="; - }; - }; - "superstruct-0.12.2" = { - name = "superstruct"; - packageName = "superstruct"; - version = "0.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/superstruct/-/superstruct-0.12.2.tgz"; - sha512 = "yu+WNa/nSbFa+VBeR2KibfCeIQSKh/aD7G5eFD4Rx4W36MWE3G6SzU3BixDOArLv56u2bz6YEePsHSsioojuXw=="; - }; - }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - }; - "supports-color-8.1.1" = { - name = "supports-color"; - packageName = "supports-color"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; - sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; - }; - }; - "supports-hyperlinks-2.3.0" = { - name = "supports-hyperlinks"; - packageName = "supports-hyperlinks"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz"; - sha512 = "RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA=="; - }; - }; - "supports-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "svg-parser-2.0.4" = { - name = "svg-parser"; - packageName = "svg-parser"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz"; - sha512 = "e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="; - }; - }; - "svgo-1.3.2" = { - name = "svgo"; - packageName = "svgo"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; - sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; - }; - }; - "svgo-2.8.0" = { - name = "svgo"; - packageName = "svgo"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; - sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; - }; - }; - "symbol-tree-3.2.4" = { - name = "symbol-tree"; - packageName = "symbol-tree"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; - }; - }; - "tailwindcss-3.3.2" = { - name = "tailwindcss"; - packageName = "tailwindcss"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz"; - sha512 = "9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w=="; - }; - }; - "tapable-1.1.3" = { - name = "tapable"; - packageName = "tapable"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; - sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; - }; - }; - "tapable-2.2.1" = { - name = "tapable"; - packageName = "tapable"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"; - sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; - }; - }; - "tar-6.1.15" = { - name = "tar"; - packageName = "tar"; - version = "6.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz"; - sha512 = "/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A=="; - }; - }; - "temp-dir-2.0.0" = { - name = "temp-dir"; - packageName = "temp-dir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz"; - sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; - }; - }; - "tempy-0.6.0" = { - name = "tempy"; - packageName = "tempy"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz"; - sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; - }; - }; - "terminal-link-2.1.1" = { - name = "terminal-link"; - packageName = "terminal-link"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz"; - sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; - }; - }; - "terser-5.17.4" = { - name = "terser"; - packageName = "terser"; - version = "5.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.17.4.tgz"; - sha512 = "jcEKZw6UPrgugz/0Tuk/PVyLAPfMBJf5clnGueo45wTweoV8yh7Q7PEkhkJ5uuUbC7zAxEcG3tqNr1bstkQ8nw=="; - }; - }; - "terser-webpack-plugin-5.3.9" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "5.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz"; - sha512 = "ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA=="; - }; - }; - "test-exclude-6.0.0" = { - name = "test-exclude"; - packageName = "test-exclude"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"; - sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; - }; - }; - "text-table-0.2.0" = { - name = "text-table"; - packageName = "text-table"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - }; - "thenify-3.3.1" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; - sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; - }; - }; - "throat-6.0.2" = { - name = "throat"; - packageName = "throat"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz"; - sha512 = "WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ=="; - }; - }; - "throttle-debounce-2.3.0" = { - name = "throttle-debounce"; - packageName = "throttle-debounce"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz"; - sha512 = "H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ=="; - }; - }; - "thunky-1.1.0" = { - name = "thunky"; - packageName = "thunky"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; - sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; - }; - }; - "tmpl-1.0.5" = { - name = "tmpl"; - packageName = "tmpl"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz"; - sha512 = "3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="; - }; - }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - }; - "toidentifier-1.0.1" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - }; - "tough-cookie-2.5.0" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; - }; - }; - "tough-cookie-4.1.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz"; - sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ=="; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; - }; - }; - "tr46-1.0.1" = { - name = "tr46"; - packageName = "tr46"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; - sha512 = "dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA=="; - }; - }; - "tr46-2.1.0" = { - name = "tr46"; - packageName = "tr46"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz"; - sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; - }; - }; - "trim-newlines-3.0.1" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"; - sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; - }; - }; - "true-case-path-1.0.3" = { - name = "true-case-path"; - packageName = "true-case-path"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz"; - sha512 = "m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew=="; - }; - }; - "tryer-1.0.1" = { - name = "tryer"; - packageName = "tryer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"; - sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; - }; - }; - "ts-interface-checker-0.1.13" = { - name = "ts-interface-checker"; - packageName = "ts-interface-checker"; - version = "0.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"; - sha512 = "Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="; - }; - }; - "ts-node-10.9.1" = { - name = "ts-node"; - packageName = "ts-node"; - version = "10.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"; - sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; - }; - }; - "tsconfig-paths-3.14.2" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "3.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz"; - sha512 = "o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g=="; - }; - }; - "tslib-1.14.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - }; - "tslib-2.5.2" = { - name = "tslib"; - packageName = "tslib"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz"; - sha512 = "5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA=="; - }; - }; - "tsscmp-1.0.6" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz"; - sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="; - }; - }; - "tsutils-3.21.0" = { - name = "tsutils"; - packageName = "tsutils"; - version = "3.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; - sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; - }; - }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - }; - "type-check-0.4.0" = { - name = "type-check"; - packageName = "type-check"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - }; - "type-detect-4.0.8" = { - name = "type-detect"; - packageName = "type-detect"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; - }; - }; - "type-fest-0.16.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz"; - sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="; - }; - }; - "type-fest-0.18.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"; - sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; - }; - }; - "type-fest-0.20.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - }; - "type-fest-0.21.3" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; - sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; - }; - }; - "type-fest-0.6.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; - sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; - }; - }; - "type-fest-0.8.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - }; - "type-fest-3.10.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.10.0.tgz"; - sha512 = "hmAPf1datm+gt3c2mvu0sJyhFy6lTkIGf0GzyaZWxRLnabQfPUqg6tF95RPg6sLxKI7nFLGdFxBcf2/7+GXI+A=="; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "typed-array-length-1.0.4" = { - name = "typed-array-length"; - packageName = "typed-array-length"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; - sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; - }; - }; - "typedarray-to-buffer-3.1.5" = { - name = "typedarray-to-buffer"; - packageName = "typedarray-to-buffer"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; - }; - }; - "typescript-4.9.5" = { - name = "typescript"; - packageName = "typescript"; - version = "4.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; - sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; - }; - }; - "unbox-primitive-1.0.2" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { - name = "unicode-canonical-property-names-ecmascript"; - packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; - }; - }; - "unicode-match-property-ecmascript-2.0.0" = { - name = "unicode-match-property-ecmascript"; - packageName = "unicode-match-property-ecmascript"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; - sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; - }; - }; - "unicode-match-property-value-ecmascript-2.1.0" = { - name = "unicode-match-property-value-ecmascript"; - packageName = "unicode-match-property-value-ecmascript"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"; - sha512 = "qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="; - }; - }; - "unicode-property-aliases-ecmascript-2.1.0" = { - name = "unicode-property-aliases-ecmascript"; - packageName = "unicode-property-aliases-ecmascript"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"; - sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; - }; - }; - "unique-filename-1.1.1" = { - name = "unique-filename"; - packageName = "unique-filename"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; - sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; - }; - }; - "unique-slug-2.0.2" = { - name = "unique-slug"; - packageName = "unique-slug"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; - sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; - }; - }; - "unique-string-2.0.0" = { - name = "unique-string"; - packageName = "unique-string"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz"; - sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; - }; - }; - "universalify-0.2.0" = { - name = "universalify"; - packageName = "universalify"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz"; - sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; - }; - }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - }; - "unquote-1.1.1" = { - name = "unquote"; - packageName = "unquote"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; - sha512 = "vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="; - }; - }; - "upath-1.2.0" = { - name = "upath"; - packageName = "upath"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; - sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; - }; - }; - "update-browserslist-db-1.0.11" = { - name = "update-browserslist-db"; - packageName = "update-browserslist-db"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"; - sha512 = "dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA=="; - }; - }; - "uri-js-4.4.1" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - }; - "urix-0.1.0" = { - name = "urix"; - packageName = "urix"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; - sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; - }; - }; - "url-parse-1.5.10" = { - name = "url-parse"; - packageName = "url-parse"; - version = "1.5.10"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; - sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; - }; - }; - "utf-8-validate-5.0.10" = { - name = "utf-8-validate"; - packageName = "utf-8-validate"; - version = "5.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz"; - sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "util.promisify-1.0.1" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"; - sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; - }; - }; - "utila-0.4.0" = { - name = "utila"; - packageName = "utila"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; - sha512 = "Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - }; - "uuid-3.4.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "v8-compile-cache-lib-3.0.1" = { - name = "v8-compile-cache-lib"; - packageName = "v8-compile-cache-lib"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"; - sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="; - }; - }; - "v8-to-istanbul-8.1.1" = { - name = "v8-to-istanbul"; - packageName = "v8-to-istanbul"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz"; - sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; - }; - }; - "validate-npm-package-license-3.0.4" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; - }; - }; - "void-elements-3.1.0" = { - name = "void-elements"; - packageName = "void-elements"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz"; - sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; - }; - }; - "vue-template-compiler-2.7.14" = { - name = "vue-template-compiler"; - packageName = "vue-template-compiler"; - version = "2.7.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; - sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; - }; - }; - "w3c-hr-time-1.0.2" = { - name = "w3c-hr-time"; - packageName = "w3c-hr-time"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; - sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; - }; - }; - "w3c-xmlserializer-2.0.0" = { - name = "w3c-xmlserializer"; - packageName = "w3c-xmlserializer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; - sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; - }; - }; - "walker-1.0.8" = { - name = "walker"; - packageName = "walker"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz"; - sha512 = "ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="; - }; - }; - "watchpack-2.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"; - sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; - }; - }; - "wbuf-1.7.3" = { - name = "wbuf"; - packageName = "wbuf"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; - sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; - }; - }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; - }; - }; - "webidl-conversions-4.0.2" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - }; - "webidl-conversions-5.0.0" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; - }; - }; - "webidl-conversions-6.1.0" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; - sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; - }; - }; - "webpack-5.83.1" = { - name = "webpack"; - packageName = "webpack"; - version = "5.83.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.83.1.tgz"; - sha512 = "TNsG9jDScbNuB+Lb/3+vYolPplCS3bbEaJf+Bj0Gw4DhP3ioAflBb1flcRt9zsWITyvOhM96wMQNRWlSX52DgA=="; - }; - }; - "webpack-dev-middleware-5.3.3" = { - name = "webpack-dev-middleware"; - packageName = "webpack-dev-middleware"; - version = "5.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"; - sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; - }; - }; - "webpack-dev-server-4.15.0" = { - name = "webpack-dev-server"; - packageName = "webpack-dev-server"; - version = "4.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz"; - sha512 = "HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ=="; - }; - }; - "webpack-hot-middleware-2.25.3" = { - name = "webpack-hot-middleware"; - packageName = "webpack-hot-middleware"; - version = "2.25.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz"; - sha512 = "IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA=="; - }; - }; - "webpack-manifest-plugin-4.1.1" = { - name = "webpack-manifest-plugin"; - packageName = "webpack-manifest-plugin"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz"; - sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; - }; - }; - "webpack-plugin-ramdisk-0.2.0" = { - name = "webpack-plugin-ramdisk"; - packageName = "webpack-plugin-ramdisk"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-plugin-ramdisk/-/webpack-plugin-ramdisk-0.2.0.tgz"; - sha512 = "I5OTfDuaQdiZQUm19Ok/8oCBmYCGqFu8e2sY6ytGT9xehZQJXB6cqdf+rHUr98gzwhcC2O96Wuhs6BQTmOy2hg=="; - }; - }; - "webpack-plugin-serve-1.6.0" = { - name = "webpack-plugin-serve"; - packageName = "webpack-plugin-serve"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-plugin-serve/-/webpack-plugin-serve-1.6.0.tgz"; - sha512 = "0163GYEpDdRmd0D82XCeYalpSrRg9+oqEtoVUeCnn1o1lnGjqFoKdgSZBhXNOg2at52l4ESwLskPhPp3cHLAqA=="; - }; - }; - "webpack-sources-1.4.3" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; - sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; - }; - }; - "webpack-sources-2.3.1" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz"; - sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; - }; - }; - "webpack-sources-3.2.3" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"; - sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; - }; - }; - "websocket-driver-0.7.4" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"; - sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; - }; - }; - "websocket-extensions-0.1.4" = { - name = "websocket-extensions"; - packageName = "websocket-extensions"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; - sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; - }; - }; - "whatwg-encoding-1.0.5" = { - name = "whatwg-encoding"; - packageName = "whatwg-encoding"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; - }; - }; - "whatwg-fetch-3.6.2" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; - sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; - }; - }; - "whatwg-mimetype-2.3.0" = { - name = "whatwg-mimetype"; - packageName = "whatwg-mimetype"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; - }; - }; - "whatwg-url-5.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; - }; - }; - "whatwg-url-7.1.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; - }; - }; - "whatwg-url-8.7.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "8.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"; - sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; - }; - }; - "which-1.3.1" = { - name = "which"; - packageName = "which"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - }; - "which-2.0.2" = { - name = "which"; - packageName = "which"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - }; - "which-boxed-primitive-1.0.2" = { - name = "which-boxed-primitive"; - packageName = "which-boxed-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - }; - "which-collection-1.0.1" = { - name = "which-collection"; - packageName = "which-collection"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; - sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; - }; - }; - "which-typed-array-1.1.9" = { - name = "which-typed-array"; - packageName = "which-typed-array"; - version = "1.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; - sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; - }; - }; - "wide-align-1.1.5" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; - sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; - }; - }; - "word-wrap-1.2.3" = { - name = "word-wrap"; - packageName = "word-wrap"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - }; - "workbox-background-sync-6.5.4" = { - name = "workbox-background-sync"; - packageName = "workbox-background-sync"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz"; - sha512 = "0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g=="; - }; - }; - "workbox-broadcast-update-6.5.4" = { - name = "workbox-broadcast-update"; - packageName = "workbox-broadcast-update"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz"; - sha512 = "I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw=="; - }; - }; - "workbox-build-6.5.4" = { - name = "workbox-build"; - packageName = "workbox-build"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.4.tgz"; - sha512 = "kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA=="; - }; - }; - "workbox-cacheable-response-6.5.4" = { - name = "workbox-cacheable-response"; - packageName = "workbox-cacheable-response"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz"; - sha512 = "DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug=="; - }; - }; - "workbox-core-6.5.4" = { - name = "workbox-core"; - packageName = "workbox-core"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.4.tgz"; - sha512 = "OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q=="; - }; - }; - "workbox-expiration-6.5.4" = { - name = "workbox-expiration"; - packageName = "workbox-expiration"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.4.tgz"; - sha512 = "jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ=="; - }; - }; - "workbox-google-analytics-6.5.4" = { - name = "workbox-google-analytics"; - packageName = "workbox-google-analytics"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz"; - sha512 = "8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg=="; - }; - }; - "workbox-navigation-preload-6.5.4" = { - name = "workbox-navigation-preload"; - packageName = "workbox-navigation-preload"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz"; - sha512 = "IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng=="; - }; - }; - "workbox-precaching-6.5.4" = { - name = "workbox-precaching"; - packageName = "workbox-precaching"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.4.tgz"; - sha512 = "hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg=="; - }; - }; - "workbox-range-requests-6.5.4" = { - name = "workbox-range-requests"; - packageName = "workbox-range-requests"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz"; - sha512 = "Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg=="; - }; - }; - "workbox-recipes-6.5.4" = { - name = "workbox-recipes"; - packageName = "workbox-recipes"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.4.tgz"; - sha512 = "QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA=="; - }; - }; - "workbox-routing-6.5.4" = { - name = "workbox-routing"; - packageName = "workbox-routing"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.4.tgz"; - sha512 = "apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg=="; - }; - }; - "workbox-strategies-6.5.4" = { - name = "workbox-strategies"; - packageName = "workbox-strategies"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.4.tgz"; - sha512 = "DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw=="; - }; - }; - "workbox-streams-6.5.4" = { - name = "workbox-streams"; - packageName = "workbox-streams"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.4.tgz"; - sha512 = "FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg=="; - }; - }; - "workbox-sw-6.5.4" = { - name = "workbox-sw"; - packageName = "workbox-sw"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.4.tgz"; - sha512 = "vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA=="; - }; - }; - "workbox-webpack-plugin-6.5.4" = { - name = "workbox-webpack-plugin"; - packageName = "workbox-webpack-plugin"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz"; - sha512 = "LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg=="; - }; - }; - "workbox-window-6.5.4" = { - name = "workbox-window"; - packageName = "workbox-window"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.4.tgz"; - sha512 = "HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug=="; - }; - }; - "wrap-ansi-7.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "write-file-atomic-3.0.3" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; - }; - }; - "ws-7.5.9" = { - name = "ws"; - packageName = "ws"; - version = "7.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; - }; - }; - "ws-8.13.0" = { - name = "ws"; - packageName = "ws"; - version = "8.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"; - sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; - }; - }; - "xml-name-validator-3.0.0" = { - name = "xml-name-validator"; - packageName = "xml-name-validator"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; - }; - }; - "xmlchars-2.2.0" = { - name = "xmlchars"; - packageName = "xmlchars"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"; - sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; - }; - }; - "y18n-5.0.8" = { - name = "y18n"; - packageName = "y18n"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - }; - "yaml-1.10.2" = { - name = "yaml"; - packageName = "yaml"; - version = "1.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; - sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; - }; - }; - "yaml-2.2.2" = { - name = "yaml"; - packageName = "yaml"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz"; - sha512 = "CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA=="; - }; - }; - "yargs-16.2.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - }; - "yargs-17.7.2" = { - name = "yargs"; - packageName = "yargs"; - version = "17.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"; - sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - "yargs-parser-21.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "21.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; - sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; - }; - }; - "ylru-1.3.2" = { - name = "ylru"; - packageName = "ylru"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ylru/-/ylru-1.3.2.tgz"; - sha512 = "RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA=="; - }; - }; - "yn-3.1.1" = { - name = "yn"; - packageName = "yn"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; - sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; - }; - }; - "yocto-queue-0.1.0" = { - name = "yocto-queue"; - packageName = "yocto-queue"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; - }; - }; - }; - args = { - name = "ntfy"; - packageName = "ntfy"; - version = "1.0.0"; - src = ./.; - dependencies = [ - sources."@alloc/quick-lru-5.2.0" - sources."@ampproject/remapping-2.2.1" - (sources."@apideck/better-ajv-errors-0.3.6" // { - dependencies = [ - sources."ajv-8.12.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."@babel/code-frame-7.21.4" - sources."@babel/compat-data-7.21.7" - (sources."@babel/core-7.21.8" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/eslint-parser-7.21.8" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - sources."semver-6.3.0" - ]; - }) - sources."@babel/generator-7.21.5" - sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.21.5" - (sources."@babel/helper-compilation-targets-7.21.5" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/helper-create-class-features-plugin-7.21.8" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/helper-create-regexp-features-plugin-7.21.8" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/helper-define-polyfill-provider-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-environment-visitor-7.21.5" - sources."@babel/helper-function-name-7.21.0" - sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.21.5" - sources."@babel/helper-module-imports-7.21.4" - sources."@babel/helper-module-transforms-7.21.5" - sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.21.5" - sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.21.5" - sources."@babel/helper-simple-access-7.21.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" - sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.21.5" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.21.0" - sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.21.5" - sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.21.8" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" - sources."@babel/plugin-proposal-async-generator-functions-7.20.7" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-class-static-block-7.21.0" - sources."@babel/plugin-proposal-decorators-7.21.0" - sources."@babel/plugin-proposal-dynamic-import-7.18.6" - sources."@babel/plugin-proposal-export-namespace-from-7.18.9" - sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-logical-assignment-operators-7.20.7" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" - sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.20.7" - sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.21.0" - sources."@babel/plugin-proposal-private-methods-7.18.6" - sources."@babel/plugin-proposal-private-property-in-object-7.21.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.21.0" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.21.4" - sources."@babel/plugin-syntax-import-assertions-7.20.0" - sources."@babel/plugin-syntax-import-meta-7.10.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.21.4" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.21.4" - sources."@babel/plugin-transform-arrow-functions-7.21.5" - sources."@babel/plugin-transform-async-to-generator-7.20.7" - sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.21.0" - sources."@babel/plugin-transform-classes-7.21.0" - sources."@babel/plugin-transform-computed-properties-7.21.5" - sources."@babel/plugin-transform-destructuring-7.21.3" - sources."@babel/plugin-transform-dotall-regex-7.18.6" - sources."@babel/plugin-transform-duplicate-keys-7.18.9" - sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-flow-strip-types-7.21.0" - sources."@babel/plugin-transform-for-of-7.21.5" - sources."@babel/plugin-transform-function-name-7.18.9" - sources."@babel/plugin-transform-literals-7.18.9" - sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.21.5" - sources."@babel/plugin-transform-modules-systemjs-7.20.11" - sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" - sources."@babel/plugin-transform-new-target-7.18.6" - sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.21.3" - sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-react-constant-elements-7.21.3" - sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.21.5" - sources."@babel/plugin-transform-react-jsx-development-7.18.6" - sources."@babel/plugin-transform-react-pure-annotations-7.18.6" - sources."@babel/plugin-transform-regenerator-7.21.5" - sources."@babel/plugin-transform-reserved-words-7.18.6" - (sources."@babel/plugin-transform-runtime-7.21.4" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.20.7" - sources."@babel/plugin-transform-sticky-regex-7.18.6" - sources."@babel/plugin-transform-template-literals-7.18.9" - sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.21.3" - sources."@babel/plugin-transform-unicode-escapes-7.21.5" - sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.21.5" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-react-7.18.6" - sources."@babel/preset-typescript-7.21.5" - sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.21.5" - sources."@babel/template-7.20.7" - sources."@babel/traverse-7.21.5" - sources."@babel/types-7.21.5" - sources."@bcoe/v8-coverage-0.2.3" - sources."@bufbuild/protobuf-1.2.0" - (sources."@cspotcode/source-map-support-0.8.1" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.9" - ]; - }) - sources."@csstools/normalize.css-12.0.0" - sources."@csstools/postcss-cascade-layers-1.1.1" - sources."@csstools/postcss-color-function-1.1.1" - sources."@csstools/postcss-font-format-keywords-1.0.1" - sources."@csstools/postcss-hwb-function-1.0.2" - sources."@csstools/postcss-ic-unit-1.0.1" - sources."@csstools/postcss-is-pseudo-class-2.0.7" - sources."@csstools/postcss-nested-calc-1.0.0" - sources."@csstools/postcss-normalize-display-values-1.0.1" - sources."@csstools/postcss-oklab-function-1.1.1" - sources."@csstools/postcss-progressive-custom-properties-1.3.0" - sources."@csstools/postcss-stepped-value-functions-1.0.1" - sources."@csstools/postcss-text-decoration-shorthand-1.0.0" - sources."@csstools/postcss-trigonometric-functions-1.0.2" - sources."@csstools/postcss-unset-value-1.0.2" - sources."@csstools/selector-specificity-2.2.0" - sources."@emotion/babel-plugin-11.11.0" - sources."@emotion/cache-11.11.0" - sources."@emotion/hash-0.9.1" - sources."@emotion/is-prop-valid-1.2.1" - sources."@emotion/memoize-0.8.1" - sources."@emotion/react-11.11.0" - sources."@emotion/serialize-1.1.2" - sources."@emotion/sheet-1.2.2" - sources."@emotion/styled-11.11.0" - sources."@emotion/unitless-0.8.1" - sources."@emotion/use-insertion-effect-with-fallbacks-1.0.1" - sources."@emotion/utils-1.2.1" - sources."@emotion/weak-memoize-0.3.1" - sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - (sources."@eslint/eslintrc-2.0.3" // { - dependencies = [ - sources."argparse-2.0.1" - sources."globals-13.20.0" - sources."js-yaml-4.1.0" - sources."type-fest-0.20.2" - ]; - }) - sources."@eslint/js-8.41.0" - sources."@gar/promisify-1.1.3" - sources."@humanwhocodes/config-array-0.11.8" - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" - (sources."@istanbuljs/load-nyc-config-1.1.0" // { - dependencies = [ - sources."camelcase-5.3.1" - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."resolve-from-5.0.0" - ]; - }) - sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/core-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."@jest/environment-27.5.1" - sources."@jest/fake-timers-27.5.1" - sources."@jest/globals-27.5.1" - (sources."@jest/reporters-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."source-map-0.6.1" - sources."supports-color-7.2.0" - ]; - }) - sources."@jest/schemas-28.1.3" - (sources."@jest/source-map-27.5.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."@jest/test-result-27.5.1" - sources."@jest/test-sequencer-27.5.1" - (sources."@jest/transform-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."source-map-0.6.1" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/types-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.3" - sources."@jridgewell/sourcemap-codec-1.4.15" - (sources."@jridgewell/trace-mapping-0.3.18" // { - dependencies = [ - sources."@jridgewell/sourcemap-codec-1.4.14" - ]; - }) - sources."@leichtgewicht/ip-codec-2.0.4" - sources."@mapbox/node-pre-gyp-1.0.10" - (sources."@mui/base-5.0.0-beta.1" // { - dependencies = [ - sources."react-is-18.2.0" - ]; - }) - sources."@mui/core-downloads-tracker-5.13.1" - sources."@mui/icons-material-5.11.16" - (sources."@mui/material-5.13.1" // { - dependencies = [ - sources."react-is-18.2.0" - ]; - }) - sources."@mui/private-theming-5.13.1" - sources."@mui/styled-engine-5.12.3" - sources."@mui/system-5.13.1" - sources."@mui/types-7.2.4" - (sources."@mui/utils-5.13.1" // { - dependencies = [ - sources."react-is-18.2.0" - ]; - }) - (sources."@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" // { - dependencies = [ - sources."eslint-scope-5.1.1" - sources."estraverse-4.3.0" - ]; - }) - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-1.1.1" - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - (sources."@pmmmwh/react-refresh-webpack-plugin-0.5.10" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) - sources."@popperjs/core-2.11.7" - sources."@remix-run/router-1.6.2" - sources."@rollup/plugin-babel-5.3.1" - sources."@rollup/plugin-node-resolve-11.2.1" - sources."@rollup/plugin-replace-2.4.2" - (sources."@rollup/pluginutils-3.1.0" // { - dependencies = [ - sources."@types/estree-0.0.39" - ]; - }) - sources."@rushstack/eslint-patch-1.2.0" - sources."@sinclair/typebox-0.24.51" - sources."@sinonjs/commons-1.8.6" - sources."@sinonjs/fake-timers-8.1.0" - sources."@surma/rollup-plugin-off-main-thread-2.2.3" - sources."@svgr/babel-plugin-add-jsx-attribute-5.4.0" - sources."@svgr/babel-plugin-remove-jsx-attribute-5.4.0" - sources."@svgr/babel-plugin-remove-jsx-empty-expression-5.0.1" - sources."@svgr/babel-plugin-replace-jsx-attribute-value-5.0.1" - sources."@svgr/babel-plugin-svg-dynamic-title-5.4.0" - sources."@svgr/babel-plugin-svg-em-dimensions-5.4.0" - sources."@svgr/babel-plugin-transform-react-native-svg-5.4.0" - sources."@svgr/babel-plugin-transform-svg-component-5.5.0" - sources."@svgr/babel-preset-5.5.0" - sources."@svgr/core-5.5.0" - sources."@svgr/hast-util-to-babel-ast-5.5.0" - sources."@svgr/plugin-jsx-5.5.0" - sources."@svgr/plugin-svgo-5.5.0" - sources."@svgr/webpack-5.5.0" - sources."@swc/core-1.3.59" - sources."@swc/core-darwin-arm64-1.3.59" - sources."@swc/core-darwin-x64-1.3.59" - sources."@swc/core-linux-arm-gnueabihf-1.3.59" - sources."@swc/core-linux-arm64-gnu-1.3.59" - sources."@swc/core-linux-arm64-musl-1.3.59" - sources."@swc/core-linux-x64-gnu-1.3.59" - sources."@swc/core-linux-x64-musl-1.3.59" - sources."@swc/core-win32-arm64-msvc-1.3.59" - sources."@swc/core-win32-ia32-msvc-1.3.59" - sources."@swc/core-win32-x64-msvc-1.3.59" - (sources."@swc/helpers-0.5.1" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - sources."@swc/wasm-1.3.59" - sources."@tootallnate/once-1.1.2" - sources."@trysound/sax-0.2.0" - sources."@tsconfig/node10-1.0.9" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/babel__core-7.20.0" - sources."@types/babel__generator-7.6.4" - sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.18.5" - sources."@types/body-parser-1.19.2" - sources."@types/bonjour-3.5.10" - sources."@types/connect-3.4.35" - sources."@types/connect-history-api-fallback-1.5.0" - sources."@types/eslint-8.37.0" - 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/graceful-fs-4.1.6" - sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-proxy-1.17.11" - sources."@types/istanbul-lib-coverage-2.0.4" - sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-3.0.1" - sources."@types/json-schema-7.0.11" - sources."@types/json5-0.0.29" - sources."@types/mime-1.3.2" - sources."@types/minimist-1.2.2" - sources."@types/node-20.2.1" - sources."@types/normalize-package-data-2.4.1" - sources."@types/parse-json-4.0.0" - sources."@types/prettier-2.7.2" - sources."@types/prop-types-15.7.5" - sources."@types/q-1.5.5" - sources."@types/qs-6.9.7" - sources."@types/range-parser-1.2.4" - sources."@types/react-18.2.6" - sources."@types/react-is-18.2.0" - sources."@types/react-transition-group-4.4.6" - sources."@types/resolve-1.17.1" - sources."@types/retry-0.12.0" - sources."@types/scheduler-0.16.3" - sources."@types/semver-7.5.0" - sources."@types/send-0.17.1" - sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.1" - sources."@types/sockjs-0.3.33" - sources."@types/stack-utils-2.0.1" - sources."@types/trusted-types-2.0.3" - sources."@types/webpack-5.28.1" - sources."@types/ws-8.5.4" - sources."@types/yargs-16.0.5" - sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/eslint-plugin-5.59.6" - sources."@typescript-eslint/experimental-utils-5.59.6" - sources."@typescript-eslint/parser-5.59.6" - sources."@typescript-eslint/scope-manager-5.59.6" - sources."@typescript-eslint/type-utils-5.59.6" - sources."@typescript-eslint/types-5.59.6" - sources."@typescript-eslint/typescript-estree-5.59.6" - (sources."@typescript-eslint/utils-5.59.6" // { - dependencies = [ - sources."eslint-scope-5.1.1" - sources."estraverse-4.3.0" - ]; - }) - sources."@typescript-eslint/visitor-keys-5.59.6" - sources."@webassemblyjs/ast-1.11.6" - sources."@webassemblyjs/floating-point-hex-parser-1.11.6" - sources."@webassemblyjs/helper-api-error-1.11.6" - sources."@webassemblyjs/helper-buffer-1.11.6" - sources."@webassemblyjs/helper-numbers-1.11.6" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.6" - sources."@webassemblyjs/helper-wasm-section-1.11.6" - sources."@webassemblyjs/ieee754-1.11.6" - sources."@webassemblyjs/leb128-1.11.6" - sources."@webassemblyjs/utf8-1.11.6" - sources."@webassemblyjs/wasm-edit-1.11.6" - sources."@webassemblyjs/wasm-gen-1.11.6" - sources."@webassemblyjs/wasm-opt-1.11.6" - sources."@webassemblyjs/wasm-parser-1.11.6" - sources."@webassemblyjs/wast-printer-1.11.6" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."accepts-1.3.8" - sources."acorn-8.8.2" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-import-assertions-1.9.0" - sources."acorn-jsx-5.3.2" - sources."acorn-walk-7.2.0" - sources."address-1.2.2" - sources."adjust-sourcemap-loader-4.0.0" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.3.0" - sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" - (sources."ajv-formats-2.1.1" // { - dependencies = [ - sources."ajv-8.12.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."ajv-keywords-3.5.2" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-html-community-0.0.8" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."arg-4.1.3" - sources."argparse-1.0.10" - (sources."aria-query-5.1.3" // { - dependencies = [ - sources."deep-equal-2.2.1" - sources."isarray-2.0.5" - ]; - }) - sources."array-buffer-byte-length-1.0.0" - sources."array-flatten-2.1.2" - sources."array-includes-3.1.6" - sources."array-union-2.1.0" - sources."array.prototype.flat-1.3.1" - sources."array.prototype.flatmap-1.3.1" - sources."array.prototype.reduce-1.0.5" - sources."array.prototype.tosorted-1.1.1" - sources."arrify-1.0.1" - sources."asap-2.0.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."ast-types-flow-0.0.7" - sources."async-3.2.4" - sources."async-foreach-0.1.3" - sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" - sources."atob-2.1.2" - sources."autoprefixer-10.4.14" - sources."available-typed-arrays-1.0.5" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."axe-core-4.7.1" - (sources."axobject-query-3.1.1" // { - dependencies = [ - sources."deep-equal-2.2.1" - sources."isarray-2.0.5" - ]; - }) - (sources."babel-jest-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."babel-loader-8.3.0" // { - dependencies = [ - sources."schema-utils-2.7.1" - ]; - }) - sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.5.1" - sources."babel-plugin-macros-3.1.0" - sources."babel-plugin-named-asset-import-0.3.8" - (sources."babel-plugin-polyfill-corejs2-0.3.3" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.6.0" - sources."babel-plugin-polyfill-regenerator-0.4.1" - sources."babel-plugin-transform-react-remove-prop-types-0.4.24" - sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.5.1" - sources."babel-preset-react-app-10.0.1" - sources."balanced-match-1.0.2" - sources."batch-0.6.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bfj-7.0.2" - sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" - sources."bluebird-3.7.2" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."http-errors-2.0.0" - sources."iconv-lite-0.4.24" - sources."ms-2.0.0" - sources."qs-6.11.0" - sources."statuses-2.0.1" - ]; - }) - sources."bonjour-service-1.1.1" - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.5" - sources."bser-2.1.1" - sources."buffer-builder-0.2.0" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."builtin-modules-3.3.0" - sources."bytes-3.1.2" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."minipass-3.3.6" - sources."mkdirp-1.0.4" - sources."yallist-4.0.0" - ]; - }) - sources."cache-content-type-1.0.1" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - sources."camelcase-6.3.0" - sources."camelcase-css-2.0.1" - (sources."camelcase-keys-6.2.2" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) - sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001488" - sources."canvas-2.11.2" - sources."case-sensitive-paths-webpack-plugin-2.4.0" - sources."caseless-0.12.0" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."char-regex-1.0.2" - sources."check-types-11.2.2" - sources."chokidar-3.5.3" - sources."chownr-2.0.0" - sources."chrome-trace-event-1.0.3" - sources."ci-info-3.8.0" - sources."cjs-module-lexer-1.2.2" - (sources."clean-css-5.3.2" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."clean-stack-2.2.0" - sources."cliui-7.0.4" - sources."clsx-1.2.1" - sources."co-4.6.0" - sources."coa-2.0.2" - sources."collect-v8-coverage-1.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-support-1.1.3" - sources."colord-2.9.3" - sources."colorette-2.0.20" - sources."combined-stream-1.0.8" - sources."commander-7.2.0" - sources."common-path-prefix-3.0.0" - sources."common-tags-1.8.2" - sources."commondir-1.0.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - sources."concat-map-0.0.1" - sources."confusing-browser-globals-1.0.11" - sources."connect-history-api-fallback-1.6.0" - sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."cookies-0.8.0" - sources."core-js-3.30.2" - sources."core-js-compat-3.30.2" - sources."core-js-pure-3.30.2" - sources."core-util-is-1.0.2" - sources."cosmiconfig-7.1.0" - sources."create-require-1.1.1" - sources."cross-fetch-3.1.5" - sources."cross-spawn-7.0.3" - sources."crypto-random-string-2.0.0" - (sources."css-2.2.4" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."css-blank-pseudo-3.0.3" - sources."css-declaration-sorter-6.4.0" - sources."css-has-pseudo-3.0.4" - sources."css-loader-6.7.4" - (sources."css-minimizer-webpack-plugin-3.4.1" // { - dependencies = [ - sources."ajv-8.12.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.1" - sources."source-map-0.6.1" - ]; - }) - sources."css-prefers-color-scheme-6.0.3" - sources."css-select-2.1.0" - sources."css-select-base-adapter-0.1.1" - (sources."css-tree-1.0.0-alpha.37" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."css-what-3.4.2" - sources."cssdb-7.6.0" - sources."cssesc-3.0.0" - sources."cssnano-5.1.15" - sources."cssnano-preset-default-5.2.14" - sources."cssnano-utils-3.1.0" - (sources."csso-4.2.0" // { - dependencies = [ - sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" - sources."source-map-0.6.1" - ]; - }) - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - sources."csstype-3.1.2" - sources."damerau-levenshtein-1.0.8" - sources."dashdash-1.14.1" - (sources."data-urls-2.0.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) - sources."de-indent-1.0.2" - sources."debug-4.3.4" - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - }) - sources."decimal.js-10.4.3" - sources."decode-uri-component-0.2.2" - sources."decompress-response-4.2.1" - sources."dedent-0.7.0" - sources."deep-equal-1.0.1" - sources."deep-is-0.1.4" - sources."deepmerge-4.3.1" - (sources."default-gateway-6.0.3" // { - dependencies = [ - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" - ]; - }) - sources."define-lazy-prop-2.0.0" - sources."define-properties-1.2.0" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-libc-2.0.1" - sources."detect-newline-3.1.0" - sources."detect-node-2.1.0" - (sources."detect-port-alt-1.1.6" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."dexie-3.2.3" - sources."dexie-react-hooks-1.1.3" - sources."didyoumean-1.2.2" - sources."diff-4.0.2" - sources."diff-sequences-27.5.1" - sources."dir-glob-3.0.1" - sources."dlv-1.1.3" - sources."dns-equal-1.0.0" - sources."dns-packet-5.6.0" - sources."doctrine-3.0.0" - sources."dom-converter-0.2.0" - sources."dom-helpers-5.2.1" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domelementtype-1.3.1" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) - (sources."domhandler-4.3.1" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domutils-1.7.0" - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - sources."dotenv-10.0.0" - sources."dotenv-expand-5.1.0" - sources."duplexer-0.1.2" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.402" - sources."emittery-0.8.1" - sources."emoji-regex-9.2.2" - sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.14.0" - sources."entities-2.2.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."error-ex-1.3.2" - sources."error-stack-parser-2.1.4" - sources."es-abstract-1.21.2" - sources."es-array-method-boxes-properly-1.0.0" - (sources."es-get-iterator-1.1.3" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) - sources."es-module-lexer-1.2.1" - sources."es-set-tostringtag-2.0.1" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" - (sources."escodegen-2.0.0" // { - dependencies = [ - sources."levn-0.3.0" - sources."optionator-0.8.3" - sources."prelude-ls-1.1.2" - sources."source-map-0.6.1" - sources."type-check-0.3.2" - ]; - }) - (sources."eslint-8.41.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."glob-parent-6.0.2" - sources."globals-13.20.0" - sources."has-flag-4.0.0" - sources."js-yaml-4.1.0" - sources."supports-color-7.2.0" - sources."type-fest-0.20.2" - ]; - }) - sources."eslint-config-react-app-7.0.1" - (sources."eslint-import-resolver-node-0.3.7" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-module-utils-2.8.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."eslint-plugin-flowtype-8.0.3" - (sources."eslint-plugin-import-2.27.5" // { - dependencies = [ - sources."debug-3.2.7" - sources."doctrine-2.1.0" - sources."semver-6.3.0" - ]; - }) - sources."eslint-plugin-jest-25.7.0" - (sources."eslint-plugin-jsx-a11y-6.7.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."eslint-plugin-react-7.32.2" // { - dependencies = [ - sources."doctrine-2.1.0" - sources."resolve-2.0.0-next.4" - sources."semver-6.3.0" - ]; - }) - sources."eslint-plugin-react-hooks-4.6.0" - sources."eslint-plugin-testing-library-5.11.0" - sources."eslint-scope-7.2.0" - sources."eslint-visitor-keys-3.4.1" - (sources."eslint-webpack-plugin-3.2.0" // { - dependencies = [ - sources."ajv-8.12.0" - sources."ajv-keywords-5.1.0" - sources."has-flag-4.0.0" - sources."jest-worker-28.1.3" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.1" - sources."supports-color-8.1.1" - ]; - }) - sources."espree-9.5.2" - sources."esprima-4.0.1" - sources."esquery-1.5.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."estree-walker-1.0.1" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."eventsource-2.0.2" - sources."execa-4.1.0" - sources."exit-0.1.2" - sources."expect-27.5.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."array-flatten-1.1.1" - sources."debug-2.6.9" - sources."http-errors-2.0.0" - sources."ms-2.0.0" - sources."path-to-regexp-0.1.7" - sources."qs-6.11.0" - sources."statuses-2.0.1" - ]; - }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.12" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.15.0" - sources."faye-websocket-0.11.4" - sources."fb-watchman-2.0.2" - (sources."fibers-5.0.3" // { - dependencies = [ - sources."detect-libc-1.0.3" - ]; - }) - sources."file-entry-cache-6.0.1" - sources."file-loader-6.2.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."filesize-8.0.7" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."statuses-2.0.1" - ]; - }) - sources."find-cache-dir-3.3.2" - sources."find-root-1.1.0" - sources."find-up-5.0.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."follow-redirects-1.15.2" - sources."for-each-0.3.3" - sources."forever-agent-0.6.1" - (sources."fork-ts-checker-webpack-plugin-6.5.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cosmiconfig-6.0.0" - sources."fs-extra-9.1.0" - sources."has-flag-4.0.0" - sources."schema-utils-2.7.0" - sources."supports-color-7.2.0" - sources."tapable-1.1.3" - ]; - }) - sources."form-data-3.0.1" - sources."forwarded-0.2.0" - sources."fraction.js-4.2.0" - sources."fresh-0.5.2" - sources."fs-extra-10.1.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."fs-monkey-1.0.3" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" - sources."gauge-3.0.2" - sources."gaze-1.1.3" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."get-own-enumerable-property-symbols-3.0.2" - sources."get-package-type-0.1.0" - sources."get-stdin-4.0.1" - sources."get-stream-5.2.0" - sources."get-symbol-description-1.0.0" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."global-modules-2.0.0" - (sources."global-prefix-3.0.0" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) - sources."globals-11.12.0" - sources."globalthis-1.0.3" - sources."globby-11.1.0" - (sources."globule-1.3.4" // { - dependencies = [ - sources."glob-7.1.7" - sources."minimatch-3.0.8" - ]; - }) - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."grapheme-splitter-1.0.4" - sources."graphemer-1.4.0" - sources."growly-1.3.0" - sources."gzip-size-6.0.0" - sources."handle-thing-2.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."hard-rejection-2.1.0" - sources."harmony-reflect-1.6.2" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-unicode-2.0.1" - sources."he-1.2.0" - sources."hoist-non-react-statics-3.3.2" - sources."hoopy-0.1.4" - (sources."hosted-git-info-4.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."hpack.js-2.1.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."html-encoding-sniffer-2.0.1" - sources."html-entities-2.3.3" - sources."html-escaper-2.0.2" - (sources."html-minifier-terser-6.1.0" // { - dependencies = [ - sources."commander-8.3.0" - ]; - }) - sources."html-parse-stringify-3.0.1" - sources."html-webpack-plugin-5.5.1" - (sources."htmlparser2-6.1.0" // { - dependencies = [ - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domutils-2.8.0" - ]; - }) - sources."http-assert-1.5.0" - sources."http-cache-semantics-4.1.1" - sources."http-deceiver-1.2.7" - (sources."http-errors-1.8.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) - sources."http-parser-js-0.5.8" - sources."http-proxy-1.18.1" - sources."http-proxy-agent-4.0.1" - sources."http-proxy-middleware-1.3.1" - sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.1" - sources."human-signals-1.1.1" - sources."humanize-duration-3.28.0" - sources."humanize-ms-1.2.1" - sources."i18next-21.10.0" - sources."i18next-browser-languagedetector-6.1.8" - sources."i18next-http-backend-1.4.5" - sources."iconv-lite-0.6.3" - sources."icss-utils-5.1.0" - sources."idb-7.1.1" - sources."identity-obj-proxy-3.0.0" - sources."ignore-5.2.4" - sources."immer-9.0.21" - sources."immutable-4.3.0" - sources."import-fresh-3.3.0" - sources."import-local-3.1.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."internal-slot-1.0.5" - sources."ip-2.0.0" - sources."ipaddr.js-2.0.1" - sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" - sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-core-module-2.12.1" - sources."is-date-object-1.0.5" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-fn-2.1.0" - sources."is-generator-function-1.0.10" - sources."is-glob-4.0.3" - sources."is-lambda-1.0.1" - sources."is-map-2.0.2" - sources."is-module-1.0.0" - sources."is-negative-zero-2.0.2" - sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-obj-1.0.1" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-plain-obj-3.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."is-promise-4.0.0" - sources."is-regex-1.1.4" - sources."is-regexp-1.0.0" - sources."is-root-2.1.0" - sources."is-set-2.0.2" - sources."is-shared-array-buffer-1.0.2" - sources."is-stream-2.0.1" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" - sources."is-typedarray-1.0.0" - sources."is-weakmap-2.0.1" - sources."is-weakref-1.0.2" - sources."is-weakset-2.0.2" - sources."is-wsl-2.2.0" - sources."isarray-0.0.1" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-5.2.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."istanbul-lib-report-3.0.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."istanbul-lib-source-maps-4.0.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."istanbul-reports-3.1.5" - (sources."jake-10.8.6" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-27.5.1" - (sources."jest-changed-files-27.5.1" // { - dependencies = [ - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."human-signals-2.1.0" - ]; - }) - (sources."jest-circus-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-cli-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-config-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-diff-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-docblock-27.5.1" - (sources."jest-each-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-environment-jsdom-27.5.1" - sources."jest-environment-node-27.5.1" - sources."jest-get-type-27.5.1" - sources."jest-haste-map-27.5.1" - (sources."jest-jasmine2-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-leak-detector-27.5.1" - (sources."jest-matcher-utils-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-message-util-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-mock-27.5.1" - sources."jest-pnp-resolver-1.2.3" - sources."jest-regex-util-27.5.1" - (sources."jest-resolve-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-resolve-dependencies-27.5.1" - (sources."jest-runner-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-runtime-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."has-flag-4.0.0" - sources."human-signals-2.1.0" - sources."strip-bom-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-serializer-27.5.1" - (sources."jest-snapshot-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-util-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-validate-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-watch-typeahead-1.1.0" // { - dependencies = [ - (sources."@jest/console-28.1.3" // { - dependencies = [ - sources."slash-3.0.0" - ]; - }) - sources."@jest/test-result-28.1.3" - sources."@jest/types-28.1.3" - sources."@types/yargs-17.0.24" - sources."ansi-regex-6.0.1" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."char-regex-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."emittery-0.10.2" - sources."has-flag-4.0.0" - (sources."jest-message-util-28.1.3" // { - dependencies = [ - sources."slash-3.0.0" - ]; - }) - sources."jest-regex-util-28.0.2" - sources."jest-util-28.1.3" - (sources."jest-watcher-28.1.3" // { - dependencies = [ - sources."string-length-4.0.2" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."pretty-format-28.1.3" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) - sources."react-is-18.2.0" - sources."slash-4.0.0" - sources."string-length-5.0.1" - sources."strip-ansi-7.0.1" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-watcher-27.5.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-worker-27.5.1" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."jiti-1.18.2" - sources."js-base64-3.7.5" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - (sources."jsdom-16.7.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) - sources."jsesc-2.5.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.3" - sources."jsonfile-6.1.0" - sources."jsonpointer-5.0.1" - sources."jsprim-1.4.2" - sources."jsx-ast-utils-3.3.3" - sources."keygrip-1.1.0" - sources."kind-of-6.0.3" - sources."kleur-3.0.3" - sources."klona-2.0.6" - sources."koa-2.14.2" - sources."koa-compose-4.2.0" - sources."koa-compress-5.1.1" - sources."koa-connect-2.1.0" - sources."koa-convert-2.0.0" - sources."koa-is-json-1.0.0" - sources."koa-route-3.2.0" - sources."koa-send-5.0.1" - (sources."koa-static-5.0.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."language-subtag-registry-0.3.22" - sources."language-tags-1.0.5" - sources."launch-editor-2.6.0" - sources."leven-3.1.0" - sources."levn-0.4.1" - sources."lilconfig-2.1.0" - sources."lines-and-columns-1.2.4" - sources."loader-runner-4.3.0" - sources."loader-utils-2.0.4" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."lodash.memoize-4.1.2" - sources."lodash.merge-4.6.2" - sources."lodash.sortby-4.7.0" - sources."lodash.uniq-4.5.0" - sources."loglevelnext-4.0.1" - sources."loose-envify-1.4.0" - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - sources."lru-cache-5.1.1" - sources."magic-string-0.25.9" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."make-error-1.3.6" - (sources."make-fetch-happen-9.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."makeerror-1.0.12" - sources."map-obj-4.3.0" - sources."mdn-data-2.0.4" - sources."media-typer-0.3.0" - sources."memfs-3.5.1" - (sources."meow-9.0.0" // { - dependencies = [ - sources."type-fest-0.18.1" - ]; - }) - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-2.1.0" - sources."min-indent-1.0.1" - (sources."mini-css-extract-plugin-2.7.6" // { - dependencies = [ - sources."ajv-8.12.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.1" - ]; - }) - sources."minimalistic-assert-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."is-plain-obj-1.1.0" - ]; - }) - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-fetch-1.4.1" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."multicast-dns-7.2.5" - sources."mz-2.7.0" - sources."nan-2.17.0" - sources."nanoid-3.3.6" - sources."natural-compare-1.4.0" - sources."natural-compare-lite-1.4.0" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - sources."node-fetch-2.6.7" - sources."node-forge-1.3.1" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."are-we-there-yet-3.0.1" - sources."gauge-4.0.4" - sources."npmlog-6.0.2" - ]; - }) - sources."node-gyp-build-4.6.0" - sources."node-int64-0.4.0" - sources."node-notifier-10.0.1" - sources."node-releases-2.0.10" - (sources."node-sass-7.0.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."nopt-5.0.0" - sources."normalize-package-data-3.0.3" - sources."normalize-path-3.0.0" - sources."normalize-range-0.1.2" - sources."normalize-url-6.1.0" - sources."npm-run-path-4.0.1" - sources."npmlog-5.0.1" - sources."nth-check-1.0.2" - sources."nwsapi-2.2.4" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."object.entries-1.1.6" - sources."object.fromentries-2.0.6" - sources."object.getownpropertydescriptors-2.1.6" - sources."object.hasown-1.1.2" - sources."object.values-1.1.6" - sources."obuf-1.1.2" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."only-0.0.2" - sources."open-7.4.2" - sources."optionator-0.9.1" - sources."p-defer-3.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" - (sources."p-retry-4.6.2" // { - dependencies = [ - sources."retry-0.13.1" - ]; - }) - sources."p-try-2.2.0" - (sources."param-case-3.0.4" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."parse5-6.0.1" - sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-1.8.0" - sources."path-type-4.0.0" - sources."performance-now-2.1.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pirates-4.0.5" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - ]; - }) - (sources."pkg-up-3.1.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) - sources."postcss-8.4.23" - sources."postcss-attribute-case-insensitive-5.0.2" - sources."postcss-browser-comments-4.0.0" - sources."postcss-calc-8.2.4" - sources."postcss-clamp-4.1.0" - sources."postcss-color-functional-notation-4.2.4" - sources."postcss-color-hex-alpha-8.0.4" - sources."postcss-color-rebeccapurple-7.1.1" - sources."postcss-colormin-5.3.1" - sources."postcss-convert-values-5.1.3" - sources."postcss-custom-media-8.0.2" - sources."postcss-custom-properties-12.1.11" - sources."postcss-custom-selectors-6.0.3" - sources."postcss-dir-pseudo-class-6.0.5" - sources."postcss-discard-comments-5.1.2" - sources."postcss-discard-duplicates-5.1.0" - sources."postcss-discard-empty-5.1.1" - sources."postcss-discard-overridden-5.1.0" - sources."postcss-double-position-gradients-3.1.2" - sources."postcss-env-function-4.0.6" - sources."postcss-flexbugs-fixes-5.0.2" - sources."postcss-focus-visible-6.0.4" - sources."postcss-focus-within-5.0.4" - sources."postcss-font-variant-5.0.0" - sources."postcss-gap-properties-3.0.5" - sources."postcss-image-set-function-4.0.7" - sources."postcss-import-15.1.0" - sources."postcss-initial-4.0.1" - sources."postcss-js-4.0.1" - sources."postcss-lab-function-4.2.1" - (sources."postcss-load-config-4.0.1" // { - dependencies = [ - sources."yaml-2.2.2" - ]; - }) - sources."postcss-loader-6.2.1" - sources."postcss-logical-5.0.4" - sources."postcss-media-minmax-5.0.0" - sources."postcss-merge-longhand-5.1.7" - sources."postcss-merge-rules-5.1.4" - sources."postcss-minify-font-values-5.1.0" - sources."postcss-minify-gradients-5.1.1" - sources."postcss-minify-params-5.1.4" - sources."postcss-minify-selectors-5.2.1" - sources."postcss-modules-extract-imports-3.0.0" - sources."postcss-modules-local-by-default-4.0.1" - sources."postcss-modules-scope-3.0.0" - sources."postcss-modules-values-4.0.0" - sources."postcss-nested-6.0.1" - sources."postcss-nesting-10.2.0" - sources."postcss-normalize-10.0.1" - sources."postcss-normalize-charset-5.1.0" - sources."postcss-normalize-display-values-5.1.0" - sources."postcss-normalize-positions-5.1.1" - sources."postcss-normalize-repeat-style-5.1.1" - sources."postcss-normalize-string-5.1.0" - sources."postcss-normalize-timing-functions-5.1.0" - sources."postcss-normalize-unicode-5.1.1" - sources."postcss-normalize-url-5.1.0" - sources."postcss-normalize-whitespace-5.1.1" - sources."postcss-opacity-percentage-1.1.3" - sources."postcss-ordered-values-5.1.3" - sources."postcss-overflow-shorthand-3.0.4" - sources."postcss-page-break-3.0.4" - sources."postcss-place-7.0.5" - sources."postcss-preset-env-7.8.3" - sources."postcss-pseudo-class-any-link-7.1.6" - sources."postcss-reduce-initial-5.1.2" - sources."postcss-reduce-transforms-5.1.0" - sources."postcss-replace-overflow-wrap-4.0.0" - sources."postcss-selector-not-6.0.1" - sources."postcss-selector-parser-6.0.13" - (sources."postcss-svgo-5.1.0" // { - dependencies = [ - sources."css-select-4.3.0" - sources."css-tree-1.1.3" - sources."css-what-6.1.0" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domutils-2.8.0" - sources."mdn-data-2.0.14" - sources."nth-check-2.1.1" - sources."source-map-0.6.1" - sources."svgo-2.8.0" - ]; - }) - sources."postcss-unique-selectors-5.1.1" - sources."postcss-value-parser-4.2.0" - sources."prelude-ls-1.2.1" - sources."pretty-bytes-5.6.0" - sources."pretty-error-4.0.0" - (sources."pretty-format-27.5.1" // { - dependencies = [ - sources."ansi-styles-5.2.0" - sources."react-is-17.0.2" - ]; - }) - sources."process-nextick-args-2.0.1" - sources."promise-8.3.0" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."prompts-2.4.2" - sources."prop-types-15.8.1" - (sources."proxy-addr-2.0.7" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."q-1.5.1" - sources."qs-6.5.3" - sources."querystringify-2.2.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-4.0.1" - sources."raf-3.4.1" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."http-errors-2.0.0" - sources."iconv-lite-0.4.24" - sources."statuses-2.0.1" - ]; - }) - sources."react-18.2.0" - sources."react-app-polyfill-3.0.0" - (sources."react-dev-utils-12.0.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."loader-utils-3.2.1" - sources."open-8.4.2" - sources."supports-color-7.2.0" - ]; - }) - sources."react-dom-18.2.0" - sources."react-error-overlay-6.0.11" - sources."react-i18next-11.18.6" - sources."react-infinite-scroll-component-6.1.0" - sources."react-is-16.13.1" - sources."react-refresh-0.11.0" - sources."react-router-6.11.2" - sources."react-router-dom-6.11.2" - sources."react-scripts-5.0.1" - sources."react-transition-group-4.4.5" - sources."read-cache-1.0.0" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."type-fest-0.8.1" - ]; - }) - sources."readable-stream-3.6.2" - sources."readdirp-3.6.0" - sources."recursive-readdir-2.2.3" - sources."redent-3.0.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.13.11" - sources."regenerator-transform-0.15.1" - sources."regex-parser-2.2.11" - sources."regexp.prototype.flags-1.5.0" - sources."regexpu-core-5.3.2" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."relateurl-0.2.7" - (sources."renderkid-3.0.0" // { - dependencies = [ - sources."css-select-4.3.0" - sources."css-what-6.1.0" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domutils-2.8.0" - sources."nth-check-2.1.1" - ]; - }) - (sources."request-2.88.2" // { - dependencies = [ - sources."form-data-2.3.3" - sources."tough-cookie-2.5.0" - sources."uuid-3.4.0" - ]; - }) - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" - sources."resolve-1.22.3" - (sources."resolve-cwd-3.0.0" // { - dependencies = [ - sources."resolve-from-5.0.0" - ]; - }) - sources."resolve-from-4.0.0" - (sources."resolve-path-1.4.0" // { - dependencies = [ - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - ]; - }) - sources."resolve-url-0.2.1" - (sources."resolve-url-loader-4.0.0" // { - dependencies = [ - sources."picocolors-0.2.1" - sources."postcss-7.0.39" - sources."source-map-0.6.1" - ]; - }) - sources."resolve.exports-1.1.1" - sources."retry-0.12.0" - sources."reusify-1.0.4" - (sources."rework-1.0.1" // { - dependencies = [ - sources."convert-source-map-0.3.5" - ]; - }) - sources."rework-visit-1.0.0" - sources."rimraf-3.0.2" - sources."rollup-2.79.1" - (sources."rollup-plugin-terser-7.0.2" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."jest-worker-26.6.2" - sources."serialize-javascript-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."run-parallel-1.2.0" - (sources."rxjs-7.8.1" // { - dependencies = [ - sources."tslib-2.5.2" - ]; - }) - (sources."safe-array-concat-1.0.0" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.0" - sources."safer-buffer-2.1.2" - sources."sanitize.css-13.0.0" - sources."sass-1.62.1" - (sources."sass-embedded-1.62.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."sass-embedded-darwin-arm64-1.62.0" - sources."sass-embedded-darwin-x64-1.62.0" - sources."sass-embedded-linux-arm-1.62.0" - sources."sass-embedded-linux-arm64-1.62.0" - sources."sass-embedded-linux-ia32-1.62.0" - sources."sass-embedded-linux-x64-1.62.0" - sources."sass-embedded-win32-ia32-1.62.0" - sources."sass-embedded-win32-x64-1.62.0" - (sources."sass-graph-4.0.1" // { - dependencies = [ - sources."cliui-8.0.1" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - }) - sources."sass-loader-12.6.0" - sources."sax-1.2.4" - sources."saxes-5.0.1" - sources."scheduler-0.23.0" - sources."schema-utils-3.1.2" - (sources."scss-tokenizer-0.4.3" // { - dependencies = [ - sources."js-base64-2.6.4" - sources."source-map-0.7.4" - ]; - }) - sources."select-hose-2.0.0" - sources."selfsigned-2.1.1" - (sources."semver-7.5.1" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."http-errors-2.0.0" - sources."ms-2.1.3" - sources."statuses-2.0.1" - ]; - }) - sources."serialize-javascript-6.0.1" - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."ms-2.0.0" - sources."setprototypeof-1.1.0" - ]; - }) - sources."serve-static-1.15.0" - sources."set-blocking-2.0.0" - sources."setprototypeof-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shell-quote-1.8.1" - sources."shellwords-0.1.1" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."sisteransi-1.0.5" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."sockjs-0.3.24" - (sources."sockjs-client-1.6.1" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."socks-2.7.1" - sources."socks-proxy-agent-6.2.1" - sources."source-list-map-2.0.1" - sources."source-map-0.5.7" - sources."source-map-js-1.0.2" - sources."source-map-loader-3.0.2" - sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."source-map-url-0.4.1" - sources."sourcemap-codec-1.4.8" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."spdy-4.0.2" - sources."spdy-transport-3.0.0" - sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" - (sources."ssri-8.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."stable-0.1.8" - sources."stack-generator-2.0.10" - (sources."stack-utils-2.0.6" // { - dependencies = [ - sources."escape-string-regexp-2.0.0" - ]; - }) - sources."stackframe-1.3.4" - (sources."stacktrace-gps-3.1.2" // { - dependencies = [ - sources."source-map-0.5.6" - ]; - }) - sources."stacktrace-js-2.0.2" - sources."statuses-1.5.0" - (sources."stdout-stream-1.4.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."stop-iteration-iterator-1.0.0" - sources."string-length-4.0.2" - sources."string-natural-compare-3.0.1" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - ]; - }) - sources."string.prototype.matchall-4.0.8" - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" - sources."string_decoder-1.3.0" - sources."stringify-object-3.3.0" - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-comments-2.0.1" - sources."strip-final-newline-2.0.0" - sources."strip-indent-3.0.0" - sources."strip-json-comments-3.1.1" - sources."style-loader-3.3.3" - sources."stylehacks-5.1.1" - sources."stylis-4.2.0" - (sources."sucrase-3.32.0" // { - dependencies = [ - sources."commander-4.1.1" - sources."glob-7.1.6" - ]; - }) - sources."superstruct-0.12.2" - sources."supports-color-5.5.0" - (sources."supports-hyperlinks-2.3.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svg-parser-2.0.4" - sources."svgo-1.3.2" - sources."symbol-tree-3.2.4" - (sources."tailwindcss-3.3.2" // { - dependencies = [ - sources."arg-5.0.2" - sources."glob-parent-6.0.2" - ]; - }) - sources."tapable-2.2.1" - (sources."tar-6.1.15" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."yallist-4.0.0" - ]; - }) - sources."temp-dir-2.0.0" - (sources."tempy-0.6.0" // { - dependencies = [ - sources."type-fest-0.16.0" - ]; - }) - sources."terminal-link-2.1.1" - (sources."terser-5.17.4" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."terser-webpack-plugin-5.3.9" - sources."test-exclude-6.0.0" - sources."text-table-0.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."throat-6.0.2" - sources."throttle-debounce-2.3.0" - sources."thunky-1.1.0" - sources."tmpl-1.0.5" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - (sources."tough-cookie-4.1.2" // { - dependencies = [ - sources."universalify-0.2.0" - ]; - }) - sources."tr46-0.0.3" - sources."trim-newlines-3.0.1" - sources."true-case-path-1.0.3" - sources."tryer-1.0.1" - sources."ts-interface-checker-0.1.13" - (sources."ts-node-10.9.1" // { - dependencies = [ - sources."acorn-walk-8.2.0" - ]; - }) - (sources."tsconfig-paths-3.14.2" // { - dependencies = [ - sources."json5-1.0.2" - ]; - }) - sources."tslib-1.14.1" - sources."tsscmp-1.0.6" - sources."tsutils-3.21.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.4.0" - sources."type-detect-4.0.8" - sources."type-fest-3.10.0" - sources."type-is-1.6.18" - sources."typed-array-length-1.0.4" - sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.9.5" - sources."unbox-primitive-1.0.2" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."unique-string-2.0.0" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."unquote-1.1.1" - sources."upath-1.2.0" - sources."update-browserslist-db-1.0.11" - sources."uri-js-4.4.1" - sources."urix-0.1.0" - sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" - sources."utila-0.4.0" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."v8-compile-cache-lib-3.0.1" - (sources."v8-to-istanbul-8.1.1" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) - sources."validate-npm-package-license-3.0.4" - sources."vary-1.1.2" - sources."verror-1.10.0" - sources."void-elements-3.1.0" - sources."vue-template-compiler-2.7.14" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."walker-1.0.8" - sources."watchpack-2.4.0" - sources."wbuf-1.7.3" - sources."webidl-conversions-3.0.1" - (sources."webpack-5.83.1" // { - dependencies = [ - sources."eslint-scope-5.1.1" - sources."estraverse-4.3.0" - ]; - }) - (sources."webpack-dev-middleware-5.3.3" // { - dependencies = [ - sources."ajv-8.12.0" - sources."ajv-keywords-5.1.0" - sources."json-schema-traverse-1.0.0" - sources."schema-utils-4.0.1" - ]; - }) - (sources."webpack-dev-server-4.15.0" // { - dependencies = [ - sources."ajv-8.12.0" - sources."ajv-keywords-5.1.0" - sources."connect-history-api-fallback-2.0.0" - sources."http-proxy-middleware-2.0.6" - sources."json-schema-traverse-1.0.0" - sources."open-8.4.2" - sources."schema-utils-4.0.1" - sources."ws-8.13.0" - ]; - }) - sources."webpack-hot-middleware-2.25.3" - (sources."webpack-manifest-plugin-4.1.1" // { - dependencies = [ - sources."source-map-0.6.1" - sources."webpack-sources-2.3.1" - ]; - }) - (sources."webpack-plugin-ramdisk-0.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."webpack-plugin-serve-1.6.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."webpack-sources-3.2.3" - sources."websocket-driver-0.7.4" - sources."websocket-extensions-0.1.4" - (sources."whatwg-encoding-1.0.5" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."whatwg-fetch-3.6.2" - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."which-collection-1.0.1" - sources."which-typed-array-1.1.9" - sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" - sources."workbox-background-sync-6.5.4" - sources."workbox-broadcast-update-6.5.4" - (sources."workbox-build-6.5.4" // { - dependencies = [ - sources."ajv-8.12.0" - sources."fs-extra-9.1.0" - sources."json-schema-traverse-1.0.0" - sources."source-map-0.8.0-beta.0" - sources."tr46-1.0.1" - sources."webidl-conversions-4.0.2" - sources."whatwg-url-7.1.0" - ]; - }) - sources."workbox-cacheable-response-6.5.4" - sources."workbox-core-6.5.4" - sources."workbox-expiration-6.5.4" - sources."workbox-google-analytics-6.5.4" - sources."workbox-navigation-preload-6.5.4" - sources."workbox-precaching-6.5.4" - sources."workbox-range-requests-6.5.4" - sources."workbox-recipes-6.5.4" - sources."workbox-routing-6.5.4" - sources."workbox-strategies-6.5.4" - sources."workbox-streams-6.5.4" - sources."workbox-sw-6.5.4" - (sources."workbox-webpack-plugin-6.5.4" // { - dependencies = [ - sources."source-map-0.6.1" - sources."webpack-sources-1.4.3" - ]; - }) - sources."workbox-window-6.5.4" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.9" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" - sources."y18n-5.0.8" - sources."yallist-3.1.1" - sources."yaml-1.10.2" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - sources."ylru-1.3.2" - sources."yn-3.1.1" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -in -{ - args = args; - sources = sources; - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; - nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { - src = stdenv.mkDerivation { - name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; - dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; - }; - }); -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/package.json b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/package.json deleted file mode 100644 index 9e919ef74b..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/package.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "ntfy", - "version": "1.0.0", - "private": true, - "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject" - }, - "dependencies": { - "@emotion/react": "^11.8.2", - "@emotion/styled": "^11.8.1", - "@mui/icons-material": "^5.4.2", - "@mui/material": "latest", - "dexie": "^3.2.1", - "dexie-react-hooks": "^1.1.1", - "humanize-duration": "^3.27.3", - "i18next": "^21.6.14", - "i18next-browser-languagedetector": "^6.1.4", - "i18next-http-backend": "^1.4.0", - "js-base64": "^3.7.2", - "react": "latest", - "react-dom": "latest", - "react-i18next": "^11.16.2", - "react-infinite-scroll-component": "^6.1.0", - "react-router-dom": "^6.2.2", - "react-scripts": "^5.0.0", - "stacktrace-gps": "^3.0.4", - "stacktrace-js": "^2.0.2" - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - } -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/update.sh b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/update.sh index 8d416981e4..748c4df654 100755 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/update.sh +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy-sh/update.sh @@ -1,24 +1,22 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix curl jq nix +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p gnugrep gnused coreutils curl wget jq nix-update prefetch-npm-deps nodejs set -euo pipefail -# cd to the folder containing this script -cd "$(dirname "$0")" +pushd "$(dirname "${BASH_SOURCE[0]}")" -CURRENT_VERSION=$(nix-instantiate ../../../../. --eval --strict -A ntfy-sh.version | tr -d '"') -TARGET_VERSION="$(curl -sL https://api.github.com/repos/binwiederhier/ntfy/releases/latest | jq --exit-status -r ".tag_name")" +version=$(curl -s "https://api.github.com/repos/binwiederhier/ntfy/tags" | jq -r .[0].name | grep -oP "^v\K.*") +url="https://raw.githubusercontent.com/binwiederhier/ntfy/v$version/" -if [[ "v$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then - echo "ntfy-sh is up-to-date: ${CURRENT_VERSION}" +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" exit 0 fi -echo "ntfy-sh: $CURRENT_VERSION -> $TARGET_VERSION" +rm -f package-lock.json +wget "$url/web/package-lock.json" +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' default.nix +rm -f package-lock.json -rm -f package.json package-lock.json -curl -sLO https://github.com/binwiederhier/ntfy/raw/$TARGET_VERSION/web/package.json -curl -sL -o package-lock-temp.json https://github.com/binwiederhier/ntfy/raw/$TARGET_VERSION/web/package-lock.json - -./generate-dependencies.sh - -rm ./package-lock-temp.json +popd +nix-update ntfy-sh --version $version diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix index a6a4e7c188..1f15f217ec 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -25,6 +25,10 @@ let inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; }; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy/webpush.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/webpush.nix index aad5bf48a4..cd58c5208e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/webpush.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy/webpush.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "cloudbell webpush notification support for ntfy"; homepage = "https://dschep.github.io/ntfy-webpush/"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/nurl/Cargo.lock index 13b9b6168a..2d89af7cda 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nurl/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/nurl/Cargo.lock @@ -25,15 +25,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[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", ] @@ -59,15 +59,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -97,9 +97,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[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 = "bitflags" @@ -107,6 +107,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" version = "0.10.4" @@ -118,21 +124,20 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "cc" @@ -148,9 +153,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.2.7" +version = "4.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "21b6396aa128fe4149d2af114f746eb048b5667e2844cc51ae90830f45de7ccb" dependencies = [ "clap_builder", "clap_derive", @@ -159,13 +164,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "8d011140df54d9c4c592974ccd7d694dd4ab5b92ea0436435fa900a211d6b0f6" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "once_cell", "strsim", @@ -176,36 +180,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.2.3" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8" +checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "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 = "clap_mangen" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4237e29de9c6949982ba87d51709204504fb8ed2fd38232fcb1e5bf7d4ba48c8" +checksum = "8f2e32b579dae093c2424a8b7e2bea09c89da01e1ce5065eb2f0a6f1cc15cc1f" dependencies = [ "clap", "roff", @@ -228,9 +232,9 @@ dependencies = [ [[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", ] @@ -267,9 +271,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -280,9 +284,9 @@ dependencies = [ [[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", ] @@ -299,9 +303,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "difflib" @@ -311,9 +315,9 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[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", "crypto-common", @@ -339,16 +343,22 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "enum_dispatch" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -372,12 +382,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 = "filetime" @@ -403,9 +410,9 @@ 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", ] @@ -422,19 +429,20 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.29.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf69b0f5c701cc3ae22d3204b671907668f6437ca88862d355eaf9bc47a4f897" +checksum = "f708dc9875d1b3e05c1cbadfd22e5b543c733c511191798587ec479115664221" dependencies = [ "gix-hash", + "gix-trace", "libc", ] [[package]] name = "gix-hash" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078eec3ac2808cc03f0bddd2704cb661da5c5dc33b41a9d7947b141d499c7c42" +checksum = "a0dd58cdbe7ffa4032fc111864c80d5f8cecd9a2c9736c97ae7e5be834188272" dependencies = [ "hex", "thiserror", @@ -442,21 +450,28 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc78f47095a0c15aea0e66103838f0748f4494bf7a9555dfe0f00425400396c" +checksum = "dfca182d2575ded2ed38280f1ebf75cd5d3790b77e0872de07854cf085821fbe" dependencies = [ "bstr", + "gix-trace", "home", "once_cell", "thiserror", ] [[package]] -name = "gix-url" -version = "0.18.0" +name = "gix-trace" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc77f89054297cc81491e31f1bab4027e554b5ef742a44bd7035db9a0f78b76" +checksum = "103eac621617be3ebe0605c9065ca51a223279a23218aaf67d10daa6e452f663" + +[[package]] +name = "gix-url" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092d3f8f4040ee1b82830224e9002fff69248348af27dfdbcc8536db80283945" dependencies = [ "bstr", "gix-features", @@ -474,9 +489,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[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 = "heck" @@ -495,18 +510,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", -] - -[[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" @@ -541,9 +547,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", @@ -551,43 +557,33 @@ dependencies = [ [[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", ] -[[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.10" +version = "1.0.11" 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", ] [[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", + "hermit-abi 0.3.2", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -607,40 +603,52 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[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 = "linux-raw-sys" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "memchr" @@ -650,9 +658,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -669,7 +677,7 @@ dependencies = [ [[package]] name = "nix-compat" version = "0.1.0" -source = "git+https://code.tvl.fyi/depot.git:/tvix/nix-compat.git#de8735b8c0b5f5128d5cad0f384a47f9cd140ac7" +source = "git+https://code.tvl.fyi/depot.git:/tvix/nix-compat.git#3ec277c76c43ebe7be6f1fc43b7aad310e58df8b" dependencies = [ "anyhow", "data-encoding", @@ -688,23 +696,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "nu-glob" -version = "0.80.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922b20eb03387d5aa1d41bc9dbdd47799648c5417a0632328b3e367cb035b31f" +checksum = "a73aed5e2a80f2021866adbd3a4b3013ace1ca06809459b3b208e791eb7729d9" [[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", ] [[package]] name = "nurl" -version = "0.3.12" +version = "0.3.13" dependencies = [ "anyhow", "assert_cmd", @@ -716,7 +724,7 @@ dependencies = [ "enum_dispatch", "gix-url", "is-terminal", - "itertools", + "itertools 0.11.0", "nix-compat", "nu-glob", "once_cell", @@ -730,9 +738,9 @@ 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 = "os_pipe" @@ -755,9 +763,9 @@ dependencies = [ [[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 = "predicates" @@ -767,7 +775,7 @@ checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.10.5", "predicates-core", ] @@ -789,18 +797,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] @@ -833,7 +841,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -842,14 +850,14 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" [[package]] name = "ring" @@ -880,35 +888,68 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[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", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", + "rustls-webpki 0.101.1", "sct", - "webpki", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +dependencies = [ + "ring", + "untrusted", ] [[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 = "same-file" @@ -921,9 +962,9 @@ 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 = "sct" @@ -937,29 +978,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -968,18 +1009,18 @@ dependencies = [ [[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", ] [[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", @@ -1053,20 +1094,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -1075,15 +1105,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.4", + "windows-sys 0.48.0", ] [[package]] @@ -1092,7 +1122,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.23", "windows-sys 0.48.0", ] @@ -1104,22 +1134,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn", ] [[package]] @@ -1139,18 +1169,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[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.9" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap", "serde", @@ -1198,9 +1228,9 @@ 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" @@ -1225,27 +1255,27 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.6.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", + "rustls-webpki 0.100.1", "serde", "serde_json", "url", - "webpki", "webpki-roots", ] [[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", @@ -1285,9 +1315,9 @@ dependencies = [ [[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", @@ -1295,24 +1325,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.16", + "syn", "wasm-bindgen-shared", ] [[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", @@ -1320,50 +1350,40 @@ 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.16", + "syn", "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", ] -[[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.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "webpki", + "rustls-webpki 0.100.1", ] [[package]] @@ -1412,7 +1432,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.1", ] [[package]] @@ -1432,9 +1452,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -1531,9 +1551,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix index a6c5801696..16fec1445a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix @@ -12,19 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-L9lYFPUk8B34vEtHZZ/9v1cEzQXoNo3Rc0e9/lwMrU0="; + hash = "sha256-rVqF+16esE27G7GS55RT91tD4x/GAzfVlIR0AgSknz0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "nix-compat-0.1.0" = "sha256-8QP9qEUtCvSvv1LcMPg04RrSagpINZeh4o2CBMzUjn4="; + "nix-compat-0.1.0" = "sha256-xHwBlmTggcZBFSh4EOY888AbmGQxhwvheJSStgpAj48="; }; }; @@ -57,5 +57,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ figsoda ]; + mainProgram = "nurl"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix index 8a390ad490..144c89f802 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Toolbox for manipulating and creating Ogg video files"; homepage = "http://www.streamnik.de/oggvideotools.html"; license = licenses.gpl2Only; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; # Compilation error on Darwin: # error: invalid argument '--std=c++0x' not allowed with 'C' # make[2]: *** [src/libresample/CMakeFiles/resample.dir/build.make:76: src/libresample/CMakeFiles/resample.dir/filterkit.c.o] Error 1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/ollama/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ollama/default.nix new file mode 100644 index 0000000000..784c308759 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/ollama/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +, darwin +}: + +buildGoModule rec { + pname = "ollama"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "jmorganca"; + repo = "ollama"; + rev = "v${version}"; + hash = "sha256-TEifqWVgZjrQcq9eDjfRgUff9vdsO3Fx2hZZJVJZLsU="; + }; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + Accelerate + MetalPerformanceShaders + MetalKit + ]); + + vendorHash = "sha256-KtpEqGXLpwH0NXFjb0F/SUBxP7BLEiEg3NouC0ZQOPs="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Get up and running with large language models locally"; + homepage = "https://github.com/jmorganca/ollama"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 9d2b08a969..9a1391b461 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -59,6 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/o2sh/onefetch"; changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne figsoda kloenk SuperSandro2000 ]; + maintainers = with maintainers; [ Br1ght0ne figsoda kloenk ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 66967b9213..d5cddeb6e2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -21,7 +21,7 @@ buildGoModule rec { vendorHash = "sha256-ABaRedZXPr2q2AmslVNIJUvONZa4tv7OkxBLR9GuBRE="; # there is a nested go.mod - sourceRoot = "source/cmd/otelcontribcol"; + sourceRoot = "${src.name}/cmd/otelcontribcol"; # upstream strongly recommends disabling CGO # additionally dependencies have had issues when GCO was enabled that weren't caught upstream diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 76f43acf13..1c387462a6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-yywmnJUTigDYeiAuK0f2511vh6sS4oD4hJLPozAlWz4="; }; # there is a nested go.mod - sourceRoot = "source/cmd/otelcorecol"; + sourceRoot = "${src.name}/cmd/otelcorecol"; vendorHash = "sha256-BNIQ0pTHGgwWw1cy7au6hUeECC8oGsSkxaX5BUCRG9Y="; # upstream strongly recommends disabling CGO diff --git a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index 12d0cf0bee..1fa26d1f6d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , expat +, fetchpatch , fmt , proj , bzip2 @@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck="; }; + patches = [ + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch"; + hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4="; + }) + ]; + postPatch = '' # Remove bundled libraries rm -r contrib diff --git a/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix b/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix index 95bfc54fbb..08be475a23 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "Crash your app in style (Golang)"; homepage = "https://github.com/maruel/panicparse"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/pc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pc/default.nix new file mode 100644 index 0000000000..ecf0122f08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/pc/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, byacc +, fetchFromSourcehut +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pc"; + version = "0.4"; + + src = fetchFromSourcehut { + owner = "~ft"; + repo = "pc"; + rev = finalAttrs.version; + hash = "sha256-fzEDI20o5ROY9n/QRzCW66iCKYaBbI++Taur6EoA0wA="; + }; + + nativeBuildInputs = [ byacc ]; + makeFlags = [ "PREFIX=$(out)" ]; + + strictDeps = true; + + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Programmer's calculator"; + homepage = "https://git.sr.ht/~ft/pc"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ moody ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index c90981475b..a4eba4aaf0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.8.2"; + version = "2.8.4"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-jsN7JouIyrFd//+kDAcEEsXiGLZx8e5jQsiNVQuDiQg="; + sha256 = "sha256-tYpn93PSvO9g31soDOW0+gOBaypMUlx9Xfo0H3ftJQk="; }; - vendorHash = "sha256-a0QA/1vUryAnO0Nr+m8frxtpnSHBOSOP1pq+BORTIJw="; + vendorHash = "sha256-SooYBVXcll8QciK8J68wUAsAH6kN+lWlmPS8h0Hw4e0="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix index d15aff792f..113da6a8f4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - version = "1.2023.8"; + version = "1.2023.10"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-2rvYoDna9zV+KAsSNYsThWLyu0BTtFm5GMBTXB7DRkA="; + sha256 = "sha256-EIdqY8sonLaHZCfOfAaUhm4M1XOek2M1OqPZkb/CTg4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index df5ef187e7..0c31eb9e62 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.9"; + version = "1.2023.10"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-/X3eKLl+nXkWIjMB3w9oKBMfEJvdIdrleaYQMFJoXK0="; + sha256 = "sha256-/+B16MQ5fzaRS/SjyMgiUsC+8Y7McyuS3IEMRgtY7jQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix index 0a31bc9dca..e5ef58e3a3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; homepage = "https://github.com/mstrobel/procyon/"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix index bbb8f96f5f..dfb0c711f7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "qt5ct"; - version = "1.5"; + version = "1.7"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-1j0M4W4CQnIH2GUx9wpxxbnIUARN1bLcsihVMfQW5JA="; + sha256 = "sha256-7VhUam5MUN/tG5/2oUjUpGj+m017WycnuWUB3ilVuNc="; }; nativeBuildInputs = [ qmake qttools ]; @@ -18,6 +18,7 @@ mkDerivation rec { qmakeFlags = [ "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + "LIBDIR=${placeholder "out"}/lib" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix new file mode 100644 index 0000000000..69044a2bb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/qt6gtk2/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase }: + +stdenv.mkDerivation (finalAttrs: { + pname = "qt6gtk2"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "trialuser02"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-g5ZCwTnNEJJ57zEwNqMxrl0EWYJMt3PquZ2IsmxQYqk="; + }; + + buildInputs = [ gtk2 qtbase ]; + nativeBuildInputs = [ pkg-config qmake ]; + + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/qt-6/plugins/{platformthemes,styles} + cp -pr src/qt6gtk2-qtplugin/libqt6gtk2.so $out/lib/qt-6/plugins/platformthemes + cp -pr src/qt6gtk2-style/libqt6gtk2-style.so $out/lib/qt-6/plugins/styles + + runHook postInstall + ''; + + meta = { + description = "GTK+2.0 integration plugins for Qt6"; + license = lib.licenses.gpl2Plus; + homepage = "https://github.com/trialuser02/qt6gtk2"; + maintainers = [ lib.maintainers.misterio77 ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix index 72cc8d8945..ec573473de 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rauc/default.nix @@ -1,7 +1,6 @@ { curl , dbus , fetchFromGitHub -, fetchpatch , glib , json-glib , lib diff --git a/third_party/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix b/third_party/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix index 1a81372d7f..777e310ac4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: +{ lib, stdenv, fetchFromGitea, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { pname = "riemann-c-client"; version = "1.10.5"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "git.madhouse-project.org"; owner = "algernon"; repo = "riemann-c-client"; rev = "riemann-c-client-${version}"; - sha256 = "sha256-LuI9XFDPx0qw/+kkpXd0FOMESERAp31R1+ttkGuJnPA="; + sha256 = "1w4wi5mr0vgbsx8pv9s08i409qqlfivsa979zyq4miyga1f3vqif"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/algernon/riemann-c-client"; + homepage = "https://git.madhouse-project.org/algernon/riemann-c-client"; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix index dea4349c14..9e89b57f0e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ripdrag/default.nix @@ -1,17 +1,17 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, gtk4 }: +{ lib, rustPlatform, fetchCrate, pkg-config, wrapGAppsHook4, gtk4 }: rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.3.0"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-D4WB1RdMPJfSLbJ96h3OuFhokfyY8Gamctm0XY694YM="; + hash = "sha256-vxAAAFLTIfLqYD7E/nwsHgFLhzMRF7DspIaWqAMZcXk="; }; - cargoSha256 = "sha256-C2I26E/dd18A4DDgOYGR8aS1RBrrNUwaXI4ZJHcrKy0="; + cargoHash = "sha256-6GKLBnG1p6iaFvnEQgfNlGpZwEG93tI256DCMLuJjOU="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rtx/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rtx/default.nix index 1fd38015a2..3aa751e28d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rtx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rtx/default.nix @@ -6,25 +6,27 @@ , stdenv , coreutils , bash +, pkg-config +, openssl , direnv , Security }: rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "1.34.0"; + version = "1.35.8"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - sha256 = "sha256-ePRYlTGgZDrIClZ4kb9v62/FiLzZT6DzL3kaY6eAq5g="; + hash = "sha256-oofbnZAB1a/Het5fqwDVx8Fl2aZcOhtb2/sKIF3KDFA="; }; - cargoSha256 = "sha256-RFAIc4KfMvxz2BYX8x8j8T5evMqFP8ML4+wHwWdODVk="; + cargoHash = "sha256-hcDHFA20jQgUnrdvqKSNCE17yVsH7B/WUKAVZN4Ck2o="; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; postPatch = '' patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs @@ -64,5 +66,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/jdxcode/rtx/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ konradmalik ]; + mainProgram = "rtx"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock new file mode 100644 index 0000000000..d754478f98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/rtz/Cargo.lock @@ -0,0 +1,3474 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[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 = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 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.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +dependencies = [ + "backtrace", +] + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "async-trait" +version = "0.1.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "binascii" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" + +[[package]] +name = "bincode" +version = "2.0.0-rc.3" +source = "git+https://github.com/bincode-org/bincode.git#224e41274b089e3833a3533459f5c5758c43ab2c" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[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 = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chashmap" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45" +dependencies = [ + "owning_ref", + "parking_lot 0.4.8", +] + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "chrono-tz" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", + "serde", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[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 = "clap" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +dependencies = [ + "is-terminal", + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "config" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" +dependencies = [ + "async-trait", + "json5", + "lazy_static", + "nom", + "pathdiff", + "ron", + "rust-ini", + "serde", + "serde_json", + "toml 0.5.11", + "yaml-rust", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "cookie" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +dependencies = [ + "aes-gcm", + "base64 0.21.2", + "hkdf", + "percent-encoding", + "rand 0.8.5", + "sha2", + "subtle", + "time 0.3.23", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if 1.0.0", + "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 1.0.0", + "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 1.0.0", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +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", +] + +[[package]] +name = "devise" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6eacefd3f541c66fc61433d65e54e0e46e0a029a819a7dbbc7a7b489e8a85f8" +dependencies = [ + "devise_codegen", + "devise_core", +] + +[[package]] +name = "devise_codegen" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6" +dependencies = [ + "devise_core", + "quote", +] + +[[package]] +name = "devise_core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" +dependencies = [ + "bitflags 2.3.3", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "dyn-clone" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" + +[[package]] +name = "earcutr" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +dependencies = [ + "itertools", + "num-traits", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[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 = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "figment" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +dependencies = [ + "atomic", + "pear", + "serde", + "toml 0.7.6", + "uncased", + "version_check", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[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-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + +[[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 = "geo" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +dependencies = [ + "earcutr", + "float_next_after", + "geo-types", + "geographiclib-rs", + "log", + "num-traits", + "robust", + "rstar", +] + +[[package]] +name = "geo-types" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +dependencies = [ + "approx", + "num-traits", + "rstar", + "serde", +] + +[[package]] +name = "geographiclib-rs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "geojson" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d728c1df1fbf328d74151efe6cb0586f79ee813346ea981add69bd22c9241b" +dependencies = [ + "geo-types", + "log", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +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]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin 0.9.8", + "stable_deref_trait", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[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 = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[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 = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + +[[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 = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[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 = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if 1.0.0", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memory_units" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "tokio", + "tokio-util", + "version_check", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "okapi" +version = "0.7.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce66b6366e049880a35c378123fddb630b1a1a3c37fa1ca70caaf4a09f6e2893" +dependencies = [ + "log", + "schemars", + "serde", + "serde_json", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[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 = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owning_ref" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "parking_lot" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e" +dependencies = [ + "owning_ref", + "parking_lot_core 0.2.14", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "parking_lot_core" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" +dependencies = [ + "libc", + "rand 0.4.6", + "smallvec 0.6.14", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec 1.11.0", + "windows-targets", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "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 = "pear" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi 1.0.0-rc", +] + +[[package]] +name = "pear_codegen" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pest" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "pest_meta" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand 0.8.5", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-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 = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi 0.5.1", +] + +[[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 = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", + "version_check", + "yansi 1.0.0-rc", +] + +[[package]] +name = "quote" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", +] + +[[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 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[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 = "ref-cast" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[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 = "robust" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" + +[[package]] +name = "rocket" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58734f7401ae5cfd129685b48f61182331745b357b96f2367f01aebaf1cc9cc9" +dependencies = [ + "async-stream", + "async-trait", + "atomic", + "binascii", + "bytes", + "either", + "figment", + "futures", + "indexmap 1.9.3", + "is-terminal", + "log", + "memchr", + "multer", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "rand 0.8.5", + "ref-cast", + "rocket_codegen", + "rocket_http", + "serde", + "serde_json", + "state", + "tempfile", + "time 0.3.23", + "tokio", + "tokio-stream", + "tokio-util", + "ubyte", + "version_check", + "yansi 0.5.1", +] + +[[package]] +name = "rocket_codegen" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7093353f14228c744982e409259fb54878ba9563d08214f2d880d59ff2fc508b" +dependencies = [ + "devise", + "glob", + "indexmap 1.9.3", + "proc-macro2", + "quote", + "rocket_http", + "syn 2.0.26", + "unicode-xid", +] + +[[package]] +name = "rocket_cors" +version = "0.6.0-alpha2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12771b47f52e34d5d0e0e444aeba382863e73263cb9e18847e7d5b74aa2cbd0" +dependencies = [ + "http", + "log", + "regex", + "rocket", + "serde", + "serde_derive", + "unicase", + "unicase_serde", + "url", +] + +[[package]] +name = "rocket_http" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936012c99162a03a67f37f9836d5f938f662e26f2717809761a9ac46432090f4" +dependencies = [ + "cookie", + "either", + "futures", + "http", + "hyper", + "indexmap 1.9.3", + "log", + "memchr", + "pear", + "percent-encoding", + "pin-project-lite", + "ref-cast", + "rustls", + "rustls-pemfile", + "serde", + "smallvec 1.11.0", + "stable-pattern", + "state", + "time 0.3.23", + "tokio", + "tokio-rustls", + "uncased", +] + +[[package]] +name = "rocket_okapi" +version = "0.8.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742098674565c8f0c35c77444f90344aafedebb71cfee9cdbf0185acc6b9cdb7" +dependencies = [ + "either", + "log", + "okapi", + "rocket", + "rocket_okapi_codegen", + "schemars", + "serde", + "serde_json", +] + +[[package]] +name = "rocket_okapi_codegen" +version = "0.8.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c43f8edc57d88750a220b0ec1870a36c1106204ec99cc35131b49de3b954a4a" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "rocket_http", + "syn 1.0.109", +] + +[[package]] +name = "ron" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "serde", +] + +[[package]] +name = "rstar" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +dependencies = [ + "heapless", + "num-traits", + "smallvec 1.11.0", +] + +[[package]] +name = "rtz" +version = "0.4.2" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "chashmap", + "chrono", + "chrono-tz", + "clap", + "config", + "geo", + "geojson", + "getrandom", + "js-sys", + "log", + "pretty_assertions", + "rand 0.8.5", + "rayon", + "reqwest", + "rocket", + "rocket_cors", + "rocket_okapi", + "rtz-build", + "rtz-core", + "schemars", + "serde", + "serde_json", + "simple_logger", + "tokio", + "wasm-bindgen", + "wasm-bindgen-futures", + "wee_alloc", +] + +[[package]] +name = "rtz-build" +version = "0.2.3" +dependencies = [ + "reqwest", + "rtz-core", + "zip", +] + +[[package]] +name = "rtz-core" +version = "0.1.1" +dependencies = [ + "anyhow", + "bincode", + "chashmap", + "geo", + "geojson", + "pretty_assertions", + "rayon", + "serde", + "serde_json", +] + +[[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 = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "schemars" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.109", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "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", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "serde" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "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]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[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 = "simple_logger" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2230cd5c29b815c9b699fb610b49a5ed65588f3509d9f0108be3a885da629333" +dependencies = [ + "colored", + "log", + "time 0.3.23", + "windows-sys 0.42.0", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +dependencies = [ + "maybe-uninit", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stable-pattern" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" +dependencies = [ + "memchr", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +dependencies = [ + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "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.26", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.26", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec 1.11.0", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[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 = "ubyte" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" +dependencies = [ + "serde", +] + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "serde", + "version_check", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase_serde" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef53697679d874d69f3160af80bc28de12730a985d57bdf2b47456ccb8b11f1" +dependencies = [ + "serde", + "unicase", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.26", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "wee_alloc" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "memory_units", + "winapi", +] + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[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.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 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +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 = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yansi" +version = "1.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee746ad3851dd3bc40e4a028ab3b00b99278d929e48957bcb2d111874a7e43e" + +[[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.23", + "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", +] diff --git a/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix new file mode 100644 index 0000000000..c4802b8034 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/rtz/default.nix @@ -0,0 +1,56 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, openssl +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rtz"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "twitchax"; + repo = "rtz"; + rev = "v${version}"; + hash = "sha256-hxRZhUSmocHQJqrWVjT6af5zTM6KKCv4GycWlO1T6qM="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "bincode-2.0.0-rc.3" = "sha256-YCoTnIKqRObeyfTanjptTYeD9U2b2c+d4CJFWIiGckI="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + openssl + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildFeatures = [ "web" ]; + + env = { + # requires nightly features + RUSTC_BOOTSTRAP = true; + }; + + meta = with lib; { + description = "A tool to easily work with timezone lookups via a binary, a library, or a server"; + homepage = "https://github.com/twitchax/rtz"; + changelog = "https://github.com/twitchax/rtz/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix index 682b2cbb56..7e6d3e26bd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sagoin/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sagoin"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - hash = "sha256-bhBC7Cblw8vmP4BalYv2DMRQWPK2AELb8Ia9PSeWcXE="; + hash = "sha256-/WNUDlJxxUGAtykX44A9EqMdBNwVKsGkPnq9pATmLEQ="; }; - cargoHash = "sha256-1XcI2LUo6xOs6bJDXKVDqMangH2dq2E6fNokuSDzpK0="; + cargoHash = "sha256-YGQZR5n71srD/8QrBUOoEe72nPm0cwgk5zrzoXy2Hx0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/scanmem/default.nix b/third_party/nixpkgs/pkgs/tools/misc/scanmem/default.nix index 0657a40689..817e713b22 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/scanmem/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/scanmem/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gobject-introspection +, intltool +, wrapGAppsHook +, procps +, python3 +, readline +}: stdenv.mkDerivation rec { - version = "0.17"; pname = "scanmem"; + version = "0.17"; src = fetchFromGitHub { owner = "scanmem"; @@ -11,12 +21,27 @@ stdenv.mkDerivation rec { sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"; }; - nativeBuildInputs = [ autoconf automake intltool libtool ]; - buildInputs = [ readline ]; + nativeBuildInputs = [ autoreconfHook gobject-introspection intltool wrapGAppsHook ]; + buildInputs = [ readline python3 ]; + configureFlags = ["--enable-gui"]; - preConfigure = '' - ./autogen.sh + # we don't need to wrap the main executable, just the GUI + dontWrapGApps = true; + + fixupPhase = '' + runHook preFixup + + # replace the upstream launcher which does stupid things + # also add procps because it shells out to `ps` and expects it to be procps + makeWrapper ${python3}/bin/python3 $out/bin/gameconqueror \ + "''${gappsWrapperArgs[@]}" \ + --set PYTHONPATH "${python3.pkgs.makePythonPath [ python3.pkgs.pygobject3 ]}" \ + --prefix PATH : "${procps}/bin" \ + --add-flags "$out/share/gameconqueror/GameConqueror.py" + + runHook postFixup ''; + meta = with lib; { homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/Cargo.lock.patch b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/Cargo.lock.patch new file mode 100644 index 0000000000..d1866991ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git c/Cargo.lock i/Cargo.lock +index fb6ef6e..347b404 100644 +--- c/Cargo.lock ++++ i/Cargo.lock +@@ -1168,7 +1168,7 @@ dependencies = [ + + [[package]] + name = "shadowenv" +-version = "2.1.0" ++version = "2.1.1" + dependencies = [ + "atty", + "blake2", diff --git a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix index 51bb84cc06..12723000ce 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - hash = "sha256-11Zce3eehyuDOl2zYl0sf/yh8SOOnu8W/CrL18e3zzw="; + hash = "sha256-NKqoeJ2sejbe7Gghk3H7oJtP16SX1PcIIjsh/bZdTfQ="; }; - cargoHash = "sha256-eo+/mZ6QFoXgIT1uT65TVR65xWBm/Cw5yBzvRUVgQUY="; + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoHash = "sha256-CGAwb+UduM2QKne2bPntOcFnaUQN/3uUANc6z7f/Oig="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix index 9a3c350b79..aa72394b71 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.2.2"; + version = "5.3.1"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-kdntnzGpu1NUP6rrBaH7ASwE7XT18vHcgf39bp5A4ds="; + sha256 = "sha256-llQt3m/qu7v5uQIfA1yxl2JZiFafk6sPgcvrIpQy/DI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock index 705cf9f90d..7d56b4aca8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock @@ -8,23 +8,23 @@ integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== "@babel/code-frame@^7.0.0": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" + integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== dependencies: - "@babel/highlight" "^7.18.6" + "@babel/highlight" "^7.22.5" -"@babel/helper-validator-identifier@^7.18.6": - 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-identifier@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" + integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== -"@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== +"@babel/highlight@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" + integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== dependencies: - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/helper-validator-identifier" "^7.22.5" chalk "^2.0.0" js-tokens "^4.0.0" @@ -36,6 +36,16 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" +"@electron/asar@^3.2.1": + version "3.2.4" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.4.tgz#7e8635a3c4f6d8b3f8ae6efaf5ecb9fbf3bd9864" + integrity sha512-lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + "@electron/get@^2.0.0": version "2.0.2" resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" @@ -51,23 +61,74 @@ 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== +"@electron/notarize@^1.2.3": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.4.tgz#a7d38773f4cad40df111a5edc64037e5d768ea1e" + integrity sha512-W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg== dependencies: + debug "^4.1.1" + fs-extra "^9.0.1" + +"@electron/osx-sign@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz#8e91442846471636ca0469426a82b253b9170151" + integrity sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g== + dependencies: + compare-version "^0.1.2" + debug "^4.3.4" + fs-extra "^10.0.0" + isbinaryfile "^4.0.8" + minimist "^1.2.6" + plist "^3.0.5" + +"@electron/rebuild@^3.2.13": + version "3.2.13" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.13.tgz#98fbb98981b1a86162546a2ab91b2355569cca4c" + integrity sha512-DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g== + dependencies: + "@malept/cross-spawn-promise" "^2.0.0" + chalk "^4.0.0" + debug "^4.1.1" + detect-libc "^2.0.1" + fs-extra "^10.0.0" + got "^11.7.0" + node-abi "^3.0.0" + node-api-version "^0.1.4" + node-gyp "^9.0.0" + ora "^5.1.0" + semver "^7.3.5" + tar "^6.0.5" + yargs "^17.0.1" + +"@electron/universal@1.3.4": + version "1.3.4" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz#bccd94b635d7c85eeed5eabba457eb4ed2be2777" + integrity sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg== + dependencies: + "@electron/asar" "^3.2.1" "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.1.0" debug "^4.3.1" - dir-compare "^2.4.0" + dir-compare "^3.0.0" fs-extra "^9.0.1" minimatch "^3.0.4" plist "^3.0.4" -"@fortawesome/fontawesome-free@6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304" - integrity sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A== +"@fortawesome/fontawesome-free@6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe" + integrity sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ== + +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" @@ -76,6 +137,13 @@ dependencies: cross-spawn "^7.0.1" +"@malept/cross-spawn-promise@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" + integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== + 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" @@ -86,6 +154,31 @@ lodash "^4.17.15" tmp-promise "^3.0.2" +"@npmcli/fs@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e" + integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w== + dependencies: + semver "^7.3.5" + +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + +"@puppeteer/browsers@1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-1.4.1.tgz#9c8ba163c3ef77ae3fc9708ad1f5787263f7290e" + integrity sha512-H43VosMzywHCcYcgv0GXXopvwnV21Ud9g2aXbPlQUJj1Xcz9V0wBwHeFz6saFhx/3VKisZfI1GEKEOhQCau7Vw== + dependencies: + debug "4.3.4" + extract-zip "2.0.1" + progress "2.0.3" + proxy-agent "6.2.1" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + yargs "17.7.1" + "@sindresorhus/is@^4.0.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" @@ -114,27 +207,19 @@ "@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== + version "4.1.8" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" + integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ== dependencies: "@types/ms" "*" -"@types/fs-extra@^9.0.11": +"@types/fs-extra@9.0.13", "@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" @@ -147,25 +232,20 @@ 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@*": - version "18.11.19" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz#35e26df9ec441ab99d73e99e9aca82935eea216d" - integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw== + version "20.4.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.4.tgz#c79c7cc22c9d0e97a7944954c9e663bcbd92b0cb" + integrity sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew== -"@types/node@^16.11.26": - version "16.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz#e3bfea80e31523fde4292a6118f19ffa24fd6f65" - integrity sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw== +"@types/node@^18.11.18": + version "18.17.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz#35d44267a33dd46b49ee0f73d31b05fd7407e290" + integrity sha512-GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg== "@types/plist@^3.0.1": version "3.0.2" @@ -187,18 +267,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" @@ -206,13 +274,57 @@ dependencies: "@types/node" "*" -agent-base@6: +"@xmldom/xmldom@^0.8.8": + version "0.8.10" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" + integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== + +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== + +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@^8.7.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== + +agent-base@6, agent-base@^6.0.2: 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" +agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434" + integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg== + dependencies: + debug "^4.3.4" + +agentkeepalive@^4.2.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255" + integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg== + dependencies: + debug "^4.1.0" + depd "^2.0.0" + humanize-ms "^1.2.1" + +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-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -233,6 +345,11 @@ ansi-regex@^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" @@ -247,70 +364,86 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + 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== +app-builder-lib@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.4.0.tgz#1606f94e99366eea9e7507228961b8396e40d546" + integrity sha512-EcdqtWvg1LAApKCfyRBukcVkmsa94s2e1VKHjZLpvA9/D14QEt8rHhffYeaA+cH/pVeoNVn2ob735KnfJKEEow== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" + "@electron/notarize" "^1.2.3" + "@electron/osx-sign" "^1.0.4" + "@electron/rebuild" "^3.2.13" + "@electron/universal" "1.3.4" "@malept/flatpak-bundler" "^0.4.0" + "@types/fs-extra" "9.0.13" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.6.0" - builder-util-runtime "9.1.1" + builder-util "24.4.0" + builder-util-runtime "9.2.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" + ejs "^3.1.8" + electron-publish "24.4.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" + isbinaryfile "^5.0.0" js-yaml "^4.1.0" lazy-val "^1.0.5" - minimatch "^3.1.2" - read-config-file "6.2.0" + minimatch "^5.1.1" + read-config-file "6.3.2" sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" + semver "^7.3.8" + tar "^6.1.12" temp-file "^3.4.0" +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + arch@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.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== +ast-types@^0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782" + integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w== + dependencies: + tslib "^2.0.1" + astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -336,10 +469,10 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@^1.2.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3" - integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw== +axios@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -355,7 +488,12 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bl@^4.0.3: +basic-ftp@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.3.tgz#b14c0fe8111ce001ec913686434fe0c2fb461228" + integrity sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g== + +bl@^4.0.3, 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== @@ -371,7 +509,7 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.0, bluebird@^3.5.5: +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== @@ -381,10 +519,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -bootstrap@5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b" - integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ== +bootstrap@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.0.tgz#0718a7cc29040ee8dbf1bd652b896f3436a87c29" + integrity sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw== brace-expansion@^1.1.7: version "1.1.11" @@ -401,33 +539,15 @@ brace-expansion@^2.0.1: 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-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" + integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== buffer-from@^1.0.0: version "1.1.2" @@ -442,46 +562,63 @@ buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: 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== +builder-util-runtime@9.2.1: + version "9.2.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz#3184dcdf7ed6c47afb8df733813224ced4f624fd" + integrity sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA== 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== +builder-util@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.4.0.tgz#dbb201a118fd573180e6a1070cf4c0be6de80cd7" + integrity sha512-tONb/GIK1MKa1BcOPHE1naId3o5nj6gdka5kP7yUJh2DOfF+jMq3laiu+UOZH6A7ZtkMtnGNMYFKFTIv408n/A== 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" + builder-util-runtime "9.2.1" + chalk "^4.1.2" cross-spawn "^7.0.3" debug "^4.3.4" - fs-extra "^10.0.0" + fs-extra "^10.1.0" http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-ci "^3.0.0" js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" temp-file "^3.4.0" +cacache@^17.0.0: + version "17.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044" + integrity sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg== + dependencies: + "@npmcli/fs" "^3.1.0" + fs-minipass "^3.0.0" + glob "^10.2.2" + lru-cache "^7.7.1" + minipass "^5.0.0" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + p-map "^4.0.0" + ssri "^10.0.0" + tar "^6.1.11" + unique-filename "^3.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== + version "7.0.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" + integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" @@ -505,7 +642,7 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.2, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -523,15 +660,39 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chromium-bidi@0.4.11: + version "0.4.11" + resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.11.tgz#d3eafb0a99f417406a734b889dacd777be5e227c" + integrity sha512-p03ajLhlQ5gebw3cmbDBFmBc2wnJM5dnXS8Phu6mblGn/KQd76yOVL5VwE0VAisa7oazNfKGTaXlIZ8Q5Bb9OA== + dependencies: + mitt "3.0.0" + 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.7.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" - integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== + +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.9.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db" + integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g== cli-truncate@^2.1.0: version "2.1.0" @@ -566,6 +727,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.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== + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -590,10 +756,10 @@ color-name@~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== +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== combined-stream@^1.0.8: version "1.0.8" @@ -602,13 +768,6 @@ combined-stream@^1.0.8: 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" @@ -624,15 +783,28 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +config-file-ts@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz#6c0741fbe118a7cf786c65f139030f0448a2cc99" + integrity sha512-cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ== + dependencies: + glob "^7.1.6" + typescript "^4.0.2" + +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 sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + 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== -cosmiconfig@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97" - integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ== +cosmiconfig@8.1.3: + version "8.1.3" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" + integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== dependencies: import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -646,12 +818,12 @@ crc@^3.8.0: dependencies: buffer "^5.1.0" -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== +cross-fetch@3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz#bae05aa31a4da760969756318feeee6e70f15d6c" + integrity sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g== dependencies: - node-fetch "2.6.7" + node-fetch "^2.6.11" cross-spawn@^6.0.0: version "6.0.5" @@ -664,7 +836,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.1, cross-spawn@^7.0.3: +cross-spawn@^7.0.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== @@ -673,20 +845,18 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: +data-uri-to-buffer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz#db89a9e279c2ffe74f50637a59a32fb23b3e4d7c" + integrity sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg== + +debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, 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@^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" @@ -699,58 +869,88 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== +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== + +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" + 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.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + 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" +degenerator@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-4.0.4.tgz#dbeeb602c64ce543c1f17e2c681d1d0cc9d4a0ac" + integrity sha512-MTZdZsuNxSBL92rsjx3VFWe57OpRlikyLbcx2B5Dmdv6oScqpMrvpY7zHLMymrUxo3U5+suPUMsNgW/+SZB1lg== + dependencies: + ast-types "^0.13.4" + escodegen "^1.14.3" + esprima "^4.0.1" + vm2 "^3.9.19" + 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-libc@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" - integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +depd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +detect-libc@^2.0.0, detect-libc@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" + integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw== 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== -devtools-protocol@0.0.1068969: - version "0.0.1068969" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz#8b9a4bc48aed1453bed08d62b07481f9abf4d6d8" - integrity sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ== +devtools-protocol@0.0.1120988: + version "0.0.1120988" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1120988.tgz#8fe49088919ae3b8df7235774633763f1f925066" + integrity sha512-39fCpE3Z78IaIPChJsP6Lhmkbf4dWXOmzLk/KFTdRkNk/0JymRIfUynDVRndV9HoDz8PyalK1UH21ST/ivwW5Q== -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== +dir-compare@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416" + integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg== dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" + buffer-equal "^1.0.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== +dmg-builder@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.4.0.tgz#46c80f119465f6a7275766c72b4f3d514cc8013d" + integrity sha512-p5z9Cx539GSBYb+b09Z+hMhuBTh/BrI71VRg4rgF6f2xtIRK/YlTGVS/O08k5OojoyhZcpS7JXxDVSmQoWgiiQ== dependencies: - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - fs-extra "^10.0.0" + app-builder-lib "24.4.0" + builder-util "24.4.0" + builder-util-runtime "9.2.1" + fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" optionalDependencies: @@ -780,63 +980,55 @@ dotenv@^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== +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== + +ejs@^3.1.8: + version "3.1.9" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" + integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== 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== +electron-builder@^24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.4.0.tgz#8846efa45bac8f6b9afc181abf71a4e12530f045" + integrity sha512-D5INxodxaUIJgEX6p/fqBd8wQNS8XRAToNIJ9SQC+taNS5D73ZsjLuXiRraFGCB0cVk9KeKhEkdEOH5AaVya4g== 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" + app-builder-lib "24.4.0" + builder-util "24.4.0" + builder-util-runtime "9.2.1" + chalk "^4.1.2" + dmg-builder "24.4.0" + fs-extra "^10.1.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" + read-config-file "6.3.2" + simple-update-notifier "^1.1.0" + yargs "^17.6.2" -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== +electron-publish@24.4.0: + version "24.4.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.4.0.tgz#a58f49ecd727620f65372881788ebb1a9b853284" + integrity sha512-U3mnVSxIfNrLW7ZnwiedFhcLf6ExPFXgAsx89WpfQFsV4gFAt/LG+H74p0m9NSvsLXiZuF82yXoxi7Ou8GHq4Q== 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" + builder-util "24.4.0" + builder-util-runtime "9.2.1" + chalk "^4.1.2" + fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" -electron@^22.0.0: - version "22.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz#1aa321415d8b8021a4b0807641f0ad56028feaf5" - integrity sha512-puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g== +electron@^25.1.0: + version "25.3.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.1.tgz#898cbb5e54d17ad0014123a10f5febc17638c6a9" + integrity sha512-t0QXXqgf0/P0OJ9LU3qpcBMK+wL0FRwTQfooBaaG08v5hywPzc1yplfb3l4tS1xC0Ttw8IBaKLBeEoRgxBRHjg== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^16.11.26" + "@types/node" "^18.11.18" extract-zip "^2.0.1" emoji-regex@^8.0.0: @@ -844,6 +1036,18 @@ emoji-regex@^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== + +encoding@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -856,6 +1060,11 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -883,6 +1092,33 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escodegen@^1.14.3: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + 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.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== + execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -901,6 +1137,11 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== +exponential-backoff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" + integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== + extract-zip@2.0.1, extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -927,6 +1168,11 @@ fast-json-stable-stringify@^2.0.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== + fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -939,7 +1185,7 @@ fessonia@^2.2.2: resolved "https://registry.yarnpkg.com/fessonia/-/fessonia-2.2.2.tgz#c8f9da5701d2e63efc9fd5793368929ddfaaf776" integrity sha512-FvlDFdwHBIxWl2K9XynAIR38NB8xn4vPPZDNK5nIQBnGwZ0xv5FxDXsz+pzYZrUqoEQPQBJemNrYhueD2de7qw== -filelist@^1.0.1: +filelist@^1.0.4: 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== @@ -951,6 +1197,14 @@ follow-redirects@^1.15.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.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" @@ -1000,6 +1254,13 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" +fs-minipass@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.2.tgz#5b383858efa8c1eb8c33b39e994f7e8555b8b3a3" + integrity sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g== + dependencies: + minipass "^5.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" @@ -1010,18 +1271,33 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + 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== + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-stream@^4.0.0: @@ -1038,12 +1314,33 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" +get-uri@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.1.tgz#cff2ba8d456c3513a04b70c45de4dbcca5b1527c" + integrity sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q== + dependencies: + basic-ftp "^5.0.2" + data-uri-to-buffer "^5.0.1" + debug "^4.3.4" + fs-extra "^8.1.0" + github-from-package@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== -glob@^7.1.3, glob@^7.1.6: +glob@^10.2.2: + version "10.3.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b" + integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.0.3" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.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== @@ -1074,7 +1371,7 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -got@^11.8.5: +got@^11.7.0, got@^11.8.5: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== @@ -1091,15 +1388,10 @@ got@^11.8.5: 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== +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== has-flag@^3.0.0: version "3.0.0" @@ -1118,11 +1410,21 @@ has-property-descriptors@^1.0.0: 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.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1137,7 +1439,7 @@ hosted-git-info@^4.1.0: dependencies: lru-cache "^6.0.0" -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1: 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== @@ -1151,6 +1453,14 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" +http-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673" + integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ== + dependencies: + agent-base "^7.1.0" + debug "^4.3.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" @@ -1159,7 +1469,7 @@ http2-wrapper@^1.0.0-beta.5.2: quick-lru "^5.1.1" resolve-alpn "^1.0.0" -https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: +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== @@ -1167,6 +1477,21 @@ https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: agent-base "6" debug "4" +https-proxy-agent@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz#0277e28f13a07d45c663633841e20a40aaafe0ab" + integrity sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ== + dependencies: + agent-base "^7.0.2" + debug "4" + +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + iconv-corefoundation@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" @@ -1195,6 +1520,16 @@ import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" +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" @@ -1213,6 +1548,16 @@ ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +ip@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" + integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== + +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -1235,11 +1580,26 @@ is-fullwidth-code-point@^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-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-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== +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-wsl@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -1247,18 +1607,16 @@ is-wsl@^2.1.1: dependencies: is-docker "^2.0.0" -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: +isbinaryfile@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== +isbinaryfile@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234" + integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -1269,15 +1627,24 @@ iso8601-duration@^2.1.1: resolved "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-2.1.1.tgz#88d9e481525b50e57840bc93fb8a1727a7d849d2" integrity sha512-VGGpW30/R57FpG1J7RqqKBAaK7lIiudlZkQ5tRoO9hNlKYQNnhs60DQpXlPFBmp6I+kJ61PHkI3f/T7cR4wfbw== +jackspeak@^2.0.3: + version "2.2.1" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.1.tgz#655e8cf025d872c9c03d3eb63e8f0c024fef16a6" + integrity sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + 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== + version "10.8.7" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" + integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== dependencies: async "^3.2.3" chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" + filelist "^1.0.4" + minimatch "^3.1.2" js-tokens@^4.0.0: version "4.0.0" @@ -1341,9 +1708,9 @@ keytar@^7.9.0: prebuild-install "^7.0.1" keyv@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" - integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== + version "4.5.3" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25" + integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug== dependencies: json-buffer "3.0.1" @@ -1352,6 +1719,14 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== +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" + 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" @@ -1362,6 +1737,14 @@ lodash@^4.17.15: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +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" + lowercase-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" @@ -1374,6 +1757,37 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.14.1, lru-cache@^7.7.1: + version "7.18.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== + +"lru-cache@^9.1.1 || ^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61" + integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw== + +make-fetch-happen@^11.0.3: + version "11.1.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f" + integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w== + dependencies: + agentkeepalive "^4.2.1" + cacache "^17.0.0" + http-cache-semantics "^4.1.1" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^5.0.0" + minipass-fetch "^3.0.0" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^10.0.0" + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1398,6 +1812,11 @@ mime@^2.5.2: 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-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1408,13 +1827,6 @@ mimic-response@^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" @@ -1422,17 +1834,63 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" -minimatch@^5.0.1: +minimatch@^5.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@^1.2.0, minimist@^1.2.3: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== +minimatch@^9.0.1: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + +minimist@^1.2.0, minimist@^1.2.3, 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-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.3.tgz#d9df70085609864331b533c960fd4ffaa78d15ce" + integrity sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ== + dependencies: + minipass "^5.0.0" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" minipass@^3.0.0: version "3.3.6" @@ -1441,12 +1899,17 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minipass@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz#26fc3364d5ea6cb971c6e5259eac67a0887510d1" - integrity sha512-4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -minizlib@^2.1.1: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e" + integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA== + +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -1454,6 +1917,11 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" +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== + mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -1464,30 +1932,40 @@ mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -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.0.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + napi-build-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +netmask@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" + integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@^3.3.0: - version "3.31.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz#dfb2ea3d01188eb80859f69bb4a4354090c1b355" - integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ== +node-abi@^3.0.0, node-abi@^3.3.0: + version "3.45.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5" + integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ== dependencies: semver "^7.3.5" @@ -1501,13 +1979,44 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -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== +node-api-version@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" + integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== + dependencies: + semver "^7.3.5" + +node-fetch@^2.6.11: + version "2.6.12" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba" + integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g== dependencies: whatwg-url "^5.0.0" +node-gyp@^9.0.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369" + integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg== + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^11.0.3" + nopt "^6.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + +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-url@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" @@ -1520,6 +2029,16 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -1532,6 +2051,40 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: 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" + +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" + +ora@^5.1.0: + 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" + p-cancelable@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" @@ -1542,6 +2095,35 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== +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" + +pac-proxy-agent@^6.0.3: + version "6.0.4" + resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-6.0.4.tgz#f90d066808974cd6813dfcdac69a2aa483b18ba1" + integrity sha512-FbJYeusBOZNe6bmrC2/+r/HljwExryon16lNKEU82gWiwIPMCEktUPSEAcTkO9K3jd/YPGuX/azZel1ltmo6nQ== + dependencies: + agent-base "^7.0.2" + debug "^4.3.4" + get-uri "^6.0.1" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.0" + pac-resolver "^6.0.1" + socks-proxy-agent "^8.0.1" + +pac-resolver@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-6.0.2.tgz#742ef24d2805b18c0a684ac02bcb0b5ce9644648" + integrity sha512-EQpuJ2ifOjpZY5sg1Q1ZeAxvtLwR7Mj3RgY8cysPGbsRu3RBXyJFWxnMus9PScjxya/0LzvVDxNh/gl0eXBU4w== + dependencies: + degenerator "^4.0.4" + ip "^1.1.8" + netmask "^2.0.2" + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -1574,6 +2156,14 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.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" @@ -1584,11 +2174,12 @@ pend@~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== +plist@^3.0.4, plist@^3.0.5: + version "3.1.0" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" + integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== dependencies: + "@xmldom/xmldom" "^0.8.8" base64-js "^1.5.1" xmlbuilder "^15.1.1" @@ -1610,12 +2201,39 @@ prebuild-install@^7.0.1: tar-fs "^2.0.0" tunnel-agent "^0.6.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 sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== + progress@2.0.3, 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== -proxy-from-env@1.1.0, proxy-from-env@^1.1.0: +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + +proxy-agent@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.2.1.tgz#062df6609a4012fd1c108974865599b61e77abde" + integrity sha512-OIbBKlRAT+ycCm6wAYIzMwPejzRtjy8F3QiDX0eKOA3e4pe3U9F/IvzcHP42bmgQxVv97juG+J8/gx+JIeCX/Q== + dependencies: + agent-base "^7.0.2" + debug "^4.3.4" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.0" + lru-cache "^7.14.1" + pac-proxy-agent "^6.0.3" + proxy-from-env "^1.1.0" + socks-proxy-agent "^8.0.1" + +proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -1633,33 +2251,26 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -puppeteer-core@19.4.0: - version "19.4.0" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz#3f52945d8cfa20cf8721a7902afcd8a1a299b54d" - integrity sha512-gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ== +puppeteer-core@20.5.0: + version "20.5.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-20.5.0.tgz#4b9ccd6c4ca35fe02373bf2147dc75b42ebd22c4" + integrity sha512-9ddHXUQ7jpliGei87zYTuEZYQvFj6Lzk5R8w4vT4gMmNArkEqC5CX72TnVIJiTUbiTpOXJkvMQaXIHYopjdUtQ== dependencies: - cross-fetch "3.1.5" + "@puppeteer/browsers" "1.4.1" + chromium-bidi "0.4.11" + cross-fetch "3.1.6" debug "4.3.4" - devtools-protocol "0.0.1068969" - extract-zip "2.0.1" - https-proxy-agent "5.0.1" - proxy-from-env "1.1.0" - rimraf "3.0.2" - tar-fs "2.1.1" - unbzip2-stream "1.4.3" - ws "8.10.0" + devtools-protocol "0.0.1120988" + ws "8.13.0" -puppeteer@19.4.0: - version "19.4.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz#3adfcb415e96d7b5900a66a1097947272313ee9f" - integrity sha512-sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg== +puppeteer@20.5.0: + version "20.5.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-20.5.0.tgz#453f42edb2cb085bb237914c2bcda7938b7ab1c2" + integrity sha512-3j0JShJGDT5z8rfDKf+wZQq3IHxw7JaDAdP7py5H5zOIgmqNG0e8R19y4tFzJ8i2WC4H/0bC51rIrTXyDop1FA== dependencies: - cosmiconfig "8.0.0" - devtools-protocol "0.0.1068969" - https-proxy-agent "5.0.1" - progress "2.0.3" - proxy-from-env "1.1.0" - puppeteer-core "19.4.0" + "@puppeteer/browsers" "1.4.1" + cosmiconfig "8.1.3" + puppeteer-core "20.5.0" quick-lru@^5.1.1: version "5.1.1" @@ -1676,21 +2287,22 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -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== +read-config-file@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411" + integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q== dependencies: + config-file-ts "^0.2.4" dotenv "^9.0.2" dotenv-expand "^5.1.0" js-yaml "^4.1.0" json5 "^2.2.0" lazy-val "^1.0.4" -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== +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -1718,7 +2330,20 @@ responselike@^2.0.0: dependencies: lowercase-keys "^2.0.0" -rimraf@3.0.2, rimraf@^3.0.0: +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" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +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== @@ -1765,19 +2390,19 @@ semver-compare@^1.0.0: integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== semver@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== 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== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" @@ -1793,6 +2418,11 @@ serialize-error@^7.0.1: 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@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -1817,11 +2447,16 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.0: +signal-exit@^3.0.0, 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== +signal-exit@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967" + integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q== + simple-concat@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" @@ -1836,7 +2471,7 @@ simple-get@^4.0.0: once "^1.3.1" simple-concat "^1.0.0" -simple-update-notifier@^1.0.7: +simple-update-notifier@^1.1.0: 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== @@ -1852,11 +2487,37 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -smart-buffer@^4.0.2: +smart-buffer@^4.0.2, smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + +socks-proxy-agent@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120" + integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ== + dependencies: + agent-base "^7.0.1" + debug "^4.3.4" + socks "^2.7.1" + +socks@^2.6.2, socks@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.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" @@ -1865,7 +2526,7 @@ source-map-support@^0.5.19: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.6.0: +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== @@ -1875,12 +2536,19 @@ sprintf-js@^1.1.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== +ssri@^10.0.0: + version "10.0.4" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6" + integrity sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ== + dependencies: + minipass "^5.0.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-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", 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== @@ -1889,6 +2557,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string-width@^5.0.1, string-width@^5.1.2: + 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_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -1896,13 +2573,20 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm: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" +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -1955,14 +2639,14 @@ tar-stream@^2.1.4: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.1.11: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== +tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2: + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -2006,6 +2690,11 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +tslib@^2.0.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -2013,11 +2702,23 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.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-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.0.2: + version "4.9.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== + unbzip2-stream@1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" @@ -2026,6 +2727,20 @@ unbzip2-stream@1.4.3: buffer "^5.2.1" through "^2.3.8" +unique-filename@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" + integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== + dependencies: + unique-slug "^4.0.0" + +unique-slug@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" + integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== + dependencies: + imurmurhash "^0.1.4" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -2062,6 +2777,21 @@ verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vm2@^3.9.19: + version "3.9.19" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.19.tgz#be1e1d7a106122c6c492b4d51c2e8b93d3ed6a4a" + integrity sha512-J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.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" + webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -2082,14 +2812,26 @@ which@^1.2.9: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: 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: +wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +word-wrap@~1.2.3: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + +"wrap-ansi-cjs@npm:wrap-ansi@^7.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== @@ -2098,15 +2840,24 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + 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== -ws@8.10.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51" - integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw== +ws@8.13.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" @@ -2128,10 +2879,23 @@ yargs-parser@^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.6.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== +yargs@17.7.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" + +yargs@^17.0.1, yargs@^17.6.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== dependencies: cliui "^8.0.1" escalade "^3.1.1" diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix index e77dea2cc2..cbb4c1d2dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix @@ -10,27 +10,27 @@ }; } { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; + name = "_babel_code_frame___code_frame_7.22.5.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_code_frame___code_frame_7.22.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz"; + sha512 = "Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.22.5.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_identifier___helper_validator_identifier_7.22.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz"; + sha512 = "aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="; }; } { - name = "_babel_highlight___highlight_7.18.6.tgz"; + name = "_babel_highlight___highlight_7.22.5.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_highlight___highlight_7.22.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz"; + sha512 = "BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw=="; }; } { @@ -41,6 +41,14 @@ sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; }; } + { + name = "_electron_asar___asar_3.2.4.tgz"; + path = fetchurl { + name = "_electron_asar___asar_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.4.tgz"; + sha512 = "lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g=="; + }; + } { name = "_electron_get___get_2.0.2.tgz"; path = fetchurl { @@ -50,19 +58,51 @@ }; } { - name = "_electron_universal___universal_1.2.1.tgz"; + name = "_electron_notarize___notarize_1.2.4.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 = "_electron_notarize___notarize_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.4.tgz"; + sha512 = "W5GQhJEosFNafewnS28d3bpQ37/s91CDWqxVchHfmv2dQSTWpOzNlUVQwYzC1ay5bChRV/A9BTL68yj0Pa+TSg=="; }; } { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz"; + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz"; - sha512 = "viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A=="; + name = "_electron_osx_sign___osx_sign_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.4.tgz"; + sha512 = "xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g=="; + }; + } + { + name = "_electron_rebuild___rebuild_3.2.13.tgz"; + path = fetchurl { + name = "_electron_rebuild___rebuild_3.2.13.tgz"; + url = "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.13.tgz"; + sha512 = "DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g=="; + }; + } + { + name = "_electron_universal___universal_1.3.4.tgz"; + path = fetchurl { + name = "_electron_universal___universal_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.4.tgz"; + sha512 = "BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg=="; + }; + } + { + name = "_fortawesome_fontawesome_free___fontawesome_free_6.4.0.tgz"; + path = fetchurl { + name = "_fortawesome_fontawesome_free___fontawesome_free_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz"; + sha512 = "0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ=="; + }; + } + { + name = "_isaacs_cliui___cliui_8.0.2.tgz"; + path = fetchurl { + name = "_isaacs_cliui___cliui_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz"; + sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; } { @@ -73,6 +113,14 @@ sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; } + { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + path = fetchurl { + name = "_malept_cross_spawn_promise___cross_spawn_promise_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; + sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; + }; + } { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; path = fetchurl { @@ -81,6 +129,30 @@ sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; }; } + { + name = "_npmcli_fs___fs_3.1.0.tgz"; + path = fetchurl { + name = "_npmcli_fs___fs_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz"; + sha512 = "7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w=="; + }; + } + { + name = "_pkgjs_parseargs___parseargs_0.11.0.tgz"; + path = fetchurl { + name = "_pkgjs_parseargs___parseargs_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"; + sha512 = "+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="; + }; + } + { + name = "_puppeteer_browsers___browsers_1.4.1.tgz"; + path = fetchurl { + name = "_puppeteer_browsers___browsers_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-1.4.1.tgz"; + sha512 = "H43VosMzywHCcYcgv0GXXopvwnV21Ud9g2aXbPlQUJj1Xcz9V0wBwHeFz6saFhx/3VKisZfI1GEKEOhQCau7Vw=="; + }; + } { name = "_sindresorhus_is___is_4.6.0.tgz"; path = fetchurl { @@ -114,11 +186,11 @@ }; } { - name = "_types_debug___debug_4.1.7.tgz"; + name = "_types_debug___debug_4.1.8.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_debug___debug_4.1.8.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz"; + sha512 = "/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ=="; }; } { @@ -129,14 +201,6 @@ 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 { @@ -153,14 +217,6 @@ 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 { @@ -170,19 +226,19 @@ }; } { - name = "_types_node___node_18.11.19.tgz"; + name = "_types_node___node_20.4.4.tgz"; path = fetchurl { - name = "_types_node___node_18.11.19.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz"; - sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; + name = "_types_node___node_20.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-20.4.4.tgz"; + sha512 = "CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew=="; }; } { - name = "_types_node___node_16.18.12.tgz"; + name = "_types_node___node_18.17.0.tgz"; path = fetchurl { - name = "_types_node___node_16.18.12.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz"; - sha512 = "vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw=="; + name = "_types_node___node_18.17.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz"; + sha512 = "GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg=="; }; } { @@ -209,22 +265,6 @@ 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 { @@ -233,6 +273,38 @@ sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; }; } + { + name = "_xmldom_xmldom___xmldom_0.8.10.tgz"; + path = fetchurl { + name = "_xmldom_xmldom___xmldom_0.8.10.tgz"; + url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz"; + sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; + }; + } + { + 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 = "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_8.10.0.tgz"; + path = fetchurl { + name = "acorn___acorn_8.10.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz"; + sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="; + }; + } { name = "agent_base___agent_base_6.0.2.tgz"; path = fetchurl { @@ -241,6 +313,30 @@ sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } + { + name = "agent_base___agent_base_7.1.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz"; + sha512 = "o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg=="; + }; + } + { + name = "agentkeepalive___agentkeepalive_4.3.0.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz"; + sha512 = "7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg=="; + }; + } + { + 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_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { @@ -265,6 +361,14 @@ 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 { @@ -281,6 +385,14 @@ sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } + { + 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 = "app_builder_bin___app_builder_bin_4.0.0.tgz"; path = fetchurl { @@ -290,11 +402,19 @@ }; } { - name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; + name = "app_builder_lib___app_builder_lib_24.4.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 = "app_builder_lib___app_builder_lib_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.4.0.tgz"; + sha512 = "EcdqtWvg1LAApKCfyRBukcVkmsa94s2e1VKHjZLpvA9/D14QEt8rHhffYeaA+cH/pVeoNVn2ob735KnfJKEEow=="; + }; + } + { + name = "aproba___aproba_2.0.0.tgz"; + path = fetchurl { + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; } { @@ -305,6 +425,14 @@ sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; }; } + { + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; + sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; + }; + } { name = "argparse___argparse_2.0.1.tgz"; path = fetchurl { @@ -313,14 +441,6 @@ 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 { @@ -329,6 +449,14 @@ sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; } + { + name = "ast_types___ast_types_0.13.4.tgz"; + path = fetchurl { + name = "ast_types___ast_types_0.13.4.tgz"; + url = "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz"; + sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; + }; + } { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { @@ -370,11 +498,11 @@ }; } { - name = "axios___axios_1.3.2.tgz"; + name = "axios___axios_1.4.0.tgz"; path = fetchurl { - name = "axios___axios_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz"; - sha512 = "1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw=="; + name = "axios___axios_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz"; + sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; }; } { @@ -393,6 +521,14 @@ sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } + { + name = "basic_ftp___basic_ftp_5.0.3.tgz"; + path = fetchurl { + name = "basic_ftp___basic_ftp_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.3.tgz"; + sha512 = "QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g=="; + }; + } { name = "bl___bl_4.1.0.tgz"; path = fetchurl { @@ -426,11 +562,11 @@ }; } { - name = "bootstrap___bootstrap_5.2.3.tgz"; + name = "bootstrap___bootstrap_5.3.0.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 = "bootstrap___bootstrap_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.0.tgz"; + sha512 = "UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw=="; }; } { @@ -449,22 +585,6 @@ 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 { @@ -474,19 +594,11 @@ }; } { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; + name = "buffer_equal___buffer_equal_1.0.1.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_equal___buffer_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz"; + sha512 = "QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg=="; }; } { @@ -506,19 +618,27 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.2.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_runtime___builder_util_runtime_9.2.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz"; + sha512 = "2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA=="; }; } { - name = "builder_util___builder_util_23.6.0.tgz"; + name = "builder_util___builder_util_24.4.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 = "builder_util___builder_util_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.4.0.tgz"; + sha512 = "tONb/GIK1MKa1BcOPHE1naId3o5nj6gdka5kP7yUJh2DOfF+jMq3laiu+UOZH6A7ZtkMtnGNMYFKFTIv408n/A=="; + }; + } + { + name = "cacache___cacache_17.1.3.tgz"; + path = fetchurl { + name = "cacache___cacache_17.1.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-17.1.3.tgz"; + sha512 = "jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg=="; }; } { @@ -530,11 +650,11 @@ }; } { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; + name = "cacheable_request___cacheable_request_7.0.4.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 = "cacheable_request___cacheable_request_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz"; + sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; } { @@ -577,6 +697,14 @@ sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; } + { + name = "chromium_bidi___chromium_bidi_0.4.11.tgz"; + path = fetchurl { + name = "chromium_bidi___chromium_bidi_0.4.11.tgz"; + url = "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.11.tgz"; + sha512 = "p03ajLhlQ5gebw3cmbDBFmBc2wnJM5dnXS8Phu6mblGn/KQd76yOVL5VwE0VAisa7oazNfKGTaXlIZ8Q5Bb9OA=="; + }; + } { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; path = fetchurl { @@ -586,11 +714,35 @@ }; } { - name = "ci_info___ci_info_3.7.1.tgz"; + name = "ci_info___ci_info_3.8.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz"; - sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; + 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_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.9.0.tgz"; + path = fetchurl { + name = "cli_spinners___cli_spinners_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz"; + sha512 = "4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g=="; }; } { @@ -625,6 +777,14 @@ sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; }; } + { + 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 = "color_convert___color_convert_1.9.3.tgz"; path = fetchurl { @@ -658,11 +818,11 @@ }; } { - name = "colors___colors_1.0.3.tgz"; + name = "color_support___color_support_1.1.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 = "color_support___color_support_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; } { @@ -673,14 +833,6 @@ 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 { @@ -705,6 +857,22 @@ sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } + { + name = "config_file_ts___config_file_ts_0.2.4.tgz"; + path = fetchurl { + name = "config_file_ts___config_file_ts_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz"; + sha512 = "cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ=="; + }; + } + { + 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"; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; + }; + } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -714,11 +882,11 @@ }; } { - name = "cosmiconfig___cosmiconfig_8.0.0.tgz"; + name = "cosmiconfig___cosmiconfig_8.1.3.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_8.1.3.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz"; + sha512 = "/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw=="; }; } { @@ -730,11 +898,11 @@ }; } { - name = "cross_fetch___cross_fetch_3.1.5.tgz"; + name = "cross_fetch___cross_fetch_3.1.6.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_fetch___cross_fetch_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz"; + sha512 = "riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g=="; }; } { @@ -753,6 +921,14 @@ sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } + { + name = "data_uri_to_buffer___data_uri_to_buffer_5.0.1.tgz"; + path = fetchurl { + name = "data_uri_to_buffer___data_uri_to_buffer_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz"; + sha512 = "a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg=="; + }; + } { name = "debug___debug_4.3.4.tgz"; path = fetchurl { @@ -761,14 +937,6 @@ 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 { @@ -785,6 +953,22 @@ sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } + { + 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 = "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 = "defer_to_connect___defer_to_connect_2.0.1.tgz"; path = fetchurl { @@ -794,11 +978,19 @@ }; } { - name = "define_properties___define_properties_1.1.4.tgz"; + name = "define_properties___define_properties_1.2.0.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_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 = "degenerator___degenerator_4.0.4.tgz"; + path = fetchurl { + name = "degenerator___degenerator_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/degenerator/-/degenerator-4.0.4.tgz"; + sha512 = "MTZdZsuNxSBL92rsjx3VFWe57OpRlikyLbcx2B5Dmdv6oScqpMrvpY7zHLMymrUxo3U5+suPUMsNgW/+SZB1lg=="; }; } { @@ -810,11 +1002,27 @@ }; } { - name = "detect_libc___detect_libc_2.0.1.tgz"; + name = "delegates___delegates_1.0.0.tgz"; path = fetchurl { - name = "detect_libc___detect_libc_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz"; - sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; + }; + } + { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + } + { + name = "detect_libc___detect_libc_2.0.2.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz"; + sha512 = "UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw=="; }; } { @@ -826,27 +1034,27 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.1120988.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.1068969.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz"; - sha512 = "ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ=="; + name = "devtools_protocol___devtools_protocol_0.0.1120988.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1120988.tgz"; + sha512 = "39fCpE3Z78IaIPChJsP6Lhmkbf4dWXOmzLk/KFTdRkNk/0JymRIfUynDVRndV9HoDz8PyalK1UH21ST/ivwW5Q=="; }; } { - name = "dir_compare___dir_compare_2.4.0.tgz"; + name = "dir_compare___dir_compare_3.3.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_compare___dir_compare_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz"; + sha512 = "J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg=="; }; } { - name = "dmg_builder___dmg_builder_23.6.0.tgz"; + name = "dmg_builder___dmg_builder_24.4.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_builder___dmg_builder_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.4.0.tgz"; + sha512 = "p5z9Cx539GSBYb+b09Z+hMhuBTh/BrI71VRg4rgF6f2xtIRK/YlTGVS/O08k5OojoyhZcpS7JXxDVSmQoWgiiQ=="; }; } { @@ -874,43 +1082,43 @@ }; } { - name = "ejs___ejs_3.1.8.tgz"; + name = "eastasianwidth___eastasianwidth_0.2.0.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 = "eastasianwidth___eastasianwidth_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz"; + sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; }; } { - name = "electron_builder___electron_builder_23.6.0.tgz"; + name = "ejs___ejs_3.1.9.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 = "ejs___ejs_3.1.9.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz"; + sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; } { - name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; + name = "electron_builder___electron_builder_24.4.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_builder___electron_builder_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.4.0.tgz"; + sha512 = "D5INxodxaUIJgEX6p/fqBd8wQNS8XRAToNIJ9SQC+taNS5D73ZsjLuXiRraFGCB0cVk9KeKhEkdEOH5AaVya4g=="; }; } { - name = "electron_publish___electron_publish_23.6.0.tgz"; + name = "electron_publish___electron_publish_24.4.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_publish___electron_publish_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.4.0.tgz"; + sha512 = "U3mnVSxIfNrLW7ZnwiedFhcLf6ExPFXgAsx89WpfQFsV4gFAt/LG+H74p0m9NSvsLXiZuF82yXoxi7Ou8GHq4Q=="; }; } { - name = "electron___electron_22.2.0.tgz"; + name = "electron___electron_25.3.1.tgz"; path = fetchurl { - name = "electron___electron_22.2.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-22.2.0.tgz"; - sha512 = "puRZSF2vWJ4pz3oetL5Td8LcuivTWz3MoAk/gjImHSN1B/2VJNEQlw1jGdkte+ppid2craOswE2lmCOZ7SwF1g=="; + name = "electron___electron_25.3.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-25.3.1.tgz"; + sha512 = "t0QXXqgf0/P0OJ9LU3qpcBMK+wL0FRwTQfooBaaG08v5hywPzc1yplfb3l4tS1xC0Ttw8IBaKLBeEoRgxBRHjg=="; }; } { @@ -921,6 +1129,22 @@ 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 = "encoding___encoding_0.1.13.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + } { name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { @@ -937,6 +1161,14 @@ sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; } + { + name = "err_code___err_code_2.0.3.tgz"; + path = fetchurl { + name = "err_code___err_code_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + } { name = "error_ex___error_ex_1.3.2.tgz"; path = fetchurl { @@ -977,6 +1209,38 @@ sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } + { + 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 = "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 = "execa___execa_1.0.0.tgz"; path = fetchurl { @@ -993,6 +1257,14 @@ sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; } + { + name = "exponential_backoff___exponential_backoff_3.1.1.tgz"; + path = fetchurl { + name = "exponential_backoff___exponential_backoff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz"; + sha512 = "dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw=="; + }; + } { name = "extract_zip___extract_zip_2.0.1.tgz"; path = fetchurl { @@ -1025,6 +1297,14 @@ 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 = "fd_slicer___fd_slicer_1.1.0.tgz"; path = fetchurl { @@ -1057,6 +1337,14 @@ sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; } + { + name = "foreground_child___foreground_child_3.1.1.tgz"; + path = fetchurl { + name = "foreground_child___foreground_child_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz"; + sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; + }; + } { name = "form_data___form_data_4.0.0.tgz"; path = fetchurl { @@ -1105,6 +1393,14 @@ sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; } + { + name = "fs_minipass___fs_minipass_3.0.2.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.2.tgz"; + sha512 = "2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g=="; + }; + } { name = "fs.realpath___fs.realpath_1.0.0.tgz"; path = fetchurl { @@ -1121,6 +1417,14 @@ sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; } + { + name = "gauge___gauge_4.0.4.tgz"; + path = fetchurl { + name = "gauge___gauge_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; + }; + } { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { @@ -1130,11 +1434,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.1.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_intrinsic___get_intrinsic_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; + sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; }; } { @@ -1153,6 +1457,14 @@ sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; } + { + name = "get_uri___get_uri_6.0.1.tgz"; + path = fetchurl { + name = "get_uri___get_uri_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.1.tgz"; + sha512 = "7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q=="; + }; + } { name = "github_from_package___github_from_package_0.0.0.tgz"; path = fetchurl { @@ -1161,6 +1473,14 @@ sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; }; } + { + name = "glob___glob_10.3.3.tgz"; + path = fetchurl { + name = "glob___glob_10.3.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz"; + sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; + }; + } { name = "glob___glob_7.2.3.tgz"; path = fetchurl { @@ -1194,19 +1514,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; + name = "graceful_fs___graceful_fs_4.2.11.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 = "graceful_fs___graceful_fs_4.2.11.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz"; + sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; } { @@ -1233,6 +1545,14 @@ 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 { @@ -1241,6 +1561,14 @@ sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; } + { + 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"; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; + }; + } { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -1273,6 +1601,14 @@ sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; } + { + name = "http_proxy_agent___http_proxy_agent_7.0.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz"; + sha512 = "+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ=="; + }; + } { name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; path = fetchurl { @@ -1289,6 +1625,22 @@ sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; } + { + name = "https_proxy_agent___https_proxy_agent_7.0.1.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz"; + sha512 = "Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ=="; + }; + } + { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + path = fetchurl { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + }; + } { name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { @@ -1321,6 +1673,22 @@ sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; } + { + 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 { @@ -1345,6 +1713,22 @@ sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } + { + name = "ip___ip_1.1.8.tgz"; + path = fetchurl { + name = "ip___ip_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz"; + sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + }; + } + { + name = "ip___ip_2.0.0.tgz"; + path = fetchurl { + name = "ip___ip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + }; + } { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { @@ -1377,6 +1761,22 @@ sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } + { + 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_lambda___is_lambda_1.0.1.tgz"; + path = fetchurl { + name = "is_lambda___is_lambda_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; + }; + } { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { @@ -1385,6 +1785,14 @@ sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; } + { + 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_wsl___is_wsl_2.2.0.tgz"; path = fetchurl { @@ -1393,14 +1801,6 @@ sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } - { - 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 { @@ -1409,6 +1809,14 @@ sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; } + { + name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz"; + sha512 = "UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg=="; + }; + } { name = "isexe___isexe_2.0.0.tgz"; path = fetchurl { @@ -1426,11 +1834,19 @@ }; } { - name = "jake___jake_10.8.5.tgz"; + name = "jackspeak___jackspeak_2.2.1.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 = "jackspeak___jackspeak_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.1.tgz"; + sha512 = "MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw=="; + }; + } + { + name = "jake___jake_10.8.7.tgz"; + path = fetchurl { + name = "jake___jake_10.8.7.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz"; + sha512 = "ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w=="; }; } { @@ -1514,11 +1930,11 @@ }; } { - name = "keyv___keyv_4.5.2.tgz"; + name = "keyv___keyv_4.5.3.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 = "keyv___keyv_4.5.3.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz"; + sha512 = "QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug=="; }; } { @@ -1529,6 +1945,14 @@ sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+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 = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { @@ -1545,6 +1969,14 @@ 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_2.0.0.tgz"; path = fetchurl { @@ -1561,6 +1993,30 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } + { + name = "lru_cache___lru_cache_7.18.3.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_7.18.3.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz"; + sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; + }; + } + { + name = "lru_cache___lru_cache_10.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz"; + sha512 = "svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw=="; + }; + } + { + name = "make_fetch_happen___make_fetch_happen_11.1.1.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz"; + sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; + }; + } { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { @@ -1593,6 +2049,14 @@ 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_response___mimic_response_1.0.1.tgz"; path = fetchurl { @@ -1609,14 +2073,6 @@ 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 { @@ -1634,11 +2090,59 @@ }; } { - name = "minimist___minimist_1.2.7.tgz"; + name = "minimatch___minimatch_9.0.3.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 = "minimatch___minimatch_9.0.3.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz"; + sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; + }; + } + { + 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_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + } + { + name = "minipass_fetch___minipass_fetch_3.0.3.tgz"; + path = fetchurl { + name = "minipass_fetch___minipass_fetch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.3.tgz"; + sha512 = "n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ=="; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + } + { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + path = fetchurl { + name = "minipass_sized___minipass_sized_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; }; } { @@ -1650,11 +2154,19 @@ }; } { - name = "minipass___minipass_4.0.2.tgz"; + name = "minipass___minipass_5.0.0.tgz"; path = fetchurl { - name = "minipass___minipass_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.2.tgz"; - sha512 = "4Hbzei7ZyBp+1aw0874YWpKOubZd/jc53/XU+gkYry1QV+VvrbO8icLM5CUtm4F0hyXn85DXYKEMIS26gitD3A=="; + name = "minipass___minipass_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz"; + sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; + }; + } + { + name = "minipass___minipass_7.0.2.tgz"; + path = fetchurl { + name = "minipass___minipass_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz"; + sha512 = "eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA=="; }; } { @@ -1665,6 +2177,14 @@ sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; } + { + 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 = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; path = fetchurl { @@ -1681,14 +2201,6 @@ sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; } - { - 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 { @@ -1697,6 +2209,14 @@ 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 = "napi_build_utils___napi_build_utils_1.0.2.tgz"; path = fetchurl { @@ -1705,6 +2225,22 @@ sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; } + { + name = "negotiator___negotiator_0.6.3.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + } + { + name = "netmask___netmask_2.0.2.tgz"; + path = fetchurl { + name = "netmask___netmask_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz"; + sha512 = "dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="; + }; + } { name = "nice_try___nice_try_1.0.5.tgz"; path = fetchurl { @@ -1714,11 +2250,11 @@ }; } { - name = "node_abi___node_abi_3.31.0.tgz"; + name = "node_abi___node_abi_3.45.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.31.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + name = "node_abi___node_abi_3.45.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz"; + sha512 = "iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ=="; }; } { @@ -1738,11 +2274,35 @@ }; } { - name = "node_fetch___node_fetch_2.6.7.tgz"; + name = "node_api_version___node_api_version_0.1.4.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_api_version___node_api_version_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz"; + sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; + }; + } + { + name = "node_fetch___node_fetch_2.6.12.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz"; + sha512 = "C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g=="; + }; + } + { + name = "node_gyp___node_gyp_9.4.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_9.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz"; + sha512 = "dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg=="; + }; + } + { + 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=="; }; } { @@ -1761,6 +2321,14 @@ sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; }; } + { + name = "npmlog___npmlog_6.0.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; + }; + } { name = "object_keys___object_keys_1.1.1.tgz"; path = fetchurl { @@ -1777,6 +2345,30 @@ 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 = "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 = "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 = "p_cancelable___p_cancelable_2.1.1.tgz"; path = fetchurl { @@ -1793,6 +2385,30 @@ sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; } + { + 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 = "pac_proxy_agent___pac_proxy_agent_6.0.4.tgz"; + path = fetchurl { + name = "pac_proxy_agent___pac_proxy_agent_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-6.0.4.tgz"; + sha512 = "FbJYeusBOZNe6bmrC2/+r/HljwExryon16lNKEU82gWiwIPMCEktUPSEAcTkO9K3jd/YPGuX/azZel1ltmo6nQ=="; + }; + } + { + name = "pac_resolver___pac_resolver_6.0.2.tgz"; + path = fetchurl { + name = "pac_resolver___pac_resolver_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-6.0.2.tgz"; + sha512 = "EQpuJ2ifOjpZY5sg1Q1ZeAxvtLwR7Mj3RgY8cysPGbsRu3RBXyJFWxnMus9PScjxya/0LzvVDxNh/gl0eXBU4w=="; + }; + } { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { @@ -1833,6 +2449,14 @@ sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } + { + name = "path_scurry___path_scurry_1.10.1.tgz"; + path = fetchurl { + name = "path_scurry___path_scurry_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz"; + sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; + }; + } { name = "path_type___path_type_4.0.0.tgz"; path = fetchurl { @@ -1850,11 +2474,11 @@ }; } { - name = "plist___plist_3.0.6.tgz"; + name = "plist___plist_3.1.0.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 = "plist___plist_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz"; + sha512 = "uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="; }; } { @@ -1865,6 +2489,14 @@ sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw=="; }; } + { + 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 = "progress___progress_2.0.3.tgz"; path = fetchurl { @@ -1873,6 +2505,22 @@ sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } + { + name = "promise_retry___promise_retry_2.0.1.tgz"; + path = fetchurl { + name = "promise_retry___promise_retry_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + } + { + name = "proxy_agent___proxy_agent_6.2.1.tgz"; + path = fetchurl { + name = "proxy_agent___proxy_agent_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.2.1.tgz"; + sha512 = "OIbBKlRAT+ycCm6wAYIzMwPejzRtjy8F3QiDX0eKOA3e4pe3U9F/IvzcHP42bmgQxVv97juG+J8/gx+JIeCX/Q=="; + }; + } { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { @@ -1898,19 +2546,19 @@ }; } { - name = "puppeteer_core___puppeteer_core_19.4.0.tgz"; + name = "puppeteer_core___puppeteer_core_20.5.0.tgz"; path = fetchurl { - name = "puppeteer_core___puppeteer_core_19.4.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz"; - sha512 = "gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ=="; + name = "puppeteer_core___puppeteer_core_20.5.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-20.5.0.tgz"; + sha512 = "9ddHXUQ7jpliGei87zYTuEZYQvFj6Lzk5R8w4vT4gMmNArkEqC5CX72TnVIJiTUbiTpOXJkvMQaXIHYopjdUtQ=="; }; } { - name = "puppeteer___puppeteer_19.4.0.tgz"; + name = "puppeteer___puppeteer_20.5.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_19.4.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz"; - sha512 = "sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg=="; + name = "puppeteer___puppeteer_20.5.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-20.5.0.tgz"; + sha512 = "3j0JShJGDT5z8rfDKf+wZQq3IHxw7JaDAdP7py5H5zOIgmqNG0e8R19y4tFzJ8i2WC4H/0bC51rIrTXyDop1FA=="; }; } { @@ -1930,19 +2578,19 @@ }; } { - name = "read_config_file___read_config_file_6.2.0.tgz"; + name = "read_config_file___read_config_file_6.3.2.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_config_file___read_config_file_6.3.2.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz"; + sha512 = "M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q=="; }; } { - name = "readable_stream___readable_stream_3.6.0.tgz"; + name = "readable_stream___readable_stream_3.6.2.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_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; } { @@ -1977,6 +2625,22 @@ sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; } + { + 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 = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; + }; + } { name = "rimraf___rimraf_3.0.2.tgz"; path = fetchurl { @@ -2034,27 +2698,27 @@ }; } { - name = "semver___semver_5.7.1.tgz"; + name = "semver___semver_5.7.2.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_5.7.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz"; + sha512 = "cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="; }; } { - name = "semver___semver_6.3.0.tgz"; + name = "semver___semver_6.3.1.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_6.3.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz"; + sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; }; } { - name = "semver___semver_7.3.8.tgz"; + name = "semver___semver_7.5.4.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.5.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz"; + sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; }; } { @@ -2073,6 +2737,14 @@ 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_1.2.0.tgz"; path = fetchurl { @@ -2113,6 +2785,14 @@ sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; } + { + name = "signal_exit___signal_exit_4.0.2.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz"; + sha512 = "MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q=="; + }; + } { name = "simple_concat___simple_concat_1.0.1.tgz"; path = fetchurl { @@ -2153,6 +2833,30 @@ sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } + { + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; + sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_8.0.1.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz"; + sha512 = "59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ=="; + }; + } + { + name = "socks___socks_2.7.1.tgz"; + path = fetchurl { + name = "socks___socks_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + }; + } { name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { @@ -2177,6 +2881,14 @@ sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; } + { + name = "ssri___ssri_10.0.4.tgz"; + path = fetchurl { + name = "ssri___ssri_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz"; + sha512 = "12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ=="; + }; + } { name = "stat_mode___stat_mode_1.0.0.tgz"; path = fetchurl { @@ -2193,6 +2905,14 @@ 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_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { @@ -2209,6 +2929,14 @@ sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } + { + name = "strip_ansi___strip_ansi_7.1.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz"; + sha512 = "iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="; + }; + } { name = "strip_eof___strip_eof_1.0.0.tgz"; path = fetchurl { @@ -2266,11 +2994,11 @@ }; } { - name = "tar___tar_6.1.13.tgz"; + name = "tar___tar_6.1.15.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 = "tar___tar_6.1.15.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz"; + sha512 = "/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A=="; }; } { @@ -2321,6 +3049,14 @@ sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ=="; }; } + { + name = "tslib___tslib_2.6.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz"; + sha512 = "7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="; + }; + } { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -2329,6 +3065,14 @@ sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; }; } + { + 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_fest___type_fest_0.13.1.tgz"; path = fetchurl { @@ -2337,6 +3081,14 @@ 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 = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { @@ -2345,6 +3097,22 @@ sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } + { + name = "unique_filename___unique_filename_3.0.0.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz"; + sha512 = "afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g=="; + }; + } + { + name = "unique_slug___unique_slug_4.0.0.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz"; + sha512 = "WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ=="; + }; + } { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { @@ -2393,6 +3161,22 @@ sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; }; } + { + name = "vm2___vm2_3.9.19.tgz"; + path = fetchurl { + name = "vm2___vm2_3.9.19.tgz"; + url = "https://registry.yarnpkg.com/vm2/-/vm2-3.9.19.tgz"; + sha512 = "J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg=="; + }; + } + { + 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 = "webidl_conversions___webidl_conversions_3.0.1.tgz"; path = fetchurl { @@ -2425,6 +3209,22 @@ sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } + { + name = "wide_align___wide_align_1.1.5.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; + }; + } + { + name = "word_wrap___word_wrap_1.2.5.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz"; + sha512 = "BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="; + }; + } { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { @@ -2433,6 +3233,14 @@ sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } + { + name = "wrap_ansi___wrap_ansi_8.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; + sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; + }; + } { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { @@ -2442,11 +3250,11 @@ }; } { - name = "ws___ws_8.10.0.tgz"; + name = "ws___ws_8.13.0.tgz"; path = fetchurl { - name = "ws___ws_8.10.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz"; - sha512 = "+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw=="; + name = "ws___ws_8.13.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz"; + sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; }; } { @@ -2482,11 +3290,19 @@ }; } { - name = "yargs___yargs_17.6.2.tgz"; + name = "yargs___yargs_17.7.1.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_17.7.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz"; + sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; + }; + } + { + name = "yargs___yargs_17.7.2.tgz"; + path = fetchurl { + name = "yargs___yargs_17.7.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz"; + sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix index 0c8b733106..ed45be67d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { your selection will be sent to standard output. ''; license = licenses.gpl2Only; - maintainers = with maintainers; [ matthiasbeyer SuperSandro2000 ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix index b2abec0974..5f50307537 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix @@ -8,14 +8,13 @@ , perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spigot"; - version = "20210527"; - srcVersion = "20210527.7dd3cfd"; + version = "20220606.eb585f8"; src = fetchurl { - url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/${pname}-${srcVersion}.tar.gz"; - hash = "sha256-EBS3lgfLtsyBQ8mzoJPyZhRBJNmkVSeF5XecGgcvqtw="; + url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/spigot-${finalAttrs.version}.tar.gz"; + hash = "sha256-JyNNZo/HUPWv5rYtlNYp8Hl0C7i3yxEyKm+77ysN7Ao="; }; nativeBuildInputs = [ @@ -33,22 +32,11 @@ stdenv.mkDerivation rec { strictDeps = true; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - [ `$out/bin/spigot -b 10 -d 10 e` == "2.7182818284" ] || exit 1 - [ `$out/bin/spigot -b 10 -d 10 pi` == "3.1415926535" ] || exit 1 - [ `$out/bin/spigot -b 10 -d 10 sqrt\(2\)` == "1.4142135623" ] || exit 1 - - runHook postInstallCheck - ''; - - meta = with lib; { + meta = { homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; description = "A command-line exact real calculator"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres mcbeth ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 2f89b8c362..9063fd1966 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -19,6 +19,10 @@ let inherit version; hash = "sha256-LdpflnGa6Js+wPG3lpjYbrmuyx1U6ZCrs/3ZLAS0apA="; }; + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; }; }; self = py; diff --git a/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix b/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix index 789f38a7df..6c6ed54eec 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.12"; + version = "1.0.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-znISDhxmAEw38TWAtA3xCZrplYs1pQ+DvfCucGDJZSU="; + sha256 = "sha256-WOdiBN/qyszAI4GNFB/RuZd9EV0uj9l5yUnryZ6cqSE="; }; - cargoSha256 = "sha256-GBms5Ha7agwG5u2U+perN8Uo5ihL4QFRZh2wxlV+Wxo="; + cargoSha256 = "sha256-sET5Gf4vLJAvgdslT+bov9vzCKuTKCEJ0/+JR2GfhmY="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 1100a62b09..fa88b633d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-aINiWzkt4sAWgcGdkHTb2KRMh2z+LiOhDdTJbzbXwR4="; + hash = "sha256-CrD65nHE40n83HO+4QM1sLHvdFaqTvOb96hPBgXKuwk="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-XT2kgiITtG1FNyztNvos/r01pvdF1xPhHA4+YhFGFEU="; + cargoHash = "sha256-ZHHrpepKZnSGufyEAjNDozaIKAt2GFRt+hU2ej7LceA="; nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix index 0c43ac74ec..f4b3910b9f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.20.8"; + version = "0.20.9"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-neHcLO64Ik61P6R6rFL3kuKi9qRQ64f1xEqUrgUKeCg="; + sha256 = "sha256-kPgyWXPHGfvZ+ne6tumy6NGn1Tl4J+toZ983YaMFi6k="; }; vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix index cbc42444af..6b1e7a2d86 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.68.0"; + version = "1.68.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-qFPTDyljSKWim8sZbDM5OZ4sHL4csqXxit4UdMnOTxs="; + hash = "sha256-z5tDPXz6Z6oPzWIp4gapNLwm+0VrwCGNIXsFu94Zn08="; }; - vendorHash = "sha256-Xxoe+8MKwZPPapTILHAIegGPBn8vaAjU5bZrd8RvazE="; + vendorHash = "sha256-V6TF7Q+9XxBeSVXlotu8tUrNCWDr80BZsQcVSBGikl8="; CGO_CFLAGS = [ "-Wno-format-security" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix index 8b9be06abb..d7a90fa889 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -39,6 +39,6 @@ buildPythonApplication rec { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index e1a9e4c479..deb2ff2c4e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/tmux/tmux/raw/${finalAttrs.version}/CHANGES"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thammers fpletz SuperSandro2000 srapenne ]; + maintainers = with lib.maintainers; [ thammers fpletz srapenne ]; }; }) diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index a8f6750c83..f900eafaac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "12.0.0"; + version = "12.0.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-l8/X2PGdUZa9r0E95wpbvag6XW5jV+7H8TJMm/D4yqk="; + hash = "sha256-PfrtTegJULzPAmKUk/6P9rD+ttPJOhaf2505og64C0Y="; }; - cargoHash = "sha256-W+NrhHxPDo+WfNMxDmmPlCdTB/YavLDQ2+JEMDF9qJ4="; + cargoHash = "sha256-S6jSI/KuHocYD2dhg3o1NSyA8Q04Xo215TWl8Y1C7g8="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix index fced21eb79..2b0903bff2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.9.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-R6Dw6/pgXUmQrq8iD93h64VVEvB4TBEcGb2Rbg6kTp0="; + sha256 = "sha256-Ag8ZQT6ugLMDTZwY6A69B+WDpLWMtBBtpg8m1a09N4I="; }; vendorHash = "sha256-UJ7U9CfQHKgK7wfb8zqLZ7na4OBBZBYiGayII3RTaiQ="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/trdl-client/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trdl-client/default.nix index b5f4405e64..3748f1755d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trdl-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trdl-client/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-jJwRIfxmjlhfS/0+IN2IdQPlO9FkTb64PWUiLwkarfM="; }; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; vendorHash = "sha256-f7FPeR+us3WvwqzcSQLbkKv905CCIAAm+HNV2FFF8OY="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix b/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix index 2f11b5c5c2..aa34fdbc41 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "twspace-crawler"; - version = "1.12.3"; + version = "1.12.7"; src = fetchFromGitHub { owner = "HitomaruKonpaku"; repo = "twspace-crawler"; - rev = "d78caf0da5eb9c493e3d4d8b4ca47d434f4764bb"; # version not tagged - hash = "sha256-ONgPGlLRi0z2V1hB15w75GUt2Asc3hrRjuEjNSZc7Bc="; + rev = "bc1626996076f4e73890dc80b2fe99d578a7c641"; # version not tagged + hash = "sha256-/2wdl7VCcO8WRAYFtr1wtu80TwyLI3Hi8XzmrzOzhUQ="; }; - npmDepsHash = "sha256-Gq1OWJlIIIOHoP0TMscaPXaVpmfexax2EjdTCDPmeQQ="; + npmDepsHash = "sha256-pPpUQ6o0P7iTcdLwWqwItJFVhYH9rC+bLKo4Gz7DiRE="; meta = with lib; { description = "Script to monitor & download Twitter Spaces 24/7"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix index 403562e039..48f760b0e0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix @@ -1,30 +1,32 @@ -{ lib, python3Packages, fetchPypi, ffmpeg }: +{ lib, python3Packages, fetchPypi, ffmpeg-headless }: python3Packages.buildPythonApplication rec { pname = "twspace-dl"; - version = "2023.1.22.1"; + version = "2023.7.24.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "twspace_dl"; - sha256 = "050e78b4583374351c288114e3b01ab34b0b19ad2d4971d15c5519521cf3f2f4"; + sha256 = "sha256-Oq9k5Nfixf1vihhna7g3ZkqCwEtCdnvlbxIuOnGVoKE="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = with python3Packages; [ + mutagen requests ]; - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}" ]; pythonImportsCheck = [ "twspace_dl" ]; meta = with lib; { description = "A python module to download twitter spaces"; homepage = "https://github.com/HoloArchivists/twspace-dl"; + changelog = "https://github.com/HoloArchivists/twspace-dl/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ marsam ]; mainProgram = "twspace_dl"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/urn-timer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/urn-timer/default.nix index df0d3bdee2..8af36c2bca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/urn-timer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/urn-timer/default.nix @@ -11,19 +11,15 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "unstable-2023-07-01"; + version = "unstable-2023-07-31"; src = fetchFromGitHub { owner = "paoloose"; repo = "urn"; - rev = "8efdabcdd806b3b8997b82925d26209e6da8311b"; - hash = "sha256-lQVdHD3IkITJ2P2zimhFLTxmOzZkdWOg/RhR2xlBLJU="; + rev = "2dad51949aa21e0e66a3d34e916fb66689c6be2e"; + hash = "sha256-0pZjgKW4kyBgMGKEa8ZMhKtzbJX2MoXKID++iy16m2A="; }; - postPatch = '' - substituteInPlace Makefile --replace 'rsync -a --exclude=".*"' 'cp -r' - ''; - nativeBuildInputs = [ xxd pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix index 41ae07f177..533f61a9c7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-CEGUXJXqXmD8uT93T9dg49Lf5vTpAzQjdnhYmbR5zTI="; }; - sourceRoot = "source/src/"; + sourceRoot = "${src.name}/src/"; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = lib.optionals withUdisks [ udisks glib ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 6dd38e6d87..697396f081 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.19"; + version = "0.0.20"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-ysMSO6VaiaL4Sh5F0VbeAQYOo78lhVQjewZ5lwaCLRM="; + sha256 = "sha256-Xr+RcWvAHyMMaHhcd3ArGeRZzpL76v7fXiHUSSxgj10="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-cBocRWIpG2BQZDPJq4cNNYrFg/MBR3o58fXGHanTn30="; + hash = "sha256-3hUEDE+Yup/+u/ACyAWXYTLerOqB/jtOzECdI540Ag0="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = "https://github.com/uutils/coreutils"; - maintainers = with maintainers; [ siraben SuperSandro2000 ]; + maintainers = with maintainers; [ siraben ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/valeronoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/valeronoi/default.nix new file mode 100644 index 0000000000..95669bbeeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/valeronoi/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost +, cgal +, cmake +, copyDesktopItems +, gpp +, mpfr +, qtbase +, qtimageformats +, qtsvg +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "valeronoi"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "ccoors"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Xa70kOPQLavuJTF9PxCgpKYj15C2fna++cFlCId0a08="; + }; + + buildInputs = [ + boost + cgal + gpp + mpfr + qtbase + qtimageformats + qtsvg + ]; + + nativeBuildInputs = [ + cmake + copyDesktopItems + wrapQtAppsHook + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/ccoors/Valeronoi/"; + description = "A WiFi mapping companion app for Valetudo"; + license = licenses.gpl3Only; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nova-madeline maeve ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index a1d56481ab..fd3a94298c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -45,6 +45,10 @@ rustPlatform.buildRustPackage { hash = "sha256-+ATOHx+LQLQV4nMdj1FRRvDTqGCTbX9kl290AbY9Vw0="; }; + patches = [ + ./rust-1.71-unnecessary-mut.diff + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -122,5 +126,6 @@ rustPlatform.buildRustPackage { license = licenses.mpl20; maintainers = with maintainers; [ thoughtpolice happysalada ]; platforms = with platforms; all; + mainProgram = "vector"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff b/third_party/nixpkgs/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff new file mode 100644 index 0000000000..2507117279 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff @@ -0,0 +1,22 @@ +diff --git a/lib/vector-core/src/tls/incoming.rs b/lib/vector-core/src/tls/incoming.rs +index 5d2fd1cdb..7992f2c2b 100644 +--- a/lib/vector-core/src/tls/incoming.rs ++++ b/lib/vector-core/src/tls/incoming.rs +@@ -263,7 +263,7 @@ impl MaybeTlsIncomingStream { + where + F: FnOnce(Pin<&mut MaybeTlsStream>, &mut Context) -> Poll>, + { +- let mut this = self.get_mut(); ++ let this = self.get_mut(); + loop { + return match &mut this.state { + StreamState::Accepted(stream) => poll_fn(Pin::new(stream), cx), +@@ -307,7 +307,7 @@ impl AsyncWrite for MaybeTlsIncomingStream { + } + + fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll> { +- let mut this = self.get_mut(); ++ let this = self.get_mut(); + match &mut this.state { + StreamState::Accepted(stream) => match Pin::new(stream).poll_shutdown(cx) { + Poll::Ready(Ok(())) => { diff --git a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix index 75069f33f4..331b880aa8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9r"; + version = "0.9.9t"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-HVhRzJReIxO4R9ZhI8vPcV29TRVffT/Eq6Z4u1xMpQo="; + sha256 = "sha256-WbigrJohLYCRvgsCNd4Cid1zGaP1aQbj59QhZ6ymLms="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix index 6ca2537077..95ffa8e8e4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-1EMSrHx6Tx58voz5veyNZg1gnubuGyg2K4dg2QdzmMw="; + sha256 = "sha256-5EUXhKv4cLDaHr6Q2mel3YbVPAYRJd1JtHyWn7kQy8Y="; }; - vendorHash = "sha256-0wHXULDKyXYBTGxfSQXT/5NidPtSnx7ujb8vyczmE38="; + vendorHash = "sha256-rwQeIHJAtnRm5nPQCvgoBabVeyLZyrY3yglCW9+NGwM="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock index 584ea99c19..53d0877bac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock @@ -17,9 +17,9 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ - "cpp_demangle 0.4.1", + "cpp_demangle 0.4.2", "fallible-iterator", - "gimli 0.27.2", + "gimli 0.27.3", "memmap2", "object 0.31.1", "rustc-demangle", @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -69,15 +69,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[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", ] @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arbitrary" @@ -124,9 +124,9 @@ 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 = "atty" @@ -161,10 +161,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake3" -version = "1.3.3" +name = "bitflags" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "blake3" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", @@ -222,16 +228,16 @@ version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "textwrap", "unicode-width", ] [[package]] name = "clap" -version = "4.3.0" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -240,27 +246,26 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.25", + "syn", ] [[package]] @@ -277,9 +282,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[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 = "cpp_demangle" @@ -292,9 +297,9 @@ dependencies = [ [[package]] name = "cpp_demangle" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c76f98bdfc7f66172e6c7065f981ebb576ffc903fe4c0561d9f0c2509226dc6" +checksum = "ee34052ee3d93d6d8f3e6f81d85c47921f6653a19a7b70e939e3e602d893a674" dependencies = [ "cfg-if", ] @@ -480,22 +485,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +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", ] @@ -512,9 +517,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" dependencies = [ "csv-core", "itoa", @@ -531,25 +536,15 @@ dependencies = [ "memchr", ] -[[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 = "derive_arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -585,9 +580,9 @@ dependencies = [ [[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 = "env_logger" @@ -648,12 +643,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[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 = "fixedbitset" @@ -682,9 +674,9 @@ 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", ] @@ -722,9 +714,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", @@ -744,9 +736,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ "fallible-iterator", "indexmap 1.9.3", @@ -797,18 +789,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", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "humantime" @@ -824,9 +807,9 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[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", @@ -869,26 +852,14 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "is-terminal" -version = "0.4.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.11", - "rustix 0.37.19", + "hermit-abi 0.3.2", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -912,9 +883,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" @@ -927,9 +898,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -948,9 +919,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[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 = "libfuzzer-sys" @@ -963,12 +934,6 @@ dependencies = [ "once_cell", ] -[[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.0.46" @@ -977,18 +942,15 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +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 = "mach" @@ -1025,9 +987,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1043,20 +1005,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 0.3.2", "libc", ] @@ -1085,9 +1047,9 @@ 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 = "oorandom" @@ -1095,26 +1057,17 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[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 = "petgraph" @@ -1128,9 +1081,9 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -1141,15 +1094,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] @@ -1162,21 +1115,19 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[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 = "proc-macro2" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1196,16 +1147,16 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ - "bitflags", + "bitflags 1.3.2", "memchr", "unicase", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1268,7 +1219,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1285,9 +1236,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", @@ -1296,9 +1259,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustc-demangle" @@ -1308,13 +1271,13 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.35.13" +version = "0.35.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "6380889b07a03b5ecf1d44dc9ede6fd2145d84b502a2a9ca0b03c48e0cc3220f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.2.8", - "io-lifetimes 0.7.5", + "io-lifetimes", "libc", "linux-raw-sys 0.0.46", "windows-sys 0.42.0", @@ -1322,15 +1285,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno 0.3.1", - "io-lifetimes 1.0.11", "libc", - "linux-raw-sys 0.3.8", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] @@ -1347,9 +1309,9 @@ dependencies = [ [[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 = "same-file" @@ -1362,21 +1324,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 = "serde" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] @@ -1393,20 +1355,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -1415,14 +1377,15 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -1433,15 +1396,15 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[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 = "spdx" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2971cb691ca629f46174f73b1f95356c5617f89b4167f04107167c3dccb8dd89" +checksum = "b19b32ed6d899ab23174302ff105c1577e45a06b08d4fe0a9dd13ce804bbbf71" dependencies = [ "smallvec", ] @@ -1478,20 +1441,9 @@ checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -1500,21 +1452,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix 0.37.19", - "windows-sys 0.45.0", + "rustix 0.38.4", + "windows-sys 0.48.0", ] [[package]] @@ -1537,22 +1489,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn", ] [[package]] @@ -1613,9 +1565,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" @@ -1639,10 +1591,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] -name = "url" -version = "2.3.1" +name = "unsafe-libyaml" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -1679,9 +1637,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", @@ -1689,24 +1647,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.25", + "syn", "wasm-bindgen-shared", ] [[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", @@ -1714,29 +1672,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.25", + "syn", "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 = "wasm-compose" -version = "0.3.0" +version = "0.4.0" dependencies = [ "anyhow", - "clap 4.3.0", "glob", "heck", "indexmap 2.0.0", @@ -1747,7 +1704,7 @@ dependencies = [ "serde_yaml", "smallvec", "wasm-encoder", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wat", "wit-component", @@ -1755,42 +1712,42 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.30.0" +version = "0.31.1" dependencies = [ "anyhow", "leb128", "tempfile", - "wasmparser 0.108.0", + "wasmparser 0.110.0", ] [[package]] name = "wasm-metadata" -version = "0.9.0" +version = "0.10.1" dependencies = [ "anyhow", - "clap 4.3.0", + "clap 4.3.19", "indexmap 2.0.0", "serde", "serde_json", "spdx", "wasm-encoder", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wat", ] [[package]] name = "wasm-mutate" -version = "0.2.28" +version = "0.2.30" dependencies = [ "anyhow", - "clap 4.3.0", + "clap 4.3.19", "egg", "env_logger", "log", "rand", "thiserror", "wasm-encoder", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] @@ -1801,37 +1758,37 @@ version = "0.1.0" dependencies = [ "anyhow", "arbitrary", - "clap 4.3.0", + "clap 4.3.19", "env_logger", "itertools", "log", "num_cpus", "rand", "wasm-mutate", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wasmtime", ] [[package]] name = "wasm-shrink" -version = "0.1.29" +version = "0.1.31" dependencies = [ "anyhow", "blake3", - "clap 4.3.0", + "clap 4.3.19", "env_logger", "log", "rand", "wasm-mutate", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] [[package]] name = "wasm-smith" -version = "0.12.11" +version = "0.12.13" dependencies = [ "arbitrary", "criterion", @@ -1842,24 +1799,23 @@ dependencies = [ "rand", "serde", "wasm-encoder", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wat", ] [[package]] name = "wasm-tools" -version = "1.0.36" +version = "1.0.38" dependencies = [ "addr2line 0.20.0", "anyhow", "arbitrary", - "atty", - "clap 4.3.0", - "cpp_demangle 0.4.1", + "clap 4.3.19", + "cpp_demangle 0.4.2", "diff", "env_logger", - "gimli 0.27.2", + "gimli 0.27.3", "is_executable", "log", "pretty_assertions", @@ -1876,7 +1832,7 @@ dependencies = [ "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wast", "wat", @@ -1893,7 +1849,7 @@ dependencies = [ "wasm-mutate", "wasm-shrink", "wasm-smith", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wast", "wat", @@ -1912,7 +1868,7 @@ dependencies = [ "wasm-encoder", "wasm-mutate", "wasm-smith", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wasmtime", "wast", @@ -1933,7 +1889,7 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.108.0" +version = "0.110.0" dependencies = [ "anyhow", "criterion", @@ -1948,13 +1904,13 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.60" +version = "0.2.62" dependencies = [ "anyhow", "diff", "rayon", "tempfile", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wast", "wat", ] @@ -2094,7 +2050,7 @@ dependencies = [ "memoffset 0.6.5", "paste", "rand", - "rustix 0.35.13", + "rustix 0.35.14", "thiserror", "wasmtime-asm-macros", "wasmtime-environ", @@ -2116,7 +2072,7 @@ dependencies = [ [[package]] name = "wast" -version = "61.0.0" +version = "62.0.1" dependencies = [ "anyhow", "leb128", @@ -2124,22 +2080,22 @@ dependencies = [ "rayon", "unicode-width", "wasm-encoder", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wat", ] [[package]] name = "wat" -version = "1.0.67" +version = "1.0.69" dependencies = [ "wast", ] [[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", @@ -2204,44 +2160,20 @@ 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.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -2368,10 +2300,10 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "wit-component" -version = "0.12.0" +version = "0.13.1" dependencies = [ "anyhow", - "bitflags", + "bitflags 2.3.3", "env_logger", "glob", "indexmap 2.0.0", @@ -2379,7 +2311,7 @@ dependencies = [ "pretty_assertions", "wasm-encoder", "wasm-metadata", - "wasmparser 0.108.0", + "wasmparser 0.110.0", "wasmprinter", "wat", "wit-parser", @@ -2387,7 +2319,7 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.9.0" +version = "0.9.2" dependencies = [ "anyhow", "env_logger", @@ -2416,10 +2348,10 @@ dependencies = [ [[package]] name = "wit-smith" -version = "0.1.6" +version = "0.1.8" dependencies = [ "arbitrary", - "clap 4.3.0", + "clap 4.3.19", "indexmap 2.0.0", "log", "semver", @@ -2427,15 +2359,6 @@ dependencies = [ "wit-parser", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yansi" version = "0.5.1" diff --git a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix index 59e8f0ad5d..6572b7469f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.36"; + version = "1.0.38"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-ADwj7Tie02I5HEG5kt3x8TiudMFnYJ1KEyK12bCQ6kc="; + hash = "sha256-SGNIGOpkREGu/bmojOh+TPlg75rKoa04u+BDiida6dI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix index 5499cac9a8..244dccce6b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-rbJONP3ge+2+WzCIpTUZeieQz9Q/MZfEUmQVbZ+9Dro="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix index 100957c718..44b28cbc8c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wit-bindgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "wit-bindgen-cli-${version}"; - hash = "sha256-NUPCRIBmACWpJALsZmbRQLJ8fpcRyf0nUmNnTyiwKYc="; + hash = "sha256-ghWwFjpIOTM6//WQ8WySLzKzy2UlaahUjIxxwYUTQWo="; }; - cargoHash = "sha256-JASKEri9ZtDtkMkhBS3fB4JWg43Le11YJvuvOF76bCo="; + cargoHash = "sha256-Ch/S0/ON2HVEGHJ7jDE9k5q9+/2ANtt8uGv3ze60I6M="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index 7b58b9c2d9..fc87723208 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -60,5 +60,6 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.artturin ]; + mainProgram = "xvfb-run"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix index 3fa7a9a807..e274222b27 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix @@ -77,5 +77,6 @@ buildPythonPackage rec { ''; license = licenses.unlicense; maintainers = with maintainers; [ mkg20001 SuperSandro2000 marsam ]; + mainProgram = "yt-dlp"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix index 8d311223be..cba030c8a6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-qmT/gTkizZpyYN/YdobBq2vunGM5SpNpCHIFmg8nPhk="; + sha256 = "sha256-h/T3McaKKASwQt+0SBBxFXMnYyt+0Xl+5i8IulUAdnU="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-1sW6bvRJJp+qT5A9+l8wN3TQuzFDiBoeLyY5JvAA7dQ="; + cargoSha256 = "sha256-uu7zi6prnfbi4EQ0+0QcTEo/t5CIwNEQgJkIgxSk5u4="; postInstall = '' installManPage man/man*/* diff --git a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix index 6ef64222fb..5574a877c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix @@ -29,7 +29,6 @@ , bettercap , bully , crunch -, dhcp , dnsmasq , ettercap , hashcat @@ -94,7 +93,6 @@ let wireshark-cli ] ++ lib.optionals supportEvilTwin [ bettercap - dhcp dnsmasq ettercap hostapd diff --git a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix index ade6a6c600..92655b27ee 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.23.3"; + version = "4.1.0"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; - rev = "v${version}"; - hash = "sha256-aOir4ezLBNWoTaDeQDWoDdV/A+Qzbq09601297o6uDE="; + rev = "refs/tags/v${version}"; + hash = "sha256-mNoz9kVW+fwmur6SGWcpH9XYCYxasZJM0Bu4Bd4XMek="; }; - vendorHash = "sha256-zUl1q6rRjX958VXKnVB2YmLUpKMUtFvdh+hkIrTomes="; + vendorHash = "sha256-rX84qTlvPyDWVvHmpIVCP50yy+m+s/VtffORL+G/3kg="; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix index 216d27eb4e..6c972bb239 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, openssl, c-ares, libxml2, sqlite, zlib, libssh2 +, gnutls, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; - buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ + buildInputs = [ gnutls c-ares libxml2 sqlite zlib libssh2 ] ++ lib.optional stdenv.isDarwin Security; outputs = [ "bin" "dev" "out" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix index 6e8c7669f0..64f6cc4eca 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "babeld"; - version = "1.12.2"; + version = "1.13.1"; src = fetchurl { url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz"; - hash = "sha256-HbIrYZMHDqJFChq1EZb9cvWKEyn3gMsDiOLksud2jLs="; + hash = "sha256-FfJNJtoMz8Bzq83vAwnygeRoTyqnESb4JlcsTIRejdk="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix index b4903bdf02..eec3b0a766 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bandwhich/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/imsnif/bandwhich"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 ]; + maintainers = with maintainers; [ Br1ght0ne figsoda ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix index 8924924448..7d0c09107d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix @@ -39,7 +39,7 @@ let # and may one day be replaced by pkg/helper bitmask-root = mkDerivation { inherit src version; - sourceRoot = "source/helpers"; + sourceRoot = "${src.name}/helpers"; pname = "bitmask-root"; nativeBuildInputs = [ python3Packages.wrapPython ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index a66d8a0742..8a23a5f8bd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.13.0"; + version = "0.13.1"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-nz3b5EMuzZgwqh1guSyOuSqwmZpPOhY6jb/7CL65Q7c="; - aarch64-linux = "sha256-fyYdm5E9iuGcs6TxrwbbCC7/NU9p35T/2nEOdv7yU9k="; - x86_64-darwin = "sha256-xx16xCghd6t9BYrQAYqJTVdrS2G8qNQ5l4gG9SfDwRI="; - aarch64-darwin = "sha256-z/aHLRqybf7UiZue608VYDlKdIenEVVmMdd/XvIzXsc="; + x86_64-linux = "sha256-SrBfZ0te1l5XDmI8euojpVVRHxqq+T1WDSVbberxJYs="; + aarch64-linux = "sha256-T0t1E8lZMJZVanG7NZh9O+1RwzH82HtGi1ytDYYslhE="; + x86_64-darwin = "sha256-Wmk2hRbRe0dOuPnwISpsh2om1khpE3sX65VfWLYXNFk="; + aarch64-darwin = "sha256-ccfAtuqZSaQG4rCQZ4ujtFhp1e6dsrMAUcRuHT+YqXU="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix index 6879b7e9d7..1f9e7b1888 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libpcap }: +{ lib, stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { pname = "cdpr"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix b/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix deleted file mode 100644 index 2fca65a32c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, python3, fetchPypi }: - -let - python = python3.override { - self = python; - packageOverrides = self: super: { - tornado = super.tornado_4; - }; - }; - - inherit (python.pkgs) buildPythonApplication iowait psutil pyzmq tornado mock six; -in - -buildPythonApplication rec { - pname = "circus"; - version = "0.16.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0paccmqwgard2l0z7swcc3nwc418l9b4mfaddb4s31bpnqg02z6x"; - }; - - postPatch = '' - # relax version restrictions to fix build - substituteInPlace setup.py \ - --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" - ''; - - nativeCheckInputs = [ mock ]; - - doCheck = false; # weird error - - propagatedBuildInputs = [ iowait psutil pyzmq tornado six ]; - - meta = with lib; { - description = "A process and socket manager"; - homepage = "https://github.com/circus-tent/circus"; - license = licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash-meta/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash-meta/default.nix index 244eab7809..c7275db6c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash-meta/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash-meta/default.nix @@ -40,5 +40,6 @@ buildGoModule rec { homepage = "https://github.com/MetaCubeX/Clash.Meta"; license = licenses.gpl3Only; maintainers = with maintainers; [ oluceps ]; + mainProgram = "clash-meta"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index 6ddf423657..7eba0e1f21 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -40,5 +40,6 @@ buildGoModule rec { changelog = "https://github.com/Dreamacro/clash/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ contrun Br1ght0ne ]; + mainProgram = "clash"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.5.2-fix-shebangs.patch b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.5.2-fix-shebangs.patch new file mode 100644 index 0000000000..7082c25ac1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.5.2-fix-shebangs.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 877c54f..3e39ed1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -209,6 +209,8 @@ $(NSS_VERSION).tar.gz: + + $(nss_static_libs): $(NSS_VERSION).tar.gz + tar xf $(NSS_VERSION).tar.gz ++ sed -i -e "1s@#!/usr/bin/env bash@#!$$(type -p bash)@" $(NSS_VERSION)/nss/build.sh ++ sed -i -e "s@/usr/bin/env grep@$$(type -p grep)@" $(NSS_VERSION)/nss/coreconf/config.gypi + + ifeq ($(host),$(build)) + # Native build, use NSS' build script. diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix index e00b1a77ef..59c281575c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix @@ -1,27 +1,185 @@ -#TODO: It should be possible to build this from source, but it's currently a lot faster to just package the binaries. -{ lib, stdenv, fetchzip, zlib, autoPatchelfHook }: -stdenv.mkDerivation rec { - pname = "curl-impersonate-bin"; - version = "v0.5.3"; +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, buildGoModule +, installShellFiles +, symlinkJoin +, zlib +, sqlite +, cmake +, python3 +, ninja +, perl +, autoconf +, automake +, libtool +, darwin +, cacert +, unzip +, go +, p11-kit +, nixosTests +}: - src = fetchzip { - url = "https://github.com/lwthiker/curl-impersonate/releases/download/${version}/curl-impersonate-${version}.x86_64-linux-gnu.tar.gz"; - sha256 = "sha256-+cH1swAIadIrWG9anzf0dcW6qyBjcKsUHFWdv75F49g="; - stripRoot = false; +let + makeCurlImpersonate = { name, target }: stdenv.mkDerivation rec { + pname = "curl-impersonate-${name}"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "lwthiker"; + repo = "curl-impersonate"; + rev = "v${version}"; + hash = "sha256-LBGWFal2szqgURIBCLB84kHWpdpt5quvBBZu6buGj2A="; + }; + + patches = [ + # Fix shebangs in the NSS build script + # (can't just patchShebangs since makefile unpacks it) + ./curl-impersonate-0.5.2-fix-shebangs.patch + ]; + + strictDeps = true; + + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' + darwin.cctools + ] ++ [ + installShellFiles + cmake + python3 + python3.pkgs.gyp + ninja + perl + autoconf + automake + libtool + unzip + go + ]; + + buildInputs = [ + zlib + sqlite + ]; + + configureFlags = [ + "--with-ca-bundle=${if stdenv.isDarwin then "/etc/ssl/cert.pem" else "/etc/ssl/certs/ca-certificates.crt"}" + "--with-ca-path=${cacert}/etc/ssl/certs" + ]; + + buildFlags = [ "${target}-build" ]; + checkTarget = "${target}-checkbuild"; + installTargets = [ "${target}-install" ]; + + doCheck = true; + + dontUseCmakeConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + dontUseNinjaCheck = true; + + postUnpack = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") (lib.filterAttrs (n: v: v ? outPath) passthru.deps)); + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + export GOPROXY=file://${passthru.boringssl-go-modules} + export GOSUMDB=off + + # Need to get value of $out for this flag + configureFlagsArray+=("--with-libnssckbi=$out/lib") + ''; + + postInstall = '' + # Remove vestigial *-config script + rm $out/bin/curl-impersonate-${name}-config + + # Patch all shebangs of installed scripts + patchShebangs $out/bin + + # Build and install completions for each curl binary + + # Patch in correct binary name and alias it to all scripts + perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-${name} --shell zsh >$TMPDIR/curl-impersonate-${name}.zsh + substituteInPlace $TMPDIR/curl-impersonate-${name}.zsh \ + --replace \ + '#compdef curl' \ + "#compdef curl-impersonate-${name}$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-${name}')" + + perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-${name} --shell fish >$TMPDIR/curl-impersonate-${name}.fish + substituteInPlace $TMPDIR/curl-impersonate-${name}.fish \ + --replace \ + '--command curl' \ + "--command curl-impersonate-${name}$(find $out/bin -name 'curl_*' -printf ' --command %f')" + + # Install zsh and fish completions + installShellCompletion $TMPDIR/curl-impersonate-${name}.{zsh,fish} + ''; + + preFixup = let + libext = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure + if grep -F nssckbi $out/lib/libcurl-impersonate-*${libext} &>/dev/null; then + # NOTE: "p11-kit-trust" always ends in ".so" even when on darwin + ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust.so $out/lib/libnssckbi${libext} + ${lib.optionalString stdenv.isLinux "patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext}"} + fi + ''; + + disallowedReferences = [ go ]; + + passthru = { + deps = callPackage ./deps.nix {}; + + boringssl-go-modules = (buildGoModule { + inherit (passthru.deps."boringssl.zip") name; + + src = passthru.deps."boringssl.zip"; + vendorHash = "sha256-ISmRdumckvSu7hBXrjvs5ZApShDiGLdD3T5B0fJ1x2Q="; + + nativeBuildInputs = [ unzip ]; + + proxyVendor = true; + }).goModules; + }; + + meta = with lib; { + description = "A special build of curl that can impersonate Chrome & Firefox"; + homepage = "https://github.com/lwthiker/curl-impersonate"; + license = with licenses; [ curl mit ]; + maintainers = with maintainers; [ deliciouslytyped lilyinstarlight ]; + platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2023-32001" # fopen TOCTOU race condition - https://curl.se/docs/CVE-2023-32001.html + "CVE-2022-43551" # HSTS bypass - https://curl.se/docs/CVE-2022-43551.html + "CVE-2022-42916" # HSTS bypass - https://curl.se/docs/CVE-2022-42916.html + ]; + }; }; +in - nativeBuildInputs = [ autoPatchelfHook zlib ]; +symlinkJoin rec { + pname = "curl-impersonate"; + inherit (passthru.curl-impersonate-ff) version meta; - installPhase = '' - mkdir -p $out/bin - cp * $out/bin - ''; + name = "${pname}-${version}"; - meta = with lib; { - description = "curl-impersonate: A special build of curl that can impersonate Chrome & Firefox "; - homepage = "https://github.com/lwthiker/curl-impersonate"; - license = with licenses; [ curl mit ]; - maintainers = with maintainers; [ deliciouslytyped ]; - platforms = platforms.linux; #TODO I'm unsure about the restrictions here, feel free to expand the platforms it if it works elsewhere. + paths = [ + passthru.curl-impersonate-ff + passthru.curl-impersonate-chrome + ]; + + passthru = { + curl-impersonate-ff = makeCurlImpersonate { name = "ff"; target = "firefox"; }; + curl-impersonate-chrome = makeCurlImpersonate { name = "chrome"; target = "chrome"; }; + + updateScript = ./update.sh; + + inherit (passthru.curl-impersonate-ff) src; + + tests = { inherit (nixosTests) curl-impersonate; }; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/deps.nix b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/deps.nix new file mode 100644 index 0000000000..498616247d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/deps.nix @@ -0,0 +1,29 @@ +# Generated by update.sh +{ fetchurl }: + +{ + "curl-7.84.0.tar.xz" = fetchurl { + url = "https://curl.se/download/curl-7.84.0.tar.xz"; + hash = "sha256-LRGLQ/VHv+W66AbY1HtOWW6lslpsHwgK70n7zYF8Xbg="; + }; + + "brotli-1.0.9.tar.gz" = fetchurl { + url = "https://github.com/google/brotli/archive/refs/tags/v1.0.9.tar.gz"; + hash = "sha256-+ejYHQQFumbRgVKa9CozVPg4yTkJX/mZMNpqqc32/kY="; + }; + + "nss-3.87.tar.gz" = fetchurl { + url = "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/nss-3.87-with-nspr-4.35.tar.gz"; + hash = "sha256-63DqC1jc5pqkkOnp/s0TKn1kTh2j1jHhYzdqDcwRoCI="; + }; + + "boringssl.zip" = fetchurl { + url = "https://github.com/google/boringssl/archive/3a667d10e94186fd503966f5638e134fe9fb4080.zip"; + hash = "sha256-HsDIkd1x5IH49fUF07dJaabMIMsQygW+NI7GneULpA8="; + }; + + "nghttp2-1.46.0.tar.bz2" = fetchurl { + url = "https://github.com/nghttp2/nghttp2/releases/download/v1.46.0/nghttp2-1.46.0.tar.bz2"; + hash = "sha256-moKXjIcAcbdp8n0riBkct3/clFpRwdaFx/YafhP8Ryk="; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/update.sh b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/update.sh new file mode 100755 index 0000000000..3930c07684 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/update.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git nix jq coreutils gnugrep gnused curl common-updater-scripts +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +stripwhitespace() { + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' +} + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$1" | jq -r .hash +} + +nixeval() { + nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . +} + +vendorhash() { + (nix --extra-experimental-features nix-command build --no-link -f "$nixpkgs" --no-link "$1" 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +getvar() { + echo "$2" | grep -F "$1" | sed -e 's/:=/:/g' | cut -d: -f2- | stripwhitespace +} + +attr="${UPDATE_NIX_ATTR_PATH:-curl-impersonate}" +version="$(curl -sSL "https://api.github.com/repos/lwthiker/curl-impersonate/releases/latest" | jq -r .tag_name | sed -e 's/^v//')" + +pkgpath="$(findpath "$attr")" + +updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" + +if [ "$updated" -eq 0 ]; then + echo 'update.sh: Package version not updated, nothing to do.' + exit 0 +fi + +vars="$(curl -sSL "https://github.com/lwthiker/curl-impersonate/raw/v$version/Makefile.in" | grep '^ *[^ ]*_\(VERSION\|URL\|COMMIT\) *:=')" + +cat >"$(dirname "$pkgpath")"/deps.nix </dev/null; do - DIR="$(dirname "$DIR")" - done - - cp client/scripts/linux $out/sbin/dhclient-script - substituteInPlace $out/sbin/dhclient-script \ - --replace /sbin/ip ${iproute2}/sbin/ip - wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \ - "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin" - '' + lib.optionalString (!withClient) '' - rm $out/sbin/{dhclient,dhclient-script,.dhclient-script-wrapped} - '' + lib.optionalString (!withRelay) '' - rm $out/sbin/dhcrelay - ''; - - preConfigure = - '' - substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" - sed -i "includes/dhcpd.h" \ - -e "s|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" - - export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Dynamic Host Configuration Protocol (DHCP) tools"; - - longDescription = '' - ISC's Dynamic Host Configuration Protocol (DHCP) distribution - provides a freely redistributable reference implementation of - all aspects of DHCP, through a suite of DHCP tools: server, - client, and relay agent. - ''; - - homepage = "https://www.isc.org/dhcp/"; - license = licenses.mpl20; - platforms = platforms.unix; - knownVulnerabilities = lib.optional (withClient || withRelay) "The client and relay component of the dhcp package have reached their end of life"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcp/set-hostname.patch b/third_party/nixpkgs/pkgs/tools/networking/dhcp/set-hostname.patch deleted file mode 100644 index 7aa9d08145..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcp/set-hostname.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/client/scripts/linux 2010-09-15 00:49:48.000000000 +0200 -+++ b/client/scripts/linux 2011-04-01 16:08:10.984372269 +0200 -@@ -133,9 +133,7 @@ - [ "$current_hostname" = '(none)' ] || - [ "$current_hostname" = 'localhost' ] || - [ "$current_hostname" = "$old_host_name" ]; then -- if [ "$new_host_name" != "$old_host_name" ]; then -- hostname "$new_host_name" -- fi -+ hostname "$new_host_name" - fi - fi diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index f4398cdd03..8ca5199838 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, nettle, fetchpatch +{ lib, stdenv, fetchurl, pkg-config, nettle , libidn, libnetfilter_conntrack, buildPackages , dbusSupport ? stdenv.isLinux , dbus diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 47746cd13d..aaa2ed1459 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-82RBNMCcEe2gB1Ygbm1S6UgMPUQ+Lm37zc1JM3Ca/gg="; + sha256 = "sha256-vHiC7RWPba4LlS0YX088HqS3hLGEt0jHKzL7DcysEkw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix index 24e1ef29ef..ae663abb08 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dsniff/default.nix @@ -13,14 +13,14 @@ let */ staticdb = symlinkJoin { inherit (db) name; - paths = with db.overrideAttrs(old: { dontDisableStatic = true; }); [ out dev ]; + paths = with db.overrideAttrs { dontDisableStatic = true; }; [ out dev ]; postBuild = '' rm $out/lib/*.so* ''; }; pcap = symlinkJoin { inherit (libpcap) name; - paths = [ (libpcap.overrideAttrs(old: { dontDisableStatic = true; })) ]; + paths = [ (libpcap.overrideAttrs { dontDisableStatic = true; }) ]; postBuild = '' cp -rs $out/include/pcap $out/include/net # prevent references to libpcap @@ -29,15 +29,15 @@ let }; net = symlinkJoin { inherit (libnet) name; - paths = [ (libnet.overrideAttrs(old: { dontDisableStatic = true; })) ]; + paths = [ (libnet.overrideAttrs { dontDisableStatic = true; }) ]; postBuild = '' # prevent dynamic linking, now that we have a static library rm $out/lib/*.so* ''; }; - nids = libnids.overrideAttrs(old: { + nids = libnids.overrideAttrs { dontDisableStatic = true; - }); + }; ssl = symlinkJoin { inherit (openssl) name; paths = with openssl.override { static = true; }; [ out dev ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/default.nix new file mode 100644 index 0000000000..972c72c4e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, catch2 +, pkg-config +, substituteAll +, yaml-cpp +}: + +stdenv.mkDerivation { + pname = "ebpf-verifier"; + version = "unstable-2023-07-15"; + + src = fetchFromGitHub { + owner = "vbpf"; + repo = "ebpf-verifier"; + rev = "de14d3aa3cd2845b621faf32b599766a66e158cf"; + fetchSubmodules = true; + hash = "sha256-gnxB8ZLbTyIYpd61T57LPKFm1MHufeVEq/qN9pu2Vpk="; + }; + + patches = [ + (substituteAll { + # We will download them instead of cmake's fetchContent + src = ./remove-fetchcontent-usage.patch; + catch2Src = catch2.src; + }) + ]; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + boost + yaml-cpp + ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ../check $out/bin/ebpf-verifier + + runHook postInstall + ''; + + meta = with lib; { + description = "eBPF verifier based on abstract interpretation"; + homepage = "https://github.com/vbpf/ebpf-verifier"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ gaelreyrol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/remove-fetchcontent-usage.patch b/third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/remove-fetchcontent-usage.patch new file mode 100644 index 0000000000..8a4af1bee1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/ebpf-verifier/remove-fetchcontent-usage.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d7cf256..cb94e5a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,8 +6,7 @@ project(ebpf_verifier) + include(FetchContent) + FetchContent_Declare( + Catch2 +- GIT_REPOSITORY https://github.com/catchorg/Catch2.git +- GIT_TAG ac93f1943762f6fc92f0dc5bac0d720a33a27530 ++ SOURCE_DIR @catch2Src@ + ) + FetchContent_MakeAvailable(Catch2) + diff --git a/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock b/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock index 24adf272e6..bc9f1a891c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -23,107 +23,60 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" -[[package]] -name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array", -] - [[package]] name = "aes" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ - "aes-soft", - "aesni", - "cipher 0.2.5", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher 0.3.0", + "cfg-if", + "cipher", "cpufeatures", - "opaque-debug", ] [[package]] -name = "aes-gcm" -version = "0.8.0" +name = "ahash" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "aead", - "aes 0.6.0", - "cipher 0.2.5", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher 0.2.5", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher 0.2.5", - "opaque-debug", + "getrandom", + "once_cell", + "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anyhow" -version = "1.0.59" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" - -[[package]] -name = "anymap" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arc-swap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "arrayref" @@ -131,12 +84,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -[[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.2" @@ -145,66 +92,49 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "assert_cmd" -version = "1.0.1" -source = "git+https://github.com/tailhook/assert_cmd?branch=edgedb_20190513#062308b405aaa36240a80c07fec520768b628035" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" dependencies = [ + "anstyle", + "bstr", "doc-comment", - "predicates 1.0.8", + "predicates 3.0.3", "predicates-core", "predicates-tree", "wait-timeout", ] -[[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "async-channel" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", "event-listener", "futures-core", ] -[[package]] -name = "async-dup" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" -dependencies = [ - "futures-io", - "simple-mutex", -] - [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ + "async-lock", "async-task", "concurrent-queue", "fastrand", "futures-lite", - "once_cell", "slab", ] [[package]] name = "async-global-executor" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", @@ -212,43 +142,27 @@ dependencies = [ "async-lock", "blocking", "futures-lite", - "num_cpus", "once_cell", ] -[[package]] -name = "async-h1" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" -dependencies = [ - "async-channel", - "async-dup", - "async-std", - "futures-core", - "http-types", - "httparse", - "log", - "pin-project", -] - [[package]] name = "async-io" -version = "1.7.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ + "async-lock", + "autocfg", "concurrent-queue", "futures-lite", "libc", "log", - "once_cell", "parking", "polling", "slab", "socket2", "waker-fn", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -262,54 +176,23 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", ] -[[package]] -name = "async-native-tls" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" -dependencies = [ - "async-std", - "native-tls", - "thiserror", - "url", -] - -[[package]] -name = "async-process" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" -dependencies = [ - "async-io", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi", -] - [[package]] name = "async-std" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-attributes", "async-channel", "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -334,20 +217,20 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.57" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "atty" @@ -368,13 +251,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -382,10 +265,10 @@ dependencies = [ ] [[package]] -name = "base-x" -version = "0.2.11" +name = "base16ct" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base32" @@ -395,9 +278,15 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" [[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" @@ -406,10 +295,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" [[package]] -name = "bigdecimal" -version = "0.3.0" +name = "basic-toml" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744" +checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1" +dependencies = [ + "serde", +] + +[[package]] +name = "bigdecimal" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ "num-bigint", "num-integer", @@ -423,67 +321,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake2b_simd" -version = "1.0.0" +name = "bitflags" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" + +[[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 = "blake2b_simd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq", + "arrayvec", + "constant_time_eq 0.2.4", ] [[package]] name = "blake3" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec", "cc", - "cfg-if 1.0.0", - "constant_time_eq", - "digest 0.10.3", + "cfg-if", + "constant_time_eq 0.2.4", + "digest", ] [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", +] + +[[package]] +name = "bstr" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +dependencies = [ + "memchr", "once_cell", + "regex-automata", + "serde", ] [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -493,15 +412,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", @@ -518,27 +437,15 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -547,50 +454,39 @@ 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", "num-traits", - "time 0.1.44", - "winapi", ] [[package]] name = "cipher" -version = "0.2.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[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", + "bitflags 1.3.2", "clap_derive", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", - "textwrap 0.16.0", + "textwrap", ] [[package]] @@ -604,15 +500,15 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -658,60 +554,48 @@ dependencies = [ [[package]] name = "colorful" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bca1619ff57dd7a56b58a8e25ef4199f123e78e503fe1653410350a1b98ae65" +checksum = "97af0562545a7d7f3d9222fcf909963bec36dcb502afaacab98c6ffac8da47ce" [[package]] name = "combine" -version = "4.6.4" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ "bytes", "memchr", ] [[package]] -name = "concurrent-queue" -version = "1.2.4" +name = "comma" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] +checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] -name = "config" -version = "0.10.1" +name = "concurrent-queue" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ - "lazy_static", - "nom", - "serde", + "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.1" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode 0.3.6", + "lazy_static", "libc", - "once_cell", - "terminal_size", "unicode-width", - "winapi", + "windows-sys 0.42.0", ] -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -719,21 +603,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "cookie" -version = "0.14.4" +name = "constant_time_eq" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "aes-gcm", - "base64", - "hkdf", - "hmac 0.10.1", - "percent-encoding", - "rand 0.8.5", - "sha2 0.9.9", - "time 0.2.27", - "version_check", -] +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" [[package]] name = "coolor" @@ -762,18 +635,18 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[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", ] [[package]] -name = "cpuid-bool" -version = "0.2.0" +name = "crc16" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" [[package]] name = "crc32fast" @@ -781,7 +654,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -790,7 +663,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -800,57 +673,55 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "memoffset", - "once_cell", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", - "once_cell", + "cfg-if", ] [[package]] @@ -859,7 +730,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -888,69 +759,24 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "ctor" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", -] - -[[package]] -name = "ctr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -dependencies = [ - "cipher 0.2.5", + "syn 1.0.109", ] [[package]] name = "ctrlc" -version = "3.2.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865" +checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" dependencies = [ - "nix 0.24.2", - "winapi", -] - -[[package]] -name = "dashmap" -version = "5.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "deadpool" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d" -dependencies = [ - "async-trait", - "config", - "crossbeam-queue", - "num_cpus", - "serde", - "tokio", + "nix", + "windows-sys 0.48.0", ] [[package]] @@ -959,12 +785,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "difflib" version = "0.4.0" @@ -973,20 +793,11 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.9.0" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -dependencies = [ - "block-buffer 0.10.2", + "block-buffer", "crypto-common", "subtle", ] @@ -997,7 +808,16 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "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]] @@ -1006,7 +826,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1021,6 +841,18 @@ dependencies = [ "winapi", ] +[[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" @@ -1033,10 +865,10 @@ dependencies = [ ] [[package]] -name = "discard" -version = "1.0.4" +name = "dissimilar" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e" [[package]] name = "doc-comment" @@ -1052,23 +884,19 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "edgedb-cli" -version = "2.3.1" +version = "3.3.0" dependencies = [ "anyhow", - "anymap", "arc-swap", "assert_cmd", "async-listen", - "async-process", - "async-std", - "atty", "backtrace", "base32", - "base64", + "base64 0.13.1", "bigdecimal", + "bitvec", "blake2b_simd", "blake3", - "blocking", "bytes", "chrono", "clap", @@ -1080,90 +908,93 @@ dependencies = [ "crossbeam-utils", "crossterm", "ctrlc", - "difference", - "dirs", + "dirs 4.0.0", + "dissimilar", "downcast-rs", "edgedb-cli-derive", - "edgedb-client", "edgedb-derive", + "edgedb-errors", "edgedb-protocol", + "edgedb-tokio", "edgeql-parser", - "env_logger 0.9.0", - "fd-lock 3.0.6", + "env_logger 0.10.0", + "fd-lock 3.0.12", "fn-error-context", "fs-err", - "futures", "futures-util", + "gethostname", "hex", "humantime 2.1.0", "humantime-serde", "immutable-chunkmap", + "indexmap 2.0.0-pre", "indicatif", + "is-terminal", "libc", "libflate", - "linked-hash-map", "log", "minimad", "native-tls", - "nix 0.24.2", + "nix", + "notify", "num-bigint", "once_cell", "open", "openssl", "os-release", - "pem 1.1.0", - "predicates 2.1.1", + "pem 1.1.1", + "predicates 2.1.5", "pretty_assertions", "prettytable-rs", - "rand 0.8.5", + "rand", "regex", "reqwest", "rexpect", "ring", "rpassword", - "rustls 0.20.6", + "rustls", "rustyline", "scram", - "semver 1.0.13", + "semver", "serde", "serde_json", "serde_millis", "serde_path_to_error", "serde_str", - "sha1 0.10.1", - "sha2 0.10.2", + "sha1", + "sha2", "shell-escape", "shutdown_hooks", - "signal", "signal-hook", "snafu", "strsim", - "surf", "tar", "tempfile", "term", - "term_size", "termcolor", "termimad", + "terminal_size", "test-case", - "textwrap 0.15.0", + "textwrap", "thiserror", "tokio", + "tokio-stream", "toml", "unicode-segmentation", + "unicode-width", "url", "urlencoding", "uuid", "wait-timeout", "warp", - "webpki 0.22.0", + "webpki", "which", "whoami", "winapi", "winreg", "wslapi", "zip", - "zstd", + "zstd 0.12.3+zstd.1.5.2", ] [[package]] @@ -1173,74 +1004,41 @@ dependencies = [ "clap", "clap_generate", "heck", - "linked-hash-map", + "indexmap 1.9.3", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "termimad", "trybuild", ] -[[package]] -name = "edgedb-client" -version = "0.3.0" -dependencies = [ - "anyhow", - "async-std", - "async-trait", - "bytes", - "dirs", - "edgedb-derive", - "edgedb-errors", - "edgedb-protocol", - "env_logger 0.9.0", - "futures-util", - "log", - "rand 0.8.5", - "rustls 0.20.6", - "rustls-native-certs", - "rustls-pemfile 0.3.0", - "scram", - "serde", - "serde_json", - "sha1 0.10.1", - "snafu", - "tls-api", - "tls-api-not-tls", - "tls-api-rustls", - "typemap", - "url", - "webpki 0.22.0", - "webpki-roots", -] - [[package]] name = "edgedb-derive" -version = "0.4.0" -source = "git+https://github.com/edgedb/edgedb-rust#fe0af0edd3ab2fd075d9159857ebebec5573cbed" +version = "0.5.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", "trybuild", ] [[package]] name = "edgedb-errors" -version = "0.3.0" -source = "git+https://github.com/edgedb/edgedb-rust#fe0af0edd3ab2fd075d9159857ebebec5573cbed" +version = "0.4.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" dependencies = [ "bytes", ] [[package]] name = "edgedb-protocol" -version = "0.4.0" -source = "git+https://github.com/edgedb/edgedb-rust#fe0af0edd3ab2fd075d9159857ebebec5573cbed" +version = "0.5.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" dependencies = [ "bigdecimal", - "bitflags", + "bitflags 2.3.1", "bytes", "chrono", "edgedb-errors", @@ -1250,25 +1048,61 @@ dependencies = [ "uuid", ] +[[package]] +name = "edgedb-tokio" +version = "0.4.0" +source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" +dependencies = [ + "anyhow", + "arc-swap", + "async-trait", + "base16ct", + "base64 0.21.2", + "bytes", + "crc16", + "dirs 5.0.1", + "edgedb-derive", + "edgedb-errors", + "edgedb-protocol", + "log", + "once_cell", + "rand", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "scram", + "serde", + "serde_json", + "sha1", + "tls-api", + "tls-api-not-tls", + "tls-api-rustls", + "tokio", + "tokio-stream", + "url", + "webpki", + "webpki-roots", +] + [[package]] name = "edgeql-parser" version = "0.1.0" -source = "git+https://github.com/edgedb/edgedb#168891d7e8320acb87075d0518eec32f29964619" +source = "git+https://github.com/edgedb/edgedb#68033e0256a9c4f214ec1b2042817d8e235f56ec" dependencies = [ "base32", "combine", - "sha2 0.10.2", + "memchr", + "sha2", "snafu", "thiserror", - "twoway", "unicode-width", ] [[package]] name = "either" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1284,11 +1118,11 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1312,12 +1146,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", + "is-terminal", "log", "regex", "termcolor", @@ -1325,13 +1159,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1344,16 +1178,6 @@ dependencies = [ "libc", ] -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -1362,9 +1186,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1381,32 +1205,32 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.6" +version = "3.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517" +checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ - "cfg-if 1.0.0", - "rustix 0.35.7", - "windows-sys 0.36.1", + "cfg-if", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.36.1", + "redox_syscall 0.2.16", + "windows-sys 0.45.0", ] [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -1423,13 +1247,13 @@ dependencies = [ [[package]] name = "fn-error-context" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236b4e4ae2b8be5f7a5652f6108c4a0f2627c569db4e7923333d31c7dbfed0fb" +checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] @@ -1455,46 +1279,39 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "fs-err" -version = "2.7.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" [[package]] -name = "fuchsia-cprng" -version = "0.1.1" +name = "fsevent-sys" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", + "libc", ] [[package]] -name = "futures-channel" -version = "0.3.21" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures-channel" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -1502,26 +1319,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -1540,40 +1346,37 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1590,54 +1393,43 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.1.16" +name = "gethostname" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ - "cfg-if 1.0.0", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "windows-targets 0.48.0", ] [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "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", - "polyval", + "wasi", ] [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-timers" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ "futures-channel", "futures-core", @@ -1647,9 +1439,9 @@ dependencies = [ [[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", @@ -1657,10 +1449,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", - "tokio-util 0.7.3", + "tokio-util", "tracing", ] @@ -1669,21 +1461,30 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] name = "headers" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", - "bitflags", + "base64 0.13.1", + "bitflags 1.3.2", "bytes", "headers-core", "http", "httpdate", "mime", - "sha-1", + "sha1", ] [[package]] @@ -1697,9 +1498,9 @@ dependencies = [ [[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" @@ -1710,6 +1511,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hermit-abi" version = "0.3.1" @@ -1725,40 +1535,20 @@ dependencies = [ "serde", ] -[[package]] -name = "hkdf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" -dependencies = [ - "digest 0.9.0", - "hmac 0.10.1", -] - -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest", ] [[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", @@ -1776,51 +1566,11 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-client" -version = "6.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" -dependencies = [ - "async-h1", - "async-native-tls", - "async-std", - "async-trait", - "cfg-if 1.0.0", - "dashmap", - "deadpool", - "futures", - "http-types", - "log", -] - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "async-std", - "base64", - "cookie", - "futures-lite", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", -] - [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1855,9 +1605,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -1892,52 +1642,85 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "immutable-chunkmap" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4935d692a73e65f929e34b6b801bbc158647a017882c2c28624d121a1a1162" +checksum = "7617eb072b88069788fa9d5cadae34faebca64e5325ec5deaa2b4c96510f9e8c" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "packed_struct", "packed_struct_codegen", ] [[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", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0-pre" +source = "git+https://github.com/bluss/indexmap?rev=11ac52c#11ac52c3c828a42d69c5fb3248198511836bfd2f" +dependencies = [ + "hashbrown 0.13.2", + "serde", ] [[package]] name = "indicatif" -version = "0.17.0" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc42b206e70d86ec03285b123e65a5458c92027d1fb2ae3555878b8113b3ddf" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" dependencies = [ "console", + "instant", "number_prefix", + "portable-atomic", "unicode-width", ] [[package]] -name = "infer" -version = "0.2.3" +name = "inotify" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +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" @@ -1945,20 +1728,14 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "io-lifetimes" -version = "0.7.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb" - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" dependencies = [ "libc", "windows-sys 0.45.0", @@ -1966,55 +1743,75 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.5", - "rustix 0.36.8", - "windows-sys 0.45.0", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] +[[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 = "kv-log-macro" version = "1.0.7" @@ -2030,30 +1827,17 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec 0.5.2", - "bitflags", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.139" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libflate" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -2062,39 +1846,24 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" dependencies = [ "rle-decode-fast", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -dependencies = [ - "serde", -] - [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -2102,20 +1871,13 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" dependencies = [ - "cfg-if 1.0.0", "value-bag", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" version = "2.5.0" @@ -2124,9 +1886,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -2149,45 +1920,45 @@ dependencies = [ [[package]] name = "minidl" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea5c42a75297faf23962781d2bb23caaf2ede8fd7337842fef63ee3ffdca5c9" +checksum = "87d3d8666e5ed22230c0096edcccf7097905b1e2975869e1b9fe5df40d26d801" [[package]] name = "minimad" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd37b2e65fbd459544194d8f52ed84027e031684335a062c708774c09d172b0b" +checksum = "277639f0198568f70f8fe4ab88a52a67c96bca12f27ba5c17a76acdcb8b45834" dependencies = [ "once_cell", ] [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", + "wasi", + "windows-sys 0.45.0", ] [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2212,50 +1983,16 @@ dependencies = [ [[package]] name = "nix" -version = "0.14.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", + "bitflags 1.3.2", + "cfg-if", "libc", - "void", -] - -[[package]] -name = "nix" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", -] - -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "lexical-core", - "memchr", - "version_check", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", ] [[package]] @@ -2264,6 +2001,24 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[package]] +name = "notify" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" +dependencies = [ + "bitflags 1.3.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.45.0", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -2296,20 +2051,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi 0.1.19", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ + "hermit-abi 0.2.6", "libc", ] @@ -2321,43 +2067,37 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.29.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.13.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "3.0.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23a407004a1033f53e93f9b45580d14de23928faad187384f891507c9b0c045" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ "pathdiff", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "openssl" -version = "0.10.41" +version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 1.3.2", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -2373,7 +2113,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2384,20 +2124,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.22.0+1.1.1q" +version = "111.25.1+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.75" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -2405,6 +2144,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 = "os-release" version = "0.1.0" @@ -2416,9 +2161,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.2.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "output_vt100" @@ -2431,23 +2176,23 @@ dependencies = [ [[package]] name = "packed_struct" -version = "0.6.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e1e99bfad1f9eb1d5d775ce5f73694a93178376b6dc34c30eddce6f1bcf5f2" +checksum = "36b29691432cc9eff8b282278473b63df73bea49bc3ec5e67f31a3ae9c3ec190" dependencies = [ + "bitvec", "packed_struct_codegen", - "serde", ] [[package]] name = "packed_struct_codegen" -version = "0.6.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8731210ac3e7bff5f86094b9f5b83a84d44965ce3e0b6c3ea827854a28d696c" +checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2468,25 +2213,25 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.36.1", + "windows-sys 0.45.0", ] [[package]] name = "password-hash" -version = "0.3.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.3", + "rand_core", "subtle", ] @@ -2498,14 +2243,14 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.3", - "hmac 0.12.1", + "digest", + "hmac", "password-hash", - "sha2 0.10.2", + "sha2", ] [[package]] @@ -2514,44 +2259,44 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" dependencies = [ - "base64", + "base64 0.13.1", "once_cell", "regex", ] [[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", + "base64 0.13.1", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2568,55 +2313,43 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "polling" -version = "2.2.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ - "cfg-if 1.0.0", + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite", + "windows-sys 0.45.0", ] [[package]] -name = "polyval" -version = "0.4.5" +name = "portable-atomic" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" -dependencies = [ - "cpuid-bool", - "opaque-debug", - "universal-hash", -] +checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "1.0.8" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -dependencies = [ - "difference", - "predicates-core", -] - -[[package]] -name = "predicates" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", @@ -2627,16 +2360,28 @@ dependencies = [ ] [[package]] -name = "predicates-core" -version = "1.0.3" +name = "predicates" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +dependencies = [ + "anstyle", + "difflib", + "itertools", + "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.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" dependencies = [ "predicates-core", "termtree", @@ -2644,14 +2389,14 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "ansi_term", "ctor", "diff", "output_vt100", + "yansi", ] [[package]] @@ -2676,7 +2421,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -2693,15 +2438,15 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -2714,13 +2459,19 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "radix_trie" version = "0.2.1" @@ -2731,32 +2482,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -2764,18 +2489,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2785,58 +2500,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core", ] [[package]] name = "rand_core" -version = "0.3.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.7", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", + "getrandom", ] [[package]] @@ -2845,7 +2518,16 @@ 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]] @@ -2854,16 +2536,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", - "redox_syscall", + "getrandom", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.6.0" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -2871,27 +2553,24 @@ dependencies = [ ] [[package]] -name = "regex-syntax" -version = "0.6.27" +name = "regex-automata" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -2903,10 +2582,10 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "serde", @@ -2924,13 +2603,14 @@ dependencies = [ [[package]] name = "rexpect" -version = "0.3.0" -source = "git+https://github.com/tailhook/rexpect?branch=default_terminal_size#a9526163bdb833f7b25beb363430042b11e42493" +version = "0.5.0" +source = "git+https://github.com/tailhook/rexpect?branch=default_terminal_size#7643379e581e8019b49070782e5b6df34d762178" dependencies = [ - "error-chain", - "nix 0.14.1", + "comma", + "nix", "regex", "tempfile", + "thiserror", ] [[package]] @@ -2972,66 +2652,30 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[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 = "rustix" -version = "0.35.7" +version = "0.37.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787" +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", - "io-lifetimes 0.7.2", + "io-lifetimes", "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.36.1", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes 1.0.5", - "libc", - "linux-raw-sys 0.1.4", + "linux-raw-sys", "windows-sys 0.45.0", ] [[package]] name = "rustls" -version = "0.19.1" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", + "sct", + "webpki", ] [[package]] @@ -3041,48 +2685,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" -dependencies = [ - "base64", + "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "rustyline" version = "8.0.0" -source = "git+https://github.com/tailhook/rustyline?branch=edgedb_20210403#257bb4bb5c0f647412103e4f336d553b97472849" +source = "git+https://github.com/tailhook/rustyline?branch=edgedb_20210403#8c0afd236b4869f9fbf41a6a322149feacbe49bd" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 1.3.2", + "cfg-if", "dirs-next", "fd-lock 2.0.0", "libc", "log", "memchr", - "nix 0.20.0", + "nix", "radix_trie", "scopeguard", "smallvec", @@ -3094,25 +2729,33 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[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.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "scoped-tls" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -3126,21 +2769,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7679a5e6b97bac99b2c208894ba0d34b17d9657f0b728c1cd3bf1c5f7f6ebe88" dependencies = [ - "base64", - "rand 0.8.5", + "base64 0.13.1", + "rand", "ring", ] -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - [[package]] name = "sct" version = "0.7.0" @@ -3153,11 +2786,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.6.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3166,9 +2799,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -3176,54 +2809,40 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" -version = "1.0.142" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.142" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "serde_json" -version = "1.0.83" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ + "indexmap 1.9.3", "itoa", "ryu", "serde", @@ -3240,24 +2859,13 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - [[package]] name = "serde_str" version = "1.0.0" @@ -3278,65 +2886,26 @@ dependencies = [ "serde", ] -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", -] - [[package]] name = "sha1" -version = "0.6.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f" -dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.10.3", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest", ] [[package]] @@ -3351,21 +2920,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6057adedbec913419c92996f395ba69931acbd50b7d56955394cd3f7bedbfa45" -[[package]] -name = "signal" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f6ce83b159ab6984d2419f495134972b48754d13ff2e3f8c998339942b56ed9" -dependencies = [ - "libc", - "nix 0.14.1", -] - [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -3384,36 +2943,27 @@ 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", ] -[[package]] -name = "simple-mutex" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" -dependencies = [ - "event-listener", -] - [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smawk" @@ -3423,9 +2973,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "snafu" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2" +checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" dependencies = [ "backtrace", "doc-comment", @@ -3434,21 +2984,21 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5" +checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[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", @@ -3460,70 +3010,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[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.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" version = "0.10.0" @@ -3536,39 +3028,34 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "surf" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7" -dependencies = [ - "async-native-tls", - "async-std", - "async-trait", - "cfg-if 1.0.0", - "futures-util", - "getrandom 0.2.7", - "http-client", - "http-types", - "log", - "mime_guess", - "once_cell", - "pin-project-lite", - "serde", - "serde_json", -] - [[package]] name = "syn" -version = "1.0.99" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tar" version = "0.4.38" @@ -3580,28 +3067,17 @@ dependencies = [ "xattr", ] -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] @@ -3615,30 +3091,20 @@ dependencies = [ "winapi", ] -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "termimad" -version = "0.20.2" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8a16d7de8d4c97a4149cc3b9d3681c5dba36011c303745bb1af19636e89ba39" +checksum = "cfab44b4bc17601cf226cce31c87462a4a5bd5d325948c8ebbc9e715660a1287" dependencies = [ "coolor", "crossbeam", @@ -3650,57 +3116,58 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "libc", - "winapi", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "termtree" -version = "0.2.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "test-case" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07aea929e9488998b64adc414c29fe5620398f01c2e3f58164122b17e567a6d5" +checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" dependencies = [ "test-case-macros", ] [[package]] name = "test-case-macros" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95968eedc6fc4f5c21920e0f4264f78ec5e4c56bb394f319becc1a5830b3e54" +checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "test-cert-gen" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3208d0ae2e3736d4ac2f6ba2229c4d9bbd54080e228e662a7684eabcf13ff419" +checksum = "345f92b7cac59507cdaba298c5493f7c40e2063d31f6fc621105183344d5d50a" dependencies = [ + "once_cell", "pem 0.8.3", - "tempdir", + "tempfile", ] [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ "smawk", "terminal_size", @@ -3708,99 +3175,41 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.18", ] [[package]] name = "time" -version = "0.1.44" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "serde", + "time-core", ] [[package]] -name = "time" -version = "0.2.27" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" -dependencies = [ - "itoa", - "js-sys", - "libc", - "num_threads", - "time-macros 0.2.4", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "tinyvec" @@ -3813,107 +3222,106 @@ 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 = "tls-api" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7dded74ddc6d4a98f9f94f17f1c4d796e4af3cb5fba9e7655f157a036ee7de0" +checksum = "66d1b3dfb0a60da3e8a130c9f2432063d9979928a05c2b2cdcfc9fd05e4f53a3" dependencies = [ "anyhow", - "futures-util", "log", "pem 0.8.3", - "tempdir", + "tempfile", "thiserror", + "tokio", "void", - "webpki 0.22.0", + "webpki", ] [[package]] name = "tls-api-not-tls" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9026a0d37898cc761deb9aa92e727c61412f24c490853337a5dcba95f1e9adf" +checksum = "529dda0254aa61462ebe3937ecf877b6b1d7e745d25b74c18ba98593aefd7086" dependencies = [ "anyhow", - "async-std", "thiserror", "tls-api", "tls-api-test", + "tokio", ] [[package]] name = "tls-api-rustls" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eeadd40cf3e8d610d3ccc5cc71443629ac0aa2c66aee7bc085c7d0b03c706a6" +checksum = "afcd7905a7d9603bc4c1bcf4710141d463cde70f027ab7900bc1d0012712444d" dependencies = [ "anyhow", - "async-std", - "rustls 0.20.6", + "rustls", "thiserror", "tls-api", "tls-api-test", - "webpki 0.22.0", + "tokio", + "webpki", "webpki-roots", ] [[package]] name = "tls-api-test" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344ab291be7ed9ab296fc28153fe3ac1e430f44c4dfb3f1324a3c09bbbb5f104" +checksum = "9df107843d725428d76bb159040fbae6d1524dcf25d5b24c56daa6b37ce9dbb5" dependencies = [ "anyhow", - "async-std", "env_logger 0.5.13", "log", "pem 0.8.3", "test-cert-gen", "tls-api", + "tokio", "untrusted 0.6.2", - "webpki 0.22.0", + "webpki", ] [[package]] name = "tokio" -version = "1.20.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "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.18", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -3921,20 +3329,20 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.19.1", + "rustls", "tokio", - "webpki 0.21.4", + "webpki", ] [[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", @@ -3943,23 +3351,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.10" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -3971,9 +3365,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -3986,11 +3380,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-core", @@ -3998,70 +3392,39 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" 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" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.64" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485" +checksum = "db3115bddce1b5f52dd4b5e0ec8298a66ce733e4cc6759247dc2d1c11508ec38" dependencies = [ + "basic-toml", "glob", "once_cell", "serde", "serde_derive", "serde_json", "termcolor", - "toml", -] - -[[package]] -name = "twoway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47" -dependencies = [ - "memchr", - "unchecked-index", -] - -[[package]] -name = "typemap" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -dependencies = [ - "unsafe-any", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "unchecked-index" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" @@ -4074,64 +3437,46 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-linebreak" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f" +checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ + "hashbrown 0.12.3", "regex", ] [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "unsafe-any" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -dependencies = [ - "traitobject", -] +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "untrusted" @@ -4147,44 +3492,42 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", "serde", ] [[package]] name = "urlencoding" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.1.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +dependencies = [ + "serde", +] [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" [[package]] name = "vcpkg" @@ -4219,6 +3562,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + [[package]] name = "want" version = "0.3.0" @@ -4231,9 +3585,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e" +checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" dependencies = [ "bytes", "futures-channel", @@ -4246,6 +3600,7 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project", + "rustls-pemfile", "scoped-tls", "serde", "serde_json", @@ -4253,23 +3608,11 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tokio-util 0.6.10", + "tokio-util", "tower-service", "tracing", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.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" @@ -4278,36 +3621,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4315,9 +3658,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4325,22 +3668,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wchar" @@ -4361,29 +3704,19 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - [[package]] name = "webpki" version = "0.22.0" @@ -4396,38 +3729,29 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.4" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.0", -] - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", + "webpki", ] [[package]] name = "which" -version = "4.2.5" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "whoami" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8" +checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" dependencies = [ "wasm-bindgen", "web-sys", @@ -4466,15 +3790,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" 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_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]] @@ -4483,7 +3809,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "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]] @@ -4492,15 +3827,30 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "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.1" @@ -4508,10 +3858,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -4520,10 +3870,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -4532,10 +3882,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_i686_gnu" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -4544,10 +3894,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" +name = "windows_i686_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -4555,6 +3905,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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.1" @@ -4562,10 +3918,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -4573,6 +3929,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" 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 = "winreg" version = "0.10.1" @@ -4593,6 +3955,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "xattr" version = "0.2.3" @@ -4603,39 +3974,64 @@ dependencies = [ ] [[package]] -name = "zip" -version = "0.6.2" +name = "yansi" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.7.5", + "aes", "byteorder", "bzip2", - "constant_time_eq", + "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils", "flate2", - "hmac 0.12.1", + "hmac", "pbkdf2", - "sha1 0.10.1", - "time 0.3.12", - "zstd", + "sha1", + "time", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "zstd" -version = "0.10.2+zstd.1.5.2" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" +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.6+zstd.1.5.2" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" +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", @@ -4643,10 +4039,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix index 1409bd0708..14f45976ff 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, runCommand , patchelf , fetchFromGitHub , rustPlatform @@ -20,23 +19,24 @@ rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "2.3.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev = "v${version}"; - sha256 = "sha256-iL8tD6cvFVWqsQAk6HBUqdz7MJ3lT2XmExGQvdQdIWs="; + sha256 = "sha256-6uhwuAGZ/XU+eENNo0H7hOdrDDx0fWvPVZAEOm5mdcY="; + fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "assert_cmd-1.0.1" = "sha256-0MkQG+JKrZXOn8B8q1HdyhZ1hVVb7dPbGEo/76o2YRc="; - "edgedb-derive-0.4.0" = "sha256-pE/GchC3JDg0E4twmov86byne+rn28JpIawBbZcJHOg="; - "edgeql-parser-0.1.0" = "sha256-e43PBHirALfrxGKi50KvE9aDAunObpXcWNBs62ssgSM="; - "rexpect-0.3.0" = "sha256-0a//fPscEXEwv+73Ja7jRf2eRWfF6VCsck9ZZ15zgog="; - "rustyline-8.0.0" = "sha256-FyMx2nAVaX0pc481BTlNxeR/NfNrr57FWKLS7+EjPVw="; + "edgedb-derive-0.5.0" = "sha256-y/mN0XuJtQBtkLmbk2s7hK5joGEH5Ge6sLCD88WyL9o="; + "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY="; + "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA="; + "edgeql-parser-0.1.0" = "sha256-Y3gXxPuR7qnTL4fu2nZIa3e20YV1fLvm2jHAng+Ke2Q="; + "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc="; "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak="; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 79e976ee22..078d80af10 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.51.0"; + version = "0.51.2"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nng9WZlKyrEtuVQec5pcfUoZQKWN1IwZ8N7JLc+Mark="; + sha256 = "sha256-uiF27qGHwAg05o9thCxIf6Z2xhMnKzhDgMKTuS6IJ8A="; }; - vendorHash = "sha256-pnC4bnb/y9x6hDa6yAwNoWDUlIiAyy6LEdoISlX+S1s="; + vendorHash = "sha256-sqlBgEfIWuDnGsepSZtrgxmG/DoP+Hc4c3nOpo8S/Ks="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix index e9266a5554..be511c7565 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gnirehtet/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , fetchzip , androidenv , makeWrapper @@ -22,7 +21,7 @@ apk = stdenv.mkDerivation { ''; }; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "gnirehtet"; inherit version; @@ -36,7 +35,7 @@ rustPlatform.buildRustPackage { inherit apk; }; - sourceRoot = "source/relay-rust"; + sourceRoot = "${src.name}/relay-rust"; cargoHash = "sha256-3oVWFMFzYsuCec1wxZiHXW6O45qbdL1npqYrg/m4SPc="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix b/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix index 5df6013855..e7f7faac5c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/goimapnotify/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://gitlab.com/shackra/goimapnotify"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wohanley ]; + mainProgram = "goimapnotify"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix index 59d3d6b314..6e9e32f361 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, installShellFiles , libiconv , Security , iputils @@ -9,21 +10,27 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - hash = "sha256-EkoOHyHYcbyqtT1zCq0kmXND1eSADE7QD3QQ01RJtvM="; + hash = "sha256-ReP+s2p0X39LVvl3/QF7fsYkU+OvsQyMhyuH8v4HuVU="; }; - cargoHash = "sha256-iDB3ZIlSLEBf+nSxLeQcE93nqMjH29w+z7kwCNksuSk="; + cargoHash = "sha256-FTiNxCoEe/iMz68F1CpJHypgrhn4WwwWowuN9I1rl6E="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = lib.optionals stdenv.isLinux [ iputils ]; + postInstall = '' + installManPage gping.1 + ''; + doInstallCheck = true; installCheckPhase = '' $out/bin/gping --version | grep "${version}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix index 8340eb1824..1d22b6cd17 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.56.1"; + version = "1.56.2"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-hmUwKFSU1KgdfC/WdK0rbRNMjzzBRWyfMQ/PomdGvbo="; + hash = "sha256-yjEaVfyfOlH/GPZz06lKvdds88VZUygPe1OxueMDnJA="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix index 2d80665c00..a54ea88b1c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XqdgfuNlZCxVWSf+3FteH+COdPBh0MPrCL2QG16yAII="; + sha256 = "U8+TEj85fo+PC46eQ2TIanUCpTNPTAvi4FSoJEeL1bo="; }; nativeBuildInputs = [ @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { gtksourceview4 ]; + # new libxml2 version + # TODO: can be dropped on next update + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix index 4c6e69c600..d0e831bf1b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-3WBL+ByYSiYKXzFkeoUnCxTdhvy3XxLKUHgJ2hO6oIo="; + hash = "sha256-BCRUMAM/OeFf4gftYwLrRmeCkRGplYaF9QZ1ZI2YLLY="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 2b69064a14..b7c39d83d8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -1,21 +1,28 @@ { useLua ? true , usePcre ? true , withPrometheusExporter ? true -, stdenv, lib, fetchurl, nixosTests -, openssl, zlib, libxcrypt -, lua5_3 ? null, pcre ? null, systemd ? null +, stdenv +, lib +, fetchurl +, nixosTests +, openssl +, zlib +, libxcrypt +, lua5_3 ? null +, pcre ? null +, systemd ? null }: assert useLua -> lua5_3 != null; assert usePcre -> pcre != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; version = "2.8.1"; src = fetchurl { - url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc="; + url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; + hash = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc="; }; buildInputs = [ openssl zlib libxcrypt ] @@ -26,10 +33,10 @@ stdenv.mkDerivation rec { # TODO: make it work on bsd as well makeFlags = [ "PREFIX=${placeholder "out"}" - ("TARGET=" + (if stdenv.isSunOS then "solaris" - else if stdenv.isLinux then "linux-glibc" - else if stdenv.isDarwin then "osx" - else "generic")) + ("TARGET=" + (if stdenv.isSunOS then "solaris" + else if stdenv.isLinux then "linux-glibc" + else if stdenv.isDarwin then "osx" + else "generic")) ]; buildFlags = [ @@ -54,8 +61,11 @@ stdenv.mkDerivation rec { passthru.tests.haproxy = nixosTests.haproxy; - meta = with lib; { + meta = { + changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/CHANGELOG"; description = "Reliable, high performance TCP/HTTP load balancer"; + homepage = "https://haproxy.org"; + license = with lib.licenses; [ gpl2Plus lgpl21Only ]; longDescription = '' HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based @@ -64,10 +74,7 @@ stdenv.mkDerivation rec { tens of thousands of connections is clearly realistic with todays hardware. ''; - homepage = "https://haproxy.org"; - changelog = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/CHANGELOG"; - license = with licenses; [ gpl2Plus lgpl21Only ]; - maintainers = with maintainers; [ ]; - platforms = with platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix index dc2f588393..2444a12fc5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "i2p"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { urls = map (mirror: "${mirror}/${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [ @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { "https://files.i2p-projekt.de" "https://download.i2p2.no/releases" ]; - sha256 = "sha256-9T80++I6h2LjeGVydRswG++ygojvtrEELU/GTGYQeE8="; + sha256 = "sha256-oKj7COnHLq7yLxVbnJqg6pD7Mx0rvPdvgmSfC57+X1s="; }; buildInputs = [ jdk ant gettext which ]; @@ -64,7 +64,21 @@ stdenv.mkDerivation (finalAttrs: { fromSource binaryBytecode # source bundles dependencies as jars ]; - license = licenses.gpl2; + license = with licenses; [ + asl20 + boost + bsd2 + bsd3 + cc-by-30 + cc0 + epl10 + gpl2 + gpl3 + lgpl21Only + lgpl3Only + mit + publicDomain + ]; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ joelmo ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix index 86891f4598..f04c3369ba 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ifwifi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, darwin, networkmanager, iw, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, networkmanager, iw, Security }: rustPlatform.buildRustPackage rec { pname = "ifwifi"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix b/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix index f201d863b7..41323b55d2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.13"; + version = "3.14"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "sha256-vuQnrrE9ai7iIHPyMmH2NxLYK++qg6yMtNtdpMK9yGU="; + hash = "sha256-cj/MQwoCe8aVJij6KjrHdYSh0L0ygnXlc/ybIGwVUAQ="; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://software.es.net/iperf/"; + homepage = "https://software.es.net/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix index ad52d99293..9bc655943e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ipv6calc"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "pbiering"; repo = pname; rev = version; - sha256 = "sha256-p/er/Ehyu7PqmikMIKPQBQ0/F81d8iiKdmLXLz+8pus="; + sha256 = "sha256-zpV3RpFPYICntNLVTC4FpkrxJ7nDh/KEzmNpg0ORWZQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/juicity/default.nix b/third_party/nixpkgs/pkgs/tools/networking/juicity/default.nix new file mode 100644 index 0000000000..ce258c5715 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/juicity/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { + pname = "juicity"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "juicity"; + repo = pname; + rev = "v${version}"; + hash = "sha256-wTMWmHQPJ65FRJUNt7liLF+nM/tXdq067KT0fMWlDfM="; + }; + + vendorHash = "sha256-RTf0+rf6DPJf9DKRNstZzJbQ3+pU/8siLSRgUo9Bcu8="; + + proxyVendor = true; + + ldflags = [ + "-X=github.com/juicity/juicity/config.Version=${version}" + ]; + + subPackages = [ + "cmd/server" + "cmd/client" + ]; + + postInstall = '' + mv $out/bin/client $out/bin/juicity-client + mv $out/bin/server $out/bin/juicity-server + install -Dm444 install/juicity-server.service $out/lib/systemd/system/juicity-server.service + install -Dm444 install/juicity-client.service $out/lib/systemd/system/juicity-client.service + substituteInPlace $out/lib/systemd/system/juicity-server.service \ + --replace /usr/bin/juicity-server $out/bin/juicity-server + substituteInPlace $out/lib/systemd/system/juicity-client.service \ + --replace /usr/bin/juicity-client $out/bin/juicity-client + ''; + + meta = with lib; { + homepage = "https://github.com/juicity/juicity"; + description = "A quic-based proxy protocol"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ oluceps ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/junkie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/junkie/default.nix index 9f7b4350f1..87c0fc6ae2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/junkie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile_2_2, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h ''; - buildInputs = [ libpcap guile openssl ]; + buildInputs = [ libpcap guile_2_2 openssl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "GUILELIBDIR=\${out}/share/guile/site" diff --git a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix index 1170fffad9..8238253636 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.57.1"; + version = "0.58.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-JNo6+WlMcIUGb/36GM6ofvJBIJnF4oRocdYsEw7V1Ks="; + sha256 = "sha256-E5QiR4hcO2Ii5qXAlMrw9Yxy8IYqjnonSGiUUyzhMVc="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix index 9ee9a3df0f..2c5b064a16 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { kea = nixosTests.kea; prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; prometheus-exporter = nixosTests.prometheus-exporters.kea; + networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; }; + networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix index 88ee2d44cb..aaa26a38c3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnutls, pkg-config, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: +{ lib, stdenv, fetchurl, openssl, pkg-config, readline, zlib, libidn2, gmp, libiconv, libunistring, gettext }: stdenv.mkDerivation rec { pname = "lftp"; @@ -14,11 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ]; + buildInputs = [ openssl readline zlib libidn2 gmp libiconv libunistring gettext ]; hardeningDisable = lib.optional stdenv.isDarwin "format"; configureFlags = [ + "--with-openssl" "--with-readline=${readline.dev}" "--with-zlib=${zlib.dev}" "--without-expat" diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 6ed8b2fc4b..2fa7f78f49 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -12,7 +12,7 @@ , gdbm , gnutls , gss -, guile +, guile_2_2 , libmysqlclient , mailcap , nettools @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libxcrypt ] ++ lib.optionals stdenv.isLinux [ nettools ] ++ lib.optionals pythonSupport [ python3 ] - ++ lib.optionals guileSupport [ guile ]; + ++ lib.optionals guileSupport [ guile_2_2 ]; patches = [ ./fix-build-mb-len-max.patch diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index e6383ca46f..f685acc049 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-07-07T05-25-51Z"; + version = "2023-07-21T20-44-27Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-r++4DQFqFjhTfNBRG/4qr2AeQAWKdJu8mzv6uYGovLk="; + sha256 = "sha256-y0+AGDI4zxMgcC65U51/UHW2mo0NNNKc+MQCcFevHmk="; }; - vendorHash = "sha256-W3FenwPwfEQxJWym6QzqMczWtygPN65Hp4gjj/karMw="; + vendorHash = "sha256-6duYIeNkqql9y1Wo+foMe88dmPmHZ625FBTDdKsHnCE="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix index 45ef93462a..a89fd79f67 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { especially over Wi-Fi, cellular, and long-distance links. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric SuperSandro2000 ]; + maintainers = with maintainers; [ viric ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix index 92cb1e553f..078bd8e316 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix @@ -46,11 +46,11 @@ let }) ]; - netfilter-go-modules = (buildGoModule { + netfilter-goModules = (buildGoModule { inherit pname version src patches; modRoot = "linux/netfilter"; vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; - }).go-modules; + }).goModules; extensionBridgeDeps = rustPlatform.fetchCargoTarball { inherit src patches; @@ -132,7 +132,7 @@ stdenv.mkDerivation { substituteInPlace extension/CMakeLists.txt \ --replace '/etc' "$out/etc" - ln -s '${netfilter-go-modules}' linux/netfilter/vendor + ln -s '${netfilter-goModules}' linux/netfilter/vendor pushd extension/bridge cargoDepsCopy="$extensionBridgeDepsCopy" cargoSetupPostPatchHook diff --git a/third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/default.nix index ddc04bab78..1edb48a62c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mqttmultimeter/default.nix @@ -41,7 +41,7 @@ buildDotnetModule rec { hash = "sha256-/XQ5HD0dBfFn3ERlLwHknS9Fyd3YMpKHBXuvMwRXcQ8="; }; - sourceRoot = "source/Source"; + sourceRoot = "${src.name}/Source"; projectFile = [ "mqttMultimeter.sln" ]; nugetDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mtr-exporter/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mtr-exporter/default.nix index 0243774262..62b884fe64 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mtr-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mtr-exporter/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "mtr-exporter"; version = "0.1.0"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix index 9ce71df109..bf324c57d4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mtr/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libcap diff --git a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix index 2ca9261f1f..83b0c0b39a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.21.8"; + version = "0.21.11"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BSLstxiiFUJZLIVqHsAFv20GdXJaq2OucG40+lu5LYU="; + sha256 = "sha256-WC2KZ9geskQtwtWitQTR1GPBHXs/7KWSuZNw7u+gkZA="; }; - vendorHash = "sha256-R5LhqW6uh7R8/vr60Sy0kVpAaTL3rwh5c4Ix08Rx6Zk="; + vendorHash = "sha256-RgvFbhhvfo4GyimAbUGjdU5DsuqS0pslD/oCmvFrtdg="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nethoscope/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nethoscope/default.nix index 276579f361..9a17adc380 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nethoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nethoscope/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , rustPlatform +, fetchFromGitHub , pkg-config , alsa-lib , libpcap diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index a5cdc383f9..ab747df01f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -4,7 +4,6 @@ , substituteAll , gettext , pkg-config -, fetchpatch , dbus , gnome , systemd @@ -58,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.42.6"; + version = "1.42.8"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-jDiKw3daxrzrYF+uIb4sPiYcr+YGeZSonw36RhDtAnk="; + sha256 = "sha256-AzfnWD0uxa3iui6MYl0vCe7M2h0ig27imqcpJdOZw1M="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -126,12 +125,6 @@ stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch - - # Support for building with ppp 2.5.0 - (fetchpatch { - url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.diff"; - hash = "sha256-BDm0P2U4HENAtq7OowWVDxqALNbG0nr9k/CLdE61Sck="; - }) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix index 8f3ed67abc..a47b23e963 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -21,7 +21,6 @@ , withGnome ? true , gcr_4 , glib -, substituteAll , lib , _experimental-update-script-combinators , makeHardcodeGsettingsPatch diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix index 545dd3d82c..f46fb12720 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -7,7 +7,6 @@ , strongswanNM , gtk3 , gtk4 -, gnome , libsecret , libnma , libnma-gtk4 diff --git a/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix index f2af99a922..9c1bb43a67 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, autoreconfHook, pkg-config, stdenv, fetchpatch, fetchFromGitHub }: +{ lib, autoreconfHook, pkg-config, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nss-mdns"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix index f272470a98..1a081993bb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ntp/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { pname = "ntp"; - version = "4.2.8p15"; + version = "4.2.8p17"; src = fetchurl { - url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz"; - sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; + url = "https://archive.ntp.org/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz"; + hash = "sha256-ED3ScuambFuN8H3OXpoCVV/NbxOXvft4IjcyjonTqGY="; }; - patches = [ - # From https://patchwork.openembedded.org/patch/180019/ - ./glibc-2.34-fix.patch - ]; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -33,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.ntp.org/"; + homepage = "https://www.ntp.org/"; description = "An implementation of the Network Time Protocol"; license = { # very close to isc and bsd2 diff --git a/third_party/nixpkgs/pkgs/tools/networking/ntp/glibc-2.34-fix.patch b/third_party/nixpkgs/pkgs/tools/networking/ntp/glibc-2.34-fix.patch deleted file mode 100644 index 256f125a77..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/ntp/glibc-2.34-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 31 Jul 2021 10:51:41 -0700 -Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc -In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which -could mean different stack sizes at runtime on different architectures -and it also causes compile failure. Default glibc thread stack size -or 64Kb set by ntp should be good in glibc these days. -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - libntp/work_thread.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/libntp/work_thread.c b/libntp/work_thread.c -index 03a5647..3ddd751 100644 ---- a/libntp/work_thread.c -+++ b/libntp/work_thread.c -@@ -41,7 +41,7 @@ - #ifndef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE (64U * 1024) - #endif --#ifndef __sun -+#if !defined(__sun) && !defined(__GLIBC__) - #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN - # undef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN --- -2.32.0 diff --git a/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix index 9141a2932b..4e67e81a7d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nzbget/default.nix @@ -1,11 +1,12 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub +, autoreconfHook , pkg-config , gnutls , libgcrypt , libpar2 +, libcap , libsigcxx , libxml2 , ncurses @@ -14,31 +15,24 @@ , nixosTests }: -stdenv.mkDerivation rec { - pname = "nzbget"; - version = "21.1"; +stdenv.mkDerivation (finalAttrs: { + pname = "nzbget-ng"; + version = "21.4-rc2"; - src = fetchurl { - url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - hash = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU="; + src = fetchFromGitHub { + owner = "nzbget-ng"; + repo = "nzbget"; + rev = "v${finalAttrs.version}"; + hash = "sha256-JJML5mtAog5xC7DkthCtoyn5QeC2Z+fdzSuEa/Te0Ew="; }; - patches = [ - # openssl 3 compatibility - # https://github.com/nzbget/nzbget/pull/793 - (fetchpatch { - name = "daemon-connect-dont-use-fips-mode-set-with-openssl-3.patch"; - url = "https://github.com/nzbget/nzbget/commit/f76e8555504e3af4cf8dd4a8c8e374b3ca025099.patch"; - hash = "sha256-39lvnhBK4126TYsRbJOUxsV9s9Hjuviw7CH/wWn/VkM="; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gnutls libgcrypt libpar2 + libcap libsigcxx libxml2 ncurses @@ -46,15 +40,20 @@ stdenv.mkDerivation rec { zlib ]; + prePatch = '' + sed -i 's/AC_INIT.*/AC_INIT( nzbget, m4_esyscmd_s( echo ${finalAttrs.version} ) )/' configure.ac + ''; + enableParallelBuilding = true; passthru.tests = { inherit (nixosTests) nzbget; }; meta = with lib; { - homepage = "https://nzbget.net"; + homepage = "https://nzbget-ng.github.io/"; + changelog = "https://github.com/nzbget-ng/nzbget/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix index 8c3866d7a9..16287b4177 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.18.0"; + version = "3.18.1"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-3KnPqUB9vNxIWF28BGZqqg1IwglHOP2qAZfDMaNcN7s="; + hash = "sha256-abCglaMFW6zPc53IU8Bgl/SaoIh1N9i3xDcfOnJypls="; }; - vendorHash = "sha256-iMEmTip9c7ySFUxcKr8ZUuREw7FfBvsIhECvmagvVL0="; + vendorHash = "sha256-olirtvnOIKvNXJsanv5UFTcpj7RpPAa5OP0qYTv4wtk="; subPackages = [ "cmd/ooniprobe" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix index 0da1cb1866..778aea8354 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitLab, fetchurl, darwin }: +{ callPackage, fetchurl, darwin }: let common = opts: callPackage (import ./common.nix opts) { inherit (darwin.apple_sdk.frameworks) PCSC; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openresolv/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openresolv/default.nix index eb97e24b1f..e937c6bcdf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openresolv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openresolv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openresolv"; - version = "3.12.0"; + version = "3.13.2"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "openresolv"; rev = "v${version}"; - sha256 = "sha256-lEyqOf2NGWnH44pDVNVSWZeuhXx7z0ru4KuXu2RuyIg="; + sha256 = "sha256-rpfzAIzuiO+QTFhN+tHND+OQOyX/GUPvLLX3CSSwqA4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix index 28bcba68a1..f3028573c0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -13,7 +13,6 @@ # package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606 , pkgs , fetchurl -, fetchpatch , zlib , openssl , libedit @@ -30,7 +29,7 @@ , linkOpenssl ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname version src; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix index e05d0ce144..ba0ce50d3f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: +{ callPackage, lib, fetchurl, fetchpatch, autoreconfHook }: let common = opts: callPackage (import ./common.nix opts) { }; in @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "9.3p1"; + version = "9.3p2"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-6bq6dwGnalHz2Fpiw4OjydzZf6kAuFm8fbEUwYaK+Kg="; + hash = "sha256-IA6+FH9ss/EB/QzfngJEKvfdyimN/9n0VoeOfMrGdug="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.3p1"; + version = "9.3p2"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-6bq6dwGnalHz2Fpiw4OjydzZf6kAuFm8fbEUwYaK+Kg="; + hash = "sha256-IA6+FH9ss/EB/QzfngJEKvfdyimN/9n0VoeOfMrGdug="; }; extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/700625bcd86b74cf3fb9536aeea250d7f8cd1fd5/security/openssh-portable/files/extra-patch-hpn"; in diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix index 0ef5076eaf..87cbd6881e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -9,7 +9,6 @@ , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , update-systemd-resolved -, util-linux , pkcs11Support ? false , pkcs11helper }: diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix index ff8ecc385c..6d4950b40f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix @@ -15,7 +15,6 @@ , boost # Not using boost leads to crashes with gtk3 , gettext , libpng -, autoreconfHook , pkg-config , makeWrapper , libX11 diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 3c9a6e7233..16eaf0d14e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , bison , pkg-config , gettext @@ -10,7 +9,6 @@ , libxml2 , libbfd , zlib -, binutils , gnutls , enableGui ? true }: @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { zlib ] ++ - lib.optionals (enableGui) [ gtk2 ] + lib.optionals enableGui [ gtk2 ] ; configureScript = "./build.sh"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix b/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix index f8e5e33eb4..ed449ecb99 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/persepolis/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper +{ lib, buildPythonApplication, fetchFromGitHub , aria , libnotify , pulseaudio diff --git a/third_party/nixpkgs/pkgs/tools/networking/pgrok/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pgrok/default.nix new file mode 100644 index 0000000000..6074746e97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/pgrok/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "pgrok"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "pgrok"; + repo = "pgrok"; + rev = "v${version}"; + hash = "sha256-lhcaJVIqZK7GnC/Q/+RDxTVFmgTana3vugDHr/SStFE="; + }; + vendorHash = "sha256-UzNx361cg4IDSQGlX5N9AxYZ8cYA0zsF5JF4Fe7efqM="; + + outputs = [ "out" "server" ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=unknown" + "-X main.date=unknown" + ]; + + postInstall = '' + moveToOutput bin/pgrokd $server + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Selfhosted TCP/HTTP tunnel, ngrok alternative, written in Go"; + homepage = "https://github.com/pgrok/pgrok"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix index 535545f42b..20e5916769 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ppp/default.nix @@ -8,7 +8,6 @@ , openssl , bash , nixosTests -, writeTextDir }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix index 17ba57f3cd..331d00cc2c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.9"; + version = "0.0.11"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "refs/tags/v${version}"; - hash = "sha256-InHo5nfgCLDxciwjaB9tamV6MGEM3DlRGU00Ng2SfVY="; + hash = "sha256-aoge1K1T4jgh8TFN8nFIjFehmz/o1UefbzEbV85dHTk="; }; - vendorHash = "sha256-GPkxUU9HXLWnj+qjee/CuSE683l2V22cH9KBP2ssaXc="; + vendorHash = "sha256-ingumSn4EDdw1Vgwm/ghQTsErqFVFZtjNfwfDwdJ/2s="; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix index fac532110d..a8dcbbebe1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pykms/default.nix @@ -43,7 +43,7 @@ pypkgs.buildPythonApplication rec { hash = "sha256-9KiMbS0uKTbWSZVIv5ziIeR9c8+EKfKd20yPmjCX7GQ="; }; - sourceRoot = "source/py-kms"; + sourceRoot = "${src.name}/py-kms"; propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal dnspython ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/q/default.nix b/third_party/nixpkgs/pkgs/tools/networking/q/default.nix index 5c57ab075a..a217c9fb6b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/q/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/q/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "q"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "natesales"; repo = "q"; rev = "v${version}"; - sha256 = "sha256-a2MmDKRXM2n3joHKdWU5sbBrF94TzcLUelNXIiL328M="; + sha256 = "sha256-zoIHpj1i0X5SCVhcT3bl5xxsDcvD2trEVhlIC5YnIZo="; }; vendorHash = "sha256-cZRaf5Ks6Y4PzeVN0Lf1TxXzrifb7uQzsMbZf6JbLK4="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix index 107b7ade8a..72096dedcc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { complete. ''; license = licenses.mit; - maintainers = with maintainers; [ fgaz SuperSandro2000 ]; + maintainers = with maintainers; [ fgaz ]; broken = stdenv.isDarwin; # needs golang.org/x/sys bump }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix index 5ddab7850f..ce017731bd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { dashboard = stdenv.mkDerivation rec { pname = "ratman-dashboard"; inherit version src; - sourceRoot = "source/ratman/dashboard"; + sourceRoot = "${src.name}/ratman/dashboard"; yarnDeps = fetchYarnDeps { yarnLock = src + "/ratman/dashboard/yarn.lock"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix index 53fc4d0b5a..613c4a8a31 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgs }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { version = "0.1.4"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix b/third_party/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix index cd3d1bfed6..83479a6d88 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap pixiewps ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; meta = with lib; { description = "Online and offline brute force attack against WPS"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix b/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix new file mode 100644 index 0000000000..239d6f2b1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/restish/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, buildGoModule +, darwin +, fetchFromGitHub +, restish +, testers +, xorg +}: + +buildGoModule rec { + pname = "restish"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "danielgtaylor"; + repo = "restish"; + rev = "refs/tags/v${version}"; + hash = "sha256-sXktiYCymoqZgEWQJHYn9KAUxtZYNCSyDyPC8D/X+Mw="; + }; + + vendorHash = "sha256-quDHEoHVAEAnw+M0xiAd07s/EOhVUgH0T1z8TaBcbj0="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Kernel + ] ++ lib.optionals stdenv.isLinux [ + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ]; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + passthru.tests.version = testers.testVersion { + package = restish; + }; + + meta = with lib; { + description = "CLI tool for interacting with REST-ish HTTP APIs"; + homepage = "https://rest.sh/"; + changelog = "https://github.com/danielgtaylor/restish/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix index 0c9e515ce0..79fd1c17a4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shorewall/default.nix @@ -7,7 +7,6 @@ , perl , perlPackages , lib, stdenv -, tree , util-linux }: let diff --git a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix index 1e15eaf9a1..e2f126a0ba 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.0"; + version = "1.3.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+zEjuoGFAZhajUCFPZXNr1SoAprjOsHf12nVCbDKOeY="; + hash = "sha256-fSQuVvV2dL+cdPIAqyXbDB8OSW77gxaYaOHKElEbq6o="; }; - vendorHash = "sha256-KJEjqcwtsNEByTQjp+TU9Yct/CJD8F9fnGuq9eeGtpQ="; + vendorHash = "sha256-AMtDAAKNbKRFcu9OEW9E+S73gGgXK7HaroEdidrXS4Y="; tags = [ "with_quic" diff --git a/third_party/nixpkgs/pkgs/tools/networking/sitespeed-io/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sitespeed-io/default.nix index 40949e6725..f7b71b2fb4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sitespeed-io/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sitespeed-io/default.nix @@ -87,5 +87,6 @@ buildNpmPackage rec { license = licenses.mit; maintainers = with maintainers; [ misterio77 ]; platforms = lib.unique (geckodriver.meta.platforms ++ chromedriver.meta.platforms); + mainProgram = "sitespeed-io"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix index 96a9b63e91..98f4cfb444 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-WooFGIdXIIoJPMqmPpnT+bc+P+IARMSxa3CvXY9++mw="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; vendorSha256 = "sha256-JqDDG53khtDdMLVOscwqi0oGviF+3DMkv5tkHvp1gJc="; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix b/third_party/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix index 43fcc24015..8a71f6d99f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.11.19"; + version = "3.13.10"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-YGD3I64g/zD5iX2oIU6Qy/WqzcWcaNs1HjMUBeKcDZ4="; + sha256 = "sha256-LTo0NV1DpHI05AvfmTKNz+/NdXaNoLxgpMhV/HqeT6g="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 6259e12ab7..cef63629b0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oNRQ+71j+i2ED3JJ+7iMh0jTpbxDD+b/P1rTT47YSmc="; + sha256 = "sha256-SVfBWOaDh2wE0XwoUzXOFohjHcb5upWILdWuUW0dwr8="; }; - vendorHash = "sha256-KEmTbMt8gPTEvoLDLpFWO/8JS0So+g9oh0wc8kfeqhw="; + vendorHash = "sha256-2Ob2oU7XBnqiWiR3td/lXDWl863ihx7j3iwP2CUGG/U="; modRoot = "./v2"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-cli/default.nix index 9c9145f327..5a20ce93cc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/swagger-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-cli/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , buildNpmPackage +, fetchFromGitHub }: buildNpmPackage rec { diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix index 090357fa6e..4866cfea41 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchFromGitHub, makeWrapper, git +{ lib, pythonPackages, fetchFromGitHub, makeWrapper , sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils , iptables, bash }: diff --git a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix index 0b4e75879c..6a7c65756a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl -, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux +, docbook_xsl, coreutils, lsof, makeWrapper, sg3_utils }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix index 24f96e63d7..f15f398dc7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { pname = "tinc"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix b/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix index 50056c3ebd..095ccfb91a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { version = "0.3.1"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix index dea517a67d..3b51398732 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, python3, python3Packages, trurl, testers }: +{ lib, stdenv, fetchFromGitHub, curl, python3, trurl, testers }: stdenv.mkDerivation rec { pname = "trurl"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix index 25cf5a0a9b..bab71aa523 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tunwg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tunwg"; - version = "23.06.14+dbfe3aa"; + version = "23.07.15+3213668"; src = fetchFromGitHub { owner = "ntnj"; repo = "tunwg"; rev = "v${version}"; - hash = "sha256-w7rx2Q0VXQBETmHROcVWzh0TIEjiITpI5CR9jvtXF7E="; + hash = "sha256-FghsfL3GW8jWBICJWXsqiFZPbDhIKl2nY8RsMH6ILTw="; }; - vendorHash = "sha256-3vDcCOrhYTHvr8ck0WxZPRUQNsKtEVyUKTD5Epbno6I="; + vendorHash = "sha256-pzUWhKcht9vodBiZGe9RU+tm0c1/slBGeIrKfZlIDdk="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/userhosts/default.nix b/third_party/nixpkgs/pkgs/tools/networking/userhosts/default.nix index 6cec402638..10bfbd650a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/userhosts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/userhosts/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "userhosts"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2raya/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2raya/default.nix index 022a4c3df9..c871c0057b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2raya/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2raya/default.nix @@ -7,30 +7,44 @@ , v2ray-geoip , v2ray-domain-list-community , symlinkJoin +, fetchYarnDeps }: let pname = "v2raya"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; rev = "v${version}"; - sha256 = "sha256-C7N23s/GA66gQ5SVXtXcM9lXIjScR3pLYCrf0w2nHfY="; + hash = "sha256-oMH4FutgI5mLz2sxDdPFUyDd80xT32r51HEQYhhnvcU="; + postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; + guiSrc = "${src}/gui"; web = mkYarnPackage { inherit pname version; - src = "${src}/gui"; - yarnNix = ./yarn.nix; + + src = guiSrc; packageJSON = ./package.json; - yarnLock = ./yarn.lock; + + offlineCache = fetchYarnDeps { + yarnLock = "${guiSrc}/yarn.lock"; + sha256 = "sha256-hVtETKhG9kX/4a4uO/aQ9sN2eTF6aAYaKDSHJIa0eWQ="; + }; + buildPhase = '' export NODE_OPTIONS=--openssl-legacy-provider - ln -s $src/postcss.config.js postcss.config.js OUTPUT_DIR=$out yarn --offline build ''; + + configurePhase = '' + cp -r $node_modules node_modules + chmod +w node_modules + ''; + distPhase = "true"; + dontInstall = true; dontFixup = true; }; @@ -45,7 +59,7 @@ buildGoModule { inherit pname version; src = "${src}/service"; - vendorSha256 = "sha256-vnhqI9G/p+SLLA4sre2wfmg1RKIYZmzeL0pSTbHb+Ck="; + vendorSha256 = "sha256-nI+nqftJybAGcHCTMVjYPuLHxqE/kyjUzkspnkzUi+g="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2raya/package.json b/third_party/nixpkgs/pkgs/tools/networking/v2raya/package.json index 8a255800b2..55c1c47056 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2raya/package.json +++ b/third_party/nixpkgs/pkgs/tools/networking/v2raya/package.json @@ -13,7 +13,7 @@ "@nuintun/qrcode": "^3.3.0", "@vue/babel-preset-app": "^4.2.2", "axios": "^0.21.1", - "buefy": "0.9.3", + "buefy": "^0.9.22", "clipboard": "^2.0.4", "dayjs": "^1.10.6", "js-base64": "^2.5.1", @@ -22,8 +22,7 @@ "pace-js": "^1.2.4", "qrcode": "^1.4.2", "register-service-worker": "^1.6.2", - "uglifyjs-webpack-plugin": "^1.1.1", - "vue": "^2.6.10", + "vue": "^2.7.14", "vue-i18n": "^8.15.3", "vue-router": "^3.0.6", "vue-virtual-scroller": "^1.0.10", @@ -31,22 +30,24 @@ "webpack-iconfont-plugin-nodejs": "^1.0.16" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.2.2", - "@vue/cli-plugin-eslint": "^4.0.5", - "@vue/cli-plugin-router": "^4.0.0", - "@vue/cli-plugin-vuex": "^4.0.0", - "@vue/cli-service": "^4.0.0", + "@babel/core": "^7.12.16", + "@babel/eslint-parser": "^7.12.16", + "@vue/cli-plugin-babel": "~5.0.8", + "@vue/cli-plugin-eslint": "~5.0.8", + "@vue/cli-plugin-router": "~5.0.8", + "@vue/cli-plugin-vuex": "~5.0.8", + "@vue/cli-service": "~5.0.8", "@vue/eslint-config-prettier": "^5.0.0", - "babel-eslint": "^10.0.3", "css-loader": "^5.2.0", - "eslint": "^5.16.0", - "eslint-plugin-prettier": "^3.1.1", - "eslint-plugin-vue": "^5.0.0", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-vue": "^8.0.3", "highlight.js": "^11.4.0", - "prettier": "^1.18.2", + "prettier": "^2.4.1", "sass": "^1.19.0", "sass-loader": "^8.0.0", - "urijs": "^1.19.11", - "vue-template-compiler": "^2.6.10" + "terser-webpack-plugin": "^5.3.6", + "urijs": "^1.19.11" } } diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.lock b/third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.lock deleted file mode 100644 index 2e6092d333..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.lock +++ /dev/null @@ -1,9381 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@ampproject/remapping@^2.0.0": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.4.tgz#ab4b6d858526ebee0d6c3aa5c3fb56a941c0d7be" - integrity sha512-zU3pj3pf//YhaoozRTYKaL20KopXrzuZFc/8Ylc49AuV8grYKH23TTq9JJoR70F8zQbil58KjSchZTWeX+jrIQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.0" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7": - 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/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" - integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== - -"@babel/core@^7.11.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz#16b8772b0a567f215839f689c5ded6bb20e864d5" - integrity sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA== - dependencies: - "@ampproject/remapping" "^2.0.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.0" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.17.0" - "@babel/parser" "^7.17.0" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" - "@babel/types" "^7.17.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.1.2" - semver "^6.3.0" - -"@babel/generator@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e" - integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw== - dependencies: - "@babel/types" "^7.17.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/helper-annotate-as-pure@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" - integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" - integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.9.6": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" - integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== - dependencies: - "@babel/compat-data" "^7.16.4" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" - semver "^6.3.0" - -"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.0": - version "7.17.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21" - integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-member-expression-to-functions" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - -"@babel/helper-create-regexp-features-plugin@^7.16.7": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" - integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - regexpu-core "^5.0.1" - -"@babel/helper-define-polyfill-provider@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" - integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA== - dependencies: - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/traverse" "^7.13.0" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" - integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-explode-assignable-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" - integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== - dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-member-expression-to-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" - integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-module-transforms@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" - integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-optimise-call-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" - integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== - dependencies: - "@babel/types" "^7.16.7" - -"@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.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== - -"@babel/helper-remap-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" - integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-wrap-function" "^7.16.8" - "@babel/types" "^7.16.8" - -"@babel/helper-replace-supers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" - integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-member-expression-to-functions" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-simple-access@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" - integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" - integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== - dependencies: - "@babel/types" "^7.16.0" - -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== - dependencies: - "@babel/types" "^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-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== - -"@babel/helper-wrap-function@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" - integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw== - dependencies: - "@babel/helper-function-name" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.8" - "@babel/types" "^7.16.8" - -"@babel/helpers@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz#79cdf6c66a579f3a7b5e739371bc63ca0306886b" - integrity sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ== - dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" - "@babel/types" "^7.17.0" - -"@babel/highlight@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" - integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.7.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c" - integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw== - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": - version "7.16.7" - 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.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" - integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" - integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" - -"@babel/plugin-proposal-async-generator-functions@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" - integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-remap-async-to-generator" "^7.16.8" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.16.7", "@babel/plugin-proposal-class-properties@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" - integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-proposal-class-static-block@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a" - integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-proposal-decorators@^7.8.3": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.0.tgz#fc0f689fe2535075056c587bc10c176fa9990443" - integrity sha512-JR8HTf3T1CsdMqfENrZ9pqncwsH4sPcvsyDLpvmv8iIbpDmeyBD7HPfGAIqkQph2j5d3B84hTm+m3qHPAedaPw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.0" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/plugin-syntax-decorators" "^7.17.0" - charcodes "^0.2.0" - -"@babel/plugin-proposal-dynamic-import@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" - integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" - integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" - integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" - integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" - integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" - integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8" - integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA== - dependencies: - "@babel/compat-data" "^7.16.4" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.16.7" - -"@babel/plugin-proposal-optional-catch-binding@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" - integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" - integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.16.11": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" - integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.10" - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-proposal-private-property-in-object@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" - integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" - integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - -"@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.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-decorators@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d" - integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@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-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.2.0", "@babel/plugin-syntax-jsx@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" - integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@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.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.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" - integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" - integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg== - dependencies: - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-remap-async-to-generator" "^7.16.8" - -"@babel/plugin-transform-block-scoped-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" - integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-block-scoping@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" - integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-classes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" - integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" - integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-destructuring@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23" - integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" - integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-duplicate-keys@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" - integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-exponentiation-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" - integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-for-of@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" - integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" - integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== - dependencies: - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" - integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-member-expression-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" - integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-modules-amd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" - integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== - dependencies: - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-commonjs@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe" - integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA== - dependencies: - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-simple-access" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-systemjs@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" - integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== - dependencies: - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-umd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" - integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== - dependencies: - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" - integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - -"@babel/plugin-transform-new-target@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" - integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-object-super@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" - integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - -"@babel/plugin-transform-parameters@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" - integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-property-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" - integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-regenerator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" - integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== - dependencies: - regenerator-transform "^0.14.2" - -"@babel/plugin-transform-reserved-words@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" - integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-runtime@^7.11.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70" - integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A== - dependencies: - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - semver "^6.3.0" - -"@babel/plugin-transform-shorthand-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" - integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-spread@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" - integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - -"@babel/plugin-transform-sticky-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" - integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-template-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" - integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-typeof-symbol@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" - integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-unicode-escapes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" - integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/plugin-transform-unicode-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" - integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - -"@babel/preset-env@^7.11.0": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" - integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== - dependencies: - "@babel/compat-data" "^7.16.8" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-async-generator-functions" "^7.16.8" - "@babel/plugin-proposal-class-properties" "^7.16.7" - "@babel/plugin-proposal-class-static-block" "^7.16.7" - "@babel/plugin-proposal-dynamic-import" "^7.16.7" - "@babel/plugin-proposal-export-namespace-from" "^7.16.7" - "@babel/plugin-proposal-json-strings" "^7.16.7" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" - "@babel/plugin-proposal-numeric-separator" "^7.16.7" - "@babel/plugin-proposal-object-rest-spread" "^7.16.7" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-private-methods" "^7.16.11" - "@babel/plugin-proposal-private-property-in-object" "^7.16.7" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.7" - "@babel/plugin-transform-async-to-generator" "^7.16.8" - "@babel/plugin-transform-block-scoped-functions" "^7.16.7" - "@babel/plugin-transform-block-scoping" "^7.16.7" - "@babel/plugin-transform-classes" "^7.16.7" - "@babel/plugin-transform-computed-properties" "^7.16.7" - "@babel/plugin-transform-destructuring" "^7.16.7" - "@babel/plugin-transform-dotall-regex" "^7.16.7" - "@babel/plugin-transform-duplicate-keys" "^7.16.7" - "@babel/plugin-transform-exponentiation-operator" "^7.16.7" - "@babel/plugin-transform-for-of" "^7.16.7" - "@babel/plugin-transform-function-name" "^7.16.7" - "@babel/plugin-transform-literals" "^7.16.7" - "@babel/plugin-transform-member-expression-literals" "^7.16.7" - "@babel/plugin-transform-modules-amd" "^7.16.7" - "@babel/plugin-transform-modules-commonjs" "^7.16.8" - "@babel/plugin-transform-modules-systemjs" "^7.16.7" - "@babel/plugin-transform-modules-umd" "^7.16.7" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8" - "@babel/plugin-transform-new-target" "^7.16.7" - "@babel/plugin-transform-object-super" "^7.16.7" - "@babel/plugin-transform-parameters" "^7.16.7" - "@babel/plugin-transform-property-literals" "^7.16.7" - "@babel/plugin-transform-regenerator" "^7.16.7" - "@babel/plugin-transform-reserved-words" "^7.16.7" - "@babel/plugin-transform-shorthand-properties" "^7.16.7" - "@babel/plugin-transform-spread" "^7.16.7" - "@babel/plugin-transform-sticky-regex" "^7.16.7" - "@babel/plugin-transform-template-literals" "^7.16.7" - "@babel/plugin-transform-typeof-symbol" "^7.16.7" - "@babel/plugin-transform-unicode-escapes" "^7.16.7" - "@babel/plugin-transform-unicode-regex" "^7.16.7" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.16.8" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.20.2" - 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.11.0", "@babel/runtime@^7.8.4": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.0.tgz#b8d142fc0f7664fb3d9b5833fd40dcbab89276c0" - integrity sha512-etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/template@^7.0.0", "@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.7.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30" - integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.0" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.0" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" - -"@hapi/address@2.x.x": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" - integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ== - -"@hapi/bourne@1.x.x": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a" - integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA== - -"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0": - version "8.5.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06" - integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow== - -"@hapi/joi@^15.0.1": - version "15.1.1" - resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7" - integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ== - dependencies: - "@hapi/address" "2.x.x" - "@hapi/bourne" "1.x.x" - "@hapi/hoek" "8.x.x" - "@hapi/topo" "3.x.x" - -"@hapi/topo@3.x.x": - version "3.1.6" - resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29" - integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ== - dependencies: - "@hapi/hoek" "^8.3.0" - -"@intervolga/optimize-cssnano-plugin@^1.0.5": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz#be7c7846128b88f6a9b1d1261a0ad06eb5c0fdf8" - integrity sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA== - dependencies: - cssnano "^4.0.0" - cssnano-preset-default "^4.0.0" - postcss "^7.0.0" - -"@jridgewell/resolve-uri@^3.0.3": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72" - integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg== - -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.10" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186" - integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg== - -"@jridgewell/trace-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz#e051581782a770c30ba219634f2019241c5d3cde" - integrity sha512-9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@mdi/font@^5.8.55": - version "5.9.55" - resolved "https://registry.yarnpkg.com/@mdi/font/-/font-5.9.55.tgz#41acd50b88073ded7095fc3029d8712b6e12f38e" - integrity sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg== - -"@mrmlnc/readdir-enhanced@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" - integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g== - dependencies: - call-me-maybe "^1.0.1" - glob-to-regexp "^0.3.0" - -"@nodelib/fs.stat@^1.1.2": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" - integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== - -"@nuintun/qrcode@^3.3.0": - version "3.3.0" - resolved "https://registry.npmmirror.com/@nuintun/qrcode/-/qrcode-3.3.0.tgz#13320457f95038837bc640917e490dca6c9dfebf" - integrity sha512-DJ8vmYyRdq8oX2l1/sGNmJjAD1KGaVvhtNUtHPJLbXpe5GoZut5UFQLM4FoFK9eyoZA1Y7chJEmEkNfs9Bdjrw== - dependencies: - tslib "^2.4.0" - -"@soda/friendly-errors-webpack-plugin@^1.7.1": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz#4d4fbb1108993aaa362116247c3d18188a2c6c85" - integrity sha512-h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg== - dependencies: - chalk "^3.0.0" - error-stack-parser "^2.0.6" - string-width "^4.2.3" - strip-ansi "^6.0.1" - -"@soda/get-current-script@^1.0.0": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87" - integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w== - -"@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/connect-history-api-fallback@*": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@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-proxy@^1.17.5": - version "1.17.8" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" - integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== - dependencies: - "@types/node" "*" - -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== - -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== - -"@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": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== - -"@types/node@*": - version "17.0.15" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.15.tgz#97779282c09c09577120a2162e71d8380003590a" - integrity sha512-zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA== - -"@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/q@^1.5.1": - version "1.5.5" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" - integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/source-list-map@*": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" - integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== - -"@types/tapable@^1": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" - integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== - -"@types/uglify-js@*": - version "3.13.1" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" - integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ== - dependencies: - source-map "^0.6.1" - -"@types/webpack-dev-server@^3.11.0": - version "3.11.6" - resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz#d8888cfd2f0630203e13d3ed7833a4d11b8a34dc" - integrity sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ== - dependencies: - "@types/connect-history-api-fallback" "*" - "@types/express" "*" - "@types/serve-static" "*" - "@types/webpack" "^4" - http-proxy-middleware "^1.0.0" - -"@types/webpack-sources@*": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" - integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== - dependencies: - "@types/node" "*" - "@types/source-list-map" "*" - source-map "^0.7.3" - -"@types/webpack@^4", "@types/webpack@^4.0.0": - version "4.41.32" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212" - integrity sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg== - dependencies: - "@types/node" "*" - "@types/tapable" "^1" - "@types/uglify-js" "*" - "@types/webpack-sources" "*" - anymatch "^3.0.0" - source-map "^0.6.0" - -"@vue/babel-helper-vue-jsx-merge-props@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" - integrity sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA== - -"@vue/babel-helper-vue-transform-on@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz#9b9c691cd06fc855221a2475c3cc831d774bc7dc" - integrity sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA== - -"@vue/babel-plugin-jsx@^1.0.3": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz#0c5bac27880d23f89894cd036a37b55ef61ddfc1" - integrity sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/plugin-syntax-jsx" "^7.0.0" - "@babel/template" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - "@vue/babel-helper-vue-transform-on" "^1.0.2" - camelcase "^6.0.0" - html-tags "^3.1.0" - svg-tags "^1.0.0" - -"@vue/babel-plugin-transform-vue-jsx@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.2.1.tgz#646046c652c2f0242727f34519d917b064041ed7" - integrity sha512-HJuqwACYehQwh1fNT8f4kyzqlNMpBuUK4rSiSES5D4QsYncv5fxFsLyrxFPG2ksO7t5WP+Vgix6tt6yKClwPzA== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/plugin-syntax-jsx" "^7.2.0" - "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1" - html-tags "^2.0.0" - lodash.kebabcase "^4.1.1" - svg-tags "^1.0.0" - -"@vue/babel-preset-app@^4.2.2", "@vue/babel-preset-app@^4.5.15": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.15.tgz#f6bc08f8f674e98a260004234cde18b966d72eb0" - integrity sha512-J+YttzvwRfV1BPczf8r3qCevznYk+jh531agVF+5EYlHF4Sgh/cGXTz9qkkiux3LQgvhEGXgmCteg1n38WuuKg== - dependencies: - "@babel/core" "^7.11.0" - "@babel/helper-compilation-targets" "^7.9.6" - "@babel/helper-module-imports" "^7.8.3" - "@babel/plugin-proposal-class-properties" "^7.8.3" - "@babel/plugin-proposal-decorators" "^7.8.3" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-jsx" "^7.8.3" - "@babel/plugin-transform-runtime" "^7.11.0" - "@babel/preset-env" "^7.11.0" - "@babel/runtime" "^7.11.0" - "@vue/babel-plugin-jsx" "^1.0.3" - "@vue/babel-preset-jsx" "^1.2.4" - babel-plugin-dynamic-import-node "^2.3.3" - core-js "^3.6.5" - core-js-compat "^3.6.5" - semver "^6.1.0" - -"@vue/babel-preset-jsx@^1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.4.tgz#92fea79db6f13b01e80d3a0099e2924bdcbe4e87" - integrity sha512-oRVnmN2a77bYDJzeGSt92AuHXbkIxbf/XXSE3klINnh9AXBmVS1DGa1f0d+dDYpLfsAKElMnqKTQfKn7obcL4w== - dependencies: - "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1" - "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" - "@vue/babel-sugar-composition-api-inject-h" "^1.2.1" - "@vue/babel-sugar-composition-api-render-instance" "^1.2.4" - "@vue/babel-sugar-functional-vue" "^1.2.2" - "@vue/babel-sugar-inject-h" "^1.2.2" - "@vue/babel-sugar-v-model" "^1.2.3" - "@vue/babel-sugar-v-on" "^1.2.3" - -"@vue/babel-sugar-composition-api-inject-h@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.2.1.tgz#05d6e0c432710e37582b2be9a6049b689b6f03eb" - integrity sha512-4B3L5Z2G+7s+9Bwbf+zPIifkFNcKth7fQwekVbnOA3cr3Pq71q71goWr97sk4/yyzH8phfe5ODVzEjX7HU7ItQ== - dependencies: - "@babel/plugin-syntax-jsx" "^7.2.0" - -"@vue/babel-sugar-composition-api-render-instance@^1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.4.tgz#e4cbc6997c344fac271785ad7a29325c51d68d19" - integrity sha512-joha4PZznQMsxQYXtR3MnTgCASC9u3zt9KfBxIeuI5g2gscpTsSKRDzWQt4aqNIpx6cv8On7/m6zmmovlNsG7Q== - dependencies: - "@babel/plugin-syntax-jsx" "^7.2.0" - -"@vue/babel-sugar-functional-vue@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.2.2.tgz#267a9ac8d787c96edbf03ce3f392c49da9bd2658" - integrity sha512-JvbgGn1bjCLByIAU1VOoepHQ1vFsroSA/QkzdiSs657V79q6OwEWLCQtQnEXD/rLTA8rRit4rMOhFpbjRFm82w== - dependencies: - "@babel/plugin-syntax-jsx" "^7.2.0" - -"@vue/babel-sugar-inject-h@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.2.2.tgz#d738d3c893367ec8491dcbb669b000919293e3aa" - integrity sha512-y8vTo00oRkzQTgufeotjCLPAvlhnpSkcHFEp60+LJUwygGcd5Chrpn5480AQp/thrxVm8m2ifAk0LyFel9oCnw== - dependencies: - "@babel/plugin-syntax-jsx" "^7.2.0" - -"@vue/babel-sugar-v-model@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.2.3.tgz#fa1f29ba51ebf0aa1a6c35fa66d539bc459a18f2" - integrity sha512-A2jxx87mySr/ulAsSSyYE8un6SIH0NWHiLaCWpodPCVOlQVODCaSpiR4+IMsmBr73haG+oeCuSvMOM+ttWUqRQ== - dependencies: - "@babel/plugin-syntax-jsx" "^7.2.0" - "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1" - "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" - camelcase "^5.0.0" - html-tags "^2.0.0" - svg-tags "^1.0.0" - -"@vue/babel-sugar-v-on@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.2.3.tgz#342367178586a69f392f04bfba32021d02913ada" - integrity sha512-kt12VJdz/37D3N3eglBywV8GStKNUhNrsxChXIV+o0MwVXORYuhDTHJRKPgLJRb/EY3vM2aRFQdxJBp9CLikjw== - dependencies: - "@babel/plugin-syntax-jsx" "^7.2.0" - "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" - camelcase "^5.0.0" - -"@vue/cli-overlay@^4.5.15": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.5.15.tgz#0700fd6bad39336d4189ba3ff7d25e638e818c9c" - integrity sha512-0zI0kANAVmjFO2LWGUIzdGPMeE3+9k+KeRDXsUqB30YfRF7abjfiiRPq5BU9pOzlJbVdpRkisschBrvdJqDuDg== - -"@vue/cli-plugin-babel@^4.2.2": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.15.tgz#ae4fb2ed54255fe3d84df381dab68509641179ed" - integrity sha512-hBLrwYfFkHldEe34op/YNgPhpOWI5n5DB2Qt9I/1Epeif4M4iFaayrgjvOR9AVM6WbD3Yx7WCFszYpWrQZpBzQ== - dependencies: - "@babel/core" "^7.11.0" - "@vue/babel-preset-app" "^4.5.15" - "@vue/cli-shared-utils" "^4.5.15" - babel-loader "^8.1.0" - cache-loader "^4.1.0" - thread-loader "^2.1.3" - webpack "^4.0.0" - -"@vue/cli-plugin-eslint@^4.0.5": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.15.tgz#5781824a941f34c26336a67b1f6584a06c6a24ff" - integrity sha512-/2Fl6wY/5bz3HD035oSnFRMsKNxDxU396KqBdpCQdwdvqk4mm6JAbXqihpcBRTNPeTO6w+LwGe6FE56PVbJdbg== - dependencies: - "@vue/cli-shared-utils" "^4.5.15" - eslint-loader "^2.2.1" - globby "^9.2.0" - inquirer "^7.1.0" - webpack "^4.0.0" - yorkie "^2.0.0" - -"@vue/cli-plugin-router@^4.0.0", "@vue/cli-plugin-router@^4.5.15": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.15.tgz#1e75c8c89df42c694f143b9f1028de3cf5d61e1e" - integrity sha512-q7Y6kP9b3k55Ca2j59xJ7XPA6x+iSRB+N4ac0ZbcL1TbInVQ4j5wCzyE+uqid40hLy4fUdlpl4X9fHJEwuVxPA== - dependencies: - "@vue/cli-shared-utils" "^4.5.15" - -"@vue/cli-plugin-vuex@^4.0.0", "@vue/cli-plugin-vuex@^4.5.15": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.15.tgz#466c1f02777d02fef53a9bb49a36cc3a3bcfec4e" - integrity sha512-fqap+4HN+w+InDxlA3hZTOGE0tzBTgXhKLoDydhywqgmhQ1D9JA6Feh94ze6tG8DsWX58/ujYUqA8jAz17FJtg== - -"@vue/cli-service@^4.0.0": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.5.15.tgz#0e9a186d51550027d0e68e95042077eb4d115b45" - integrity sha512-sFWnLYVCn4zRfu45IcsIE9eXM0YpDV3S11vlM2/DVbIPAGoYo5ySpSof6aHcIvkeGsIsrHFpPHzNvDZ/efs7jA== - dependencies: - "@intervolga/optimize-cssnano-plugin" "^1.0.5" - "@soda/friendly-errors-webpack-plugin" "^1.7.1" - "@soda/get-current-script" "^1.0.0" - "@types/minimist" "^1.2.0" - "@types/webpack" "^4.0.0" - "@types/webpack-dev-server" "^3.11.0" - "@vue/cli-overlay" "^4.5.15" - "@vue/cli-plugin-router" "^4.5.15" - "@vue/cli-plugin-vuex" "^4.5.15" - "@vue/cli-shared-utils" "^4.5.15" - "@vue/component-compiler-utils" "^3.1.2" - "@vue/preload-webpack-plugin" "^1.1.0" - "@vue/web-component-wrapper" "^1.2.0" - acorn "^7.4.0" - acorn-walk "^7.1.1" - address "^1.1.2" - autoprefixer "^9.8.6" - browserslist "^4.12.0" - cache-loader "^4.1.0" - case-sensitive-paths-webpack-plugin "^2.3.0" - cli-highlight "^2.1.4" - clipboardy "^2.3.0" - cliui "^6.0.0" - copy-webpack-plugin "^5.1.1" - css-loader "^3.5.3" - cssnano "^4.1.10" - debug "^4.1.1" - default-gateway "^5.0.5" - dotenv "^8.2.0" - dotenv-expand "^5.1.0" - file-loader "^4.2.0" - fs-extra "^7.0.1" - globby "^9.2.0" - hash-sum "^2.0.0" - html-webpack-plugin "^3.2.0" - launch-editor-middleware "^2.2.1" - lodash.defaultsdeep "^4.6.1" - lodash.mapvalues "^4.6.0" - lodash.transform "^4.6.0" - mini-css-extract-plugin "^0.9.0" - minimist "^1.2.5" - pnp-webpack-plugin "^1.6.4" - portfinder "^1.0.26" - postcss-loader "^3.0.0" - ssri "^8.0.1" - terser-webpack-plugin "^1.4.4" - thread-loader "^2.1.3" - url-loader "^2.2.0" - vue-loader "^15.9.2" - vue-style-loader "^4.1.2" - webpack "^4.0.0" - webpack-bundle-analyzer "^3.8.0" - webpack-chain "^6.4.0" - webpack-dev-server "^3.11.0" - webpack-merge "^4.2.2" - optionalDependencies: - vue-loader-v16 "npm:vue-loader@^16.1.0" - -"@vue/cli-shared-utils@^4.5.15": - version "4.5.15" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz#dba3858165dbe3465755f256a4890e69084532d6" - integrity sha512-SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q== - dependencies: - "@hapi/joi" "^15.0.1" - chalk "^2.4.2" - execa "^1.0.0" - launch-editor "^2.2.1" - lru-cache "^5.1.1" - node-ipc "^9.1.1" - open "^6.3.0" - ora "^3.4.0" - read-pkg "^5.1.1" - request "^2.88.2" - semver "^6.1.0" - strip-ansi "^6.0.0" - -"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9" - integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ== - dependencies: - consolidate "^0.15.1" - hash-sum "^1.0.2" - lru-cache "^4.1.2" - merge-source-map "^1.1.0" - postcss "^7.0.36" - postcss-selector-parser "^6.0.2" - source-map "~0.6.1" - vue-template-es2015-compiler "^1.9.0" - optionalDependencies: - prettier "^1.18.2 || ^2.0.0" - -"@vue/eslint-config-prettier@^5.0.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-5.1.0.tgz#837241a26ed396976cb8dabd77939303245523cf" - integrity sha512-LNqBXtM+4XqKz6yW3rrF/frCVZUKyYryiiMc8aCGq3czSXhTR/UNhl89FAtqZcpSwh5u8k2Qh8BvFctva68HUQ== - dependencies: - eslint-config-prettier "^6.0.0" - -"@vue/preload-webpack-plugin@^1.1.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" - integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== - -"@vue/web-component-wrapper@^1.2.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" - integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA== - -"@webassemblyjs/ast@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" - integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== - dependencies: - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - -"@webassemblyjs/floating-point-hex-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" - integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== - -"@webassemblyjs/helper-api-error@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" - integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== - -"@webassemblyjs/helper-buffer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" - integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== - -"@webassemblyjs/helper-code-frame@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" - integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== - dependencies: - "@webassemblyjs/wast-printer" "1.9.0" - -"@webassemblyjs/helper-fsm@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" - integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== - -"@webassemblyjs/helper-module-context@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" - integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== - dependencies: - "@webassemblyjs/ast" "1.9.0" - -"@webassemblyjs/helper-wasm-bytecode@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" - integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== - -"@webassemblyjs/helper-wasm-section@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" - integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - -"@webassemblyjs/ieee754@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" - integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" - integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" - integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== - -"@webassemblyjs/wasm-edit@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" - integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/helper-wasm-section" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-opt" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - "@webassemblyjs/wast-printer" "1.9.0" - -"@webassemblyjs/wasm-gen@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" - integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" - -"@webassemblyjs/wasm-opt@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" - integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - -"@webassemblyjs/wasm-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" - integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" - -"@webassemblyjs/wast-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" - integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/floating-point-hex-parser" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-code-frame" "1.9.0" - "@webassemblyjs/helper-fsm" "1.9.0" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/wast-printer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" - integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - "@xtuc/long" "4.2.2" - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -a-sync-waterfall@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz#75b6b6aa72598b497a125e7a2770f14f4c8a1fa7" - integrity sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA== - -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn-jsx@^5.0.0: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn-walk@^7.1.1: - 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@^6.0.2, acorn@^6.0.7, acorn@^6.4.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== - -acorn@^7.1.1, acorn@^7.4.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -address@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" - integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== - -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== - -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: - 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.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: - 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" - -alphanum-sort@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - -ansi-colors@^3.0.0: - version "3.2.4" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" - integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== - -ansi-escapes@^3.2.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-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-html-community@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== - -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@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -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.0, 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-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -anymatch@^3.0.0, 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" - -aproba@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -arch@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" - integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== - -argparse@^1.0.6, 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@^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.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-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - -array-union@^1.0.1, array-union@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= - -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= - -array.prototype.flatmap@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" - integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - function-bind "^1.1.1" - -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= - -asap@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= - -asn1.js@^5.2.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" - integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - safer-buffer "^2.1.0" - -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 sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - -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= - -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== - -async-each@^1.0.1: - 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== - -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - -async-throttle@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/async-throttle/-/async-throttle-1.1.0.tgz#229e7f3fa7a2a797e86f360e6309a08224d4fa7a" - integrity sha1-Ip5/P6eip5fobzYOYwmggiTU+no= - -async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== - dependencies: - lodash "^4.17.14" - -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== - -autoprefixer@^9.8.6: - version "9.8.8" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a" - integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA== - dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - picocolors "^0.2.1" - postcss "^7.0.32" - postcss-value-parser "^4.1.0" - -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.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== - -axios@^0.21.1: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - -babel-eslint@^10.0.3: - version "10.1.0" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" - integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - eslint-visitor-keys "^1.0.0" - resolve "^1.12.0" - -babel-loader@^8.1.0: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^1.4.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" - -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - -babel-plugin-polyfill-corejs2@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" - integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w== - dependencies: - "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.3.1" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" - integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.1" - core-js-compat "^3.21.0" - -babel-plugin-polyfill-regenerator@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" - integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.1" - -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.0.2: - 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" - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= - -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" - -bfj@^6.1.1: - version "6.1.2" - resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f" - integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw== - dependencies: - bluebird "^3.5.5" - check-types "^8.0.3" - hoopy "^0.1.4" - tryer "^1.0.1" - -big.js@^3.1.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" - integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q== - -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - -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-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== - -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" - -bluebird@^3.1.1, bluebird@^3.5.1, 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== - -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: - version "4.12.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== - -bn.js@^5.0.0, bn.js@^5.1.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" - integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== - -body-parser@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" - integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== - dependencies: - bytes "3.1.1" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.6" - raw-body "2.4.2" - type-is "~1.6.18" - -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= - dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" - -boolbase@^1.0.0, boolbase@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= - -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@^2.3.1, braces@^2.3.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.1, 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" - -brorand@^1.0.1, brorand@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= - -browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" - integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== - 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" - -browserify-cipher@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" - integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== - dependencies: - browserify-aes "^1.0.4" - browserify-des "^1.0.0" - evp_bytestokey "^1.0.0" - -browserify-des@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" - integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== - dependencies: - cipher-base "^1.0.1" - des.js "^1.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" - integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== - dependencies: - bn.js "^5.0.0" - randombytes "^2.0.1" - -browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== - 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" - -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== - dependencies: - pako "~1.0.5" - -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4.19.1: - version "4.19.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" - integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== - dependencies: - caniuse-lite "^1.0.30001286" - electron-to-chromium "^1.4.17" - escalade "^3.1.1" - node-releases "^2.0.1" - picocolors "^1.0.0" - -buefy@0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/buefy/-/buefy-0.9.3.tgz#c33b3309e9458ca5fe3ef14955e4bc2df7a0e3e2" - integrity sha512-Xqfo3ppeBo8Fwhb2fLwWnpkIC/1thPErU7DX3HksxTHxrSMixJ2BYkf3f6aWv4Ffx/FWX5UHnUrgtT7o7slnDA== - dependencies: - bulma "0.9.0" - -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-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== - -buffer-json@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23" - integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== - -buffer-xor@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= - -buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -bufferstreams@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-3.0.0.tgz#d2cb186cffeb527668341891e523c19539bc4a14" - integrity sha512-Qg0ggJUWJq90vtg4lDsGN9CDWvzBMQxhiEkSOD/sJfYt6BLect3eV1/S6K7SCSKJ34n60rf6U5eUPmQENVE4UA== - dependencies: - readable-stream "^3.4.0" - -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= - -bulma@0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.0.tgz#948c5445a49e9d7546f0826cb3820d17178a814f" - integrity sha512-rV75CJkubNUroAt0qCRkjznZLoaXq/ctfMXsMvKSL84UetbSyx5REl96e8GoQ04G4Tkw0XF3STECffTOQrbzOQ== - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= - -bytes@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" - integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== - -cacache@^10.0.4: - version "10.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460" - integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA== - dependencies: - bluebird "^3.5.1" - chownr "^1.0.1" - glob "^7.1.2" - graceful-fs "^4.1.11" - lru-cache "^4.1.1" - mississippi "^2.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.2" - ssri "^5.2.4" - unique-filename "^1.1.0" - y18n "^4.0.0" - -cacache@^12.0.2, cacache@^12.0.3: - version "12.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" - integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - -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" - -cache-loader@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz#9948cae353aec0a1fcb1eafda2300816ec85387e" - integrity sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw== - dependencies: - buffer-json "^2.0.0" - find-cache-dir "^3.0.0" - loader-utils "^1.2.3" - mkdirp "^0.5.1" - neo-async "^2.6.1" - schema-utils "^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" - -call-me-maybe@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" - integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= - -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= - dependencies: - callsites "^2.0.0" - -caller-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - -callsites@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= - -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@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" - integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= - dependencies: - no-case "^2.2.0" - upper-case "^1.1.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== - -camelcase@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286: - version "1.0.30001388" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz" - integrity sha512-znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ== - -case-sensitive-paths-webpack-plugin@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" - integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: - 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.1.0: - 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" - -charcodes@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4" - integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ== - -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-types@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" - integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== - -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1: - 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" - -chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - -chownr@^1.0.1, chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -ci-info@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" - integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== - -cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -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.2.x: - version "4.2.4" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178" - integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A== - 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-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-highlight@^2.1.4: - version "2.1.11" - resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" - integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg== - dependencies: - chalk "^4.0.0" - highlight.js "^10.7.1" - mz "^2.4.0" - parse5 "^5.1.1" - parse5-htmlparser2-tree-adapter "^6.0.0" - yargs "^16.0.0" - -cli-spinners@^2.0.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" - integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== - -cli-width@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" - integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== - -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== - -clipboard@^2.0.4: - version "2.0.10" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.10.tgz#e61f6f7139ac5044c58c0484dcac9fb2a918bfd6" - integrity sha512-cz3m2YVwFz95qSEbCDi2fzLN/epEN9zXBvfgAoGkvGOJZATMl9gtTDVOtBYkx2ODUJl2kvmud7n32sV2BpYR4g== - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - -clipboardy@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" - integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== - dependencies: - arch "^2.1.1" - execa "^1.0.0" - is-wsl "^2.1.1" - -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - -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@^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" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= - -coa@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" - integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== - dependencies: - "@types/q" "^1.5.1" - chalk "^2.4.1" - q "^1.1.2" - -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, color-convert@^1.9.3: - 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.0.0, 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== - -color-string@^1.6.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa" - integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" - integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== - dependencies: - color-convert "^1.9.3" - color-string "^1.6.0" - -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.17.x: - version "2.17.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" - integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== - -commander@^2.18.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@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - -commander@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== - -commander@~2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" - integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA== - -commander@~2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" - integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= - -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== - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -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.5.0: - 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" - -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== - -console-browserify@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" - integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== - -consolidate@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" - integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw== - dependencies: - bluebird "^3.1.1" - -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= - -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -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.7.0: - 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.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== - -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" - -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= - -copy-webpack-plugin@^5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz#8a889e1dcafa6c91c6cd4be1ad158f1d3823bae2" - integrity sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ== - dependencies: - cacache "^12.0.3" - find-cache-dir "^2.1.0" - glob-parent "^3.1.0" - globby "^7.1.1" - is-glob "^4.0.1" - loader-utils "^1.2.3" - minimatch "^3.0.4" - normalize-path "^3.0.0" - p-limit "^2.2.1" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" - webpack-log "^2.0.0" - -core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.6.5: - version "3.21.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885" - integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A== - dependencies: - browserslist "^4.19.1" - semver "7.0.0" - -core-js@^3.6.5: - version "3.21.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.0.tgz#f479dbfc3dffb035a0827602dd056839a774aa71" - integrity sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ== - -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 sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -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@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" - -create-ecdh@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" - integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== - dependencies: - bn.js "^4.1.0" - elliptic "^6.5.3" - -create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" - integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - md5.js "^1.3.4" - ripemd160 "^2.0.1" - sha.js "^2.4.0" - -create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" - integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== - 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" - -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^6.0.0, cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0: - 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-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== - 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" - -css-color-names@0.0.4, css-color-names@^0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" - integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= - -css-declaration-sorter@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22" - integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA== - dependencies: - postcss "^7.0.1" - timsort "^0.3.0" - -css-loader@^3.5.3: - version "3.6.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645" - integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ== - dependencies: - camelcase "^5.3.1" - cssesc "^3.0.0" - icss-utils "^4.1.1" - loader-utils "^1.2.3" - normalize-path "^3.0.0" - postcss "^7.0.32" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.2" - postcss-modules-scope "^2.2.0" - postcss-modules-values "^3.0.0" - postcss-value-parser "^4.1.0" - schema-utils "^2.7.0" - semver "^6.3.0" - -css-loader@^5.2.0: - version "5.2.7" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" - integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== - dependencies: - icss-utils "^5.1.0" - loader-utils "^2.0.0" - postcss "^8.2.15" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.1.0" - schema-utils "^3.0.0" - semver "^7.3.5" - -css-select-base-adapter@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" - integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== - -css-select@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" - integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== - dependencies: - boolbase "^1.0.0" - css-what "^3.2.1" - domutils "^1.7.0" - nth-check "^1.0.2" - -css-select@^4.1.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" - integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== - dependencies: - boolbase "^1.0.0" - css-what "^5.1.0" - domhandler "^4.3.0" - domutils "^2.8.0" - nth-check "^2.0.1" - -css-tree@1.0.0-alpha.37: - version "1.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" - integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== - dependencies: - mdn-data "2.0.4" - source-map "^0.6.1" - -css-tree@^1.1.2: - 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@^3.2.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" - integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== - -css-what@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" - integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== - -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== - -cssnano-preset-default@^4.0.0, cssnano-preset-default@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" - integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== - dependencies: - css-declaration-sorter "^4.0.1" - cssnano-util-raw-cache "^4.0.1" - postcss "^7.0.0" - postcss-calc "^7.0.1" - postcss-colormin "^4.0.3" - postcss-convert-values "^4.0.1" - postcss-discard-comments "^4.0.2" - postcss-discard-duplicates "^4.0.2" - postcss-discard-empty "^4.0.1" - postcss-discard-overridden "^4.0.1" - postcss-merge-longhand "^4.0.11" - postcss-merge-rules "^4.0.3" - postcss-minify-font-values "^4.0.2" - postcss-minify-gradients "^4.0.2" - postcss-minify-params "^4.0.2" - postcss-minify-selectors "^4.0.2" - postcss-normalize-charset "^4.0.1" - postcss-normalize-display-values "^4.0.2" - postcss-normalize-positions "^4.0.2" - postcss-normalize-repeat-style "^4.0.2" - postcss-normalize-string "^4.0.2" - postcss-normalize-timing-functions "^4.0.2" - postcss-normalize-unicode "^4.0.1" - postcss-normalize-url "^4.0.1" - postcss-normalize-whitespace "^4.0.2" - postcss-ordered-values "^4.1.2" - postcss-reduce-initial "^4.0.3" - postcss-reduce-transforms "^4.0.2" - postcss-svgo "^4.0.3" - postcss-unique-selectors "^4.0.1" - -cssnano-util-get-arguments@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" - integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= - -cssnano-util-get-match@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" - integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= - -cssnano-util-raw-cache@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" - integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== - dependencies: - postcss "^7.0.0" - -cssnano-util-same-parent@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" - integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== - -cssnano@^4.0.0, cssnano@^4.1.10: - version "4.1.11" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" - integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== - dependencies: - cosmiconfig "^5.0.0" - cssnano-preset-default "^4.0.8" - is-resolvable "^1.0.0" - postcss "^7.0.0" - -csso@^4.0.2: - 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" - -cubic2quad@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz#2442260b72c02ee4b6a2fe998fcc1c4073622286" - integrity sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ== - -cyclist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" - integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= - -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" - -dayjs@^1.10.6: - version "1.10.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" - integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== - -de-indent@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" - integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= - -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@^3.1.1, debug@^3.2.6: - 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" - -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -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-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.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== - -deepmerge@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" - integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ== - -default-gateway@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" - integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA== - dependencies: - execa "^1.0.0" - ip-regex "^2.1.0" - -default-gateway@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-5.0.5.tgz#4fd6bd5d2855d39b34cc5a59505486e9aafc9b10" - integrity sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA== - dependencies: - execa "^3.3.0" - -defaults@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= - dependencies: - clone "^1.0.2" - -define-properties@^1.1.2, define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -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" - -del@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" - integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ== - dependencies: - "@types/glob" "^7.1.1" - globby "^6.1.0" - is-path-cwd "^2.0.0" - is-path-in-cwd "^2.0.0" - p-map "^2.0.0" - pify "^4.0.1" - rimraf "^2.6.3" - -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== - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -des.js@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" - integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== - dependencies: - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -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-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== - -diffie-hellman@^5.0.0: - version "5.0.3" - resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" - integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== - dependencies: - bn.js "^4.1.0" - miller-rabin "^4.0.0" - randombytes "^2.0.0" - -dijkstrajs@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257" - integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg== - -dir-glob@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" - integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag== - dependencies: - arrify "^1.0.1" - path-type "^3.0.0" - -dir-glob@^2.0.0, dir-glob@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" - integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== - dependencies: - path-type "^3.0.0" - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - -dns-packet@^1.3.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= - dependencies: - buffer-indexof "^1.0.0" - -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-converter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" - integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== - dependencies: - utila "~0.4" - -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.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - -domelementtype@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: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== - -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" - integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== - dependencies: - domelementtype "^2.2.0" - -domutils@^1.7.0: - 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.5.2, 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" - -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - 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@^8.2.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" - integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== - -duplexer@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - -duplexify@^3.4.2, duplexify@^3.6.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" - integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - -easy-stack@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066" - integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w== - -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= - -ejs@^2.6.1: - version "2.7.4" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" - integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== - -electron-to-chromium@^1.4.17: - version "1.4.65" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz#c0820db06e268e0a2fd4dbce38fb5376d38ca449" - integrity sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw== - -elliptic@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== - 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" - -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - -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== - -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -encode-utf8@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda" - integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.0.0, 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" - -enhanced-resolve@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" - integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.5.0" - tapable "^1.0.0" - -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - -errno@^0.1.3, errno@~0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" - integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== - dependencies: - prr "~1.0.1" - -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" - -error-stack-parser@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" - integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== - dependencies: - stackframe "^1.1.1" - -es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" - integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - get-intrinsic "^1.1.1" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-symbols "^1.0.2" - internal-slot "^1.0.3" - is-callable "^1.2.4" - is-negative-zero "^2.0.1" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.1" - is-string "^1.0.7" - is-weakref "^1.0.1" - object-inspect "^1.11.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.1" - -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" - -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= - -eslint-config-prettier@^6.0.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" - integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== - dependencies: - get-stdin "^6.0.0" - -eslint-loader@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337" - integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg== - dependencies: - loader-fs-cache "^1.0.0" - loader-utils "^1.0.2" - object-assign "^4.0.1" - object-hash "^1.1.4" - rimraf "^2.6.1" - -eslint-plugin-prettier@^3.1.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5" - integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g== - dependencies: - prettier-linter-helpers "^1.0.0" - -eslint-plugin-vue@^5.0.0: - version "5.2.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961" - integrity sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw== - dependencies: - vue-eslint-parser "^5.0.0" - -eslint-scope@^4.0.0, eslint-scope@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - -eslint-utils@^1.3.1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" - integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-visitor-keys@^1.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@^5.16.0: - version "5.16.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" - integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== - 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" - -espree@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f" - integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w== - dependencies: - acorn "^6.0.2" - acorn-jsx "^5.0.0" - eslint-visitor-keys "^1.0.0" - -espree@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" - integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== - dependencies: - acorn "^6.0.7" - acorn-jsx "^5.0.0" - eslint-visitor-keys "^1.0.0" - -esprima@^4.0.0: - 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.0.1: - 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.1.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== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -event-pubsub@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e" - integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ== - -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -events@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -eventsource@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" - integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== - dependencies: - original "^1.0.0" - -evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - -execa@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" - integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.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" - -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - 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" - -execa@^3.3.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" - integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - p-finally "^2.0.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.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" - -express@^4.16.3, express@^4.17.1: - version "4.17.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" - integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.1" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.4.1" - 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.7" - qs "6.9.6" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" - setprototypeof "1.2.0" - 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@^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.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.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-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@^2.0.2, fast-glob@^2.2.6: - version "2.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" - integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw== - dependencies: - "@mrmlnc/readdir-enhanced" "^2.2.1" - "@nodelib/fs.stat" "^1.1.2" - glob-parent "^3.1.0" - is-glob "^4.0.0" - merge2 "^1.2.3" - micromatch "^3.1.10" - -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= - -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - -figgy-pudding@^3.5.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" - integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== - -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" - -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@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" - integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== - dependencies: - flat-cache "^2.0.1" - -file-loader@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" - integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA== - dependencies: - loader-utils "^1.2.3" - schema-utils "^2.5.0" - -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== - -filesize@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" - integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== - -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" - -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-cache-dir@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" - integrity sha1-yN765XyKUqinhPnjHFfHQumToLk= - dependencies: - commondir "^1.0.1" - mkdirp "^0.5.1" - pkg-dir "^1.0.0" - -find-cache-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" - integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8= - dependencies: - commondir "^1.0.1" - make-dir "^1.0.0" - pkg-dir "^2.0.0" - -find-cache-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - -find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== - dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= - 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 sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - 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.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" - -flat-cache@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" - integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== - dependencies: - flatted "^2.0.0" - rimraf "2.6.3" - write "1.0.3" - -flatted@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" - integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== - -flush-write-stream@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" - integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== - dependencies: - inherits "^2.0.3" - readable-stream "^2.3.6" - -follow-redirects@^1.0.0, follow-redirects@^1.14.0: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== - -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= - -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.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -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= - -from2@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - -fs-extra@^7.0.1: - 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-write-stream-atomic@^1.0.8: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= - dependencies: - graceful-fs "^4.1.2" - iferr "^0.1.5" - imurmurhash "^0.1.4" - readable-stream "1 || 2" - -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.2.7: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - -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== - -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= - -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== - -geometry-interfaces@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/geometry-interfaces/-/geometry-interfaces-1.1.4.tgz#9e82af6700ca639a675299f08e1f5fbc4a79d48d" - integrity sha512-qD6OdkT6NcES9l4Xx3auTpwraQruU7dARbQPVO71MKvkGYw5/z/oIiGymuFXrRaEQa5Y67EIojUpaLeGEa5hGA== - -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-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-stdin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" - integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= - -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.0.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-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 sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -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-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -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-to-regexp@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" - integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= - -glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - 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" - -globals@^11.1.0, globals@^11.7.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== - -globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -globby@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" - integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA= - dependencies: - array-union "^1.0.1" - dir-glob "^2.0.0" - glob "^7.1.2" - ignore "^3.3.5" - pify "^3.0.0" - slash "^1.0.0" - -globby@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d" - integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w== - dependencies: - array-union "^1.0.1" - dir-glob "2.0.0" - fast-glob "^2.0.2" - glob "^7.1.2" - ignore "^3.3.5" - pify "^3.0.0" - slash "^1.0.0" - -globby@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" - integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== - dependencies: - "@types/glob" "^7.1.1" - array-union "^1.0.2" - dir-glob "^2.2.2" - fast-glob "^2.2.6" - glob "^7.1.3" - ignore "^4.0.3" - pify "^4.0.1" - slash "^2.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.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== - -gzip-size@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" - integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== - dependencies: - duplexer "^0.1.1" - pify "^4.0.1" - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -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.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" - -has-bigints@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== - -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-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-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - -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 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" - -has@^1.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" - -hash-base@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" - integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== - dependencies: - inherits "^2.0.4" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" - -hash-sum@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" - integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ= - -hash-sum@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" - integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== - -hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" - integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.1" - -he@1.2.x, he@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -hex-color-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" - integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== - -highlight.js@^10.7.1: - version "10.7.3" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" - integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== - -highlight.js@^11.4.0: - version "11.4.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.4.0.tgz#34ceadd49e1596ee5aba3d99346cdfd4845ee05a" - integrity sha512-nawlpCBCSASs7EdvZOYOYVkJpGmAOKMYZgZtUqSRqodZE0GRVcFKwo1RcpeOemqh9hyttTdd5wDBwHkuSyUfnA== - -hmac-drbg@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -hoopy@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" - integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== - -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== - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -hsl-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" - integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= - -hsla-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" - integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= - -html-entities@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" - integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== - -html-minifier@^3.2.3: - version "3.5.21" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c" - integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA== - dependencies: - camel-case "3.0.x" - clean-css "4.2.x" - commander "2.17.x" - he "1.2.x" - param-case "2.1.x" - relateurl "0.2.x" - uglify-js "3.4.x" - -html-tags@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" - integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos= - -html-tags@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" - integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== - -html-webpack-plugin@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b" - integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s= - dependencies: - html-minifier "^3.2.3" - loader-utils "^0.2.16" - lodash "^4.17.3" - pretty-error "^2.0.2" - tapable "^1.0.0" - toposort "^1.0.0" - util.promisify "1.0.0" - -htmlparser2@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= - -http-errors@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5" - integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA== - -http-proxy-middleware@0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" - integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q== - dependencies: - http-proxy "^1.17.0" - is-glob "^4.0.0" - lodash "^4.17.11" - micromatch "^3.1.10" - -http-proxy-middleware@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665" - integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg== - dependencies: - "@types/http-proxy" "^1.17.5" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.17.0, http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^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-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= - -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - -iconv-lite@0.4.24, 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" - -icss-utils@^4.0.0, icss-utils@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" - integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== - dependencies: - postcss "^7.0.14" - -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - -ieee754@^1.1.4: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -iferr@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= - -ignore@^3.3.5: - version "3.3.10" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" - integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== - -ignore@^4.0.3, ignore@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== - -immutable@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" - integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== - -import-cwd@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" - integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk= - dependencies: - import-from "^2.1.0" - -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" - -import-fresh@^3.0.0: - 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@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" - integrity sha1-M1238qev/VOqpHHUuAId7ja387E= - dependencies: - resolve-from "^3.0.0" - -import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== - dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - -infer-owner@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - -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.4, 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.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= - -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@^6.2.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" - integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== - 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" - -inquirer@^7.1.0: - version "7.3.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" - integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.19" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.6.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - -internal-ip@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" - integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg== - dependencies: - default-gateway "^4.2.0" - ipaddr.js "^1.9.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" - -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= - -ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= - -ipaddr.js@1.9.1, ipaddr.js@^1.9.0: - 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-absolute-url@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" - integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= - -is-absolute-url@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" - integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== - -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-arguments@^1.0.4: - 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-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-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - -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@^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-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.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@^1.0.10: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" - integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== - dependencies: - ci-info "^1.5.0" - -is-color-stop@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" - integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= - dependencies: - css-color-names "^0.0.4" - hex-color-regex "^1.1.0" - hsl-regex "^1.0.0" - hsla-regex "^1.0.0" - rgb-regex "^1.0.1" - rgba-regex "^1.0.0" - -is-core-module@^2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== - 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 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-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-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-directory@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= - -is-docker@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -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@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -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@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0, is-glob@^4.0.1, 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-negative-zero@^2.0.1: - 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.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== - 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 sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - 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@^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@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== - -is-path-in-cwd@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb" - integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ== - dependencies: - is-path-inside "^2.1.0" - -is-path-inside@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" - integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg== - dependencies: - path-is-inside "^1.0.2" - -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 sha1-caUMhCnfync8kqOQpKA7OfzVHT4= - -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - -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-promise@~1, is-promise@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-1.0.1.tgz#31573761c057e33c2e91aab9e96da08cefbe76e5" - integrity sha1-MVc3YcBX4zwukaq56W2gjO++duU= - -is-regex@^1.0.4, 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-resolvable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" - integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== - -is-shared-array-buffer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" - integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - -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 sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-weakref@^1.0.1: - 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.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== - -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= - -is-wsl@^2.1.1: - 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@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, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -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= - -javascript-stringify@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79" - integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg== - -js-base64@^2.5.1: - version "2.6.4" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" - integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== - -js-message@1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47" - integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA== - -js-queue@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.2.tgz#0be590338f903b36c73d33c31883a821412cd482" - integrity sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA== - dependencies: - easy-stack "^1.0.1" - -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.0, 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" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -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 sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: - 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-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@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 sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= - -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= - -json3@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" - integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== - -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -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.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - -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.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" - -killable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" - integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== - -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== - -launch-editor-middleware@^2.2.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.3.0.tgz#edd0ed45a46f5f1cf27540f93346b5de9e8c3be0" - integrity sha512-GJR64trLdFFwCoL9DMn/d1SZX0OzTDPixu4mcfWTShQ4tIqCHCGvlg9fOEYQXyBlrSMQwylsJfUWncheShfV2w== - dependencies: - launch-editor "^2.3.0" - -launch-editor@^2.2.1, launch-editor@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.3.0.tgz#23b2081403b7eeaae2918bda510f3535ccab0ee4" - integrity sha512-3QrsCXejlWYHjBPFXTyGNhPj4rrQdB+5+r5r3wArpLH201aR+nWUgw/zKKkTmilCfY/sv6u8qo98pNvtg8LUTA== - dependencies: - picocolors "^1.0.0" - shell-quote "^1.6.1" - -levn@^0.3.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.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -loader-fs-cache@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz#f08657646d607078be2f0a032f8bd69dd6f277d9" - integrity sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA== - dependencies: - find-cache-dir "^0.1.1" - mkdirp "^0.5.1" - -loader-runner@^2.3.1, loader-runner@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" - integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== - -loader-utils@^0.2.16: - version "0.2.17" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" - integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g= - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - object-assign "^4.0.1" - -loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - -loader-utils@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" - integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= - 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" - -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.defaultsdeep@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" - integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== - -lodash.kebabcase@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" - integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY= - -lodash.mapvalues@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" - integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw= - -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - -lodash.transform@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" - integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg== - dependencies: - chalk "^2.0.1" - -loglevel@^1.6.8: - version "1.8.0" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114" - integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA== - -lower-case@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" - integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= - -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2: - 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@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.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" - -make-dir@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" - integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== - dependencies: - pify "^3.0.0" - -make-dir@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== - dependencies: - pify "^4.0.1" - semver "^5.6.0" - -make-dir@^3.0.2, 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" - -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" - -md5.js@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" - integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - -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== - -mdn-data@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" - integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== - -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= - -memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -memory-fs@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" - integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -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-source-map@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" - integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== - dependencies: - source-map "^0.6.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.2.3: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -microbuffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz#8b3832ed40c87d51f47bb234913a698a756d19d2" - integrity sha1-izgy7UDIfVH0e7I0kTppinVtGdI= - -micromatch@^3.1.10, micromatch@^3.1.4: - 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" - -micromatch@^4.0.2: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -miller-rabin@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" - integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== - dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" - -mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": - version "1.51.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" - integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== - -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.34" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" - integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== - dependencies: - mime-db "1.51.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== - -mime@^2.4.4: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== - -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== - -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== - -mini-css-extract-plugin@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e" - integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A== - dependencies: - loader-utils "^1.1.0" - normalize-url "1.9.1" - schema-utils "^1.0.0" - webpack-sources "^1.1.0" - -minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= - -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@^1.2.0, 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.1.1: - version "3.1.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" - integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== - dependencies: - yallist "^4.0.0" - -mississippi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f" - integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^2.0.1" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - -mississippi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" - integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^3.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.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.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: - 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" - -move-concurrently@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= - dependencies: - aproba "^1.1.1" - copy-concurrently "^1.0.0" - fs-write-stream-atomic "^1.0.8" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.3" - -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.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.3, 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== - -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== - dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" - -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= - -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== - -mz@^2.4.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" - -nan@^2.12.1, nan@^2.14.2: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== - -nanoid@^3.1.23, nanoid@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== - -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" - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - -neatequal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" - integrity sha1-LuEhG8n6bkxVcV/SELsFYC6xrjs= - dependencies: - varstream "^0.3.2" - -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - -no-case@^2.2.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" - integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== - dependencies: - lower-case "^1.1.1" - -node-forge@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" - integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== - -node-ipc@^9.1.1: - version "9.2.1" - resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz#b32f66115f9d6ce841dc4ec2009d6a733f98bb6b" - integrity sha512-mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ== - dependencies: - event-pubsub "4.3.0" - js-message "1.0.7" - js-queue "2.0.2" - -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - -node-releases@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" - integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== - -nodeify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/nodeify/-/nodeify-1.0.1.tgz#64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d" - integrity sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0= - dependencies: - is-promise "~1.0.0" - promise "~1.3.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-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" - integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k= - -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" - -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 sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= - -normalize-url@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" - integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= - dependencies: - object-assign "^4.0.1" - prepend-http "^1.0.0" - query-string "^4.1.0" - sort-keys "^1.0.0" - -normalize-url@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" - integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== - -normalize.css@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3" - integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg== - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -npm-run-path@^4.0.0: - 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" - -nth-check@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== - dependencies: - boolbase "~1.0.0" - -nth-check@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" - integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== - dependencies: - boolbase "^1.0.0" - -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - -nunjucks@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.3.tgz#1b33615247290e94e28263b5d855ece765648a31" - integrity sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ== - dependencies: - a-sync-waterfall "^1.0.0" - asap "^2.0.3" - commander "^5.1.0" - -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-hash@^1.1.4: - version "1.3.1" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df" - integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA== - -object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" - integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== - -object-is@^1.0.1: - 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.0.12, 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 sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.assign@^4.1.0, 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.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" - integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.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@^1.1.0: - 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" - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -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" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -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 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" - -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" - -open@^6.3.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9" - integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg== - dependencies: - is-wsl "^1.1.0" - -opener@^1.5.1: - version "1.5.2" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" - integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== - -opn@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" - integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== - dependencies: - is-wsl "^1.1.0" - -optionator@^0.8.2: - 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" - -ora@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" - integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg== - dependencies: - chalk "^2.4.2" - cli-cursor "^2.1.0" - cli-spinners "^2.0.0" - log-symbols "^2.2.0" - strip-ansi "^5.2.0" - wcwidth "^1.0.1" - -original@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" - integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== - dependencies: - url-parse "^1.4.3" - -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= - -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= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-finally@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" - integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== - -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, p-limit@^2.2.1: - 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-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= - 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-map@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" - integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== - -p-retry@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" - integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w== - dependencies: - retry "^0.12.0" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - -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== - -pace-js@^1.2.4: - version "1.2.4" - resolved "https://registry.npmmirror.com/pace-js/-/pace-js-1.2.4.tgz#699aa54c76411ec0297ac06a8cddb6e11e01db99" - integrity sha512-qnCxtvUoY9yHId0AwMQCVmWltb698GiuVArmDbQzonTu9QCo0SgWUVnX9jB9mi+/FUSWvQULBPxUAAo/kLrh1A== - -pako@^1.0.0, 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== - -parallel-transform@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" - integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== - dependencies: - cyclist "^1.0.1" - inherits "^2.0.3" - readable-stream "^2.1.5" - -param-case@2.1.x: - version "2.1.1" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" - integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= - dependencies: - no-case "^2.2.0" - -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-asn1@^5.0.0, parse-asn1@^5.1.5: - version "5.1.6" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" - integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== - 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" - -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.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-htmlparser2-tree-adapter@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== - dependencies: - parse5 "^6.0.1" - -parse5@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== - -parse5@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - -parseurl@~1.3.2, 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-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= - 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 sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - -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 sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-is-inside@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - -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-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@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== - dependencies: - pify "^3.0.0" - -pbkdf2@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" - integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== - 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" - -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= - -picocolors@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" - integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== - -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.3: - 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 sha1-7RQaasBDqEnqWISY59yosVMw6Qw= - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= - 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 sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - -pkg-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" - integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q= - dependencies: - find-up "^1.0.0" - -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" - -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== - dependencies: - find-up "^3.0.0" - -pkg-dir@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -pngjs@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb" - integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw== - -pnp-webpack-plugin@^1.6.4: - version "1.7.0" - resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9" - integrity sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg== - dependencies: - ts-pnp "^1.1.6" - -portfinder@^1.0.26: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" - -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-calc@^7.0.1: - version "7.0.5" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" - integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== - dependencies: - postcss "^7.0.27" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.2" - -postcss-colormin@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" - integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== - dependencies: - browserslist "^4.0.0" - color "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-convert-values@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" - integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-discard-comments@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" - integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== - dependencies: - postcss "^7.0.0" - -postcss-discard-duplicates@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" - integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ== - dependencies: - postcss "^7.0.0" - -postcss-discard-empty@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765" - integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w== - dependencies: - postcss "^7.0.0" - -postcss-discard-overridden@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57" - integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg== - dependencies: - postcss "^7.0.0" - -postcss-load-config@^2.0.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a" - integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw== - dependencies: - cosmiconfig "^5.0.0" - import-cwd "^2.0.0" - -postcss-loader@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" - integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== - dependencies: - loader-utils "^1.1.0" - postcss "^7.0.0" - postcss-load-config "^2.0.0" - schema-utils "^1.0.0" - -postcss-merge-longhand@^4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" - integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== - dependencies: - css-color-names "0.0.4" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - stylehacks "^4.0.0" - -postcss-merge-rules@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" - integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== - dependencies: - browserslist "^4.0.0" - caniuse-api "^3.0.0" - cssnano-util-same-parent "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - vendors "^1.0.0" - -postcss-minify-font-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" - integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-minify-gradients@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" - integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== - dependencies: - cssnano-util-get-arguments "^4.0.0" - is-color-stop "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-minify-params@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" - integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== - dependencies: - alphanum-sort "^1.0.0" - browserslist "^4.0.0" - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - uniqs "^2.0.0" - -postcss-minify-selectors@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" - integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== - dependencies: - alphanum-sort "^1.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - -postcss-modules-extract-imports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" - integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== - dependencies: - postcss "^7.0.5" - -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" - integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== - dependencies: - icss-utils "^4.1.1" - postcss "^7.0.32" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" - integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== - dependencies: - postcss "^7.0.6" - postcss-selector-parser "^6.0.0" - -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-modules-values@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" - integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== - dependencies: - icss-utils "^4.0.0" - postcss "^7.0.6" - -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== - dependencies: - icss-utils "^5.0.0" - -postcss-normalize-charset@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" - integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g== - dependencies: - postcss "^7.0.0" - -postcss-normalize-display-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" - integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== - dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-positions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" - integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== - dependencies: - cssnano-util-get-arguments "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-repeat-style@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" - integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== - dependencies: - cssnano-util-get-arguments "^4.0.0" - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-string@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" - integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== - dependencies: - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-timing-functions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" - integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== - dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-unicode@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" - integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg== - dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-url@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1" - integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA== - dependencies: - is-absolute-url "^2.0.0" - normalize-url "^3.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-normalize-whitespace@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" - integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-ordered-values@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" - integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== - dependencies: - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-reduce-initial@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" - integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== - dependencies: - browserslist "^4.0.0" - caniuse-api "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" - -postcss-reduce-transforms@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" - integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== - dependencies: - cssnano-util-get-match "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-selector-parser@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270" - integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA== - dependencies: - dot-prop "^5.2.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.9" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" - integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-svgo@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" - integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - svgo "^1.0.0" - -postcss-unique-selectors@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" - integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg== - dependencies: - alphanum-sort "^1.0.0" - postcss "^7.0.0" - uniqs "^2.0.0" - -postcss-value-parser@^3.0.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" - integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== - -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.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@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.39" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" - integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== - dependencies: - picocolors "^0.2.1" - source-map "^0.6.1" - -postcss@^8.2.15: - version "8.4.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" - integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA== - dependencies: - nanoid "^3.2.0" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -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= - -prepend-http@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= - -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@^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== - -"prettier@^1.18.2 || ^2.0.0": - version "2.5.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" - integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== - -pretty-error@^2.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6" - integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw== - dependencies: - lodash "^4.17.20" - renderkid "^2.0.4" - -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 sha1-czIwDoQBYb2j5podHZGn1LwW8YI= - -progress@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= - -promise@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-1.3.0.tgz#e5cc9a4c8278e4664ffedc01c7da84842b040175" - integrity sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU= - dependencies: - is-promise "~1" - -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - -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== - -public-encrypt@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" - integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== - 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" - -pump@^2.0.0, pump@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -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" - -pumpify@^1.3.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== - dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - -punycode@^1.2.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - -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== - -q@^1.1.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= - -qrcode@^1.4.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.0.tgz#95abb8a91fdafd86f8190f2836abbfc500c72d1b" - integrity sha512-9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ== - dependencies: - dijkstrajs "^1.0.1" - encode-utf8 "^1.0.3" - pngjs "^5.0.0" - yargs "^15.3.1" - -qs@6.9.6: - version "6.9.6" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" - integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== - -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== - -query-string@^4.1.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" - integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= - dependencies: - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - -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== - -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, 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" - -randomfill@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" - integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== - dependencies: - randombytes "^2.0.5" - safe-buffer "^5.1.0" - -range-parser@^1.2.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.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" - integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== - dependencies: - bytes "3.1.1" - http-errors "1.8.1" - iconv-lite "0.4.24" - unpipe "1.0.0" - -read-pkg@^5.1.1: - 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@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: - 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@^1.0.33: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.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@^2.2.1: - 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" - -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" - -regenerate-unicode-properties@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" - integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== - 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.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== - -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== - 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.prototype.flags@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" - integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -regexpp@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== - -regexpu-core@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" - integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw== - dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^10.0.1" - regjsgen "^0.6.0" - regjsparser "^0.8.2" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" - -register-service-worker@^1.6.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.7.2.tgz#6516983e1ef790a98c4225af1216bc80941a4bd2" - integrity sha512-CiD3ZSanZqcMPRhtfct5K9f7i3OLCcBBWsJjLh1gW9RO/nS94sVzY59iS+fgYBOBqaBpf4EzfqUF3j9IG+xo8A== - -regjsgen@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" - integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== - -regjsparser@^0.8.2: - version "0.8.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" - integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== - dependencies: - jsesc "~0.5.0" - -relateurl@0.2.x: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= - -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= - -renderkid@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609" - integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ== - dependencies: - css-select "^4.1.3" - dom-converter "^0.2.0" - htmlparser2 "^6.1.0" - lodash "^4.17.21" - strip-ansi "^3.0.1" - -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 sha1-jcrkcOHIirwtYA//Sndihtp15jc= - -request@^2.88.2: - 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= - -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== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= - -resolve-cwd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= - dependencies: - resolve-from "^3.0.0" - -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - -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.10.0, resolve@^1.12.0, resolve@^1.14.2: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== - dependencies: - is-core-module "^2.8.1" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -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" - -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== - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= - -rgb-regex@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" - integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= - -rgba-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" - integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= - -rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: - 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" - -ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" - integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - -run-async@^2.2.0, 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-queue@^1.0.0, run-queue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= - dependencies: - aproba "^1.1.1" - -rxjs@^6.4.0, rxjs@^6.6.0: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - -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.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.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@^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== - -sass-loader@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d" - integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ== - dependencies: - clone-deep "^4.0.1" - loader-utils "^1.2.3" - neo-async "^2.6.1" - schema-utils "^2.6.1" - semver "^6.3.0" - -sass@^1.19.0: - version "1.49.7" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49" - integrity sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - -sax@^1.2.4, 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== - -schema-utils@^0.4.5: - version "0.4.7" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" - integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ== - dependencies: - ajv "^6.1.0" - ajv-keywords "^3.1.0" - -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - -schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.7.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - -schema-utils@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -scrollparent@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/scrollparent/-/scrollparent-2.0.1.tgz#715d5b9cc57760fb22bdccc3befb5bfe06b1a317" - integrity sha1-cV1bnMV3YPsivczDvvtb/gaxoxc= - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= - -select@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" - integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= - -selfsigned@^1.10.8: - version "1.10.14" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.14.tgz#ee51d84d9dcecc61e07e4aba34f229ab525c1574" - integrity sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA== - dependencies: - node-forge "^0.10.0" - -"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.5.1, 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@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -semver@^6.0.0, semver@^6.1.0, 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.5: - 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.2: - version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== - 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.8.1" - mime "1.6.0" - ms "2.1.3" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -serialize-javascript@^1.4.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" - integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== - -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" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" - integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.2" - -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.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.11" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" - integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - -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@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - -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.6.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== - -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.0, signal-exit@^3.0.2: - 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-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== - -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== - dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" - -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" - -sockjs-client@^1.5.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3" - integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ== - dependencies: - debug "^3.2.6" - eventsource "^1.0.7" - faye-websocket "^0.11.3" - inherits "^2.0.4" - json3 "^3.3.3" - url-parse "^1.5.3" - -sockjs@^0.3.21: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - -sort-keys@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" - integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= - dependencies: - is-plain-obj "^1.0.0" - -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - -"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.12: - 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.0, source-map@^0.5.6: - 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.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - -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== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - -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.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" - -ssri@^5.2.4: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06" - integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ== - dependencies: - safe-buffer "^5.1.1" - -ssri@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" - integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== - dependencies: - figgy-pudding "^3.5.1" - -ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== - dependencies: - minipass "^3.1.1" - -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - -stackframe@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" - integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== - -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.4.0 < 2", "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" - -stream-each@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" - integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== - -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 sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= - -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@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.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.fromcodepoint@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653" - integrity sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM= - -string.prototype.codepointat@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc" - integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg== - -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string_decoder@^1.0.0, 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.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@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.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-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - -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@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" - integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= - -strip-json-comments@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -stylehacks@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" - integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== - dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - -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@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.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-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-pathdata@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz#65e8d765642ba15fe15434444087d082bc526b29" - integrity sha512-TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow== - -svg-tags@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" - integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= - -svg2ttf@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz#75c9b8d3c799a91c893ef7bdbfa72d8e00a48a5c" - integrity sha512-CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA== - dependencies: - argparse "^2.0.1" - cubic2quad "^1.0.0" - lodash "^4.17.10" - microbuffer "^1.0.0" - svgpath "^2.1.5" - xmldom "~0.5.0" - -svgicons2svgfont@^9.1.1: - version "9.2.0" - resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz#9ff1b643891891eb52ab1bd764b468e2d06ded80" - integrity sha512-mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ== - dependencies: - array.prototype.flatmap "1.2.4" - commander "^4.0.1" - geometry-interfaces "^1.1.4" - glob "^7.1.6" - neatequal "^1.0.0" - readable-stream "^3.4.0" - sax "^1.2.4" - string.fromcodepoint "^0.2.1" - string.prototype.codepointat "^0.2.1" - svg-pathdata "^5.0.2" - -svgo@^1.0.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" - integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== - dependencies: - chalk "^2.4.1" - coa "^2.0.2" - css-select "^2.0.0" - css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.37" - csso "^4.0.2" - js-yaml "^3.13.1" - mkdirp "~0.5.1" - object.values "^1.1.0" - sax "~1.2.4" - stable "^0.1.8" - unquote "~1.1.1" - util.promisify "~1.0.0" - -svgpath@^2.1.5: - version "2.5.0" - resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.5.0.tgz#d57434641d9aa9abae02a4038ebf281fa3005b10" - integrity sha512-o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw== - -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== - dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" - -tapable@^1.0.0, tapable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== - -terser-webpack-plugin@^1.4.3, terser-webpack-plugin@^1.4.4: - version "1.4.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" - integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== - dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" - source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" - -terser@^4.1.2: - version "4.8.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" - integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.1" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" - integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== - dependencies: - any-promise "^1.0.0" - -thread-loader@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda" - integrity sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg== - dependencies: - loader-runner "^2.3.1" - loader-utils "^1.1.0" - neo-async "^2.6.0" - -thro-debs@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/thro-debs/-/thro-debs-1.0.7.tgz#3c5382f7b1bf9dec1ebcdf88ab517867264cad85" - integrity sha512-/LDfLEdlIscZ7DerWP75GpETmPqJtnNK5tZuVowZCemFbCKas4sztADrM3FSW8UeoZEl3SV6tWhy6NPsIA1ZVw== - -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - -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= - -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - -timers-browserify@^2.0.4: - version "2.0.12" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" - integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== - dependencies: - setimmediate "^1.0.4" - -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - -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== - -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-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= - -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-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, 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.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - -toposort@^1.0.0: - version "1.0.7" - resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" - integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk= - -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" - -tryer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" - integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== - -ts-pnp@^1.1.6: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" - integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== - -tslib@^1.9.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.4.0: - version "2.4.0" - resolved "https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - -"ttf2eot@^2.0.0 ": - version "2.0.0" - resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz#8e6337a585abd1608a0c84958ab483ce69f6654b" - integrity sha1-jmM3pYWr0WCKDISVirSDzmn2ZUs= - dependencies: - argparse "^1.0.6" - microbuffer "^1.0.0" - -ttf2woff2-no-gyp@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ttf2woff2-no-gyp/-/ttf2woff2-no-gyp-4.0.6.tgz#bf6071475b434cbfe638506c7424100c663096b0" - integrity sha512-6IVFyCeh1rGwPYr5vrviHOh/yfMD3+g+Ue1bm1zjtoQfPjcJLAD6HLYX1OmtYaw383IsHiHQFtcxtUY8FGqU/w== - dependencies: - bindings "^1.5.0" - bufferstreams "^3.0.0" - nan "^2.14.2" - -ttf2woff@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz#09a7cee59abd3c15282b57ed84ac7c7770749f1f" - integrity sha512-X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA== - dependencies: - argparse "^1.0.6" - microbuffer "^1.0.0" - pako "^1.0.0" - -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= - -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-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-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= - -uglify-es@^3.3.4: - version "3.3.9" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" - integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ== - dependencies: - commander "~2.13.0" - source-map "~0.6.1" - -uglify-js@3.4.x: - version "3.4.10" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f" - integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw== - dependencies: - commander "~2.19.0" - source-map "~0.6.1" - -uglifyjs-webpack-plugin@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de" - integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw== - dependencies: - cacache "^10.0.4" - find-cache-dir "^1.0.0" - schema-utils "^0.4.5" - serialize-javascript "^1.4.0" - source-map "^0.6.1" - uglify-es "^3.3.4" - webpack-sources "^1.1.0" - worker-farm "^1.5.2" - -unbox-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== - dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.1" - has-symbols "^1.0.2" - which-boxed-primitive "^1.0.2" - -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.0.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" - integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== - -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" - -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - -unique-filename@^1.1.0, unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - -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= - -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= - -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" - -upath@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== - -upper-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" - integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= - -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" - -urijs@^1.19.11: - version "1.19.11" - resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc" - integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ== - -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= - -url-loader@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b" - integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog== - dependencies: - loader-utils "^1.2.3" - mime "^2.4.4" - schema-utils "^2.5.0" - -url-parse@^1.4.3, url-parse@^1.5.3: - version "1.5.4" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd" - integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -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, 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= - -util.promisify@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" - integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== - dependencies: - define-properties "^1.1.2" - object.getownpropertydescriptors "^2.0.3" - -util.promisify@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" - integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.2" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.0" - -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - dependencies: - inherits "2.0.1" - -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== - dependencies: - inherits "2.0.3" - -utila@~0.4: - version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= - -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== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -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" - -varstream@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz#18ac6494765f3ff1a35ad9a4be053bec188a5de1" - integrity sha1-GKxklHZfP/GjWtmkvgU77BiKXeE= - dependencies: - readable-stream "^1.0.33" - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -vendors@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" - integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== - -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" - -vm-browserify@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" - integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== - -vue-eslint-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1" - integrity sha512-JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g== - dependencies: - debug "^4.1.0" - eslint-scope "^4.0.0" - eslint-visitor-keys "^1.0.0" - espree "^4.1.0" - esquery "^1.0.1" - lodash "^4.17.11" - -vue-hot-reload-api@^2.3.0: - version "2.3.4" - resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" - integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== - -vue-i18n@^8.15.3: - version "8.27.0" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.0.tgz#3e3b3ed2c107ccbd7f20dbdd7a96763a9990253e" - integrity sha512-SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw== - -"vue-loader-v16@npm:vue-loader@^16.1.0": - version "16.8.3" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.3.tgz#d43e675def5ba9345d6c7f05914c13d861997087" - integrity sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA== - dependencies: - chalk "^4.1.0" - hash-sum "^2.0.0" - loader-utils "^2.0.0" - -vue-loader@^15.9.2: - version "15.9.8" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.8.tgz#4b0f602afaf66a996be1e534fb9609dc4ab10e61" - integrity sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog== - dependencies: - "@vue/component-compiler-utils" "^3.1.0" - hash-sum "^1.0.2" - loader-utils "^1.1.0" - vue-hot-reload-api "^2.3.0" - vue-style-loader "^4.1.0" - -vue-observe-visibility@^0.4.4: - version "0.4.6" - resolved "https://registry.yarnpkg.com/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz#878cb8ebcf3078e40807af29774e97105ebd519e" - integrity sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q== - -vue-resize@^0.4.5: - version "0.4.5" - resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-0.4.5.tgz#4777a23042e3c05620d9cbda01c0b3cc5e32dcea" - integrity sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg== - -vue-router@^3.0.6: - version "3.5.3" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.3.tgz#041048053e336829d05dafacf6a8fb669a2e7999" - integrity sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg== - -vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35" - integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg== - dependencies: - hash-sum "^1.0.2" - loader-utils "^1.0.2" - -vue-template-compiler@^2.6.10: - version "2.6.14" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" - integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== - dependencies: - de-indent "^1.0.2" - he "^1.1.0" - -vue-template-es2015-compiler@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" - integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== - -vue-virtual-scroller@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-1.0.10.tgz#fdf243240001f05bd79aa77f2e2e60403760e2fb" - integrity sha512-Hn4qSBDhRY4XdngPioYy/ykDjrLX/NMm1fQXm/4UQQ/Xv1x8JbHGFZNftQowTcfICgN7yc31AKnUk1UGLJ2ndA== - dependencies: - scrollparent "^2.0.1" - vue-observe-visibility "^0.4.4" - vue-resize "^0.4.5" - -vue@^2.6.10: - version "2.6.14" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" - integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== - -vuex@^3.0.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71" - integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw== - -watchpack-chokidar2@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" - integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== - dependencies: - chokidar "^2.1.8" - -watchpack@^1.7.4: - version "1.7.5" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" - integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== - dependencies: - graceful-fs "^4.1.2" - neo-async "^2.5.0" - optionalDependencies: - chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.1" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - dependencies: - minimalistic-assert "^1.0.0" - -wcwidth@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= - dependencies: - defaults "^1.0.3" - -webpack-bundle-analyzer@^3.8.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz#f6f94db108fb574e415ad313de41a2707d33ef3c" - integrity sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA== - dependencies: - acorn "^7.1.1" - acorn-walk "^7.1.1" - bfj "^6.1.1" - chalk "^2.4.1" - commander "^2.18.0" - ejs "^2.6.1" - express "^4.16.3" - filesize "^3.6.1" - gzip-size "^5.0.0" - lodash "^4.17.19" - mkdirp "^0.5.1" - opener "^1.5.1" - ws "^6.0.0" - -webpack-chain@^6.4.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.5.1.tgz#4f27284cbbb637e3c8fbdef43eef588d4d861206" - integrity sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA== - dependencies: - deepmerge "^1.5.2" - javascript-stringify "^2.0.1" - -webpack-dev-middleware@^3.7.2: - version "3.7.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5" - integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ== - dependencies: - memory-fs "^0.4.1" - mime "^2.4.4" - mkdirp "^0.5.1" - range-parser "^1.2.1" - webpack-log "^2.0.0" - -webpack-dev-server@^3.11.0: - version "3.11.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz#8c86b9d2812bf135d3c9bce6f07b718e30f7c3d3" - integrity sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA== - dependencies: - ansi-html-community "0.0.8" - bonjour "^3.5.0" - chokidar "^2.1.8" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - debug "^4.1.1" - del "^4.1.1" - express "^4.17.1" - html-entities "^1.3.1" - http-proxy-middleware "0.19.1" - import-local "^2.0.0" - internal-ip "^4.3.0" - ip "^1.1.5" - is-absolute-url "^3.0.3" - killable "^1.0.1" - loglevel "^1.6.8" - opn "^5.5.0" - p-retry "^3.0.1" - portfinder "^1.0.26" - schema-utils "^1.0.0" - selfsigned "^1.10.8" - semver "^6.3.0" - serve-index "^1.9.1" - sockjs "^0.3.21" - sockjs-client "^1.5.0" - spdy "^4.0.2" - strip-ansi "^3.0.1" - supports-color "^6.1.0" - url "^0.11.0" - webpack-dev-middleware "^3.7.2" - webpack-log "^2.0.0" - ws "^6.2.1" - yargs "^13.3.2" - -webpack-iconfont-plugin-nodejs@^1.0.16: - version "1.0.21" - resolved "https://registry.yarnpkg.com/webpack-iconfont-plugin-nodejs/-/webpack-iconfont-plugin-nodejs-1.0.21.tgz#3e28e574010e26d34ffd1760f680a172226730b2" - integrity sha512-B46tGXRCiWypnaMmE2QdwPxF++/JC+xQV95teEpl2SRaAU+Pq8NHwuBUd2AkrR4osHOZtf6s8TrlaMGvd1XopA== - dependencies: - async-throttle "^1.1.0" - glob-parent "^5.1.2" - globby "^8.0.1" - nodeify "^1.0.1" - nunjucks "^3.2.3" - svg2ttf "^5.2.0" - svgicons2svgfont "^9.1.1" - thro-debs "^1.0.7" - ttf2eot "^2.0.0 " - ttf2woff "^2.0.2" - ttf2woff2-no-gyp "^4.0.6" - -webpack-log@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f" - integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg== - dependencies: - ansi-colors "^3.0.0" - uuid "^3.3.2" - -webpack-merge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" - integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== - dependencies: - lodash "^4.17.15" - -webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack@^4.0.0: - version "4.46.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" - integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/wasm-edit" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^6.4.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.5.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.3" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.7.4" - webpack-sources "^1.4.1" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== - -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@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -which@^1.2.9: - 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" - -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== - -worker-farm@^1.5.2, worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== - dependencies: - errno "~0.1.7" - -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - -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 sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -write@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" - integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== - dependencies: - mkdirp "^0.5.1" - -ws@^6.0.0, ws@^6.2.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" - integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== - dependencies: - async-limiter "~1.0.0" - -xmldom@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - -xtend@^4.0.0, xtend@~4.0.1: - 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 sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -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@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -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.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@^13.3.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - 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" - -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@^16.0.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" - -yorkie@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yorkie/-/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9" - integrity sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw== - dependencies: - execa "^0.8.0" - is-ci "^1.0.10" - normalize-path "^1.0.0" - strip-indent "^2.0.0" diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.nix b/third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.nix deleted file mode 100644 index 1d450d5dac..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/v2raya/yarn.nix +++ /dev/null @@ -1,10101 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "_ampproject_remapping___remapping_2.0.4.tgz"; - path = fetchurl { - name = "_ampproject_remapping___remapping_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.4.tgz"; - sha512 = "zU3pj3pf//YhaoozRTYKaL20KopXrzuZFc/8Ylc49AuV8grYKH23TTq9JJoR70F8zQbil58KjSchZTWeX+jrIQ=="; - }; - } - { - 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_compat_data___compat_data_7.17.0.tgz"; - path = fetchurl { - name = "_babel_compat_data___compat_data_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz"; - sha512 = "392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="; - }; - } - { - name = "_babel_core___core_7.17.0.tgz"; - path = fetchurl { - name = "_babel_core___core_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz"; - sha512 = "x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA=="; - }; - } - { - name = "_babel_generator___generator_7.17.0.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz"; - sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw=="; - }; - } - { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; - sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; - }; - } - { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; - sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; - }; - } - { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz"; - sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; - }; - } - { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.17.1.tgz"; - path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.17.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz"; - sha512 = "JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ=="; - }; - } - { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.17.0.tgz"; - path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz"; - sha512 = "awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA=="; - }; - } - { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.1.tgz"; - path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; - sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; - }; - } - { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; - sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; - }; - } - { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; - sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; - }; - } - { - name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; - sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; - }; - } - { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; - sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; - }; - } - { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; - sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; - }; - } - { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz"; - sha512 = "VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q=="; - }; - } - { - name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; - sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; - }; - } - { - name = "_babel_helper_module_transforms___helper_module_transforms_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; - sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; - }; - } - { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; - sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; - }; - } - { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; - sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; - }; - } - { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.8.tgz"; - path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; - sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; - sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz"; - sha512 = "ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g=="; - }; - } - { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; - path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; - sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; - }; - } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; - sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; - }; - } - { - 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_option___helper_validator_option_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; - sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; - }; - } - { - name = "_babel_helper_wrap_function___helper_wrap_function_7.16.8.tgz"; - path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; - sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; - }; - } - { - name = "_babel_helpers___helpers_7.17.0.tgz"; - path = fetchurl { - name = "_babel_helpers___helpers_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz"; - sha512 = "Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ=="; - }; - } - { - name = "_babel_highlight___highlight_7.16.10.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.16.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz"; - sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; - }; - } - { - name = "_babel_parser___parser_7.17.0.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz"; - sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="; - }; - } - { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.7.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.16.7.tgz"; - sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; - }; - } - { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz"; - sha512 = "di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw=="; - }; - } - { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.8.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; - sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; - }; - } - { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; - sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; - }; - } - { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; - sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; - }; - } - { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.17.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.0.tgz"; - sha512 = "JR8HTf3T1CsdMqfENrZ9pqncwsH4sPcvsyDLpvmv8iIbpDmeyBD7HPfGAIqkQph2j5d3B84hTm+m3qHPAedaPw=="; - }; - } - { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; - sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; - }; - } - { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; - sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; - }; - } - { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; - sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; - }; - } - { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; - sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; - }; - } - { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; - sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; - }; - } - { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; - sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; - }; - } - { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz"; - sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; - }; - } - { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; - sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; - }; - } - { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; - sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; - }; - } - { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.11.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; - sha512 = "F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw=="; - }; - } - { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; - sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; - }; - } - { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; - sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; - }; - } - { - 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_decorators___plugin_syntax_decorators_7.17.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz"; - sha512 = "qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A=="; - }; - } - { - 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_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.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz"; - sha512 = "Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q=="; - }; - } - { - 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.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; - sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; - }; - } - { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; - sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; - }; - } - { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; - sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; - }; - } - { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; - sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; - }; - } - { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; - sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; - }; - } - { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; - sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; - }; - } - { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; - sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; - }; - } - { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; - sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; - }; - } - { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; - sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; - }; - } - { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; - sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; - }; - } - { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; - sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; - }; - } - { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; - sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; - }; - } - { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; - sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; - }; - } - { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; - sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; - }; - } - { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; - sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; - }; - } - { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz"; - sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; - }; - } - { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; - sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; - }; - } - { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; - sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; - }; - } - { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz"; - sha512 = "j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw=="; - }; - } - { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; - sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; - }; - } - { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; - sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; - }; - } - { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; - sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; - }; - } - { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; - sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; - }; - } - { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; - sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; - }; - } - { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; - sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; - }; - } - { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.17.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz"; - sha512 = "fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A=="; - }; - } - { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; - sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; - }; - } - { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; - sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; - }; - } - { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; - sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; - }; - } - { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; - sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; - }; - } - { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; - sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; - }; - } - { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; - sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; - }; - } - { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.7.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; - sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; - }; - } - { - name = "_babel_preset_env___preset_env_7.16.11.tgz"; - path = fetchurl { - name = "_babel_preset_env___preset_env_7.16.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz"; - sha512 = "qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g=="; - }; - } - { - 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.17.0.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.0.tgz"; - sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; - }; - } - { - name = "_babel_template___template_7.16.7.tgz"; - path = fetchurl { - name = "_babel_template___template_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz"; - sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; - }; - } - { - name = "_babel_traverse___traverse_7.17.0.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz"; - sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg=="; - }; - } - { - name = "_babel_types___types_7.17.0.tgz"; - path = fetchurl { - name = "_babel_types___types_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; - }; - } - { - name = "_hapi_address___address_2.1.4.tgz"; - path = fetchurl { - name = "_hapi_address___address_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz"; - sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; - }; - } - { - name = "_hapi_bourne___bourne_1.3.2.tgz"; - path = fetchurl { - name = "_hapi_bourne___bourne_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz"; - sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; - }; - } - { - name = "_hapi_hoek___hoek_8.5.1.tgz"; - path = fetchurl { - name = "_hapi_hoek___hoek_8.5.1.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz"; - sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; - }; - } - { - name = "_hapi_joi___joi_15.1.1.tgz"; - path = fetchurl { - name = "_hapi_joi___joi_15.1.1.tgz"; - url = "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz"; - sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; - }; - } - { - name = "_hapi_topo___topo_3.1.6.tgz"; - path = fetchurl { - name = "_hapi_topo___topo_3.1.6.tgz"; - url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz"; - sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; - }; - } - { - name = "_intervolga_optimize_cssnano_plugin___optimize_cssnano_plugin_1.0.6.tgz"; - path = fetchurl { - name = "_intervolga_optimize_cssnano_plugin___optimize_cssnano_plugin_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"; - sha512 = "zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="; - }; - } - { - name = "_jridgewell_resolve_uri___resolve_uri_3.0.4.tgz"; - path = fetchurl { - name = "_jridgewell_resolve_uri___resolve_uri_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz"; - sha512 = "cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg=="; - }; - } - { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.10.tgz"; - path = fetchurl { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.10.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz"; - sha512 = "Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg=="; - }; - } - { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.2.tgz"; - path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.2.tgz"; - sha512 = "9KzzH4kMjA2XmBRHfqG2/Vtl7s92l6uNDd0wW7frDE+EUvQFGqNXhWp0UGJjSkt3v2AYjzOZn1QO9XaTNJIt1Q=="; - }; - } - { - name = "_mdi_font___font_5.9.55.tgz"; - path = fetchurl { - name = "_mdi_font___font_5.9.55.tgz"; - url = "https://registry.yarnpkg.com/@mdi/font/-/font-5.9.55.tgz"; - sha512 = "jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg=="; - }; - } - { - name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; - path = fetchurl { - name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; - sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; - }; - } - { - name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; - path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; - sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; - }; - } - { - name = "_nuintun_qrcode___qrcode_3.3.0.tgz"; - path = fetchurl { - name = "_nuintun_qrcode___qrcode_3.3.0.tgz"; - url = "https://registry.npmmirror.com/@nuintun/qrcode/-/qrcode-3.3.0.tgz"; - sha512 = "DJ8vmYyRdq8oX2l1/sGNmJjAD1KGaVvhtNUtHPJLbXpe5GoZut5UFQLM4FoFK9eyoZA1Y7chJEmEkNfs9Bdjrw=="; - }; - } - { - name = "_soda_friendly_errors_webpack_plugin___friendly_errors_webpack_plugin_1.8.1.tgz"; - path = fetchurl { - name = "_soda_friendly_errors_webpack_plugin___friendly_errors_webpack_plugin_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"; - sha512 = "h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="; - }; - } - { - name = "_soda_get_current_script___get_current_script_1.0.2.tgz"; - path = fetchurl { - name = "_soda_get_current_script___get_current_script_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; - sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; - }; - } - { - name = "_types_body_parser___body_parser_1.19.2.tgz"; - path = fetchurl { - name = "_types_body_parser___body_parser_1.19.2.tgz"; - url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; - }; - } - { - name = "_types_connect_history_api_fallback___connect_history_api_fallback_1.3.5.tgz"; - path = fetchurl { - name = "_types_connect_history_api_fallback___connect_history_api_fallback_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"; - sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; - }; - } - { - name = "_types_connect___connect_3.4.35.tgz"; - path = fetchurl { - name = "_types_connect___connect_3.4.35.tgz"; - url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; - sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; - }; - } - { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.28.tgz"; - path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.28.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; - sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; - }; - } - { - name = "_types_express___express_4.17.13.tgz"; - path = fetchurl { - name = "_types_express___express_4.17.13.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; - sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; - }; - } - { - 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_proxy___http_proxy_1.17.8.tgz"; - path = fetchurl { - name = "_types_http_proxy___http_proxy_1.17.8.tgz"; - url = "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz"; - sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; - }; - } - { - name = "_types_json_schema___json_schema_7.0.9.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.9.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; - sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; - }; - } - { - name = "_types_mime___mime_1.3.2.tgz"; - path = fetchurl { - name = "_types_mime___mime_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; - sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; - }; - } - { - 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_node___node_17.0.15.tgz"; - path = fetchurl { - name = "_types_node___node_17.0.15.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.15.tgz"; - sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; - }; - } - { - 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_q___q_1.5.5.tgz"; - path = fetchurl { - name = "_types_q___q_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz"; - sha512 = "L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="; - }; - } - { - name = "_types_qs___qs_6.9.7.tgz"; - path = fetchurl { - name = "_types_qs___qs_6.9.7.tgz"; - url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; - sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; - }; - } - { - name = "_types_range_parser___range_parser_1.2.4.tgz"; - path = fetchurl { - name = "_types_range_parser___range_parser_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; - }; - } - { - name = "_types_serve_static___serve_static_1.13.10.tgz"; - path = fetchurl { - name = "_types_serve_static___serve_static_1.13.10.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; - sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; - }; - } - { - name = "_types_source_list_map___source_list_map_0.1.2.tgz"; - path = fetchurl { - name = "_types_source_list_map___source_list_map_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz"; - sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; - }; - } - { - name = "_types_tapable___tapable_1.0.8.tgz"; - path = fetchurl { - name = "_types_tapable___tapable_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz"; - sha512 = "ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="; - }; - } - { - name = "_types_uglify_js___uglify_js_3.13.1.tgz"; - path = fetchurl { - name = "_types_uglify_js___uglify_js_3.13.1.tgz"; - url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz"; - sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; - }; - } - { - name = "_types_webpack_dev_server___webpack_dev_server_3.11.6.tgz"; - path = fetchurl { - name = "_types_webpack_dev_server___webpack_dev_server_3.11.6.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz"; - sha512 = "XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ=="; - }; - } - { - name = "_types_webpack_sources___webpack_sources_3.2.0.tgz"; - path = fetchurl { - name = "_types_webpack_sources___webpack_sources_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; - sha512 = "Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="; - }; - } - { - name = "_types_webpack___webpack_4.41.32.tgz"; - path = fetchurl { - name = "_types_webpack___webpack_4.41.32.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz"; - sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; - }; - } - { - name = "_vue_babel_helper_vue_jsx_merge_props___babel_helper_vue_jsx_merge_props_1.2.1.tgz"; - path = fetchurl { - name = "_vue_babel_helper_vue_jsx_merge_props___babel_helper_vue_jsx_merge_props_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz"; - sha512 = "QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA=="; - }; - } - { - name = "_vue_babel_helper_vue_transform_on___babel_helper_vue_transform_on_1.0.2.tgz"; - path = fetchurl { - name = "_vue_babel_helper_vue_transform_on___babel_helper_vue_transform_on_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz"; - sha512 = "hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA=="; - }; - } - { - name = "_vue_babel_plugin_jsx___babel_plugin_jsx_1.1.1.tgz"; - path = fetchurl { - name = "_vue_babel_plugin_jsx___babel_plugin_jsx_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz"; - sha512 = "j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w=="; - }; - } - { - name = "_vue_babel_plugin_transform_vue_jsx___babel_plugin_transform_vue_jsx_1.2.1.tgz"; - path = fetchurl { - name = "_vue_babel_plugin_transform_vue_jsx___babel_plugin_transform_vue_jsx_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.2.1.tgz"; - sha512 = "HJuqwACYehQwh1fNT8f4kyzqlNMpBuUK4rSiSES5D4QsYncv5fxFsLyrxFPG2ksO7t5WP+Vgix6tt6yKClwPzA=="; - }; - } - { - name = "_vue_babel_preset_app___babel_preset_app_4.5.15.tgz"; - path = fetchurl { - name = "_vue_babel_preset_app___babel_preset_app_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.15.tgz"; - sha512 = "J+YttzvwRfV1BPczf8r3qCevznYk+jh531agVF+5EYlHF4Sgh/cGXTz9qkkiux3LQgvhEGXgmCteg1n38WuuKg=="; - }; - } - { - name = "_vue_babel_preset_jsx___babel_preset_jsx_1.2.4.tgz"; - path = fetchurl { - name = "_vue_babel_preset_jsx___babel_preset_jsx_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.4.tgz"; - sha512 = "oRVnmN2a77bYDJzeGSt92AuHXbkIxbf/XXSE3klINnh9AXBmVS1DGa1f0d+dDYpLfsAKElMnqKTQfKn7obcL4w=="; - }; - } - { - name = "_vue_babel_sugar_composition_api_inject_h___babel_sugar_composition_api_inject_h_1.2.1.tgz"; - path = fetchurl { - name = "_vue_babel_sugar_composition_api_inject_h___babel_sugar_composition_api_inject_h_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.2.1.tgz"; - sha512 = "4B3L5Z2G+7s+9Bwbf+zPIifkFNcKth7fQwekVbnOA3cr3Pq71q71goWr97sk4/yyzH8phfe5ODVzEjX7HU7ItQ=="; - }; - } - { - name = "_vue_babel_sugar_composition_api_render_instance___babel_sugar_composition_api_render_instance_1.2.4.tgz"; - path = fetchurl { - name = "_vue_babel_sugar_composition_api_render_instance___babel_sugar_composition_api_render_instance_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.4.tgz"; - sha512 = "joha4PZznQMsxQYXtR3MnTgCASC9u3zt9KfBxIeuI5g2gscpTsSKRDzWQt4aqNIpx6cv8On7/m6zmmovlNsG7Q=="; - }; - } - { - name = "_vue_babel_sugar_functional_vue___babel_sugar_functional_vue_1.2.2.tgz"; - path = fetchurl { - name = "_vue_babel_sugar_functional_vue___babel_sugar_functional_vue_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.2.2.tgz"; - sha512 = "JvbgGn1bjCLByIAU1VOoepHQ1vFsroSA/QkzdiSs657V79q6OwEWLCQtQnEXD/rLTA8rRit4rMOhFpbjRFm82w=="; - }; - } - { - name = "_vue_babel_sugar_inject_h___babel_sugar_inject_h_1.2.2.tgz"; - path = fetchurl { - name = "_vue_babel_sugar_inject_h___babel_sugar_inject_h_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.2.2.tgz"; - sha512 = "y8vTo00oRkzQTgufeotjCLPAvlhnpSkcHFEp60+LJUwygGcd5Chrpn5480AQp/thrxVm8m2ifAk0LyFel9oCnw=="; - }; - } - { - name = "_vue_babel_sugar_v_model___babel_sugar_v_model_1.2.3.tgz"; - path = fetchurl { - name = "_vue_babel_sugar_v_model___babel_sugar_v_model_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.2.3.tgz"; - sha512 = "A2jxx87mySr/ulAsSSyYE8un6SIH0NWHiLaCWpodPCVOlQVODCaSpiR4+IMsmBr73haG+oeCuSvMOM+ttWUqRQ=="; - }; - } - { - name = "_vue_babel_sugar_v_on___babel_sugar_v_on_1.2.3.tgz"; - path = fetchurl { - name = "_vue_babel_sugar_v_on___babel_sugar_v_on_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.2.3.tgz"; - sha512 = "kt12VJdz/37D3N3eglBywV8GStKNUhNrsxChXIV+o0MwVXORYuhDTHJRKPgLJRb/EY3vM2aRFQdxJBp9CLikjw=="; - }; - } - { - name = "_vue_cli_overlay___cli_overlay_4.5.15.tgz"; - path = fetchurl { - name = "_vue_cli_overlay___cli_overlay_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.5.15.tgz"; - sha512 = "0zI0kANAVmjFO2LWGUIzdGPMeE3+9k+KeRDXsUqB30YfRF7abjfiiRPq5BU9pOzlJbVdpRkisschBrvdJqDuDg=="; - }; - } - { - name = "_vue_cli_plugin_babel___cli_plugin_babel_4.5.15.tgz"; - path = fetchurl { - name = "_vue_cli_plugin_babel___cli_plugin_babel_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.15.tgz"; - sha512 = "hBLrwYfFkHldEe34op/YNgPhpOWI5n5DB2Qt9I/1Epeif4M4iFaayrgjvOR9AVM6WbD3Yx7WCFszYpWrQZpBzQ=="; - }; - } - { - name = "_vue_cli_plugin_eslint___cli_plugin_eslint_4.5.15.tgz"; - path = fetchurl { - name = "_vue_cli_plugin_eslint___cli_plugin_eslint_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.15.tgz"; - sha512 = "/2Fl6wY/5bz3HD035oSnFRMsKNxDxU396KqBdpCQdwdvqk4mm6JAbXqihpcBRTNPeTO6w+LwGe6FE56PVbJdbg=="; - }; - } - { - name = "_vue_cli_plugin_router___cli_plugin_router_4.5.15.tgz"; - path = fetchurl { - name = "_vue_cli_plugin_router___cli_plugin_router_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.15.tgz"; - sha512 = "q7Y6kP9b3k55Ca2j59xJ7XPA6x+iSRB+N4ac0ZbcL1TbInVQ4j5wCzyE+uqid40hLy4fUdlpl4X9fHJEwuVxPA=="; - }; - } - { - name = "_vue_cli_plugin_vuex___cli_plugin_vuex_4.5.15.tgz"; - path = fetchurl { - name = "_vue_cli_plugin_vuex___cli_plugin_vuex_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.15.tgz"; - sha512 = "fqap+4HN+w+InDxlA3hZTOGE0tzBTgXhKLoDydhywqgmhQ1D9JA6Feh94ze6tG8DsWX58/ujYUqA8jAz17FJtg=="; - }; - } - { - name = "_vue_cli_service___cli_service_4.5.15.tgz"; - path = fetchurl { - name = "_vue_cli_service___cli_service_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.5.15.tgz"; - sha512 = "sFWnLYVCn4zRfu45IcsIE9eXM0YpDV3S11vlM2/DVbIPAGoYo5ySpSof6aHcIvkeGsIsrHFpPHzNvDZ/efs7jA=="; - }; - } - { - name = "_vue_cli_shared_utils___cli_shared_utils_4.5.15.tgz"; - path = fetchurl { - name = "_vue_cli_shared_utils___cli_shared_utils_4.5.15.tgz"; - url = "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz"; - sha512 = "SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q=="; - }; - } - { - name = "_vue_component_compiler_utils___component_compiler_utils_3.3.0.tgz"; - path = fetchurl { - name = "_vue_component_compiler_utils___component_compiler_utils_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"; - sha512 = "97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="; - }; - } - { - name = "_vue_eslint_config_prettier___eslint_config_prettier_5.1.0.tgz"; - path = fetchurl { - name = "_vue_eslint_config_prettier___eslint_config_prettier_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-5.1.0.tgz"; - sha512 = "LNqBXtM+4XqKz6yW3rrF/frCVZUKyYryiiMc8aCGq3czSXhTR/UNhl89FAtqZcpSwh5u8k2Qh8BvFctva68HUQ=="; - }; - } - { - name = "_vue_preload_webpack_plugin___preload_webpack_plugin_1.1.2.tgz"; - path = fetchurl { - name = "_vue_preload_webpack_plugin___preload_webpack_plugin_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"; - sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; - }; - } - { - name = "_vue_web_component_wrapper___web_component_wrapper_1.3.0.tgz"; - path = fetchurl { - name = "_vue_web_component_wrapper___web_component_wrapper_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"; - sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; - }; - } - { - name = "_webassemblyjs_ast___ast_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_ast___ast_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"; - sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; - }; - } - { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; - sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; - }; - } - { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; - sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; - }; - } - { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; - sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; - }; - } - { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; - sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; - }; - } - { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; - sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; - }; - } - { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; - sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; - }; - } - { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; - sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; - }; - } - { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; - sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; - }; - } - { - name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; - sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; - }; - } - { - name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; - sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; - }; - } - { - name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; - sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; - }; - } - { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; - sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; - }; - } - { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; - sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; - }; - } - { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; - sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; - }; - } - { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; - sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; - }; - } - { - name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; - sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; - }; - } - { - name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; - sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; - }; - } - { - name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; - path = fetchurl { - name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - } - { - name = "_xtuc_long___long_4.2.2.tgz"; - path = fetchurl { - name = "_xtuc_long___long_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - } - { - name = "a_sync_waterfall___a_sync_waterfall_1.0.1.tgz"; - path = fetchurl { - name = "a_sync_waterfall___a_sync_waterfall_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz"; - sha512 = "RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="; - }; - } - { - name = "accepts___accepts_1.3.8.tgz"; - path = fetchurl { - name = "accepts___accepts_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - } - { - 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_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_6.4.2.tgz"; - path = fetchurl { - name = "acorn___acorn_6.4.2.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; - sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; - }; - } - { - 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 = "address___address_1.1.2.tgz"; - path = fetchurl { - name = "address___address_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz"; - sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; - }; - } - { - name = "ajv_errors___ajv_errors_1.0.1.tgz"; - path = fetchurl { - name = "ajv_errors___ajv_errors_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; - sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; - }; - } - { - 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 = "alphanum_sort___alphanum_sort_1.0.2.tgz"; - path = fetchurl { - name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; - sha1 = "l6ERlkmyEa0zaR2fn0hqjsn74KM="; - }; - } - { - name = "ansi_colors___ansi_colors_3.2.4.tgz"; - path = fetchurl { - name = "ansi_colors___ansi_colors_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; - sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; - }; - } - { - 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_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_html_community___ansi_html_community_0.0.8.tgz"; - path = fetchurl { - name = "ansi_html_community___ansi_html_community_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz"; - sha512 = "1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="; - }; - } - { - 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_4.1.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; - }; - } - { - 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 = "any_promise___any_promise_1.3.0.tgz"; - path = fetchurl { - name = "any_promise___any_promise_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "q8av7tzqUugJzcA3au0845Y10X8="; - }; - } - { - name = "anymatch___anymatch_2.0.0.tgz"; - path = fetchurl { - name = "anymatch___anymatch_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; - sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; - }; - } - { - 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 = "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 = "arch___arch_2.2.0.tgz"; - path = fetchurl { - name = "arch___arch_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz"; - sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; - }; - } - { - 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_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_flatten___array_flatten_2.1.2.tgz"; - path = fetchurl { - name = "array_flatten___array_flatten_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz"; - sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; - }; - } - { - 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"; - sha1 = "mjRBDk9OPaI96jdb5b5w8kd47Dk="; - }; - } - { - 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"; - sha1 = "r2rId6Jcx/dOBYiUdThY39sk/bY="; - }; - } - { - 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 = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; - sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q=="; - }; - } - { - 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"; - sha1 = "iYUI2iIm84DfkEcoRWhJwVAaSw0="; - }; - } - { - 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"; - sha1 = "5QNHYR1+aQlDIIu9r+vLwvuGbUY="; - }; - } - { - name = "asn1.js___asn1.js_5.4.1.tgz"; - path = fetchurl { - name = "asn1.js___asn1.js_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; - sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; - }; - } - { - 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"; - sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; - }; - } - { - name = "assert___assert_1.5.0.tgz"; - path = fetchurl { - name = "assert___assert_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz"; - sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; - }; - } - { - 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 = "astral_regex___astral_regex_1.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; - }; - } - { - 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 = "async_limiter___async_limiter_1.0.1.tgz"; - path = fetchurl { - name = "async_limiter___async_limiter_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; - }; - } - { - name = "async_throttle___async_throttle_1.1.0.tgz"; - path = fetchurl { - name = "async_throttle___async_throttle_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/async-throttle/-/async-throttle-1.1.0.tgz"; - sha1 = "Ip5/P6eip5fobzYOYwmggiTU+no="; - }; - } - { - name = "async___async_2.6.3.tgz"; - path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; - }; - } - { - 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 = "autoprefixer___autoprefixer_9.8.8.tgz"; - path = fetchurl { - name = "autoprefixer___autoprefixer_9.8.8.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz"; - sha512 = "eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA=="; - }; - } - { - 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.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 = "axios___axios_0.21.4.tgz"; - path = fetchurl { - name = "axios___axios_0.21.4.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - } - { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - path = fetchurl { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; - }; - } - { - name = "babel_loader___babel_loader_8.2.3.tgz"; - path = fetchurl { - name = "babel_loader___babel_loader_8.2.3.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz"; - sha512 = "n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw=="; - }; - } - { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; - path = fetchurl { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; - }; - } - { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.1.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; - sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; - }; - } - { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.2.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; - sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; - }; - } - { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.3.1.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; - sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; - }; - } - { - 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 = "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 = "batch___batch_0.6.1.tgz"; - path = fetchurl { - name = "batch___batch_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; - sha1 = "3DQxT05nkxgJP8dgJyUl+UvyXBY="; - }; - } - { - 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 = "bfj___bfj_6.1.2.tgz"; - path = fetchurl { - name = "bfj___bfj_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz"; - sha512 = "BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw=="; - }; - } - { - name = "big.js___big.js_3.2.0.tgz"; - path = fetchurl { - name = "big.js___big.js_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz"; - sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; - }; - } - { - name = "big.js___big.js_5.2.2.tgz"; - path = fetchurl { - name = "big.js___big.js_5.2.2.tgz"; - url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; - sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; - }; - } - { - 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_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 = "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 = "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 = "bn.js___bn.js_4.12.0.tgz"; - path = fetchurl { - name = "bn.js___bn.js_4.12.0.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; - sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; - }; - } - { - name = "bn.js___bn.js_5.2.0.tgz"; - path = fetchurl { - name = "bn.js___bn.js_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz"; - sha512 = "D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="; - }; - } - { - name = "body_parser___body_parser_1.19.1.tgz"; - path = fetchurl { - name = "body_parser___body_parser_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; - }; - } - { - name = "bonjour___bonjour_3.5.0.tgz"; - path = fetchurl { - name = "bonjour___bonjour_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz"; - sha1 = "jokKGD2O6aI5OzhExpGkK897yfU="; - }; - } - { - 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"; - sha1 = "aN/1++YMUes3cl6p4+0xDcwed24="; - }; - } - { - 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_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 = "brorand___brorand_1.1.0.tgz"; - path = fetchurl { - name = "brorand___brorand_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; - }; - } - { - name = "browserify_aes___browserify_aes_1.2.0.tgz"; - path = fetchurl { - name = "browserify_aes___browserify_aes_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; - }; - } - { - name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; - path = fetchurl { - name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; - }; - } - { - name = "browserify_des___browserify_des_1.0.2.tgz"; - path = fetchurl { - name = "browserify_des___browserify_des_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz"; - sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; - }; - } - { - name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; - path = fetchurl { - name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; - sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; - }; - } - { - name = "browserify_sign___browserify_sign_4.2.1.tgz"; - path = fetchurl { - name = "browserify_sign___browserify_sign_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; - sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; - }; - } - { - name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; - path = fetchurl { - name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; - }; - } - { - name = "browserslist___browserslist_4.19.1.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.19.1.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz"; - sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; - }; - } - { - name = "buefy___buefy_0.9.3.tgz"; - path = fetchurl { - name = "buefy___buefy_0.9.3.tgz"; - url = "https://registry.yarnpkg.com/buefy/-/buefy-0.9.3.tgz"; - sha512 = "Xqfo3ppeBo8Fwhb2fLwWnpkIC/1thPErU7DX3HksxTHxrSMixJ2BYkf3f6aWv4Ffx/FWX5UHnUrgtT7o7slnDA=="; - }; - } - { - 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_indexof___buffer_indexof_1.1.1.tgz"; - path = fetchurl { - name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; - }; - } - { - name = "buffer_json___buffer_json_2.0.0.tgz"; - path = fetchurl { - name = "buffer_json___buffer_json_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz"; - sha512 = "+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw=="; - }; - } - { - name = "buffer_xor___buffer_xor_1.0.3.tgz"; - path = fetchurl { - name = "buffer_xor___buffer_xor_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "JuYe0UIvtw3ULm42cp7VHYVf6Nk="; - }; - } - { - name = "buffer___buffer_4.9.2.tgz"; - path = fetchurl { - name = "buffer___buffer_4.9.2.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; - sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; - }; - } - { - name = "bufferstreams___bufferstreams_3.0.0.tgz"; - path = fetchurl { - name = "bufferstreams___bufferstreams_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-3.0.0.tgz"; - sha512 = "Qg0ggJUWJq90vtg4lDsGN9CDWvzBMQxhiEkSOD/sJfYt6BLect3eV1/S6K7SCSKJ34n60rf6U5eUPmQENVE4UA=="; - }; - } - { - name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; - path = fetchurl { - name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "hZgoeOIbmOHGZCXgPQF0eI9Wnug="; - }; - } - { - name = "bulma___bulma_0.9.0.tgz"; - path = fetchurl { - name = "bulma___bulma_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/bulma/-/bulma-0.9.0.tgz"; - sha512 = "rV75CJkubNUroAt0qCRkjznZLoaXq/ctfMXsMvKSL84UetbSyx5REl96e8GoQ04G4Tkw0XF3STECffTOQrbzOQ=="; - }; - } - { - name = "bytes___bytes_3.0.0.tgz"; - path = fetchurl { - name = "bytes___bytes_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; - sha1 = "0ygVQE1olpn4Wk6k+odV3ROpYEg="; - }; - } - { - name = "bytes___bytes_3.1.1.tgz"; - path = fetchurl { - name = "bytes___bytes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz"; - sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; - }; - } - { - name = "cacache___cacache_10.0.4.tgz"; - path = fetchurl { - name = "cacache___cacache_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz"; - sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA=="; - }; - } - { - name = "cacache___cacache_12.0.4.tgz"; - path = fetchurl { - name = "cacache___cacache_12.0.4.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; - sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; - }; - } - { - 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 = "cache_loader___cache_loader_4.1.0.tgz"; - path = fetchurl { - name = "cache_loader___cache_loader_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz"; - sha512 = "ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw=="; - }; - } - { - 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 = "call_me_maybe___call_me_maybe_1.0.1.tgz"; - path = fetchurl { - name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; - sha1 = "JtII6onje1y95gJQoV8DHBak1ms="; - }; - } - { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - path = fetchurl { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "hH4PzgoiN1CpoCfFSzNzGtMVQTQ="; - }; - } - { - name = "caller_path___caller_path_2.0.0.tgz"; - path = fetchurl { - name = "caller_path___caller_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "Ro+DBE42mrIBD6xfBs7uFbsssfQ="; - }; - } - { - name = "callsites___callsites_2.0.0.tgz"; - path = fetchurl { - name = "callsites___callsites_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; - sha1 = "BuuE8A7qQT2oav/vrL/7Ngk7PFA="; - }; - } - { - 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_3.0.0.tgz"; - path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "yjw2iKTpzzpM2nd9xNy8cTJJz3M="; - }; - } - { - 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_6.3.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - } - { - name = "caniuse_api___caniuse_api_3.0.0.tgz"; - path = fetchurl { - name = "caniuse_api___caniuse_api_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; - }; - } - { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001388.tgz"; - path = fetchurl { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001388.tgz"; - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz"; - sha512 = "znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ=="; - }; - } - { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.4.0.tgz"; - path = fetchurl { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"; - sha512 = "roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="; - }; - } - { - 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 = "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 = "charcodes___charcodes_0.2.0.tgz"; - path = fetchurl { - name = "charcodes___charcodes_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz"; - sha512 = "Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ=="; - }; - } - { - 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_types___check_types_8.0.3.tgz"; - path = fetchurl { - name = "check_types___check_types_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz"; - sha512 = "YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="; - }; - } - { - 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 = "chokidar___chokidar_2.1.8.tgz"; - path = fetchurl { - name = "chokidar___chokidar_2.1.8.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; - sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; - }; - } - { - name = "chownr___chownr_1.1.4.tgz"; - path = fetchurl { - name = "chownr___chownr_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; - }; - } - { - name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; - path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; - }; - } - { - name = "ci_info___ci_info_1.6.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz"; - sha512 = "vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="; - }; - } - { - name = "cipher_base___cipher_base_1.0.4.tgz"; - path = fetchurl { - name = "cipher_base___cipher_base_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; - }; - } - { - 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.4.tgz"; - path = fetchurl { - name = "clean_css___clean_css_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz"; - sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; - }; - } - { - 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_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_highlight___cli_highlight_2.1.11.tgz"; - path = fetchurl { - name = "cli_highlight___cli_highlight_2.1.11.tgz"; - url = "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz"; - sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; - }; - } - { - name = "cli_spinners___cli_spinners_2.6.1.tgz"; - path = fetchurl { - name = "cli_spinners___cli_spinners_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz"; - sha512 = "x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="; - }; - } - { - name = "cli_width___cli_width_2.2.1.tgz"; - path = fetchurl { - name = "cli_width___cli_width_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; - sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; - }; - } - { - 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 = "clipboard___clipboard_2.0.10.tgz"; - path = fetchurl { - name = "clipboard___clipboard_2.0.10.tgz"; - url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.10.tgz"; - sha512 = "cz3m2YVwFz95qSEbCDi2fzLN/epEN9zXBvfgAoGkvGOJZATMl9gtTDVOtBYkx2ODUJl2kvmud7n32sV2BpYR4g=="; - }; - } - { - name = "clipboardy___clipboardy_2.3.0.tgz"; - path = fetchurl { - name = "clipboardy___clipboardy_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz"; - sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; - }; - } - { - name = "cliui___cliui_5.0.0.tgz"; - path = fetchurl { - name = "cliui___cliui_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; - sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; - }; - } - { - 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_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 = "clone_deep___clone_deep_4.0.1.tgz"; - path = fetchurl { - name = "clone_deep___clone_deep_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; - sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; - }; - } - { - 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"; - sha1 = "2jCcwmPfFZlMaIypAheco8fNfH4="; - }; - } - { - name = "coa___coa_2.0.2.tgz"; - path = fetchurl { - name = "coa___coa_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; - sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; - }; - } - { - 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 = "color_string___color_string_1.9.0.tgz"; - path = fetchurl { - name = "color_string___color_string_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz"; - sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; - }; - } - { - name = "color___color_3.2.1.tgz"; - path = fetchurl { - name = "color___color_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz"; - sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; - }; - } - { - 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.17.1.tgz"; - path = fetchurl { - name = "commander___commander_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; - sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; - }; - } - { - 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_4.1.1.tgz"; - path = fetchurl { - name = "commander___commander_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; - sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; - }; - } - { - 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 = "commander___commander_2.13.0.tgz"; - path = fetchurl { - name = "commander___commander_2.13.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz"; - sha512 = "MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="; - }; - } - { - name = "commander___commander_2.19.0.tgz"; - path = fetchurl { - name = "commander___commander_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz"; - sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; - }; - } - { - name = "commondir___commondir_1.0.1.tgz"; - path = fetchurl { - name = "commondir___commondir_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; - sha1 = "3dgA2gxmEnOTzKWVDqloo6rxJTs="; - }; - } - { - 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 = "compressible___compressible_2.0.18.tgz"; - path = fetchurl { - name = "compressible___compressible_2.0.18.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - } - { - name = "compression___compression_1.7.4.tgz"; - path = fetchurl { - name = "compression___compression_1.7.4.tgz"; - url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - } - { - 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 = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; - path = fetchurl { - name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; - }; - } - { - name = "console_browserify___console_browserify_1.2.0.tgz"; - path = fetchurl { - name = "console_browserify___console_browserify_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; - sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; - }; - } - { - name = "consolidate___consolidate_0.15.1.tgz"; - path = fetchurl { - name = "consolidate___consolidate_0.15.1.tgz"; - url = "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz"; - sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; - }; - } - { - name = "constants_browserify___constants_browserify_1.0.0.tgz"; - path = fetchurl { - name = "constants_browserify___constants_browserify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "wguW2MYXdIqvHBYCF2DNJ/y4y3U="; - }; - } - { - name = "content_disposition___content_disposition_0.5.4.tgz"; - path = fetchurl { - name = "content_disposition___content_disposition_0.5.4.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - } - { - 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.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.1.tgz"; - path = fetchurl { - name = "cookie___cookie_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; - sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; - }; - } - { - name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; - path = fetchurl { - name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; - }; - } - { - 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 = "copy_webpack_plugin___copy_webpack_plugin_5.1.2.tgz"; - path = fetchurl { - name = "copy_webpack_plugin___copy_webpack_plugin_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; - sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; - }; - } - { - name = "core_js_compat___core_js_compat_3.21.0.tgz"; - path = fetchurl { - name = "core_js_compat___core_js_compat_3.21.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz"; - sha512 = "OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A=="; - }; - } - { - name = "core_js___core_js_3.21.0.tgz"; - path = fetchurl { - name = "core_js___core_js_3.21.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.21.0.tgz"; - sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; - }; - } - { - 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 = "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_5.2.1.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; - }; - } - { - name = "create_ecdh___create_ecdh_4.0.4.tgz"; - path = fetchurl { - name = "create_ecdh___create_ecdh_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; - sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; - }; - } - { - name = "create_hash___create_hash_1.2.0.tgz"; - path = fetchurl { - name = "create_hash___create_hash_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; - sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; - }; - } - { - name = "create_hmac___create_hmac_1.1.7.tgz"; - path = fetchurl { - name = "create_hmac___create_hmac_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; - sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; - }; - } - { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "6L0O/uWPz/b4+UUQoKVUu/ojVEk="; - }; - } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; - }; - } - { - 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_browserify___crypto_browserify_3.12.0.tgz"; - path = fetchurl { - name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; - }; - } - { - name = "css_color_names___css_color_names_0.0.4.tgz"; - path = fetchurl { - name = "css_color_names___css_color_names_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; - sha1 = "gIrcLnnPhHOAabZGyyDsJ762KeA="; - }; - } - { - name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; - path = fetchurl { - name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; - sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; - }; - } - { - name = "css_loader___css_loader_3.6.0.tgz"; - path = fetchurl { - name = "css_loader___css_loader_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz"; - sha512 = "M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="; - }; - } - { - name = "css_loader___css_loader_5.2.7.tgz"; - path = fetchurl { - name = "css_loader___css_loader_5.2.7.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz"; - sha512 = "Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg=="; - }; - } - { - name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; - path = fetchurl { - name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; - sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; - }; - } - { - name = "css_select___css_select_2.1.0.tgz"; - path = fetchurl { - name = "css_select___css_select_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; - sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; - }; - } - { - name = "css_select___css_select_4.2.1.tgz"; - path = fetchurl { - name = "css_select___css_select_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz"; - sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ=="; - }; - } - { - name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; - path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; - sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; - }; - } - { - 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_3.4.2.tgz"; - path = fetchurl { - name = "css_what___css_what_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; - sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; - }; - } - { - name = "css_what___css_what_5.1.0.tgz"; - path = fetchurl { - name = "css_what___css_what_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz"; - sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; - }; - } - { - 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 = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; - path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; - sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; - }; - } - { - name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; - path = fetchurl { - name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; - sha1 = "7ToIKZ8h11dBsg87gfGU7UnMFQ8="; - }; - } - { - name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; - path = fetchurl { - name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; - sha1 = "wOTKB/U4a7F+xeUiULT1lhNlFW0="; - }; - } - { - name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; - path = fetchurl { - name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; - sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; - }; - } - { - name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; - path = fetchurl { - name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; - sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; - }; - } - { - name = "cssnano___cssnano_4.1.11.tgz"; - path = fetchurl { - name = "cssnano___cssnano_4.1.11.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; - sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; - }; - } - { - 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 = "cubic2quad___cubic2quad_1.2.1.tgz"; - path = fetchurl { - name = "cubic2quad___cubic2quad_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz"; - sha512 = "wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ=="; - }; - } - { - name = "cyclist___cyclist_1.0.1.tgz"; - path = fetchurl { - name = "cyclist___cyclist_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; - sha1 = "WW6WmP0MgOEgOMK4LW6xs1tiJNk="; - }; - } - { - 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 = "dayjs___dayjs_1.10.7.tgz"; - path = fetchurl { - name = "dayjs___dayjs_1.10.7.tgz"; - url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz"; - sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; - }; - } - { - 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"; - sha1 = "sgOOhG3DO6pXlhKNCAS0VbjB4h0="; - }; - } - { - 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 = "debug___debug_4.3.3.tgz"; - path = fetchurl { - name = "debug___debug_4.3.3.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; - sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; - }; - } - { - 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"; - sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA="; - }; - } - { - 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_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 = "deepmerge___deepmerge_1.5.2.tgz"; - path = fetchurl { - name = "deepmerge___deepmerge_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz"; - sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; - }; - } - { - name = "default_gateway___default_gateway_4.2.0.tgz"; - path = fetchurl { - name = "default_gateway___default_gateway_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz"; - sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; - }; - } - { - name = "default_gateway___default_gateway_5.0.5.tgz"; - path = fetchurl { - name = "default_gateway___default_gateway_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-5.0.5.tgz"; - sha512 = "z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA=="; - }; - } - { - name = "defaults___defaults_1.0.3.tgz"; - path = fetchurl { - name = "defaults___defaults_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz"; - sha1 = "xlYFHpgX2f8I7YgUd/P+QBnz730="; - }; - } - { - name = "define_properties___define_properties_1.1.3.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; - }; - } - { - 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 = "del___del_4.1.1.tgz"; - path = fetchurl { - name = "del___del_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; - sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; - }; - } - { - 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 = "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 = "des.js___des.js_1.0.1.tgz"; - path = fetchurl { - name = "des.js___des.js_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; - sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; - }; - } - { - 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_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 = "diffie_hellman___diffie_hellman_5.0.3.tgz"; - path = fetchurl { - name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; - }; - } - { - name = "dijkstrajs___dijkstrajs_1.0.2.tgz"; - path = fetchurl { - name = "dijkstrajs___dijkstrajs_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz"; - sha512 = "QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="; - }; - } - { - name = "dir_glob___dir_glob_2.0.0.tgz"; - path = fetchurl { - name = "dir_glob___dir_glob_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz"; - sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag=="; - }; - } - { - name = "dir_glob___dir_glob_2.2.2.tgz"; - path = fetchurl { - name = "dir_glob___dir_glob_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz"; - sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; - }; - } - { - name = "dns_equal___dns_equal_1.0.0.tgz"; - path = fetchurl { - name = "dns_equal___dns_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz"; - sha1 = "s55/HabrCnW6nBcySzR1PEfgZU0="; - }; - } - { - name = "dns_packet___dns_packet_1.3.4.tgz"; - path = fetchurl { - name = "dns_packet___dns_packet_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz"; - sha512 = "BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA=="; - }; - } - { - name = "dns_txt___dns_txt_2.0.2.tgz"; - path = fetchurl { - name = "dns_txt___dns_txt_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz"; - sha1 = "uR2Ab10nGI5Ks+fRB9iBocxGQrY="; - }; - } - { - 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_converter___dom_converter_0.2.0.tgz"; - path = fetchurl { - name = "dom_converter___dom_converter_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz"; - sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; - }; - } - { - 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.3.2.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; - }; - } - { - name = "domain_browser___domain_browser_1.2.0.tgz"; - path = fetchurl { - name = "domain_browser___domain_browser_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; - sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; - }; - } - { - 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.2.0.tgz"; - path = fetchurl { - name = "domelementtype___domelementtype_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; - }; - } - { - name = "domhandler___domhandler_4.3.0.tgz"; - path = fetchurl { - name = "domhandler___domhandler_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz"; - sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; - }; - } - { - 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 = "dot_prop___dot_prop_5.3.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; - }; - } - { - 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_8.6.0.tgz"; - path = fetchurl { - name = "dotenv___dotenv_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz"; - sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; - }; - } - { - name = "duplexer___duplexer_0.1.2.tgz"; - path = fetchurl { - name = "duplexer___duplexer_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; - sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; - }; - } - { - name = "duplexify___duplexify_3.7.1.tgz"; - path = fetchurl { - name = "duplexify___duplexify_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; - sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; - }; - } - { - name = "easy_stack___easy_stack_1.0.1.tgz"; - path = fetchurl { - name = "easy_stack___easy_stack_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz"; - sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; - }; - } - { - 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 = "ejs___ejs_2.7.4.tgz"; - path = fetchurl { - name = "ejs___ejs_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz"; - sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; - }; - } - { - name = "electron_to_chromium___electron_to_chromium_1.4.65.tgz"; - path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.4.65.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz"; - sha512 = "0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw=="; - }; - } - { - name = "elliptic___elliptic_6.5.4.tgz"; - path = fetchurl { - name = "elliptic___elliptic_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; - sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; - }; - } - { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; - }; - } - { - 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 = "emojis_list___emojis_list_2.1.0.tgz"; - path = fetchurl { - name = "emojis_list___emojis_list_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "TapNnbAPmBmIDHn6RXrlsJof04k="; - }; - } - { - name = "emojis_list___emojis_list_3.0.0.tgz"; - path = fetchurl { - name = "emojis_list___emojis_list_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; - }; - } - { - name = "encode_utf8___encode_utf8_1.0.3.tgz"; - path = fetchurl { - name = "encode_utf8___encode_utf8_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz"; - sha512 = "ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="; - }; - } - { - 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 = "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 = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; - path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; - sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; - }; - } - { - 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 = "errno___errno_0.1.8.tgz"; - path = fetchurl { - name = "errno___errno_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz"; - sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="; - }; - } - { - 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 = "error_stack_parser___error_stack_parser_2.0.6.tgz"; - path = fetchurl { - name = "error_stack_parser___error_stack_parser_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; - sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; - }; - } - { - name = "es_abstract___es_abstract_1.19.1.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz"; - sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; - }; - } - { - 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 = "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 = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; - path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"; - sha512 = "a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw=="; - }; - } - { - name = "eslint_loader___eslint_loader_2.2.1.tgz"; - path = fetchurl { - name = "eslint_loader___eslint_loader_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz"; - sha512 = "RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="; - }; - } - { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; - path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; - sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; - }; - } - { - name = "eslint_plugin_vue___eslint_plugin_vue_5.2.3.tgz"; - path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_5.2.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz"; - sha512 = "mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw=="; - }; - } - { - name = "eslint_scope___eslint_scope_4.0.3.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; - sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; - }; - } - { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; - sha512 = "fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="; - }; - } - { - 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___eslint_5.16.0.tgz"; - path = fetchurl { - name = "eslint___eslint_5.16.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz"; - sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; - }; - } - { - name = "espree___espree_4.1.0.tgz"; - path = fetchurl { - name = "espree___espree_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz"; - sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w=="; - }; - } - { - name = "espree___espree_5.0.1.tgz"; - path = fetchurl { - name = "espree___espree_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; - sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; - }; - } - { - 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 = "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 = "event_pubsub___event_pubsub_4.3.0.tgz"; - path = fetchurl { - name = "event_pubsub___event_pubsub_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz"; - sha512 = "z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="; - }; - } - { - name = "eventemitter3___eventemitter3_4.0.7.tgz"; - path = fetchurl { - name = "eventemitter3___eventemitter3_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; - }; - } - { - name = "events___events_3.3.0.tgz"; - path = fetchurl { - name = "events___events_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - } - { - name = "eventsource___eventsource_1.1.0.tgz"; - path = fetchurl { - name = "eventsource___eventsource_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz"; - sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg=="; - }; - } - { - name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; - path = fetchurl { - name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; - }; - } - { - name = "execa___execa_0.8.0.tgz"; - path = fetchurl { - name = "execa___execa_0.8.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz"; - sha1 = "2NdrvBtVIX7RkP1t1J08d07PyNo="; - }; - } - { - name = "execa___execa_1.0.0.tgz"; - path = fetchurl { - name = "execa___execa_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; - }; - } - { - name = "execa___execa_3.4.0.tgz"; - path = fetchurl { - name = "execa___execa_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz"; - sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; - }; - } - { - 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 = "express___express_4.17.2.tgz"; - path = fetchurl { - name = "express___express_4.17.2.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz"; - sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; - }; - } - { - 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_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 = "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.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_2.2.7.tgz"; - path = fetchurl { - name = "fast_glob___fast_glob_2.2.7.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz"; - sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; - }; - } - { - 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 = "faye_websocket___faye_websocket_0.11.4.tgz"; - path = fetchurl { - name = "faye_websocket___faye_websocket_0.11.4.tgz"; - url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz"; - sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; - }; - } - { - name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; - path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; - }; - } - { - 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 = "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_5.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; - }; - } - { - name = "file_loader___file_loader_4.3.0.tgz"; - path = fetchurl { - name = "file_loader___file_loader_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz"; - sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; - }; - } - { - 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 = "filesize___filesize_3.6.1.tgz"; - path = fetchurl { - name = "filesize___filesize_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz"; - sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; - }; - } - { - 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 = "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_cache_dir___find_cache_dir_0.1.1.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz"; - sha1 = "yN765XyKUqinhPnjHFfHQumToLk="; - }; - } - { - name = "find_cache_dir___find_cache_dir_1.0.0.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; - sha1 = "kojj6ePMN0hxfTnq3hfPcfww7m8="; - }; - } - { - name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; - sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; - }; - } - { - name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; - sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; - }; - } - { - 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"; - sha1 = "ay6YIrGizgpgq2TWEOzK1TyyTQ8="; - }; - } - { - 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"; - sha1 = "RdG35QbHF93UgndaK3eSCjwMV6c="; - }; - } - { - 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 = "flat_cache___flat_cache_2.0.1.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; - sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; - }; - } - { - name = "flatted___flatted_2.0.2.tgz"; - path = fetchurl { - name = "flatted___flatted_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; - sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; - }; - } - { - name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; - path = fetchurl { - name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; - sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; - }; - } - { - name = "follow_redirects___follow_redirects_1.14.7.tgz"; - path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.7.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz"; - sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; - }; - } - { - 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 = "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.2.0.tgz"; - path = fetchurl { - name = "forwarded___forwarded_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - } - { - 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 = "from2___from2_2.3.0.tgz"; - path = fetchurl { - name = "from2___from2_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; - sha1 = "i/tVAr3kpNNs/e6gB/zKIdfjgq8="; - }; - } - { - 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_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; - path = fetchurl { - name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; - sha1 = "tH31NJPvkR33VzHnCp3tAYnbQMk="; - }; - } - { - 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.13.tgz"; - path = fetchurl { - name = "fsevents___fsevents_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; - sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; - }; - } - { - 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 = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; - path = fetchurl { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; - }; - } - { - 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 = "geometry_interfaces___geometry_interfaces_1.1.4.tgz"; - path = fetchurl { - name = "geometry_interfaces___geometry_interfaces_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/geometry-interfaces/-/geometry-interfaces-1.1.4.tgz"; - sha512 = "qD6OdkT6NcES9l4Xx3auTpwraQruU7dARbQPVO71MKvkGYw5/z/oIiGymuFXrRaEQa5Y67EIojUpaLeGEa5hGA=="; - }; - } - { - 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.1.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; - }; - } - { - name = "get_stdin___get_stdin_6.0.0.tgz"; - path = fetchurl { - name = "get_stdin___get_stdin_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz"; - sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; - }; - } - { - name = "get_stream___get_stream_3.0.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="; - }; - } - { - name = "get_stream___get_stream_4.1.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - } - { - 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_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"; - sha1 = "3BXKHGcjh8p2vTesCjlbogQqLCg="; - }; - } - { - 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_parent___glob_parent_3.1.0.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"; - sha1 = "nmr2KZ2NO9K9QEMIMr0RPfkGxa4="; - }; - } - { - 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_to_regexp___glob_to_regexp_0.3.0.tgz"; - path = fetchurl { - name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; - sha1 = "jFoUlNIGbFcMw7/kSWF1rMTVAqs="; - }; - } - { - name = "glob___glob_7.2.0.tgz"; - path = fetchurl { - name = "glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; - }; - } - { - 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 = "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"; - sha1 = "9abXDoOV4hyFj7BInWTfAkJNUGw="; - }; - } - { - name = "globby___globby_7.1.1.tgz"; - path = fetchurl { - name = "globby___globby_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz"; - sha1 = "+yzP+UAfhgCUXfral0QMypcrhoA="; - }; - } - { - name = "globby___globby_8.0.2.tgz"; - path = fetchurl { - name = "globby___globby_8.0.2.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz"; - sha512 = "yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w=="; - }; - } - { - name = "globby___globby_9.2.0.tgz"; - path = fetchurl { - name = "globby___globby_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz"; - sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg=="; - }; - } - { - 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.9.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.9.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; - }; - } - { - name = "gzip_size___gzip_size_5.1.1.tgz"; - path = fetchurl { - name = "gzip_size___gzip_size_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz"; - sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA=="; - }; - } - { - name = "handle_thing___handle_thing_2.0.1.tgz"; - path = fetchurl { - name = "handle_thing___handle_thing_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; - sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; - }; - } - { - 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.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 = "has_bigints___has_bigints_1.0.1.tgz"; - path = fetchurl { - name = "has_bigints___has_bigints_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; - sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; - }; - } - { - 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_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_symbols___has_symbols_1.0.2.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; - }; - } - { - 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"; - 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 = "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 = "hash_base___hash_base_3.1.0.tgz"; - path = fetchurl { - name = "hash_base___hash_base_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; - sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; - }; - } - { - name = "hash_sum___hash_sum_1.0.2.tgz"; - path = fetchurl { - name = "hash_sum___hash_sum_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz"; - sha1 = "M7QHd3VMZDJXPBIMw4CLvRDUfwQ="; - }; - } - { - name = "hash_sum___hash_sum_2.0.0.tgz"; - path = fetchurl { - name = "hash_sum___hash_sum_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz"; - sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; - }; - } - { - name = "hash.js___hash.js_1.1.7.tgz"; - path = fetchurl { - name = "hash.js___hash.js_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; - sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; - }; - } - { - 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 = "hex_color_regex___hex_color_regex_1.1.0.tgz"; - path = fetchurl { - name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; - sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; - }; - } - { - name = "highlight.js___highlight.js_10.7.3.tgz"; - path = fetchurl { - name = "highlight.js___highlight.js_10.7.3.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz"; - sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; - }; - } - { - name = "highlight.js___highlight.js_11.4.0.tgz"; - path = fetchurl { - name = "highlight.js___highlight.js_11.4.0.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.4.0.tgz"; - sha512 = "nawlpCBCSASs7EdvZOYOYVkJpGmAOKMYZgZtUqSRqodZE0GRVcFKwo1RcpeOemqh9hyttTdd5wDBwHkuSyUfnA=="; - }; - } - { - name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; - path = fetchurl { - name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; - }; - } - { - name = "hoopy___hoopy_0.1.4.tgz"; - path = fetchurl { - name = "hoopy___hoopy_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz"; - sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; - }; - } - { - 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 = "hpack.js___hpack.js_2.1.6.tgz"; - path = fetchurl { - name = "hpack.js___hpack.js_2.1.6.tgz"; - url = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz"; - sha1 = "h3dMCUnlE/QuhFdbPEVoH63ioLI="; - }; - } - { - name = "hsl_regex___hsl_regex_1.0.0.tgz"; - path = fetchurl { - name = "hsl_regex___hsl_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz"; - sha1 = "1JMwx4ntgZ4nakwNJy3/owsY/m4="; - }; - } - { - name = "hsla_regex___hsla_regex_1.0.0.tgz"; - path = fetchurl { - name = "hsla_regex___hsla_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz"; - sha1 = "wc56MWjIxmFAM6S194d/OyJfnDg="; - }; - } - { - name = "html_entities___html_entities_1.4.0.tgz"; - path = fetchurl { - name = "html_entities___html_entities_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz"; - sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; - }; - } - { - name = "html_minifier___html_minifier_3.5.21.tgz"; - path = fetchurl { - name = "html_minifier___html_minifier_3.5.21.tgz"; - url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz"; - sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; - }; - } - { - name = "html_tags___html_tags_2.0.0.tgz"; - path = fetchurl { - name = "html_tags___html_tags_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz"; - sha1 = "ELMKOGCF9Dzt41PMj6fLDe7qZos="; - }; - } - { - name = "html_tags___html_tags_3.1.0.tgz"; - path = fetchurl { - name = "html_tags___html_tags_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz"; - sha512 = "1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg=="; - }; - } - { - name = "html_webpack_plugin___html_webpack_plugin_3.2.0.tgz"; - path = fetchurl { - name = "html_webpack_plugin___html_webpack_plugin_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz"; - sha1 = "sBq71yOsqqeze2r0SS69oD2d03s="; - }; - } - { - name = "htmlparser2___htmlparser2_6.1.0.tgz"; - path = fetchurl { - name = "htmlparser2___htmlparser2_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; - sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; - }; - } - { - name = "http_deceiver___http_deceiver_1.2.7.tgz"; - path = fetchurl { - name = "http_deceiver___http_deceiver_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz"; - sha1 = "+nFolEq5pRnTN8sL7HKE3D5yPYc="; - }; - } - { - name = "http_errors___http_errors_1.8.1.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - } - { - name = "http_errors___http_errors_1.6.3.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz"; - sha1 = "i1VoC7S+KDoLW/TqLjhYC+HZMg0="; - }; - } - { - name = "http_parser_js___http_parser_js_0.5.5.tgz"; - path = fetchurl { - name = "http_parser_js___http_parser_js_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz"; - sha512 = "x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="; - }; - } - { - name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; - path = fetchurl { - name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; - sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; - }; - } - { - name = "http_proxy_middleware___http_proxy_middleware_1.3.1.tgz"; - path = fetchurl { - name = "http_proxy_middleware___http_proxy_middleware_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; - sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; - }; - } - { - name = "http_proxy___http_proxy_1.18.1.tgz"; - path = fetchurl { - name = "http_proxy___http_proxy_1.18.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; - sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; - }; - } - { - 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_browserify___https_browserify_1.0.0.tgz"; - path = fetchurl { - name = "https_browserify___https_browserify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "7AbBDgo0wPL68Zn3/X/Hj//QPHM="; - }; - } - { - name = "human_signals___human_signals_1.1.1.tgz"; - path = fetchurl { - name = "human_signals___human_signals_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; - sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; - }; - } - { - 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 = "icss_utils___icss_utils_4.1.1.tgz"; - path = fetchurl { - name = "icss_utils___icss_utils_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz"; - sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; - }; - } - { - name = "icss_utils___icss_utils_5.1.0.tgz"; - path = fetchurl { - name = "icss_utils___icss_utils_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; - sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; - }; - } - { - 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 = "iferr___iferr_0.1.5.tgz"; - path = fetchurl { - name = "iferr___iferr_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; - sha1 = "xg7taebY/bazEEofy8ocGS3FtQE="; - }; - } - { - name = "ignore___ignore_3.3.10.tgz"; - path = fetchurl { - name = "ignore___ignore_3.3.10.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; - sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; - }; - } - { - name = "ignore___ignore_4.0.6.tgz"; - path = fetchurl { - name = "ignore___ignore_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; - sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; - }; - } - { - name = "immutable___immutable_4.0.0.tgz"; - path = fetchurl { - name = "immutable___immutable_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz"; - sha512 = "zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="; - }; - } - { - name = "import_cwd___import_cwd_2.1.0.tgz"; - path = fetchurl { - name = "import_cwd___import_cwd_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz"; - sha1 = "qmzzbnInYShcs3HsZRn1PiQ1sKk="; - }; - } - { - name = "import_fresh___import_fresh_2.0.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "2BNVwVYS04bGH53dOSLUMEgipUY="; - }; - } - { - 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_2.1.0.tgz"; - path = fetchurl { - name = "import_from___import_from_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz"; - sha1 = "M1238qev/VOqpHHUuAId7ja387E="; - }; - } - { - name = "import_local___import_local_2.0.0.tgz"; - path = fetchurl { - name = "import_local___import_local_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; - sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; - }; - } - { - 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"; - sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; - }; - } - { - name = "indexes_of___indexes_of_1.0.1.tgz"; - path = fetchurl { - name = "indexes_of___indexes_of_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "8w9xbI4r00bHtn0985FVZqfAVgc="; - }; - } - { - name = "infer_owner___infer_owner_1.0.4.tgz"; - path = fetchurl { - name = "infer_owner___infer_owner_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; - }; - } - { - 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.1.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; - sha1 = "sX0I0ya0Qj5Wjv9xn5GwscvfafE="; - }; - } - { - 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_6.5.2.tgz"; - path = fetchurl { - name = "inquirer___inquirer_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; - }; - } - { - name = "inquirer___inquirer_7.3.3.tgz"; - path = fetchurl { - name = "inquirer___inquirer_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz"; - sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; - }; - } - { - name = "internal_ip___internal_ip_4.3.0.tgz"; - path = fetchurl { - name = "internal_ip___internal_ip_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz"; - sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; - }; - } - { - 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 = "ip_regex___ip_regex_2.1.0.tgz"; - path = fetchurl { - name = "ip_regex___ip_regex_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "+ni/XS5pE8kRzp+BnuUUa7bYROk="; - }; - } - { - name = "ip___ip_1.1.5.tgz"; - path = fetchurl { - name = "ip___ip_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; - sha1 = "vd7XARQpCCjAoDnnLvJfWq7ENUo="; - }; - } - { - 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_absolute_url___is_absolute_url_2.1.0.tgz"; - path = fetchurl { - name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; - sha1 = "UFMN+4T8yap9vnhS6Do3uTufKqY="; - }; - } - { - name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; - path = fetchurl { - name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; - sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; - }; - } - { - 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_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_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_arrayish___is_arrayish_0.3.2.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; - }; - } - { - 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_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_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.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_1.2.1.tgz"; - path = fetchurl { - name = "is_ci___is_ci_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz"; - sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg=="; - }; - } - { - name = "is_color_stop___is_color_stop_1.1.0.tgz"; - path = fetchurl { - name = "is_color_stop___is_color_stop_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz"; - sha1 = "z/9HGu5N1cnhWFmPvhKWe1za00U="; - }; - } - { - name = "is_core_module___is_core_module_2.8.1.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.8.1.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; - }; - } - { - 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_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_directory___is_directory_0.3.1.tgz"; - path = fetchurl { - name = "is_directory___is_directory_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "YTObbyR1/Hcv2cnYP1yFddwVSuE="; - }; - } - { - 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_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_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"; - sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; - }; - } - { - 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_3.1.0.tgz"; - path = fetchurl { - name = "is_glob___is_glob_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "e6WuJCF4BKxwcHuWkiVnSGzD6Eo="; - }; - } - { - 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_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.6.tgz"; - path = fetchurl { - name = "is_number_object___is_number_object_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz"; - sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; - }; - } - { - 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_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_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_2.2.0.tgz"; - path = fetchurl { - name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; - }; - } - { - name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; - path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; - sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; - }; - } - { - name = "is_path_inside___is_path_inside_2.1.0.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; - sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; - }; - } - { - 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"; - sha1 = "caUMhCnfync8kqOQpKA7OfzVHT4="; - }; - } - { - name = "is_plain_obj___is_plain_obj_3.0.0.tgz"; - path = fetchurl { - name = "is_plain_obj___is_plain_obj_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz"; - sha512 = "gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="; - }; - } - { - 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_promise___is_promise_1.0.1.tgz"; - path = fetchurl { - name = "is_promise___is_promise_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-1.0.1.tgz"; - sha1 = "MVc3YcBX4zwukaq56W2gjO++duU="; - }; - } - { - 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_resolvable___is_resolvable_1.1.0.tgz"; - path = fetchurl { - name = "is_resolvable___is_resolvable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; - }; - } - { - name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; - path = fetchurl { - name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; - sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; - }; - } - { - 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"; - sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; - }; - } - { - 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"; - sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; - }; - } - { - 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_1.1.0.tgz"; - path = fetchurl { - name = "is_wsl___is_wsl_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz"; - sha1 = "HxbkqiKwTRM2tmGIpmrzxgDDpm0="; - }; - } - { - 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_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 = "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"; - sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; - }; - } - { - 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 = "javascript_stringify___javascript_stringify_2.1.0.tgz"; - path = fetchurl { - name = "javascript_stringify___javascript_stringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz"; - sha512 = "JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="; - }; - } - { - name = "js_base64___js_base64_2.6.4.tgz"; - path = fetchurl { - name = "js_base64___js_base64_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz"; - sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; - }; - } - { - name = "js_message___js_message_1.0.7.tgz"; - path = fetchurl { - name = "js_message___js_message_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz"; - sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; - }; - } - { - name = "js_queue___js_queue_2.0.2.tgz"; - path = fetchurl { - name = "js_queue___js_queue_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.2.tgz"; - sha512 = "pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA=="; - }; - } - { - 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.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 = "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_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"; - 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_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___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"; - sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; - }; - } - { - 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 = "json3___json3_3.3.3.tgz"; - path = fetchurl { - name = "json3___json3_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz"; - sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; - }; - } - { - name = "json5___json5_0.5.1.tgz"; - path = fetchurl { - name = "json5___json5_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz"; - sha1 = "Hq3nrMASA0rYTiOWdn6tn6VJWCE="; - }; - } - { - 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.0.tgz"; - path = fetchurl { - name = "json5___json5_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; - sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; - }; - } - { - 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.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 = "killable___killable_1.0.1.tgz"; - path = fetchurl { - name = "killable___killable_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz"; - sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; - }; - } - { - 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 = "launch_editor_middleware___launch_editor_middleware_2.3.0.tgz"; - path = fetchurl { - name = "launch_editor_middleware___launch_editor_middleware_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.3.0.tgz"; - sha512 = "GJR64trLdFFwCoL9DMn/d1SZX0OzTDPixu4mcfWTShQ4tIqCHCGvlg9fOEYQXyBlrSMQwylsJfUWncheShfV2w=="; - }; - } - { - name = "launch_editor___launch_editor_2.3.0.tgz"; - path = fetchurl { - name = "launch_editor___launch_editor_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.3.0.tgz"; - sha512 = "3QrsCXejlWYHjBPFXTyGNhPj4rrQdB+5+r5r3wArpLH201aR+nWUgw/zKKkTmilCfY/sv6u8qo98pNvtg8LUTA=="; - }; - } - { - 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.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 = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; - path = fetchurl { - name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; - sha512 = "ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA=="; - }; - } - { - name = "loader_runner___loader_runner_2.4.0.tgz"; - path = fetchurl { - name = "loader_runner___loader_runner_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; - sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; - }; - } - { - name = "loader_utils___loader_utils_0.2.17.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_0.2.17.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz"; - sha1 = "+G5jdNQyBabmxg6RlvF8Apm/s0g="; - }; - } - { - name = "loader_utils___loader_utils_1.4.0.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; - }; - } - { - name = "loader_utils___loader_utils_2.0.2.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; - }; - } - { - 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"; - sha1 = "K1aLJl7slExtnA3pw9u7ygNUzY4="; - }; - } - { - 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 = "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.defaultsdeep___lodash.defaultsdeep_4.6.1.tgz"; - path = fetchurl { - name = "lodash.defaultsdeep___lodash.defaultsdeep_4.6.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; - sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; - }; - } - { - name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; - path = fetchurl { - name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; - sha1 = "hImxyw0p/4gZXM7KRI/21swpXDY="; - }; - } - { - name = "lodash.mapvalues___lodash.mapvalues_4.6.0.tgz"; - path = fetchurl { - name = "lodash.mapvalues___lodash.mapvalues_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; - sha1 = "G6+lAF3p3W9PJmaMMMo3IwzJaJw="; - }; - } - { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - path = fetchurl { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "vMbEmkKihA7Zl/Mj6tpezRguC/4="; - }; - } - { - name = "lodash.transform___lodash.transform_4.6.0.tgz"; - path = fetchurl { - name = "lodash.transform___lodash.transform_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz"; - sha1 = "EjBkIvYzJK7YSD0/ODMrX2cFR6A="; - }; - } - { - name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; - path = fetchurl { - name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "0CJTc662Uq3BvILklFM5qEJ1R3M="; - }; - } - { - 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_2.2.0.tgz"; - path = fetchurl { - name = "log_symbols___log_symbols_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; - }; - } - { - name = "loglevel___loglevel_1.8.0.tgz"; - path = fetchurl { - name = "loglevel___loglevel_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz"; - sha512 = "G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA=="; - }; - } - { - name = "lower_case___lower_case_1.1.4.tgz"; - path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "miyr0bno4K6ZOkv31YdcOcQujqw="; - }; - } - { - 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_5.1.1.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - } - { - 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_1.3.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; - sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; - }; - } - { - name = "make_dir___make_dir_2.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; - sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; - }; - } - { - 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 = "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 = "md5.js___md5.js_1.3.5.tgz"; - path = fetchurl { - name = "md5.js___md5.js_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; - sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; - }; - } - { - 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 = "mdn_data___mdn_data_2.0.4.tgz"; - path = fetchurl { - name = "mdn_data___mdn_data_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; - sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; - }; - } - { - 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 = "memory_fs___memory_fs_0.4.1.tgz"; - path = fetchurl { - name = "memory_fs___memory_fs_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz"; - sha1 = "OpoguEYlI+RHz7x+i7gO1me/xVI="; - }; - } - { - name = "memory_fs___memory_fs_0.5.0.tgz"; - path = fetchurl { - name = "memory_fs___memory_fs_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; - sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA=="; - }; - } - { - 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_source_map___merge_source_map_1.1.0.tgz"; - path = fetchurl { - name = "merge_source_map___merge_source_map_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz"; - sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; - }; - } - { - 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 = "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 = "microbuffer___microbuffer_1.0.0.tgz"; - path = fetchurl { - name = "microbuffer___microbuffer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz"; - sha1 = "izgy7UDIfVH0e7I0kTppinVtGdI="; - }; - } - { - 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 = "micromatch___micromatch_4.0.4.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; - }; - } - { - name = "miller_rabin___miller_rabin_4.0.1.tgz"; - path = fetchurl { - name = "miller_rabin___miller_rabin_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; - }; - } - { - name = "mime_db___mime_db_1.51.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.51.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; - }; - } - { - name = "mime_types___mime_types_2.1.34.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.34.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; - }; - } - { - 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_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 = "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 = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; - path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; - sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; - }; - } - { - name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; - path = fetchurl { - name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; - }; - } - { - name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; - path = fetchurl { - name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; - }; - } - { - 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_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.6.tgz"; - path = fetchurl { - name = "minipass___minipass_3.1.6.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz"; - sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; - }; - } - { - name = "mississippi___mississippi_2.0.0.tgz"; - path = fetchurl { - name = "mississippi___mississippi_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz"; - sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw=="; - }; - } - { - name = "mississippi___mississippi_3.0.0.tgz"; - path = fetchurl { - name = "mississippi___mississippi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; - sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; - }; - } - { - 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 = "move_concurrently___move_concurrently_1.0.1.tgz"; - path = fetchurl { - name = "move_concurrently___move_concurrently_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; - sha1 = "viwAX9oy4LKa8fBdfEszIUxwH5I="; - }; - } - { - 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.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 = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; - path = fetchurl { - name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; - sha1 = "iZ8R2WhuXgXLkbNdXw5jt3PPyQE="; - }; - } - { - name = "multicast_dns___multicast_dns_6.2.3.tgz"; - path = fetchurl { - name = "multicast_dns___multicast_dns_6.2.3.tgz"; - url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; - }; - } - { - 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 = "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 = "mz___mz_2.7.0.tgz"; - path = fetchurl { - name = "mz___mz_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; - }; - } - { - name = "nan___nan_2.15.0.tgz"; - path = fetchurl { - name = "nan___nan_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; - sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; - }; - } - { - name = "nanoid___nanoid_3.2.0.tgz"; - path = fetchurl { - name = "nanoid___nanoid_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz"; - sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; - }; - } - { - 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___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"; - sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; - }; - } - { - name = "neatequal___neatequal_1.0.0.tgz"; - path = fetchurl { - name = "neatequal___neatequal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz"; - sha1 = "LuEhG8n6bkxVcV/SELsFYC6xrjs="; - }; - } - { - name = "negotiator___negotiator_0.6.3.tgz"; - path = fetchurl { - name = "negotiator___negotiator_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - } - { - name = "neo_async___neo_async_2.6.2.tgz"; - path = fetchurl { - name = "neo_async___neo_async_2.6.2.tgz"; - url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - } - { - name = "nice_try___nice_try_1.0.5.tgz"; - path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - } - { - name = "no_case___no_case_2.3.2.tgz"; - path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; - }; - } - { - name = "node_forge___node_forge_0.10.0.tgz"; - path = fetchurl { - name = "node_forge___node_forge_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; - sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; - }; - } - { - name = "node_ipc___node_ipc_9.2.1.tgz"; - path = fetchurl { - name = "node_ipc___node_ipc_9.2.1.tgz"; - url = "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz"; - sha512 = "mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ=="; - }; - } - { - name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; - path = fetchurl { - name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; - sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; - }; - } - { - name = "node_releases___node_releases_2.0.1.tgz"; - path = fetchurl { - name = "node_releases___node_releases_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz"; - sha512 = "CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="; - }; - } - { - name = "nodeify___nodeify_1.0.1.tgz"; - path = fetchurl { - name = "nodeify___nodeify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/nodeify/-/nodeify-1.0.1.tgz"; - sha1 = "ZKtpp7268DzhB7TwM1yHwLnpGx0="; - }; - } - { - 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_path___normalize_path_1.0.0.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz"; - sha1 = "MtDkcvkf80VwHBWoMRAY07CpA3k="; - }; - } - { - 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 = "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"; - sha1 = "LRDAa9/TEuqXd2laTShDlFa3WUI="; - }; - } - { - name = "normalize_url___normalize_url_1.9.1.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; - sha1 = "LMDWazHqIwNkWENuNiDYWVTGbDw="; - }; - } - { - name = "normalize_url___normalize_url_3.3.0.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz"; - sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; - }; - } - { - name = "normalize.css___normalize.css_8.0.1.tgz"; - path = fetchurl { - name = "normalize.css___normalize.css_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz"; - sha512 = "qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg=="; - }; - } - { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; - }; - } - { - 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 = "nth_check___nth_check_1.0.2.tgz"; - path = fetchurl { - name = "nth_check___nth_check_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; - sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; - }; - } - { - name = "nth_check___nth_check_2.0.1.tgz"; - path = fetchurl { - name = "nth_check___nth_check_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz"; - sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; - }; - } - { - name = "num2fraction___num2fraction_1.2.2.tgz"; - path = fetchurl { - name = "num2fraction___num2fraction_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz"; - sha1 = "b2gragJ6Tp3fpFZM0lidHU5mnt4="; - }; - } - { - name = "nunjucks___nunjucks_3.2.3.tgz"; - path = fetchurl { - name = "nunjucks___nunjucks_3.2.3.tgz"; - url = "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.3.tgz"; - sha512 = "psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ=="; - }; - } - { - 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_hash___object_hash_1.3.1.tgz"; - path = fetchurl { - name = "object_hash___object_hash_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz"; - sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; - }; - } - { - name = "object_inspect___object_inspect_1.12.0.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz"; - sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; - }; - } - { - 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"; - sha1 = "95xEk68MU3e1n+OdOV5BBC3QRbs="; - }; - } - { - 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.getownpropertydescriptors___object.getownpropertydescriptors_2.1.3.tgz"; - path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"; - sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; - }; - } - { - 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_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 = "obuf___obuf_1.1.2.tgz"; - path = fetchurl { - name = "obuf___obuf_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"; - sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; - }; - } - { - 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 = "on_headers___on_headers_1.0.2.tgz"; - path = fetchurl { - name = "on_headers___on_headers_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - } - { - 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 = "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___open_6.4.0.tgz"; - path = fetchurl { - name = "open___open_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz"; - sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; - }; - } - { - name = "opener___opener_1.5.2.tgz"; - path = fetchurl { - name = "opener___opener_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; - sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; - }; - } - { - name = "opn___opn_5.5.0.tgz"; - path = fetchurl { - name = "opn___opn_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz"; - sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; - }; - } - { - 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 = "ora___ora_3.4.0.tgz"; - path = fetchurl { - name = "ora___ora_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz"; - sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; - }; - } - { - name = "original___original_1.0.2.tgz"; - path = fetchurl { - name = "original___original_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz"; - sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; - }; - } - { - name = "os_browserify___os_browserify_0.3.0.tgz"; - path = fetchurl { - name = "os_browserify___os_browserify_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "hUNzx/XCMVkU/Jv8a9gjj92h7Cc="; - }; - } - { - 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 = "p_finally___p_finally_1.0.0.tgz"; - path = fetchurl { - name = "p_finally___p_finally_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; - }; - } - { - name = "p_finally___p_finally_2.0.1.tgz"; - path = fetchurl { - name = "p_finally___p_finally_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz"; - sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; - }; - } - { - 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_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"; - sha1 = "IKAQOyIqcMj9OcwuWAaA893l7EM="; - }; - } - { - 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_map___p_map_2.1.0.tgz"; - path = fetchurl { - name = "p_map___p_map_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; - sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; - }; - } - { - name = "p_retry___p_retry_3.0.1.tgz"; - path = fetchurl { - name = "p_retry___p_retry_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; - sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; - }; - } - { - 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"; - sha1 = "y8ec26+P1CKOE/Yh8rGiN8GyB7M="; - }; - } - { - 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 = "pace_js___pace_js_1.2.4.tgz"; - path = fetchurl { - name = "pace_js___pace_js_1.2.4.tgz"; - url = "https://registry.npmmirror.com/pace-js/-/pace-js-1.2.4.tgz"; - sha512 = "qnCxtvUoY9yHId0AwMQCVmWltb698GiuVArmDbQzonTu9QCo0SgWUVnX9jB9mi+/FUSWvQULBPxUAAo/kLrh1A=="; - }; - } - { - 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 = "parallel_transform___parallel_transform_1.2.0.tgz"; - path = fetchurl { - name = "parallel_transform___parallel_transform_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; - sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; - }; - } - { - name = "param_case___param_case_2.1.1.tgz"; - path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "35T9jPZTHs915r75oIWPvHK+Ikc="; - }; - } - { - 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_asn1___parse_asn1_5.1.6.tgz"; - path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.6.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; - sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; - }; - } - { - name = "parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "vjX1Qlvh9/bHRxhPmKeIy5lHfuA="; - }; - } - { - 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_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; - path = fetchurl { - name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; - sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; - }; - } - { - name = "parse5___parse5_5.1.1.tgz"; - path = fetchurl { - name = "parse5___parse5_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; - sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; - }; - } - { - name = "parse5___parse5_6.0.1.tgz"; - path = fetchurl { - name = "parse5___parse5_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; - }; - } - { - 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_browserify___path_browserify_0.0.1.tgz"; - path = fetchurl { - name = "path_browserify___path_browserify_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; - sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; - }; - } - { - name = "path_dirname___path_dirname_1.0.2.tgz"; - path = fetchurl { - name = "path_dirname___path_dirname_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "zDPSTVJeCZpTiMAzbG4yuRYGCeA="; - }; - } - { - 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"; - sha1 = "D+tsZPD8UY2adU3V77YscCJ2H0s="; - }; - } - { - 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"; - sha1 = "zg6+ql94yxiSXqfYENe1mwEP1RU="; - }; - } - { - 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"; - sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; - }; - } - { - 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"; - sha1 = "NlQX3t5EQw0cEa9hAn+s8HS9/FM="; - }; - } - { - name = "path_key___path_key_2.0.1.tgz"; - path = fetchurl { - name = "path_key___path_key_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; - }; - } - { - 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_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_3.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; - sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; - }; - } - { - name = "pbkdf2___pbkdf2_3.1.2.tgz"; - path = fetchurl { - name = "pbkdf2___pbkdf2_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz"; - sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; - }; - } - { - 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 = "picocolors___picocolors_0.2.1.tgz"; - path = fetchurl { - name = "picocolors___picocolors_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz"; - sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; - }; - } - { - 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"; - sha1 = "7RQaasBDqEnqWISY59yosVMw6Qw="; - }; - } - { - 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"; - sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; - }; - } - { - name = "pify___pify_4.0.1.tgz"; - path = fetchurl { - name = "pify___pify_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; - sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; - }; - } - { - 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"; - sha1 = "ITXW36ejWMBprJsXh3YogihFD/o="; - }; - } - { - 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"; - sha1 = "clVrgM+g1IqXToDnckjoDtT3+HA="; - }; - } - { - name = "pkg_dir___pkg_dir_1.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz"; - sha1 = "ektQio1bstYp1EcFb/TpyTFM89Q="; - }; - } - { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "9tXREJ4Z1j7fQo4L1X4Sd3YVM0s="; - }; - } - { - name = "pkg_dir___pkg_dir_3.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; - sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; - }; - } - { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; - }; - } - { - name = "pngjs___pngjs_5.0.0.tgz"; - path = fetchurl { - name = "pngjs___pngjs_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz"; - sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; - }; - } - { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.7.0.tgz"; - path = fetchurl { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz"; - sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="; - }; - } - { - name = "portfinder___portfinder_1.0.28.tgz"; - path = fetchurl { - name = "portfinder___portfinder_1.0.28.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; - sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; - }; - } - { - 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_calc___postcss_calc_7.0.5.tgz"; - path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz"; - sha512 = "1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="; - }; - } - { - name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; - path = fetchurl { - name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; - sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; - }; - } - { - name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; - path = fetchurl { - name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; - sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; - }; - } - { - name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; - path = fetchurl { - name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; - sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; - }; - } - { - name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; - path = fetchurl { - name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; - sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; - }; - } - { - name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; - path = fetchurl { - name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; - sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; - }; - } - { - name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; - path = fetchurl { - name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; - sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; - }; - } - { - name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; - path = fetchurl { - name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; - sha512 = "/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw=="; - }; - } - { - name = "postcss_loader___postcss_loader_3.0.0.tgz"; - path = fetchurl { - name = "postcss_loader___postcss_loader_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz"; - sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; - }; - } - { - name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; - path = fetchurl { - name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; - sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; - }; - } - { - name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; - path = fetchurl { - name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; - sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; - }; - } - { - name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; - sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; - }; - } - { - name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; - sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; - }; - } - { - name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; - sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; - }; - } - { - name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; - sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; - }; - } - { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; - sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; - }; - } - { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; - sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; - }; - } - { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; - path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; - sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; - }; - } - { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; - sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; - }; - } - { - name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; - path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; - sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; - }; - } - { - name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; - sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; - }; - } - { - name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; - sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; - }; - } - { - name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; - sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; - }; - } - { - name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; - path = fetchurl { - name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; - sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; - }; - } - { - name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; - sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; - }; - } - { - name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; - sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; - }; - } - { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; - sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; - }; - } - { - name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; - sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; - }; - } - { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; - sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; - }; - } - { - name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; - path = fetchurl { - name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; - sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; - }; - } - { - name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; - path = fetchurl { - name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; - sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; - }; - } - { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; - sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; - }; - } - { - name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; - path = fetchurl { - name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; - sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; - }; - } - { - name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; - path = fetchurl { - name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; - sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; - }; - } - { - name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; - path = fetchurl { - name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; - sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; - sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.9.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.9.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz"; - sha512 = "UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ=="; - }; - } - { - name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; - path = fetchurl { - name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; - sha512 = "NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="; - }; - } - { - name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; - path = fetchurl { - name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; - sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; - }; - } - { - name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; - path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; - sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; - }; - } - { - 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_7.0.39.tgz"; - path = fetchurl { - name = "postcss___postcss_7.0.39.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz"; - sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; - }; - } - { - name = "postcss___postcss_8.4.6.tgz"; - path = fetchurl { - name = "postcss___postcss_8.4.6.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz"; - sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; - }; - } - { - 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 = "prepend_http___prepend_http_1.0.4.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "1PRWKwzjaW5BrFLQ4ALlemNdxtw="; - }; - } - { - 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_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 = "prettier___prettier_2.5.1.tgz"; - path = fetchurl { - name = "prettier___prettier_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz"; - sha512 = "vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg=="; - }; - } - { - name = "pretty_error___pretty_error_2.1.2.tgz"; - path = fetchurl { - name = "pretty_error___pretty_error_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz"; - sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="; - }; - } - { - 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"; - sha1 = "czIwDoQBYb2j5podHZGn1LwW8YI="; - }; - } - { - 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 = "promise_inflight___promise_inflight_1.0.1.tgz"; - path = fetchurl { - name = "promise_inflight___promise_inflight_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha1 = "mEcocL8igTL8vdhoEputEsPAKeM="; - }; - } - { - name = "promise___promise_1.3.0.tgz"; - path = fetchurl { - name = "promise___promise_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-1.3.0.tgz"; - sha1 = "5cyaTIJ45GZP/twBx9qEhCsEAXU="; - }; - } - { - name = "proxy_addr___proxy_addr_2.0.7.tgz"; - path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - } - { - name = "prr___prr_1.0.1.tgz"; - path = fetchurl { - name = "prr___prr_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; - sha1 = "0/wRS6BplaRexok/SEzrHXj19HY="; - }; - } - { - 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"; - sha1 = "8FKijacOYYkX7wqKw0wa5aaChrM="; - }; - } - { - 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 = "public_encrypt___public_encrypt_4.0.3.tgz"; - path = fetchurl { - name = "public_encrypt___public_encrypt_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; - }; - } - { - name = "pump___pump_2.0.1.tgz"; - path = fetchurl { - name = "pump___pump_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; - sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; - }; - } - { - 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 = "pumpify___pumpify_1.5.1.tgz"; - path = fetchurl { - name = "pumpify___pumpify_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; - sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; - }; - } - { - name = "punycode___punycode_1.3.2.tgz"; - path = fetchurl { - name = "punycode___punycode_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; - sha1 = "llOgNvt8HuQjQvIyXM7v6jkmxI0="; - }; - } - { - name = "punycode___punycode_1.4.1.tgz"; - path = fetchurl { - name = "punycode___punycode_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; - sha1 = "wNWmOycYgArY4esPpSachN1BhF4="; - }; - } - { - 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 = "q___q_1.5.1.tgz"; - path = fetchurl { - name = "q___q_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; - sha1 = "fjL3W0E4EpHQRhHxvxQQmsAGUdc="; - }; - } - { - name = "qrcode___qrcode_1.5.0.tgz"; - path = fetchurl { - name = "qrcode___qrcode_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.0.tgz"; - sha512 = "9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ=="; - }; - } - { - name = "qs___qs_6.9.6.tgz"; - path = fetchurl { - name = "qs___qs_6.9.6.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; - }; - } - { - 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 = "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"; - sha1 = "u7aTucqRXCMlFbIosaArYJBD2+s="; - }; - } - { - name = "querystring_es3___querystring_es3_0.2.1.tgz"; - path = fetchurl { - name = "querystring_es3___querystring_es3_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "nsYfeQSYdXB9aUFFlv2Qek1xHnM="; - }; - } - { - name = "querystring___querystring_0.2.0.tgz"; - path = fetchurl { - name = "querystring___querystring_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; - sha1 = "sgmEkgO7Jd+CDadW50cAWHhSFiA="; - }; - } - { - 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 = "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 = "randomfill___randomfill_1.0.4.tgz"; - path = fetchurl { - name = "randomfill___randomfill_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; - }; - } - { - 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.2.tgz"; - path = fetchurl { - name = "raw_body___raw_body_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz"; - sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; - }; - } - { - 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_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_1.1.14.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_1.1.14.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "fPTFTvZI44EwhMY23SB54WbAgdk="; - }; - } - { - 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_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 = "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 = "regenerate_unicode_properties___regenerate_unicode_properties_10.0.1.tgz"; - path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"; - sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; - }; - } - { - 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.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 = "regenerator_transform___regenerator_transform_0.14.5.tgz"; - path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; - }; - } - { - 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.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz"; - sha512 = "pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ=="; - }; - } - { - name = "regexpp___regexpp_2.0.1.tgz"; - path = fetchurl { - name = "regexpp___regexpp_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; - sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; - }; - } - { - name = "regexpu_core___regexpu_core_5.0.1.tgz"; - path = fetchurl { - name = "regexpu_core___regexpu_core_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz"; - sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; - }; - } - { - name = "register_service_worker___register_service_worker_1.7.2.tgz"; - path = fetchurl { - name = "register_service_worker___register_service_worker_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.7.2.tgz"; - sha512 = "CiD3ZSanZqcMPRhtfct5K9f7i3OLCcBBWsJjLh1gW9RO/nS94sVzY59iS+fgYBOBqaBpf4EzfqUF3j9IG+xo8A=="; - }; - } - { - name = "regjsgen___regjsgen_0.6.0.tgz"; - path = fetchurl { - name = "regjsgen___regjsgen_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz"; - sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="; - }; - } - { - name = "regjsparser___regjsparser_0.8.4.tgz"; - path = fetchurl { - name = "regjsparser___regjsparser_0.8.4.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz"; - sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="; - }; - } - { - name = "relateurl___relateurl_0.2.7.tgz"; - path = fetchurl { - name = "relateurl___relateurl_0.2.7.tgz"; - url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; - sha1 = "VNvzd+UUQKypCkzSdGANP/LYiKk="; - }; - } - { - 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 = "renderkid___renderkid_2.0.7.tgz"; - path = fetchurl { - name = "renderkid___renderkid_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz"; - sha512 = "oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ=="; - }; - } - { - 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"; - 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 = "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 = "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"; - sha1 = "kl0mAdOaxIXgkc8NpcbmlNw9yv8="; - }; - } - { - name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; - path = fetchurl { - name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; - sha1 = "AKn3OHVW4nA46uIyyqNypqWbZlo="; - }; - } - { - name = "resolve_from___resolve_from_3.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "six699nWiBvItuZTM17rywoYh0g="; - }; - } - { - 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.22.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.22.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; - }; - } - { - 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 = "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 = "retry___retry_0.12.0.tgz"; - path = fetchurl { - name = "retry___retry_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; - sha1 = "G0KmJmoh8HQh0bC1S33BZ7AcATs="; - }; - } - { - name = "rgb_regex___rgb_regex_1.0.1.tgz"; - path = fetchurl { - name = "rgb_regex___rgb_regex_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz"; - sha1 = "wODWiC3w4jviVKR16O3UGRX+rrE="; - }; - } - { - name = "rgba_regex___rgba_regex_1.0.0.tgz"; - path = fetchurl { - name = "rgba_regex___rgba_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz"; - sha1 = "QzdOLiyglosO8VI0YLfXMP8i7rM="; - }; - } - { - name = "rimraf___rimraf_2.6.3.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; - }; - } - { - 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 = "ripemd160___ripemd160_2.0.2.tgz"; - path = fetchurl { - name = "ripemd160___ripemd160_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; - sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; - }; - } - { - 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_queue___run_queue_1.0.3.tgz"; - path = fetchurl { - name = "run_queue___run_queue_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; - sha1 = "6Eg5bwV9Ij8kOGkkYY4laUFh7Ec="; - }; - } - { - name = "rxjs___rxjs_6.6.7.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.6.7.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; - sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; - }; - } - { - 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.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 = "sass_loader___sass_loader_8.0.2.tgz"; - path = fetchurl { - name = "sass_loader___sass_loader_8.0.2.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz"; - sha512 = "7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ=="; - }; - } - { - name = "sass___sass_1.49.7.tgz"; - path = fetchurl { - name = "sass___sass_1.49.7.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz"; - sha512 = "13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ=="; - }; - } - { - 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 = "schema_utils___schema_utils_0.4.7.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_0.4.7.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz"; - sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; - }; - } - { - name = "schema_utils___schema_utils_1.0.0.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; - sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; - }; - } - { - name = "schema_utils___schema_utils_2.7.1.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; - }; - } - { - name = "schema_utils___schema_utils_3.1.1.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; - sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; - }; - } - { - name = "scrollparent___scrollparent_2.0.1.tgz"; - path = fetchurl { - name = "scrollparent___scrollparent_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/scrollparent/-/scrollparent-2.0.1.tgz"; - sha1 = "cV1bnMV3YPsivczDvvtb/gaxoxc="; - }; - } - { - name = "select_hose___select_hose_2.0.0.tgz"; - path = fetchurl { - name = "select_hose___select_hose_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz"; - sha1 = "Yl2GWPhlr0Psliv8N2o3NZpJlMo="; - }; - } - { - 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 = "selfsigned___selfsigned_1.10.14.tgz"; - path = fetchurl { - name = "selfsigned___selfsigned_1.10.14.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.14.tgz"; - sha512 = "lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA=="; - }; - } - { - 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_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 = "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.2.tgz"; - path = fetchurl { - name = "send___send_0.17.2.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; - }; - } - { - name = "serialize_javascript___serialize_javascript_1.9.1.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; - sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; - }; - } - { - 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 = "serve_index___serve_index_1.9.1.tgz"; - path = fetchurl { - name = "serve_index___serve_index_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz"; - sha1 = "03aNabHn2C5c4FD/9bRTvqEqkjk="; - }; - } - { - name = "serve_static___serve_static_1.14.2.tgz"; - path = fetchurl { - name = "serve_static___serve_static_1.14.2.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; - }; - } - { - 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.0.tgz"; - path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; - }; - } - { - name = "setprototypeof___setprototypeof_1.2.0.tgz"; - path = fetchurl { - name = "setprototypeof___setprototypeof_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - } - { - name = "sha.js___sha.js_2.4.11.tgz"; - path = fetchurl { - name = "sha.js___sha.js_2.4.11.tgz"; - url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; - }; - } - { - name = "shallow_clone___shallow_clone_3.0.1.tgz"; - path = fetchurl { - name = "shallow_clone___shallow_clone_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; - sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; - }; - } - { - name = "shebang_command___shebang_command_1.2.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; - }; - } - { - 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_1.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; - }; - } - { - 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.3.tgz"; - path = fetchurl { - name = "shell_quote___shell_quote_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz"; - sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; - }; - } - { - 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_swizzle___simple_swizzle_0.2.2.tgz"; - path = fetchurl { - name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "pNprY1/8zMoz9w0Xy5JZLeleVXo="; - }; - } - { - name = "slash___slash_1.0.0.tgz"; - path = fetchurl { - name = "slash___slash_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; - sha1 = "xB8vbDn8FtHNF61LXYlhFK5HDVU="; - }; - } - { - name = "slash___slash_2.0.0.tgz"; - path = fetchurl { - name = "slash___slash_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz"; - sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; - }; - } - { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; - }; - } - { - 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 = "sockjs_client___sockjs_client_1.5.2.tgz"; - path = fetchurl { - name = "sockjs_client___sockjs_client_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz"; - sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; - }; - } - { - name = "sockjs___sockjs_0.3.24.tgz"; - path = fetchurl { - name = "sockjs___sockjs_0.3.24.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz"; - sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; - }; - } - { - 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"; - sha1 = "RBttTTRnmPG05J6JIK37oOVD+a0="; - }; - } - { - name = "source_list_map___source_list_map_2.0.1.tgz"; - path = fetchurl { - name = "source_list_map___source_list_map_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz"; - sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; - }; - } - { - 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"; - 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 = "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 = "spdy_transport___spdy_transport_3.0.0.tgz"; - path = fetchurl { - name = "spdy_transport___spdy_transport_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; - }; - } - { - name = "spdy___spdy_4.0.2.tgz"; - path = fetchurl { - name = "spdy___spdy_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; - sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; - }; - } - { - 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.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 = "ssri___ssri_5.3.0.tgz"; - path = fetchurl { - name = "ssri___ssri_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz"; - sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; - }; - } - { - name = "ssri___ssri_6.0.2.tgz"; - path = fetchurl { - name = "ssri___ssri_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; - sha512 = "cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q=="; - }; - } - { - name = "ssri___ssri_8.0.1.tgz"; - path = fetchurl { - name = "ssri___ssri_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz"; - sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; - }; - } - { - 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 = "stackframe___stackframe_1.2.0.tgz"; - path = fetchurl { - name = "stackframe___stackframe_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz"; - sha512 = "GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="; - }; - } - { - 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 = "stream_each___stream_each_1.2.3.tgz"; - path = fetchurl { - name = "stream_each___stream_each_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; - sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; - }; - } - { - name = "stream_http___stream_http_2.8.3.tgz"; - path = fetchurl { - name = "stream_http___stream_http_2.8.3.tgz"; - url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz"; - sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; - }; - } - { - name = "stream_shift___stream_shift_1.0.1.tgz"; - path = fetchurl { - name = "stream_shift___stream_shift_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; - }; - } - { - 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"; - sha1 = "J5siXfHVgrH1TmWt3UNS4Y+qBxM="; - }; - } - { - 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_3.1.0.tgz"; - path = fetchurl { - name = "string_width___string_width_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; - }; - } - { - 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.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; - path = fetchurl { - name = "string.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz"; - sha1 = "jZeDM8C8klOPUPOD5IiPPlYZ1lM="; - }; - } - { - name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; - path = fetchurl { - name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; - sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; - }; - } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; - }; - } - { - 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_5.2.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; - }; - } - { - 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_eof___strip_eof_1.0.0.tgz"; - path = fetchurl { - name = "strip_eof___strip_eof_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; - }; - } - { - 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_2.0.0.tgz"; - path = fetchurl { - name = "strip_indent___strip_indent_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz"; - sha1 = "XvjbKV0B5u1sv3qrlpmNeCJSe2g="; - }; - } - { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; - }; - } - { - name = "stylehacks___stylehacks_4.0.3.tgz"; - path = fetchurl { - name = "stylehacks___stylehacks_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz"; - sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; - }; - } - { - 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_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; - }; - } - { - 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_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_pathdata___svg_pathdata_5.0.5.tgz"; - path = fetchurl { - name = "svg_pathdata___svg_pathdata_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; - sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; - }; - } - { - 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"; - sha1 = "WPcc7jvVGbWdSyqEO2x95krAR2Q="; - }; - } - { - name = "svg2ttf___svg2ttf_5.2.0.tgz"; - path = fetchurl { - name = "svg2ttf___svg2ttf_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz"; - sha512 = "CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA=="; - }; - } - { - name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; - path = fetchurl { - name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz"; - sha512 = "mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ=="; - }; - } - { - name = "svgo___svgo_1.3.2.tgz"; - path = fetchurl { - name = "svgo___svgo_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; - sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; - }; - } - { - name = "svgpath___svgpath_2.5.0.tgz"; - path = fetchurl { - name = "svgpath___svgpath_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/svgpath/-/svgpath-2.5.0.tgz"; - sha512 = "o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw=="; - }; - } - { - name = "table___table_5.4.6.tgz"; - path = fetchurl { - name = "table___table_5.4.6.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; - }; - } - { - name = "tapable___tapable_1.1.3.tgz"; - path = fetchurl { - name = "tapable___tapable_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; - sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; - }; - } - { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; - path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; - sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; - }; - } - { - name = "terser___terser_4.8.0.tgz"; - path = fetchurl { - name = "terser___terser_4.8.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; - sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; - }; - } - { - 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"; - sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; - }; - } - { - name = "thenify_all___thenify_all_1.6.0.tgz"; - path = fetchurl { - name = "thenify_all___thenify_all_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "GhkY1ALY/D+Y+/I02wvMjMEOlyY="; - }; - } - { - name = "thenify___thenify_3.3.1.tgz"; - path = fetchurl { - name = "thenify___thenify_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz"; - sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; - }; - } - { - name = "thread_loader___thread_loader_2.1.3.tgz"; - path = fetchurl { - name = "thread_loader___thread_loader_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz"; - sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; - }; - } - { - name = "thro_debs___thro_debs_1.0.7.tgz"; - path = fetchurl { - name = "thro_debs___thro_debs_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/thro-debs/-/thro-debs-1.0.7.tgz"; - sha512 = "/LDfLEdlIscZ7DerWP75GpETmPqJtnNK5tZuVowZCemFbCKas4sztADrM3FSW8UeoZEl3SV6tWhy6NPsIA1ZVw=="; - }; - } - { - 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"; - sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; - }; - } - { - name = "thunky___thunky_1.1.0.tgz"; - path = fetchurl { - name = "thunky___thunky_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; - sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; - }; - } - { - name = "timers_browserify___timers_browserify_2.0.12.tgz"; - path = fetchurl { - name = "timers_browserify___timers_browserify_2.0.12.tgz"; - url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz"; - sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="; - }; - } - { - name = "timsort___timsort_0.3.0.tgz"; - path = fetchurl { - name = "timsort___timsort_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; - sha1 = "QFQRqOfmM5/mTbmiNN4R3DHgK9Q="; - }; - } - { - 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 = "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_arraybuffer___to_arraybuffer_1.0.1.tgz"; - path = fetchurl { - name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; - sha1 = "fSKbH8xjfkZsoIEYCDanqr/4P0M="; - }; - } - { - 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_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 = "toidentifier___toidentifier_1.0.1.tgz"; - path = fetchurl { - name = "toidentifier___toidentifier_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - } - { - name = "toposort___toposort_1.0.7.tgz"; - path = fetchurl { - name = "toposort___toposort_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz"; - sha1 = "LmhELZ9k7HILjMieZEOsbKqVACk="; - }; - } - { - 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 = "tryer___tryer_1.0.1.tgz"; - path = fetchurl { - name = "tryer___tryer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz"; - sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; - }; - } - { - name = "ts_pnp___ts_pnp_1.2.0.tgz"; - path = fetchurl { - name = "ts_pnp___ts_pnp_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz"; - sha512 = "csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="; - }; - } - { - 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.npmmirror.com/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - } - { - name = "ttf2eot___ttf2eot_2.0.0.tgz"; - path = fetchurl { - name = "ttf2eot___ttf2eot_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz"; - sha1 = "jmM3pYWr0WCKDISVirSDzmn2ZUs="; - }; - } - { - name = "ttf2woff2_no_gyp___ttf2woff2_no_gyp_4.0.6.tgz"; - path = fetchurl { - name = "ttf2woff2_no_gyp___ttf2woff2_no_gyp_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/ttf2woff2-no-gyp/-/ttf2woff2-no-gyp-4.0.6.tgz"; - sha512 = "6IVFyCeh1rGwPYr5vrviHOh/yfMD3+g+Ue1bm1zjtoQfPjcJLAD6HLYX1OmtYaw383IsHiHQFtcxtUY8FGqU/w=="; - }; - } - { - name = "ttf2woff___ttf2woff_2.0.2.tgz"; - path = fetchurl { - name = "ttf2woff___ttf2woff_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz"; - sha512 = "X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA=="; - }; - } - { - name = "tty_browserify___tty_browserify_0.0.0.tgz"; - path = fetchurl { - name = "tty_browserify___tty_browserify_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz"; - sha1 = "oVe6QC2iTpv5V/mqadUk7tQpAaY="; - }; - } - { - 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_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_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 = "uglify_es___uglify_es_3.3.9.tgz"; - path = fetchurl { - name = "uglify_es___uglify_es_3.3.9.tgz"; - url = "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz"; - sha512 = "r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ=="; - }; - } - { - name = "uglify_js___uglify_js_3.4.10.tgz"; - path = fetchurl { - name = "uglify_js___uglify_js_3.4.10.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz"; - sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; - }; - } - { - name = "uglifyjs_webpack_plugin___uglifyjs_webpack_plugin_1.3.0.tgz"; - path = fetchurl { - name = "uglifyjs_webpack_plugin___uglifyjs_webpack_plugin_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz"; - sha512 = "ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw=="; - }; - } - { - name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; - path = fetchurl { - name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; - }; - } - { - 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.0.0.tgz"; - path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; - sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; - }; - } - { - 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 = "uniq___uniq_1.0.1.tgz"; - path = fetchurl { - name = "uniq___uniq_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; - sha1 = "sxxa6CVIRKOoKBVBzisEuGWnNP8="; - }; - } - { - name = "uniqs___uniqs_2.0.0.tgz"; - path = fetchurl { - name = "uniqs___uniqs_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; - sha1 = "/+3ks2slKQaW5uFl1KWe25mOawI="; - }; - } - { - name = "unique_filename___unique_filename_1.1.1.tgz"; - path = fetchurl { - name = "unique_filename___unique_filename_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; - sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; - }; - } - { - name = "unique_slug___unique_slug_2.0.2.tgz"; - path = fetchurl { - name = "unique_slug___unique_slug_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; - sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; - }; - } - { - 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 = "unquote___unquote_1.1.1.tgz"; - path = fetchurl { - name = "unquote___unquote_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; - sha1 = "j97XMk7G6IoP+LkF58CYzcCG1UQ="; - }; - } - { - 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 = "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 = "upper_case___upper_case_1.1.3.tgz"; - path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "9rRQHC7EzdJrp4vnIilh3ndiFZg="; - }; - } - { - 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 = "urijs___urijs_1.19.11.tgz"; - path = fetchurl { - name = "urijs___urijs_1.19.11.tgz"; - url = "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz"; - sha512 = "HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="; - }; - } - { - 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 = "url_loader___url_loader_2.3.0.tgz"; - path = fetchurl { - name = "url_loader___url_loader_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz"; - sha512 = "goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog=="; - }; - } - { - name = "url_parse___url_parse_1.5.4.tgz"; - path = fetchurl { - name = "url_parse___url_parse_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz"; - sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg=="; - }; - } - { - name = "url___url_0.11.0.tgz"; - path = fetchurl { - name = "url___url_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; - sha1 = "ODjpfPxgUh63PFJajlW/3Z4uKPE="; - }; - } - { - 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 = "util.promisify___util.promisify_1.0.0.tgz"; - path = fetchurl { - name = "util.promisify___util.promisify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; - }; - } - { - name = "util.promisify___util.promisify_1.0.1.tgz"; - path = fetchurl { - name = "util.promisify___util.promisify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; - sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; - }; - } - { - name = "util___util_0.10.3.tgz"; - path = fetchurl { - name = "util___util_0.10.3.tgz"; - url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; - sha1 = "evsa/lCAUkZInj23/g7TeTNqwPk="; - }; - } - { - name = "util___util_0.11.1.tgz"; - path = fetchurl { - name = "util___util_0.11.1.tgz"; - url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; - sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; - }; - } - { - name = "utila___utila_0.4.0.tgz"; - path = fetchurl { - name = "utila___utila_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz"; - sha1 = "ihagXURWV6Oupe7MWxKk+lN5dyw="; - }; - } - { - 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 = "uuid___uuid_8.3.2.tgz"; - path = fetchurl { - name = "uuid___uuid_8.3.2.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - } - { - 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 = "varstream___varstream_0.3.2.tgz"; - path = fetchurl { - name = "varstream___varstream_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz"; - sha1 = "GKxklHZfP/GjWtmkvgU77BiKXeE="; - }; - } - { - 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 = "vendors___vendors_1.0.4.tgz"; - path = fetchurl { - name = "vendors___vendors_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; - sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; - }; - } - { - 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 = "vm_browserify___vm_browserify_1.1.2.tgz"; - path = fetchurl { - name = "vm_browserify___vm_browserify_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; - }; - } - { - name = "vue_eslint_parser___vue_eslint_parser_5.0.0.tgz"; - path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz"; - sha512 = "JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g=="; - }; - } - { - name = "vue_hot_reload_api___vue_hot_reload_api_2.3.4.tgz"; - path = fetchurl { - name = "vue_hot_reload_api___vue_hot_reload_api_2.3.4.tgz"; - url = "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; - sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; - }; - } - { - name = "vue_i18n___vue_i18n_8.27.0.tgz"; - path = fetchurl { - name = "vue_i18n___vue_i18n_8.27.0.tgz"; - url = "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.0.tgz"; - sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="; - }; - } - { - name = "vue_loader___vue_loader_16.8.3.tgz"; - path = fetchurl { - name = "vue_loader___vue_loader_16.8.3.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.3.tgz"; - sha512 = "7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="; - }; - } - { - name = "vue_loader___vue_loader_15.9.8.tgz"; - path = fetchurl { - name = "vue_loader___vue_loader_15.9.8.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.8.tgz"; - sha512 = "GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="; - }; - } - { - name = "vue_observe_visibility___vue_observe_visibility_0.4.6.tgz"; - path = fetchurl { - name = "vue_observe_visibility___vue_observe_visibility_0.4.6.tgz"; - url = "https://registry.yarnpkg.com/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz"; - sha512 = "xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="; - }; - } - { - name = "vue_resize___vue_resize_0.4.5.tgz"; - path = fetchurl { - name = "vue_resize___vue_resize_0.4.5.tgz"; - url = "https://registry.yarnpkg.com/vue-resize/-/vue-resize-0.4.5.tgz"; - sha512 = "bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="; - }; - } - { - name = "vue_router___vue_router_3.5.3.tgz"; - path = fetchurl { - name = "vue_router___vue_router_3.5.3.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.3.tgz"; - sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; - }; - } - { - name = "vue_style_loader___vue_style_loader_4.1.3.tgz"; - path = fetchurl { - name = "vue_style_loader___vue_style_loader_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz"; - sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; - }; - } - { - name = "vue_template_compiler___vue_template_compiler_2.6.14.tgz"; - path = fetchurl { - name = "vue_template_compiler___vue_template_compiler_2.6.14.tgz"; - url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; - sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; - }; - } - { - name = "vue_template_es2015_compiler___vue_template_es2015_compiler_1.9.1.tgz"; - path = fetchurl { - name = "vue_template_es2015_compiler___vue_template_es2015_compiler_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; - sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; - }; - } - { - name = "vue_virtual_scroller___vue_virtual_scroller_1.0.10.tgz"; - path = fetchurl { - name = "vue_virtual_scroller___vue_virtual_scroller_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-1.0.10.tgz"; - sha512 = "Hn4qSBDhRY4XdngPioYy/ykDjrLX/NMm1fQXm/4UQQ/Xv1x8JbHGFZNftQowTcfICgN7yc31AKnUk1UGLJ2ndA=="; - }; - } - { - name = "vue___vue_2.6.14.tgz"; - path = fetchurl { - name = "vue___vue_2.6.14.tgz"; - url = "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz"; - sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; - }; - } - { - name = "vuex___vuex_3.6.2.tgz"; - path = fetchurl { - name = "vuex___vuex_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz"; - sha512 = "ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="; - }; - } - { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; - path = fetchurl { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"; - sha512 = "nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww=="; - }; - } - { - name = "watchpack___watchpack_1.7.5.tgz"; - path = fetchurl { - name = "watchpack___watchpack_1.7.5.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz"; - sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="; - }; - } - { - name = "wbuf___wbuf_1.7.3.tgz"; - path = fetchurl { - name = "wbuf___wbuf_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz"; - sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; - }; - } - { - 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"; - sha1 = "8LDc+RW8X/FSivrbLA4XtTLaL+g="; - }; - } - { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz"; - path = fetchurl { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz"; - sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA=="; - }; - } - { - name = "webpack_chain___webpack_chain_6.5.1.tgz"; - path = fetchurl { - name = "webpack_chain___webpack_chain_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.5.1.tgz"; - sha512 = "7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="; - }; - } - { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; - path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"; - sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; - }; - } - { - name = "webpack_dev_server___webpack_dev_server_3.11.3.tgz"; - path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.11.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz"; - sha512 = "3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA=="; - }; - } - { - name = "webpack_iconfont_plugin_nodejs___webpack_iconfont_plugin_nodejs_1.0.21.tgz"; - path = fetchurl { - name = "webpack_iconfont_plugin_nodejs___webpack_iconfont_plugin_nodejs_1.0.21.tgz"; - url = "https://registry.yarnpkg.com/webpack-iconfont-plugin-nodejs/-/webpack-iconfont-plugin-nodejs-1.0.21.tgz"; - sha512 = "B46tGXRCiWypnaMmE2QdwPxF++/JC+xQV95teEpl2SRaAU+Pq8NHwuBUd2AkrR4osHOZtf6s8TrlaMGvd1XopA=="; - }; - } - { - name = "webpack_log___webpack_log_2.0.0.tgz"; - path = fetchurl { - name = "webpack_log___webpack_log_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz"; - sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; - }; - } - { - name = "webpack_merge___webpack_merge_4.2.2.tgz"; - path = fetchurl { - name = "webpack_merge___webpack_merge_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz"; - sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; - }; - } - { - name = "webpack_sources___webpack_sources_1.4.3.tgz"; - path = fetchurl { - name = "webpack_sources___webpack_sources_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; - sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; - }; - } - { - name = "webpack___webpack_4.46.0.tgz"; - path = fetchurl { - name = "webpack___webpack_4.46.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz"; - sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; - }; - } - { - name = "websocket_driver___websocket_driver_0.7.4.tgz"; - path = fetchurl { - name = "websocket_driver___websocket_driver_0.7.4.tgz"; - url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; - sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; - }; - } - { - name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; - path = fetchurl { - name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; - sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; - }; - } - { - 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_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"; - sha1 = "2e8H3Od7mQK4o6j6SzHD4/fm6Ho="; - }; - } - { - 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 = "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 = "worker_farm___worker_farm_1.7.0.tgz"; - path = fetchurl { - name = "worker_farm___worker_farm_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; - sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; - }; - } - { - 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"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; - }; - } - { - name = "write___write_1.0.3.tgz"; - path = fetchurl { - name = "write___write_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; - sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; - }; - } - { - name = "ws___ws_6.2.2.tgz"; - path = fetchurl { - name = "ws___ws_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz"; - sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; - }; - } - { - name = "xmldom___xmldom_0.5.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="; - }; - } - { - 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"; - sha1 = "HBH5IY8HYImkfdUS+TxmmaaoHVI="; - }; - } - { - name = "yallist___yallist_3.1.1.tgz"; - path = fetchurl { - name = "yallist___yallist_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - } - { - 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_13.1.2.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.2.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; - }; - } - { - 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___yargs_13.3.2.tgz"; - path = fetchurl { - name = "yargs___yargs_13.3.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; - sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; - }; - } - { - 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_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 = "yorkie___yorkie_2.0.0.tgz"; - path = fetchurl { - name = "yorkie___yorkie_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/yorkie/-/yorkie-2.0.0.tgz"; - sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; - }; - } - ]; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/vegeta/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vegeta/default.nix index 6e7bbaa836..17efa4336b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vegeta/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vegeta/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "vegeta"; - version = "12.8.4"; + version = "12.11.0"; rev = "e04d9c0df8177e8633bff4afe7b39c2f3a9e7dea"; src = fetchFromGitHub { owner = "tsenart"; repo = "vegeta"; rev = "v${version}"; - sha256 = "sha256-FAb7nf6jZju95YEZR1GjPnfbsA5M8NcIKQyc8cgEgWs="; + sha256 = "sha256-dqVwz4nc+QDD5M2ajLtnoEnvaka/n6KxqCvRH63Za4g="; }; - vendorSha256 = "sha256-v9Hu9eQJSmm4Glt49F7EN40rKjrg4acyll9Bfgey+Mw="; + vendorHash = "sha256-Pq8MRfwYhgk5YWEmBisBrV2F7Ztn18MdpRFZ9r/1y7A="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix index f9507cf459..d5fd324719 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vpnc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , makeWrapper, pkg-config, perl -, gawk, gnutls, libgcrypt, openresolv, vpnc-scripts +, gnutls, libgcrypt, vpnc-scripts , opensslSupport ? false, openssl # Distributing this is a GPL violation. }: diff --git a/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix b/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix index bc52bb33e3..c316e98317 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/waitron/default.nix @@ -34,6 +34,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ guibert ]; platforms = platforms.linux; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix index 15dc7b163b..2f74cd86e7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, wireguard-go, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "wg-netmanager"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix index 823987888a..a9843e2efa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wgautomesh/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://git.deuxfleurs.fr/Deuxfleurs/wgautomesh"; license = licenses.agpl3Only; maintainers = [ maintainers.lx ]; + mainProgram = "wgautomesh"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index 6d19aea804..08ef1fdae2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wsl-vpnkit/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wsl-vpnkit/default.nix new file mode 100644 index 0000000000..39152cbab2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/wsl-vpnkit/default.nix @@ -0,0 +1,84 @@ +{ lib +, resholve +, fetchFromGitHub + + # Runtime dependencies +, coreutils +, dnsutils +, gawk +, gnugrep +, gvproxy +, iproute2 +, iptables +, iputils +, wget +}: + +let + version = "0.4.1"; + gvproxyWin = gvproxy.overrideAttrs (_: { + buildPhase = '' + GOARCH=amd64 GOOS=windows go build -ldflags '-s -w' -o bin/gvproxy-windows.exe ./cmd/gvproxy + ''; + }); +in +resholve.mkDerivation { + pname = "wsl-vpnkit"; + inherit version; + + src = fetchFromGitHub { + owner = "sakai135"; + repo = "wsl-vpnkit"; + rev = "v${version}"; + hash = "sha256-Igbr3L2W32s4uBepllSz07bkbI3qwAKMZkBrXLqGrGA="; + }; + + postPatch = '' + substituteInPlace wsl-vpnkit \ + --replace "/app/wsl-vm" "${gvproxy}/bin/gvforwarder" \ + --replace "/app/wsl-gvproxy.exe" "${gvproxyWin}/bin/gvproxy-windows.exe" + ''; + + installPhase = '' + mkdir -p $out/bin + cp wsl-vpnkit $out/bin + ''; + + solutions.wsl-vpnkit = { + scripts = [ "bin/wsl-vpnkit" ]; + interpreter = "none"; + inputs = [ + coreutils + dnsutils + gawk + gnugrep + iproute2 + iptables + iputils + wget + ]; + + keep = { + "$VMEXEC_PATH" = true; + "$GVPROXY_PATH" = true; + }; + + execer = [ + "cannot:${iproute2}/bin/ip" + "cannot:${wget}/bin/wget" + ]; + + fix = { + aliases = true; + ping = "${iputils}/bin/ping"; + }; + }; + + meta = with lib; { + description = "Provides network connectivity to Windows Subsystem for Linux (WSL) when blocked by VPN"; + homepage = "https://github.com/sakai135/wsl-vpnkit"; + changelog = "https://github.com/sakai135/wsl-vpnkit/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ terlar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix index 06c321d99d..ba6175f59b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , python3 +, fetchFromGitHub }: let diff --git a/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix index b7a77f8054..2d197f8504 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -33,10 +33,10 @@ echo "xrdcp failed trying to download any of the urls" >&2 exit $ret fi - '').overrideAttrs (finalAttrs: prevAttrs: + '').overrideAttrs (finalAttrs: if (pname != "" && version != "") then { inherit pname version; - name = with finalAttrs; "${pname}-${version}"; + name = "${pname}-${version}"; } else { name = if (name != "") then name else (baseNameOf finalAttrs.url); }) diff --git a/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix index 0a8b390361..9109b60eaa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-nESTyZHLk0cGOGTSQ2o3lc87aXYGJeez20Ac00LT/FU="; + sha256 = "sha256-k261Kg/TkMHviQxFVCDZXOIAYv4TbsCSfgI+K69Q9Uk="; }; buildInputs = [ jre ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 40901804e9..c761d887e3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -59,10 +59,11 @@ in stdenv.mkDerivation { rustc ]; buildInputs = [ - iproute2 lzo openssl zlib + ] ++ lib.optional stdenv.isLinux [ + iproute2 ]; enableParallelBuilding = true; @@ -96,6 +97,6 @@ in stdenv.mkDerivation { homepage = "https://www.zerotier.com"; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix index 2666a4f0b6..bbd5c2dc26 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, patchelf }: +{ lib, stdenv, fetchzip }: let inherit (stdenv.hostPlatform) system; @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-B2dK4yZPBitt6WT0wBJB2Wvly3ykDlFVZT5409XH7GY="; - aarch64-linux = "sha256-FQ+RvOmB4j3Y67tIx0OqkjFunkhYMNJASZUkTOMxKTU="; - armv7l-linux = "sha256-bRhaF3PaulcjzVxB3kalvHrJKK8sEOnmXJnjBI7yBbk="; + x86_64-linux = "sha256-sHQD8uN8Pm/LnayW1XdWXJ90gN4cCE4sGd+Or4TlhP8="; + aarch64-linux = "sha256-VJaVC+sfqdT0BnV1v8MjzftemP4Iuln1wy3BaCTbeYA="; + armv7l-linux = "sha256-7v9u7OtUbtnzvlTBvO5zuIuTgNqualxYsrv97TZGa9U="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.0"; + version = "0.4.2"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix index 73f114d96e..0e5d59ee8f 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/alejandra/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/kamadorueda/alejandra/blob/${version}/CHANGELOG.md"; license = licenses.unlicense; maintainers = with maintainers; [ _0x4A6F kamadorueda sciencentistguy ]; + mainProgram = "alejandra"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix index 3df316ef9e..0cbf0f6b10 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, nix, openssl, pkg-config, ronn, rustPlatform }: +{ lib, fetchFromGitHub, nix, ronn, rustPlatform }: let blake3-src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/tools/nix/devour-flake/default.nix b/third_party/nixpkgs/pkgs/tools/nix/devour-flake/default.nix new file mode 100644 index 0000000000..a424836535 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/devour-flake/default.nix @@ -0,0 +1,27 @@ +{ writeShellApplication +, fetchFromGitHub +, nix +}: + +let + devour-flake = fetchFromGitHub { + owner = "srid"; + repo = "devour-flake"; + rev = "v2"; + hash = "sha256-CZedJtbZlWAbv/b/aYgOEFd9vcTBn/oJNI3p29UitLk="; + }; +in +writeShellApplication { + name = "devour-flake"; + runtimeInputs = [ nix ]; + text = '' + FLAKE="$1" + shift 1 || true + + nix build ${devour-flake}#default \ + "$@" \ + -L --no-link --print-out-paths \ + --override-input flake "$FLAKE" \ + | xargs cat + ''; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix b/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix index 768a283ebd..6975e61fa6 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "manix"; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix new file mode 100644 index 0000000000..0d881d6976 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixci/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, rustPlatform +, fetchCrate +, libiconv +, openssl +, pkg-config +, Security +, devour-flake +}: + +rustPlatform.buildRustPackage rec { + pname = "nixci"; + version = "0.1.3"; + + src = fetchCrate { + inherit version; + pname = "nixci"; + hash = "sha256-sM/1G1mf+msWbG4CX/pZNt4FmSKR2hWXdcq5h7W1AM0="; + }; + + cargoHash = "sha256-PKBNQKuWV4PE7iSKr+LugayroFjDBT4/vyyjJiw/E+I="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libiconv openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + # The rust program expects an environment (at build time) that points to the + # devour-flake executable. + DEVOUR_FLAKE = lib.getExe devour-flake; + + meta = with lib; { + description = "Define and build CI for Nix projects anywhere"; + homepage = "https://github.com/srid/nixci"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ srid ]; + mainProgram = "nixci"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index 785261a8e0..25771a135b 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "nix-community"; - repo = "nixdoc"; + repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-8pp6xlmdb3kZ6unTiO4yRruyEZ//GIHZF1k8f4kQr9Q="; + sha256 = "sha256-cEMehtxkqXAar/fDy3CnzsDEAuC1ABBaYqzqVBGnTrs="; }; - cargoSha256 = "sha256-k8/+BBMjQCsrgCi33fTdiSukaAZlg6XU3NwXaJdGYVw="; + cargoHash = "sha256-QFDHIqXyTWTdqNrLcwWw3plX6EDH/k043nay5opjtws="; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; meta = with lib; { description = "Generate documentation for Nix functions"; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix index 8a00c15d90..63f2da0df2 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix @@ -63,7 +63,7 @@ in touch $out ''; }; -}).overrideAttrs (o: { +}).overrideAttrs { inherit version; pname = "nixos-install-tools"; -}) +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix index 793f19e533..b7f73c7eb7 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -17,5 +17,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://nix-community.github.io/nixpkgs-fmt"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm ]; + mainProgram = "nixpkgs-fmt"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix b/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix index 96f2f55488..b9b589ebd2 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix @@ -1,7 +1,5 @@ { lib , rustPlatform -, fetchFromGitHub -, nix-gitignore , makeWrapper , stdenv , darwin diff --git a/third_party/nixpkgs/pkgs/tools/nix/web-devmode.nix b/third_party/nixpkgs/pkgs/tools/nix/web-devmode.nix new file mode 100644 index 0000000000..6ebdc31118 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/web-devmode.nix @@ -0,0 +1,117 @@ +{ + pkgs, + # arguments to `nix-build`, e.g. `"foo.nix -A bar"` + buildArgs, + # what path to open a browser at + open, +}: let + inherit (pkgs) lib; + + error_page = pkgs.writeShellScriptBin "error_page" '' + echo " + + + + + 
$1
+ " + ''; + + # The following would have been simpler: + # 1. serve from `$serve` + # 2. pass each build a `--out-link $serve/result` + # But that way live-server does not seem to detect changes and therefore no + # auto-reloads occur. + # Instead, we copy the contents of each build to the `$serve` directory. + # Using rsync here, instead of `cp`, to get as close to an atomic + # directory copy operation as possible. `--delay-updates` should + # also go towards that. + build_and_copy = pkgs.writeShellScriptBin "build_and_copy" '' + set -euxo pipefail + + set +e + stderr=$(2>&1 nix-build --out-link $out_link ${buildArgs}) + exit_status=$? + set -e + + if [ $exit_status -eq 0 ]; + then + # setting permissions to be able to clean up + ${lib.getBin pkgs.rsync}/bin/rsync \ + --recursive \ + --chmod=u=rwX \ + --delete-before \ + --delay-updates \ + $out_link/ \ + $serve/ + else + set +x + ${lib.getBin error_page}/bin/error_page "$stderr" > $error_page_absolute + set -x + + ${lib.getBin pkgs.findutils}/bin/find $serve \ + -type f \ + ! -name $error_page_relative \ + -delete + fi + ''; + + # https://watchexec.github.io/ + watcher = pkgs.writeShellScriptBin "watcher" '' + set -euxo pipefail + + ${lib.getBin pkgs.watchexec}/bin/watchexec \ + --shell=none \ + --restart \ + --print-events \ + ${lib.getBin build_and_copy}/bin/build_and_copy + ''; + + # A Rust alternative to live-server exists, but it was not in nixpkgs. + # `--no-css-inject`: without this it seems that only CSS is auto-reloaded. + # https://www.npmjs.com/package/live-server + server = pkgs.writeShellScriptBin "server" '' + set -euxo pipefail + + ${lib.getBin pkgs.nodePackages_latest.live-server}/bin/live-server \ + --host=127.0.0.1 \ + --verbose \ + --no-css-inject \ + --entry-file=$error_page_relative \ + --open=${open} \ + $serve + ''; + + devmode = + pkgs.writeShellScriptBin "devmode" + '' + set -euxo pipefail + + function handle_exit { + rm -rf "$tmpdir" + } + + tmpdir=$(mktemp -d) + trap handle_exit EXIT + + export out_link="$tmpdir/result" + export serve="$tmpdir/serve" + mkdir $serve + export error_page_relative=error.html + export error_page_absolute=$serve/$error_page_relative + ${lib.getBin error_page}/bin/error_page "building …" > $error_page_absolute + + ${lib.getBin pkgs.parallel}/bin/parallel \ + --will-cite \ + --line-buffer \ + --tagstr '{/}' \ + ::: \ + "${lib.getBin watcher}/bin/watcher" \ + "${lib.getBin server}/bin/server" + ''; +in + devmode diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix index ebd1e15909..901a7aeff2 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix @@ -4,47 +4,38 @@ python3Packages.buildPythonApplication rec { pname = "apkg"; - version = "0.4.0"; + version = "0.4.1"; + format = "pyproject"; src = fetchFromGitLab { domain = "gitlab.nic.cz"; owner = "packaging"; repo = pname; rev = "v${version}"; - sha256 = "duZz2Kwjgek5pMJTDH8gMZAZ13uFwaIYT5E1brW7I7U="; + sha256 = "x7UYkqkF1XJ3OMfQpIQ4+27KI0dLvL42Wms5xQTY/H4="; }; - # TODO: solve this properly. Detection won't work anymore. - postPatch = '' - patch <<-EOF - --- a/setup.py - +++ b/setup.py - @@ -25,1 +25,1 @@ - - version=version, - + version='${version}', - EOF - ''; - propagatedBuildInputs = with python3Packages; [ # copy&pasted requirements.txt (almost exactly) beautifulsoup4 # upstream version detection - blessings # terminal colors + blessed # terminal colors build # apkg distribution - cached-property # @cached_property for python <= 3.7 + cached-property # for python <= 3.7; but pip complains even with 3.8 click # nice CLI framework distro # current distro detection jinja2 # templating packaging # version parsing requests # HTTP for humans™ - setuptools # required by minver toml # config files ]; + nativeBuildInputs = with python3Packages; [ hatchling ]; + makeWrapperArgs = [ # deps for `srcpkg` operation for other distros; could be optional "--prefix" "PATH" ":" (lib.makeBinPath [ gitMinimal rpm dpkg fakeroot ]) ]; - nativeCheckInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest dunamai ]; checkPhase = '' runHook preCheck py.test # inspiration: .gitlab-ci.yml diff --git a/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index 3fa9528add..d11cd16127 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -17,7 +17,7 @@ let }; # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" - appimagekit_squashfuse = squashfuse.overrideAttrs (attrs: rec { + appimagekit_squashfuse = squashfuse.overrideAttrs rec { pname = "squashfuse"; version = "unstable-2016-10-09"; @@ -61,7 +61,7 @@ let cp -v ./.libs/*.a $out/lib cp -v ./*.h $out/include ''; - }); + }; in stdenv.mkDerivation rec { pname = "appimagekit"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix index 48b9f3664e..405c269b22 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-QDwBSnBjtrNMh76nesSwIVKYupvD9NzIcIY3kofp1f0="; + hash = "sha256-CVySyC/O/0zALdrcJHeFm4JjyI0wFdZ5mqcuMwE1my8="; }; nativeBuildInputs = [ @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://salsa.debian.org/apt-team/apt"; description = "Command-line package management tools used on Debian-based systems"; + changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${version}/debian/changelog"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix index 7b04161938..b8701d2ba9 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/comma/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comma"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "comma"; rev = "v${version}"; - hash = "sha256-5HNH/Lqj8OU/piH3tvPRkINXHHkt6bRp0QYYR4xOybE="; + hash = "sha256-x2HVm2vcEFHDrCQLIp5QzNsDARcbBfPdaIMLWVNfi4c="; }; - cargoHash = "sha256-4Epy5ZPyitRVTHEFVlRo66GvxJVBddlOII/7yqjuK9k="; + cargoHash = "sha256-N6Bc0+m0Qz1c/80oLvQTj8gvMusPXIriegNlRYWWStU="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix index dedb57960b..27f055c089 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, dysnomia, libintl, libiconv }: stdenv.mkDerivation rec { pname = "disnix"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix index 087bde2cbb..7dbc07dbc1 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.0.15"; + version = "5.1.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-0MR9CJDFL1vbuO7FZyyn3PNb0p27oaho6I2eminTyYU="; + hash = "sha256-Bwr/qQ6ri1c3tTYlFG28TzUpZCw4qqhO+ba67EAeBTY="; }; nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/fusesoc/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/fusesoc/default.nix index 92a8dc1807..99926fd5c0 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/fusesoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/fusesoc/default.nix @@ -4,7 +4,6 @@ , verilog , verilator , gnumake -, gcc , edalize , fastjsonschema , pyparsing diff --git a/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix index 5b815261fb..cee9301d59 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix @@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nix-community/harmonia"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; + mainProgram = "harmonia"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix index a6effa921b..6fa3887b9e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix @@ -54,6 +54,6 @@ buildGoModule rec { description = "Cross-distribution system package compiler"; homepage = "https://holocm.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index 89a626fef6..c65b244cb9 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -14,7 +14,7 @@ , unstableGitUpdater }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "home-manager"; version = "2023-05-30"; @@ -89,4 +89,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ AndersonTorres ]; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix index efbf2037f2..130e36c858 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-update"; - version = "0.19.0"; + version = "0.19.2"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - hash = "sha256-v58x48la837gbqMaQ6PEl9Ick1NH+Y4okf2yttDzqC4="; + hash = "sha256-FyQcsKCHsAB8BmPxeIZdiidaxyNi/5bFA/ilGydDVM0="; }; makeWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix index 19b8d77bb4..609d0da08a 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix @@ -132,6 +132,10 @@ self = stdenv.mkDerivation { (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic") ]; + postPatch = '' + patchShebangs --build tests + ''; + preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 @@ -237,6 +241,7 @@ self = stdenv.mkDerivation { maintainers = with maintainers; [ eelco lovesegfault artturin ]; platforms = platforms.unix; outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + mainProgram = "nix"; }; }; in self diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index 5b2fa00291..6ff28eb4e6 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -76,10 +76,10 @@ let aws-sdk-cpp-nix = (aws-sdk-cpp.override { apis = [ "s3" "transfer" ]; customMemoryManagement = false; - }).overrideAttrs (args: { + }).overrideAttrs { # only a stripped down version is build which takes a lot less resources to build requiredSystemFeatures = [ ]; - }); + }; common = args: @@ -186,6 +186,11 @@ in lib.makeExtensible (self: ({ hash = "sha256-/XCWa2osNFIpPC5MkxlX6qTZf/DaTLwS3LWN0SRFiuU="; }; + nix_2_17 = common { + version = "2.17.0"; + hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8="; + }; + # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, # making this package an inaccurate representation of what features are available @@ -205,7 +210,7 @@ in lib.makeExtensible (self: ({ stable = self.nix_2_15; - unstable = self.nix_2_16; + unstable = self.nix_2_17; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index 0c2cbca1ce..bd5e31ff6b 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -43,6 +43,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Mic92/nixpkgs-review"; changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ figsoda mic92 SuperSandro2000 ]; + maintainers = with maintainers; [ figsoda mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix index 517abf26f9..f9a7fcdcde 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pacman/default.nix @@ -106,6 +106,8 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + hardeningDisable = [ "fortify3" ]; + postInstall = '' installShellCompletion --bash scripts/pacman --zsh scripts/_pacman wrapProgram $out/bin/makepkg \ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix index 01eda1ea05..dba9d11b47 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix @@ -1,4 +1,10 @@ -{ lib, python3, fetchFromGitHub, fetchPypi }: +{ lib +, stdenv +, python3 +, fetchFromGitHub +, fetchPypi +, nix-update-script +}: let python = python3.override { # override resolvelib due to @@ -7,7 +13,7 @@ let # 3. Ansible being unable to upgrade to a later version of resolvelib # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 packageOverrides = self: super: { - resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec { + resolvelib = super.resolvelib.overridePythonAttrs rec { version = "1.0.1"; src = fetchFromGitHub { owner = "sarugaku"; @@ -15,7 +21,7 @@ let rev = "/refs/tags/${version}"; hash = "sha256-oxyPn3aFPOyx/2aP7Eg2ThtPbyzrFT1JzWqy6GqNbzM="; }; - }); + }; }; self = python; }; @@ -24,13 +30,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.7.0"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4dyu/neMFX/U1RuI0ZEBzdbONIHvdWyvpy1Gu5iMAcg="; + hash = "sha256-BgsWKP2kZfLEHgZNISyp66Yww0ajMF4RWuI6TCzwJNo="; }; nativeBuildInputs = [ @@ -39,8 +45,8 @@ buildPythonApplication rec { propagatedBuildInputs = [ blinker - cacheyou certifi + cachecontrol findpython installer packaging @@ -69,7 +75,7 @@ buildPythonApplication rec { pytest-rerunfailures pytest-xdist pytest-httpserver - ]; + ] ++ lib.optional stdenv.isLinux first; pytestFlagsArray = [ "-m 'not network'" @@ -89,6 +95,8 @@ buildPythonApplication rec { __darwinAllowLocalNetworking = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://pdm.fming.dev"; changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix index 5a67e00363..25c3fd1343 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.19.1"; + version = "1.20.4"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "WHR2evPn4Y0wzGwVUEuYPrDDnuPSsYHr4xIofAHeTJk="; + sha256 = "sha256-GW29jbFt68ITJfmuxkwl8c39mA+ObYiV6NeT/OXPlyM="; }; setOutputFlags = false; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/reuse/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/reuse/default.nix index 11d08c0dfd..8ba5be3e77 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/reuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/reuse/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "reuse"; - version = "1.1.2"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-J+zQrokrAX5tRU/2RPPSaFDyfsACPHHQYbK5sO99CMs="; + hash = "sha256-MEQiuBxe/ctHlAnmLhQY4QH62uAcHb7CGfZz+iZCRSk="; }; nativeBuildInputs = with python3Packages; [ @@ -22,12 +22,15 @@ python3Packages.buildPythonApplication rec { debian jinja2 license-expression - setuptools - setuptools-scm ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + disabledTestPaths = [ + # pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError() + "src/reuse" + ]; + meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; homepage = "https://github.com/fsfe/reuse-tool"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix index 7cb1dd91c2..9418244212 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,22 +1,22 @@ { stdenv, lib -, pkg-config, autoreconfHook +, pkg-config, autoreconfHook, pandoc , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages , sqlite, zstd, libcap }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.18.0"; + version = "4.18.1"; src = fetchurl { url = "https://ftp.osuosl.org/pub/rpm/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - hash = "sha256-KhcVLXGHqzDt8sL7WGRjvfY4jee1g3SAlVZZ5ekFRVQ="; + hash = "sha256-N/O0LAlmlB4q0/EP3jY5gkplkdBxl7qP0IacoHeeH1Y="; }; outputs = [ "out" "dev" "man" ]; separateDebugInfo = true; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config pandoc ]; buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optional stdenv.isLinux libcap; diff --git a/third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix b/third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix new file mode 100644 index 0000000000..6ed6b526b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/age-plugin-ledger/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, libusb1 +, openssl +, rage +, AppKit +}: + +rustPlatform.buildRustPackage rec { + pname = "age-plugin-ledger"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "Ledger-Donjon"; + repo = "age-plugin-ledger"; + rev = "v${version}"; + hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg="; + }; + + cargoHash = "sha256-SbgH67XuxBa7WFirSdOIUxfJGlIYezISCEA3LJGN3ys="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libusb1 + openssl + ] ++ lib.optional stdenv.isDarwin AppKit; + + nativeCheckInputs = [ + rage + ]; + + meta = with lib; { + description = "A Ledger Nano plugin for age"; + homepage = "https://github.com/Ledger-Donjon/age-plugin-ledger"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ erdnaxe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/age-plugin-tpm/default.nix b/third_party/nixpkgs/pkgs/tools/security/age-plugin-tpm/default.nix index 200a3e67f2..8882a70a1a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/age-plugin-tpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/age-plugin-tpm/default.nix @@ -32,10 +32,10 @@ buildGoModule rec { ]; meta = with lib; { - description = "TPM 2.0 plugin for age"; + description = "TPM 2.0 plugin for age (This software is experimental, use it at your own risk)"; homepage = "https://github.com/Foxboron/age-plugin-tpm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ kranzes ]; + maintainers = with maintainers; [ kranzes sgo ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix index e0b553a8e4..c746bb8557 100644 --- a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-6VmpBt1KxWRdZJLVPNeqETQnZITGoX+rz29eIiOnHnU="; + sha256 = "sha256-RUBSF6zG+LpBopnCo/mj+Sr+iFz95Ce0p0/RNIOuRCg="; }; - cargoHash = "sha256-Q/1zgfF1v3D5Mg+JhS0K9mF4BN9xHV2tf7AtsBHZGh0="; + cargoHash = "sha256-ngIrAaQY3aWPridH67ZKACbFRkP8BeZ1W1wji6IPBAA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix b/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix index 850e632130..04d2598fd5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/authz0/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "authz0"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - hash = "sha256-8WtvUeHP7fJ1/G+UB1QLCSSNx7XA+vREcwJxoMeQsgM="; + hash = "sha256-NrArxuhzd57NIdM4d9p/wfCB1e6l83pV+cjjCgZ9YtM="; }; - vendorSha256 = "sha256-EQhvHu/LXZtVQ+MzjB96K0MUM4THiRDe1FkAATfGhdw="; + vendorHash = "sha256-ARPrArvCgxLdCaiUdJyjB/9GbbldnMXwFbyYubbsqxc="; meta = with lib; { description = "Automated authorization test tool"; diff --git a/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix b/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix index b6ae17a611..4f1dcf3182 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.5.9"; + version = "0.6.11"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lopOFEWqRWZox/XniQX6OiQPWlmWJpnQ7yFueiTZpss="; + hash = "sha256-4bZnGgf/H2/uLhh8ip8rrA+U0vA+1SO5uhjLK40j3wE="; }; - # Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 - deleteVendor = true; - vendorSha256 = null; + vendorHash = "sha256-RcZqnyZtonE4qeu+llL1OPGPG93/Rx8ESWM5wapZ1BM="; ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix b/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix index 2b08da598f..1f0f2a2bf0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "FILES=b2sum.c ../sse/" "#FILES=b2sum.c ../sse/" ''; - sourceRoot = "source/b2sum"; + sourceRoot = "${finalAttrs.src.name}/b2sum"; buildInputs = [ openmp ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/cli.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/cli.nix new file mode 100644 index 0000000000..446dc89bd8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/cli.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, buildNpmPackage +, nodejs_18 +, fetchFromGitHub +, python3 +, darwin +, nixosTests +}: + +let + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; +in buildNpmPackage' rec { + pname = "bitwarden-cli"; + version = "2023.7.0"; + + src = fetchFromGitHub { + owner = "bitwarden"; + repo = "clients"; + rev = "cli-v${version}"; + hash = "sha256-Xnfjp+qRJWvxvgSODbajLxYsP2DtOYK9CXBMfIn+qwA="; + }; + + npmDepsHash = "sha256-vz7erDhh3BpHNadPwIXkD2PRCnbxM7e7lE0rvBEXGyc="; + + nativeBuildInputs = [ + python3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools + ]; + + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmBuildScript = "build:prod"; + + npmWorkspace = "apps/cli"; + + passthru.tests = { + vaultwarden = nixosTests.vaultwarden.sqlite; + }; + + meta = with lib; { + changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; + description = "A secure and free password manager for all of your devices"; + homepage = "https://bitwarden.com"; + license = lib.licenses.gpl3Only; + mainProgram = "bw"; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix index db618f4ec4..a9b902f80d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -41,7 +41,7 @@ let desktop-native = rustPlatform.buildRustPackage { pname = "bitwarden-desktop-native"; inherit src version; - sourceRoot = "source-patched/apps/desktop/desktop_native"; + sourceRoot = "${src.name}/apps/desktop/desktop_native"; cargoSha256 = "sha256-8U4E5q2OSZGXy2ZRn0y4Skm5Y+FiOJVU1mtzObO9UqY="; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix index 6bd060154f..8895293643 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.18.0"; + version = "8.20.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-JlFPJ4tbpxt/UBXpQCod3zythOHP9wQ8yqAMqKAyqoU="; + hash = "sha256-VPXxeI4dO6bHUagS38l7358sXW3ot/v/j9MUrD/akNg="; }; proxyVendor = true; - vendorHash = "sha256-RDQQVl3AxdZaF4ISQiQ8ZliZi6TWwIzYLZLxs0yPkJc="; + vendorHash = "sha256-LH9ts/hD16rF9VBJIfwTAQXq9MMAiBKBR3ulKGNrlow="; subPackages = [ "apps/cnspec" diff --git a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix index cfde59a7e7..238a74cc95 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -67,7 +67,6 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ autoPatchelfHook - maven makeShellWrapper wrapGAppsHook jdk diff --git a/third_party/nixpkgs/pkgs/tools/security/deepsea/default.nix b/third_party/nixpkgs/pkgs/tools/security/deepsea/default.nix index bfe004d2d9..0befd62e22 100644 --- a/third_party/nixpkgs/pkgs/tools/security/deepsea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/deepsea/default.nix @@ -26,6 +26,6 @@ buildGoModule rec { homepage = "https://github.com/dsnezhkov/deepsea"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix b/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix index a63205d9ba..65fae4928c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix @@ -5,16 +5,22 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.1.4"; + version = "1.1.5"; format = "setuptools"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - hash = "sha256-DtyYYNtv0Zk8103NN+vlnr3Etv0bAZ6+A2CXeZZgiUg="; + hash = "sha256-W7ZFc+kF00ANoYVTlsY+lJ9FjMEGbqYfNojoZFiRHU8="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "flake8" "" \ + --replace "pytest" "" + ''; + propagatedBuildInputs = with python3.pkgs; [ dnspython netaddr diff --git a/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix b/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix index 8244d7f0c2..514df406f3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/donkey/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "tags/release/${version}"; hash = "sha256-2xgb9l0Eko39HJVROAWEIP3qLg5t/5h/rm2MoXoKnJI="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildInputs = [ libmd ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 6ddea4607d..ddc4b55432 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.65.0"; + version = "3.65.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-0OFHPF3O6uIlf6X6oo+nIalj2PVOoRXb0dV5AjRDxR4="; + sha256 = "sha256-scFjaxUMlKGpO7UQrIS/f1Rsxu4weZ26jRCRmoUBGCs="; }; vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw="; diff --git a/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix b/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix index fcd94f66fb..bf28f89361 100644 --- a/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix @@ -1,38 +1,60 @@ { lib +, mkDerivation , fetchFromGitHub -# Haskell deps -, mkDerivation, aeson, base, base16-bytestring, binary, brick, bytestring -, containers, data-dword, data-has, directory, exceptions, extra, filepath -, hashable, hevm, hpack, html-entities, lens, ListLike, MonadRandom, mtl -, optparse-applicative, process, random, semver, tasty, tasty-hunit -, tasty-quickcheck, text, transformers, unix, unliftio, unordered-containers -, vector, vector-instances, vty, yaml +, haskellPackages +, haskell +, slither-analyzer }: -mkDerivation rec { + +let haskellPackagesOverride = haskellPackages.override { + overrides = self: super: { + # following the revision specified in echidna/stack.yaml + # TODO: 0.51.3 is not in haskellPackages yet + hevm = haskell.lib.overrideCabal super.hevm (oa: { + version = "0.51.3"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "hevm"; + rev = "release/0.51.3"; + hash = "sha256-H6oURBGoQWSOuPhBB+UKg2UarVzXgv1tmfDBLnOtdhU="; + }; + libraryHaskellDepends = oa.libraryHaskellDepends + ++ (with haskellPackages;[githash witch]); + }); + }; + }; +in mkDerivation rec { pname = "echidna"; - version = "2.0.5"; + version = "2.2.1"; src = fetchFromGitHub { owner = "crytic"; repo = "echidna"; rev = "v${version}"; - sha256 = "sha256-8bChe+qA4DowfuwsR5wLckb56fXi102g8vL2gAH/kYE="; + sha256 = "sha256-5d9ttPR3rRHywBeLM85EGCEZLNZNZzOAhIN6AJToJyI="; }; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring binary brick bytestring containers data-dword - data-has directory exceptions extra filepath hashable hevm html-entities - lens ListLike MonadRandom mtl optparse-applicative process random semver - text transformers unix unliftio unordered-containers vector vector-instances - vty yaml + + libraryToolDepends = with haskellPackagesOverride; [ + haskellPackages.hpack ]; - libraryToolDepends = [ hpack ]; - executableHaskellDepends = libraryHaskellDepends; - testHaskellDepends = [ + + # Note: This can be extracted from package.yaml of echidna, the list is shorter because some are transitive. + executableHaskellDepends = with haskellPackagesOverride; + [aeson base base16-bytestring binary brick bytestring code-page containers data-dword data-has directory exceptions extra + filepath hashable hevm html-conduit html-entities http-conduit lens ListLike MonadRandom mtl optics optparse-applicative + process random semver text transformers unix unliftio unordered-containers vector vector-instances vty with-utf8 + xml-conduit yaml]; + + # Note: there is also a runtime dependency of slither-analyzer, let's include it also. + executableSystemDepends = [ slither-analyzer ]; + + testHaskellDepends = with haskellPackagesOverride; [ tasty tasty-hunit tasty-quickcheck ]; + preConfigure = '' hpack # re-enable dynamic build for Linux @@ -46,7 +68,7 @@ mkDerivation rec { description = "Ethereum smart contract fuzzer"; homepage = "https://github.com/crytic/echidna"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ arturcygan ]; + maintainers = with lib.maintainers; [ arturcygan hellwolf ]; platforms = lib.platforms.unix; mainProgram = "echidna-test"; } diff --git a/third_party/nixpkgs/pkgs/tools/security/enc/default.nix b/third_party/nixpkgs/pkgs/tools/security/enc/default.nix index 00d6d0211f..646d7c8055 100644 --- a/third_party/nixpkgs/pkgs/tools/security/enc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/enc/default.nix @@ -7,17 +7,16 @@ buildGoModule rec { pname = "enc"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "life4"; repo = "enc"; - rev = "v${version}"; - sha256 = "Tt+J/MnYJNewSl5UeewS0b47NGW2yzfcVHA5+9UQWSs="; + rev = version; + hash = "sha256-kVK/+pR3Rzg7oCjHKr+i+lK6nhqlBN6Wj92i4SKU2l0="; }; - vendorSha256 = "lB6GkE6prfBG7OCOJ1gm23Ee5+nAgmJg8I9Nqe1fsRw="; - proxyVendor = true; + vendorHash = "sha256-6LNo4iBZDc0DTn8f/2PdCb6CNFCjU6o1xDkB5m/twJk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index e8e192074b..00f93f5e97 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-07-12"; + version = "2023-08-01"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ro17fRg9sw6+3ba6apIXtGwWvnPs0i6tMMJu6VwWPd0="; + hash = "sha256-s0D7NMgU2cApeZWqAFGtLk8DdkGNVLh2kY/xNK7W7c0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix index def4fc50c1..d006e3140b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/firefox_decrypt/default.nix @@ -8,15 +8,15 @@ buildPythonApplication rec { pname = "firefox_decrypt"; - version = "unstable-2023-07-06"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "unode"; repo = pname; - rev = "2c61b27e6754cdf6a518ea617d05433f5ccf9f39"; - sha256 = "sha256-/Q6ET6NJ23eYo0ywYMY5TPYpzPHGDzH5+wEpFdsibh8="; + rev = "0931c0484d7429f7d4de3a2f5b62b01b7924b49f"; + sha256 = "sha256-9HbH8DvHzmlem0XnDbcrIsMQRBuf82cHObqpLzQxNZM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix b/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix index 865f0d6a53..61e01daa0f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sDOsnpxvPTlexZFDEbF7kOl/1h/Xl3/ziBII95Oxqsw="; + sha256 = "sha256-9FDHMhL2vWyS5o04E3nML/pCL+juA87ZAEU6naIPCdc="; # 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-zbh/NWA9or3dIeAwQ/sUOKrq03d3KVa5G5JkPbissr8="; + vendorHash = "sha256-dEBHhgy4dyorVbP1TloPTa1h6U/923bYrXX4qiRa/2w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix index 7ff9fe9947..8f2a9f05fd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/build.nix @@ -15,13 +15,13 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.3.1"; + version = "10.3.2"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-KYZAu+15rcTkdfVQdKgAlVv3FxREUH0IIgYBb0qjdO8="; + hash = "sha256-CVnEHtSF3DVTH+8qwUsABJq/lRkg6xulEWU+Q5C9ajo="; }; gradle = gradle_7; diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 440ed7fc88..87ea59122b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.5"; + version = "1.15.6"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-0vMzCqH/p0GXtjoSrnSqMsIul9D00fICYb29KY6/Hno="; + hash = "sha256-qhnkU2LuwUWP3Fi/XekFJp3WujeRxF/UHVBiVTfbxJ4="; }; - vendorHash = "sha256-IgfzzwJANUfDToFLHv3BjDfm93KNm5zxQ5GMq7TQP+Q="; + vendorHash = "sha256-FZFN+xy23osgFs7Cm3S+LwKaE9Y94qcDVgv+CxA8J68="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix index 08d363c241..45a6e9db31 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotrue"; - version = "2.82.2"; + version = "2.83.1"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-x/ae7iTfwyEJ7JwNr6US+LJfVt1rZSGpf26LN5MU52o="; + hash = "sha256-3H2B6gEL9qatR49P+0E+O0EDd+uylb0nDETqxW+XuFY="; }; vendorHash = "sha256-eG6zB/nfsYYvvLf5i8AySkTfXv9rIGTTmyMA4PtcGjg="; diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index a0be8c3319..3b096f8869 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.64.0"; + version = "0.65.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Cq7Swgwbtfku+ZvoMeXmLpTbic6Fm/EdGi8C9R2J+X0="; + hash = "sha256-Dqjdl0fco3t8/jVt9/7pwXzoKapctU3T+ixkKTQ6sAE="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-txC+2I50Zf0xP/FGFoCLNLVVaXg/MfQKMgDSFTNg0eU="; + vendorHash = "sha256-VxsXhNOFj7Iwq7Sa2J8ADcfLt9Bz+D0RHwEGawveryU="; nativeBuildInputs = [ installShellFiles @@ -38,16 +38,16 @@ buildGoModule rec { openssl ]; - subPackages = [ "." ]; + subPackages = [ "cmd/grype" ]; excludedPackages = "test/integration"; ldflags = [ "-s" "-w" - "-X github.com/anchore/grype/internal/version.version=${version}" - "-X github.com/anchore/grype/internal/version.gitDescription=v${version}" - "-X github.com/anchore/grype/internal/version.gitTreeState=clean" + "-X=github.com/anchore/grype/internal/version.version=${version}" + "-X=github.com/anchore/grype/internal/version.gitDescription=v${version}" + "-X=github.com/anchore/grype/internal/version.gitTreeState=clean" ]; preBuild = '' @@ -80,8 +80,7 @@ buildGoModule rec { --replace "TestRegistryAuth" "SkipRegistryAuth" substituteInPlace test/cli/sbom_input_test.go \ --replace "TestSBOMInput_FromStdin" "SkipSBOMInput_FromStdin" \ - --replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" \ - --replace "TestAttestationInput_AsArgument" "SkipAttestationInput_AsArgument" + --replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" substituteInPlace test/cli/subprocess_test.go \ --replace "TestSubprocessStdin" "SkipSubprocessStdin" diff --git a/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix b/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix index ccd6230b06..f252c7eedc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wgc6wv7i6cs95rgzzx3zqm14xxbjyajvcqylz8w97d8kk4x4wjr"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix b/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix index 93c4b4fcf7..0fec2a9ec9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix @@ -2,12 +2,13 @@ , addOpenGLRunpath , config , cudaPackages ? {} -, cudaSupport ? config.cudaSupport or false +, cudaSupport ? config.cudaSupport , fetchurl , makeWrapper , opencl-headers , ocl-icd , xxHash +, Foundation, IOKit, Metal, OpenCL, libiconv }: stdenv.mkDerivation rec { @@ -19,13 +20,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-sl4Qd7zzSQjMjxjBppouyYsEeyy88PURRNzzuh4Leyo="; }; + postPatch = '' + # Remove hardcoded paths on darwin + substituteInPlace src/Makefile \ + --replace "/usr/bin/ar" "ar" \ + --replace "/usr/bin/sed" "sed" \ + --replace '-i ""' '-i' + ''; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; - buildInputs = [ opencl-headers xxHash ]; + buildInputs = [ opencl-headers xxHash ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation IOKit Metal OpenCL libiconv ]; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -35,6 +45,8 @@ stdenv.mkDerivation rec { "USE_SYSTEM_XXHASH=1" ]; + enableParallelBuilding = true; + preFixup = '' for f in $out/share/hashcat/OpenCL/*.cl; do # Rewrite files to be included for compilation at runtime for opencl offload @@ -63,7 +75,7 @@ stdenv.mkDerivation rec { description = "Fast password cracker"; homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ kierdavis zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index 3200a541b1..90999d1f88 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -5,20 +5,25 @@ buildGoModule rec { pname = "httpx"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-VYFXxCKlVqueUk/uoD15ay+IWiFKDsBHp5WXZlajw70="; + hash = "sha256-62WOeMnnr08k8pGUTqxiZqHQJxXYqUIh+PzHvJxnJAY="; }; - vendorHash = "sha256-1WamyEnDsuyv0ijHPJthS/ZZVXKrGu8LG8w5wMVoUS0="; + vendorHash = "sha256-ASOheYGuvSHEz51SGUtRGCa3Cl4x+zfIfRkS3JX6vCs="; - subPackages = [ "cmd/httpx" ]; + subPackages = [ + "cmd/httpx" + ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; # Tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix index 2911c369b0..10f67d5f0b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, gradle, jdk, makeWrapper, perl }: +{ lib +, stdenv +, fetchFromGitHub +, gradle +, jdk +, makeWrapper +, perl +, imagemagick +, makeDesktopItem +, copyDesktopItems +, desktopToDarwinBundle +}: let pname = "jadx"; @@ -46,10 +57,11 @@ let outputHashMode = "recursive"; outputHash = "sha256-QebPRmfLtXy4ZlyKeGC5XNzhMTsYI0X36My+nTFvQpM="; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { inherit pname version src; - nativeBuildInputs = [ gradle jdk makeWrapper ]; + nativeBuildInputs = [ gradle jdk imagemagick makeWrapper copyDesktopItems ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; # Otherwise, Gradle fails with `java.net.SocketException: Operation not permitted` __darwinAllowLocalNetworking = true; @@ -96,14 +108,39 @@ in stdenv.mkDerivation { ''; installPhase = '' + runHook preInstall + mkdir $out $out/bin cp -R build/jadx/lib $out for prog in jadx jadx-gui; do cp build/jadx/bin/$prog $out/bin wrapProgram $out/bin/$prog --set JAVA_HOME ${jdk.home} done + + for size in 16 32 48; do + install -Dm444 \ + jadx-gui/src/main/resources/logos/jadx-logo-"$size"px.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/jadx.png + done + for size in 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -resize "$size"x"$size" jadx-gui/src/main/resources/logos/jadx-logo.png $out/share/icons/hicolor/"$size"x"$size"/apps/jadx.png + done + + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "jadx"; + desktopName = "JADX"; + exec = "jadx-gui"; + icon = "jadx"; + comment = finalAttrs.meta.description; + categories = [ "Development" "Utility" ]; + }) + ]; + meta = with lib; { description = "Dex to Java decompiler"; longDescription = '' @@ -118,4 +155,4 @@ in stdenv.mkDerivation { platforms = platforms.unix; maintainers = with maintainers; [ delroth ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/security/jd-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/jd-cli/default.nix index 102a41833e..367851a0d4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jd-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jd-cli/default.nix @@ -11,9 +11,9 @@ maven.buildMavenPackage rec { hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; }; - mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo="; + mvnHash = "sha256-1zn980QP48fWvm45HR1yDHdyzHYPkl/P0RpII+Zu+xc="; - nativeBuildInputs = [ maven makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin $out/share/jd-cli @@ -27,7 +27,6 @@ maven.buildMavenPackage rec { description = "Simple command line wrapper around JD Core Java Decompiler project"; homepage = "https://github.com/intoolswetrust/jd-cli"; license = licenses.gpl3; - platforms = platforms.unix; maintainers = with maintainers; [ majiir ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix b/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix index da39777074..fb5c2c59f1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorHash = "sha256-RyAQh1uXw3bEZ6vuh8+mEf8T4l3ZIFAaFJ6dGMoANys="; - sourceRoot = "source/cmd/jwx"; + sourceRoot = "${src.name}/cmd/jwx"; meta = with lib; { description = " Implementation of various JWx (Javascript Object Signing and Encryption/JOSE) technologies"; diff --git a/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix index 3762f68b12..18f00ed756 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-rvxe9kHTAc2QZnJRkWNzzYgrM8ShPlBZVIvOKlbP8vg="; + sha256 = "sha256-r1SUYz71IXgqWTYtZlk+OjlYHSfJ8nOK2/YFOoIESMw="; }; vendorHash = "sha256-K9QvA4WNF61iToPze26OwP78HKseuajnsHzmWdoo7Y4="; diff --git a/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix index a7b266c34e..34d36f93b5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { rev = version; sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh"; }; - sourceRoot = "source/cli"; + sourceRoot = "${src.name}/cli"; # some tests are designed to run against code in the source directory - adapt to run against # *installed* code diff --git a/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix b/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix index a0b88c5b64..e1d78b7975 100644 --- a/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmodsecurity"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity"; rev = "v${version}"; - sha256 = "sha256-7tA1fqKK5aGOhWBifLAjDmQ80ven4+OcwAzAowPStzA="; + sha256 = "sha256-VaoPpJ0twuGWU7G9AvKK4kq9Ed0BeG2J7B81sOuJVrE="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index b21bf4d02e..d5bfa05291 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.25" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.27" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index b791e4d68b..37e3161509 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: ba44d1810c38a63f46b3c1fb9290de4a384b802d - ref: refs/tags/6.3.25 + revision: 53af96320f2fddfc0189ea66fd9db1f87d94eb06 + ref: refs/tags/6.3.27 specs: - metasploit-framework (6.3.25) + metasploit-framework (6.3.27) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -131,23 +131,23 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.785.0) - aws-sdk-core (3.178.0) + aws-partitions (1.795.0) + aws-sdk-core (3.180.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.389.0) + aws-sdk-ec2 (1.395.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.85.0) + aws-sdk-iam (1.86.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.129.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-s3 (1.132.0) + aws-sdk-core (~> 3, >= 3.179.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) aws-sdk-ssm (1.156.0) @@ -190,7 +190,7 @@ GEM faraday-net_http (3.0.2) faraday-retry (2.2.0) faraday (~> 2.0) - faye-websocket (0.11.2) + faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.15.5) @@ -212,7 +212,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.7.3) + irb (1.7.4) reline (>= 0.3.6) jmespath (1.6.2) jsobfu (0.4.2) @@ -258,8 +258,8 @@ GEM webrick metasploit_payloads-mettle (1.0.20) method_source (1.0.0) - mini_portile2 (2.8.2) - minitest (5.18.1) + mini_portile2 (2.8.4) + minitest (5.19.0) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) @@ -271,7 +271,7 @@ GEM timeout net-smtp (0.3.3) net-protocol - net-ssh (7.1.0) + net-ssh (7.2.0) network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.9) @@ -300,7 +300,7 @@ GEM puma (6.3.0) nio4r (~> 2.0) racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-protection (3.0.6) rack rack-test (2.1.0) @@ -326,7 +326,7 @@ GEM recog (3.1.1) nokogiri redcarpet (3.6.0) - reline (0.3.6) + reline (0.3.7) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -376,9 +376,9 @@ GEM rex-text (0.2.52) rex-zip (0.1.4) rex-text - rexml (3.2.5) + rexml (3.2.6) rkelly-remix (0.0.7) - ruby-macho (3.0.0) + ruby-macho (4.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) ruby_smb (3.2.5) @@ -423,7 +423,7 @@ GEM warden (1.2.9) rack (>= 2.0.9) webrick (1.8.1) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) win32api (0.1.0) @@ -442,7 +442,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.2) webrick - zeitwerk (2.6.8) + zeitwerk (2.6.10) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index fe3d5979d5..d1d4459542 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.25"; + version = "6.3.27"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ezAlfG9ZDJ1QowwNUCpkHkjxV2qKITE/qftN2sWq6CE="; + sha256 = "sha256-3iNzOLOASz78ZUoShKMH/AYZE+UTu31qU/VjXP677cc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index bf050dcfff..71feb682f9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -104,40 +104,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05m0c3h1z0jhaqiciil55fshrjvc725cf1lc0g933pf98vqflb0r"; + sha256 = "07nz6pdzhrfzyhcnd0slikbw0xpslisis2ab57v83fbmn3rkpwn4"; type = "gem"; }; - version = "1.785.0"; + version = "1.795.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv5h7n0vkyjq0v3xqad5xhrl4ijnh214zq3xg4ghvsk6ah8a90r"; + sha256 = "1a820i7b3fcpnk0966sp7sdj9mzkazfwjflrd1f3i9qgbabf5li3"; type = "gem"; }; - version = "3.178.0"; + version = "3.180.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19pfwc0884g9afjh18q76snr9ldnihksmagf36yiqchnvvk956lj"; + sha256 = "01ds6pw1q87mqbyv7v0a444lsifrv6y0sqcw3v5yrng2ap43xby7"; type = "gem"; }; - version = "1.389.0"; + version = "1.395.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hk0ylwjc6jq4qvw08v27ggh9pgfyi1j24jjb0lxb1p21m8ljpi"; + sha256 = "02bp18pi29zncznkzkjzlg5j1cl99q41xvw0z5qx9q55mcwaj7i8"; type = "gem"; }; - version = "1.85.0"; + version = "1.86.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06hgrc39ngs8nis2f85z5gg4ihskk9x3xv6vamc4wx927nsymf42"; + sha256 = "0cjb40w8hw4h59bbjidp6hlb1j6akb36d8s5a37vlm6zwq327i7f"; type = "gem"; }; - version = "1.129.0"; + version = "1.132.0"; }; aws-sdk-ssm = { groups = ["default"]; @@ -404,10 +404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p4hsz3v75lxyj3ymwjm7pxrrk1997n54lfm51h5laakzxbji421"; + sha256 = "01xkpv5b4fjc5n6n1fq6z1ris991av2fbadvs8r71i9r34b8g48h"; type = "gem"; }; - version = "0.11.2"; + version = "0.11.3"; }; ffi = { groups = ["default"]; @@ -534,10 +534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dhwvflcssva4s7ad4sddr2zra8723l2hm1px2rg63ljnh0bgvr3"; + sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; jmespath = { groups = ["default"]; @@ -634,12 +634,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "ba44d1810c38a63f46b3c1fb9290de4a384b802d"; - sha256 = "08g8mb2xlkgvm4zk28cad9bz2j0ychm5038cld89s32rdxy2ac3v"; + rev = "53af96320f2fddfc0189ea66fd9db1f87d94eb06"; + sha256 = "1izdpgz5qqzmadm7vfqkwl9ij1pw0yiq84jacpy3wjw0ncw768yy"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.25"; + version = "6.3.27"; }; metasploit-model = { groups = ["default"]; @@ -696,20 +696,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.1"; + version = "5.19.0"; }; mqtt = { groups = ["default"]; @@ -796,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; + sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.0"; }; network_interface = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-protection = { groups = ["default"]; @@ -1087,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rgsfxm3sb9mgsxa7gks40wy4sb41w33j30y6izmih70ss34x4dh"; + sha256 = "1n6b6a1b18fscw9ff0fw5jk1l7kzw542r8444mm7d27zyx5v18sj"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; rex-arch = { groups = ["default"]; @@ -1277,10 +1277,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rkelly-remix = { groups = ["default"]; @@ -1297,10 +1297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sg0kzqrldx9mlpvymif3dcgz8j8q1nc8jaszrd03nfh5bvp3fd5"; + sha256 = "1yf8fq0l5hlqkjklcpxmg6vhzvbyigwd2n441aq42b2wa2f8xj5q"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1548,10 +1548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -1618,9 +1618,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "06vf6y5ai20ry3b1h9cl7vsdj6i5valq172zdxpnfhj5zvlp104j"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.10"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix b/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix index 50860198e7..8ac0c834ee 100644 --- a/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix @@ -1,22 +1,23 @@ -{ buildGoModule +{ lib +, stdenv +, buildGoModule , fetchFromGitHub -, lib, stdenv }: buildGoModule rec { pname = "monsoon"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = "monsoon"; - rev = "v${version}"; - sha256 = "sha256-eXzD47qFkouYJkqWHbs2g2pbl3I7vWgIU6TqN3MEYQI="; + rev = "refs/tags/v${version}"; + hash = "sha256-7cfy8dYhiReFVz10wui3qqxlXOX7wheREkvSnj2KyOw="; }; - vendorSha256 = "sha256-tG+qV4Q77wT6x8y5cjZUaAWpL//sMUg1Ce3jS/dXF+Y="; + vendorHash = "sha256-SZDX61iPwT/mfxJ+n2nlvzgEvUu6h3wVkmeqZtxQ9KE="; - # tests fails on darwin + # Tests fails on darwin doCheck = !stdenv.isDarwin; meta = with lib; { @@ -26,6 +27,7 @@ buildGoModule rec { requests, filter the responses and display them in real-time. ''; homepage = "https://github.com/RedTeamPentesting/monsoon"; + changelog = "https://github.com/RedTeamPentesting/monsoon/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index 9aab6bb76c..9fc66896ef 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.8"; + version = "2.9.10"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0rviTlnsI4BfWDJMgbkma44xauDhlZB2d15uel4/Y3M="; + hash = "sha256-FpgKOUycSiA0llEvJK71+LnITSTxPkP+Wt5a14Vfwas="; }; - vendorHash = "sha256-OSaxxfUZBimMaM81Y2lV9CIxYCS1HCngCENFROZiikg="; + vendorHash = "sha256-g8+tkGqsXROj157sdUMfZMh7+5+dxd3mIxr5KY/mWO8="; modRoot = "./v2"; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/osv-detector/default.nix b/third_party/nixpkgs/pkgs/tools/security/osv-detector/default.nix index 63d4e07a7b..58db4504d2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/osv-detector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/osv-detector/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "osv-detector"; - version = "0.6.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "G-Rath"; repo = pname; rev = "v${version}"; - hash = "sha256-Y/9q4ZJ4vxDitqrM4hGe49iqLYk4ebhTs4jrD7P8fdw="; + hash = "sha256-vIkLrKyDeMfRe/0EPhlKlHAO6XB0/OFY5mTUHeZbcg8="; }; - vendorSha256 = "sha256-KAxpDQIRrLZIOvfW8wf0CV4Fj6l3W6nNZNCH3ZE6yJc="; + vendorHash = "sha256-Rrosye8foVntoFDvDmyNuXgnEgjzcOXenOKBMZVCRio="; ldflags = [ "-w" @@ -24,6 +24,22 @@ buildGoModule rec { "-X main.version=${version}" ]; + checkFlags = + let + skippedTests = [ + # Disable tests requiring network access + "TestRun_ParseAs_CsvFile" + "TestRun_ParseAs_CsvRow" + "TestRun_DBs" + "TestRun_Lockfile" + "TestRun_ParseAsGlobal" + "TestRun_Ignores" + "TestRun_ParseAsSpecific" + "TestRun_Configs" + ]; + in + [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; + passthru.tests.version = testers.testVersion { package = osv-detector; command = "osv-detector -version"; diff --git a/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix b/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix index ff5d43bcfe..e40d9c4cda 100644 --- a/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-QKswDnqPJzucfOrRzKkBMvyuGsjamY9yhyBqcyhZNvI="; + hash = "sha256-mvR4LqUPtmLBH9RSfVge4anwun1wHJMCuGyHGQvA56s="; }; - vendorHash = "sha256-xHgatAblsnPikAYnfoWTGzpeAHs3ON06bDuxELH/AKI="; + vendorHash = "sha256-oxAvpiNrdst7Y8EbSTrTEebX6+G/8K5UFwdKG+wiDQE="; subPackages = [ "cmd/osv-scanner" diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix index 1b840999e6..3437b19e3a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix @@ -29,8 +29,7 @@ let selected = [ pass ] ++ extensions passExtensions ++ lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { - # lib.getExe looks for name, so we keep it the same as mainProgram - name = "pass"; + name = "pass-env"; paths = selected; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.concatMap (x: x.buildInputs) selected; @@ -51,6 +50,7 @@ let wrapProgram $out/bin/pass \ --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions" ''; + meta.mainProgram = "pass"; }; in diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix index 3b5aedf81a..6b0a975099 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix @@ -1,16 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep -, libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, unstableGitUpdater +, coreutils +, util-linux +, gnugrep +, libnotify +, pwgen +, findutils +, gawk +, gnused +# wayland-only deps +, rofi-wayland +, pass-wayland +, wl-clipboard +, wtype +# x11-only deps +, rofi +, pass +, xclip +, xdotool +# backend selector +, backend ? "x11" }: -stdenv.mkDerivation rec { +assert lib.assertOneOf "backend" backend [ "x11" "wayland" ]; + +stdenv.mkDerivation { pname = "rofi-pass"; - version = "2.0.2"; + version = "unstable-2023-07-04"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; - rev = version; - sha256 = "131jpcwyyzgzjn9lx4k1zn95pd68pjw4i41jfzcp9z9fnazyln5n"; + rev = "fa16c0211d898d337e76397d22de4f92e2405ede"; + hash = "sha256-GGa8ZNHZZD/sU+oL5ekHXxAe3bpX/42x6zO2LJuypNw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,32 +50,43 @@ stdenv.mkDerivation rec { cp -a config.example $out/share/doc/rofi-pass/config.example ''; - wrapperPath = with lib; makeBinPath [ + wrapperPath = lib.makeBinPath ([ coreutils findutils gawk gnugrep gnused libnotify - (pass.withExtensions (ext: [ ext.pass-otp ])) pwgen - rofi util-linux + ] ++ lib.optionals (backend == "x11") [ + rofi + (pass.withExtensions (ext: [ ext.pass-otp ])) xclip xdotool - ]; + ] ++ lib.optionals (backend == "wayland") [ + rofi-wayland + (pass-wayland.withExtensions (ext: [ ext.pass-otp ])) + wl-clipboard + wtype + ]); fixupPhase = '' patchShebangs $out/bin wrapProgram $out/bin/rofi-pass \ - --prefix PATH : "${wrapperPath}" + --prefix PATH : "$wrapperPath" \ + --set-default ROFI_PASS_BACKEND ${if backend == "wayland" then "wtype" else "xdotool"} \ + --set-default ROFI_PASS_CLIPBOARD_BACKEND ${if backend == "wayland" then "wl-clipboard" else "xclip"} ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "A script to make rofi work with password-store"; homepage = "https://github.com/carnager/rofi-pass"; license = lib.licenses.gpl3; platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ lilyinstarlight ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/proxmark3/default.nix b/third_party/nixpkgs/pkgs/tools/security/proxmark3/default.nix index b52e7279fa..48d0d4a0ee 100644 --- a/third_party/nixpkgs/pkgs/tools/security/proxmark3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/proxmark3/default.nix @@ -1,61 +1,86 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, pcsclite, qt5 -, gcc-arm-embedded }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gcc-arm-embedded +, readline +, bzip2 +, openssl +, jansson +, whereami +, lua +, Foundation +, AppKit +, withGui ? true, wrapQtAppsHook, qtbase +, withPython ? true, python3 +, withBlueshark ? false, bluez5 +, withGeneric ? false +, withSmall ? false +, withoutFunctions ? [] +, hardwarePlatform ? if withGeneric then "PM3GENERIC" else "PM3RDV4" +, hardwarePlatformExtras ? lib.optionalString withBlueshark "BTADDON" +, standalone ? "LF_SAMYRUN" +}: +assert withBlueshark -> stdenv.hostPlatform.isLinux; +stdenv.mkDerivation rec { + pname = "proxmark3"; + version = "4.16717"; -let - generic = { pname, version, rev, sha256 }: - stdenv.mkDerivation rec { - inherit pname version; - - src = fetchFromGitHub { - owner = "Proxmark"; - repo = "proxmark3"; - inherit rev sha256; - }; - - nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; - buildInputs = [ ncurses readline pcsclite qt5.qtbase ]; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace client/Makefile --replace '-ltermcap' ' ' - substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' - substituteInPlace client/flasher.c \ - --replace 'armsrc/obj/fullimage.elf' \ - '${placeholder "out"}/firmware/fullimage.elf' - ''; - - buildPhase = '' - make bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf client - ''; - - installPhase = '' - install -Dt $out/bin client/proxmark3 - install -T client/flasher $out/bin/proxmark3-flasher - install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf - ''; - - meta = with lib; { - description = "Client for proxmark3, powerful general purpose RFID tool"; - homepage = "http://www.proxmark.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz ]; - }; - }; -in - -{ - proxmark3 = generic rec { - pname = "proxmark3"; - version = "3.1.0"; + src = fetchFromGitHub { + owner = "RfidResearchGroup"; + repo = "proxmark3"; rev = "v${version}"; - sha256 = "1qw28n1bhhl91ix77lv50qcr919fq3hjc8zhhqphwxal2svgx2jf"; + sha256 = "sha256-rkfVgT+9fqlWvUXzLH28Nzd8HldJnU+IZz8conY8Mis="; }; - proxmark3-unstable = generic { - pname = "proxmark3-unstable"; - version = "2019-12-28"; - rev = "a4ff62be63ca2a81071e9aa2b882bd3ff57f13ad"; - sha256 = "067lp28xqx61n3i2a2fy489r5frwxqrcfj8cpv3xdzi3gb3vk5c3"; + patches = [ + # Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if + # XQuartz is installed, however it is not actually required for GUI features + ./darwin-always-gui.patch + ]; + + postPatch = '' + # Remove hardcoded paths on Darwin + substituteInPlace Makefile.defs \ + --replace "/usr/bin/ar" "ar" \ + --replace "/usr/bin/ranlib" "ranlib" + # Replace hardcoded path to libwhereami + substituteInPlace client/Makefile \ + --replace "/usr/include/whereami.h" "${whereami}/include/whereami.h" + ''; + + nativeBuildInputs = [ + pkg-config + gcc-arm-embedded + ] ++ lib.optional withGui wrapQtAppsHook; + buildInputs = [ + readline + bzip2 + openssl + jansson + whereami + lua + ] ++ lib.optional withGui qtbase + ++ lib.optional withPython python3 + ++ lib.optional withBlueshark bluez5 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d" + "PLATFORM=${hardwarePlatform}" + "PLATFORM_EXTRAS=${hardwarePlatformExtras}" + "STANDALONE=${standalone}" + "USE_BREW=0" + ] ++ lib.optional withSmall "PLATFORM_SIZE=256" + ++ map (x: "SKIP_${x}=1") withoutFunctions; + enableParallelBuilding = true; + + meta = with lib; { + description = "Client for proxmark3, powerful general purpose RFID tool"; + homepage = "https://github.com/RfidResearchGroup/proxmark3"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ nyanotech emilytrau ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix deleted file mode 100644 index fc033125e8..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, gcc-arm-embedded -, readline -, bzip2 -, openssl -, jansson -, whereami -, lua -, Foundation -, AppKit -, withGui ? true, wrapQtAppsHook, qtbase -, withPython ? true, python3 -, withBlueshark ? false, bluez5 -, withGeneric ? false -, withSmall ? false -, withoutFunctions ? [] -, hardwarePlatform ? if withGeneric then "PM3GENERIC" else "PM3RDV4" -, hardwarePlatformExtras ? lib.optionalString withBlueshark "BTADDON" -, standalone ? "LF_SAMYRUN" -}: -assert withBlueshark -> stdenv.hostPlatform.isLinux; -stdenv.mkDerivation rec { - pname = "proxmark3-rrg"; - version = "4.16717"; - - src = fetchFromGitHub { - owner = "RfidResearchGroup"; - repo = "proxmark3"; - rev = "v${version}"; - sha256 = "sha256-rkfVgT+9fqlWvUXzLH28Nzd8HldJnU+IZz8conY8Mis="; - }; - - patches = [ - # Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if - # XQuartz is installed, however it is not actually required for GUI features - ./darwin-always-gui.patch - ]; - - postPatch = '' - # Remove hardcoded paths on Darwin - substituteInPlace Makefile.defs \ - --replace "/usr/bin/ar" "ar" \ - --replace "/usr/bin/ranlib" "ranlib" - # Replace hardcoded path to libwhereami - substituteInPlace client/Makefile \ - --replace "/usr/include/whereami.h" "${whereami}/include/whereami.h" - ''; - - nativeBuildInputs = [ - pkg-config - gcc-arm-embedded - ] ++ lib.optional withGui wrapQtAppsHook; - buildInputs = [ - readline - bzip2 - openssl - jansson - whereami - lua - ] ++ lib.optional withGui qtbase - ++ lib.optional withPython python3 - ++ lib.optional withBlueshark bluez5 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d" - "PLATFORM=${hardwarePlatform}" - "PLATFORM_EXTRAS=${hardwarePlatformExtras}" - "STANDALONE=${standalone}" - "USE_BREW=0" - ] ++ lib.optional withSmall "PLATFORM_SIZE=256" - ++ map (x: "SKIP_${x}=1") withoutFunctions; - enableParallelBuilding = true; - - meta = with lib; { - description = "Client for proxmark3, powerful general purpose RFID tool"; - homepage = "https://github.com/RfidResearchGroup/proxmark3"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ nyanotech emilytrau ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/psudohash/default.nix b/third_party/nixpkgs/pkgs/tools/security/psudohash/default.nix new file mode 100644 index 0000000000..d5be9f9a77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/psudohash/default.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + stdenv, + python3 +}: + +stdenv.mkDerivation rec { + pname = "psudohash"; + version = "unstable-2023-05-15"; + + src = fetchFromGitHub { + owner = "t3l3machus"; + repo = "psudohash"; + rev = "2d586dec8b5836546ae54b924eb59952a7ee393c"; + hash = "sha256-l/Rp9405Wf6vh85PFrRTtTLJE7GPODowseNqEw42J18="; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + install -Dm555 psudohash.py $out/bin/psudohash + + install -Dm444 common_padding_values.txt $out/share/psudohash/common_padding_values.txt + + substituteInPlace $out/bin/psudohash \ + --replace "common_padding_values.txt" "$out/share/${pname}/common_padding_values.txt" + + runHook postInstall + ''; + + meta = with lib; { + description = "Password list generator for orchestrating brute force attacks and cracking hashes"; + homepage = "https://github.com/t3l3machus/psudohash"; + license = licenses.mit; + maintainers = with maintainers; [ exploitoverload ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix b/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix index ccf30f000e..b0a40fba9d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix @@ -10,12 +10,12 @@ with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; - version = "0.4.38"; + version = "0.4.39"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-8TMDbkRyTkzULrBeO0SL/WXB240LD/iZLigE/zPum2A="; + hash = "sha256-KXYHeWwV9Tw1ZpO/vASHjDnceeb+1K0yIUohb7EcRAI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix b/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix index 82628019b4..0a3de075f8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "23.4.1"; + version = "23.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-YOI768QNAgqUy3Vc2kyJCUeJE7j0PyP5BOUelhvyHgU="; + sha256 = "sha256-RkYLTZ40ZINg3cNPBJrSOGOzSSfislBmwdUOQHDu32U="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/rage/default.nix b/third_party/nixpkgs/pkgs/tools/security/rage/default.nix index ea8e304099..44b67e96a1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rage/default.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/str4d/rage/raw/v${version}/rage/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; # either at your option maintainers = with maintainers; [ marsam ryantm ]; + mainProgram = "rage"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index 21952a3cda..25c8af82c9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -5,7 +5,7 @@ , openssl , pkg-config , installShellFiles -, Security +, darwin # rbw-fzf , withFzf ? false @@ -24,20 +24,23 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.7.1"; + version = "1.8.3"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - sha256 = "sha256-xE3T3iVXFaaTF90ehQiG6+dLXcsqrHeprSMUnlSsxkE="; + sha256 = "sha256-dC/x+ihH1POIFN/8pbk967wATXKU4YVBGI0QCo8d+SY="; }; - cargoHash = "sha256-eaG56FGz4smlqDPi/CJ0KB7NMEgp684X19PVWxGQutw="; + cargoHash = "sha256-nI1Pf7gREbAk+JVF3Gn2j8OqprexCQ5fVvECtq2aBPM="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.AppKit + ]; preConfigure = lib.optionalString stdenv.isLinux '' export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" diff --git a/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix b/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix index 62de3da174..2820f473c1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-tPiojtSCpqJjLGRZ1rNno7TKhmZ3jBtdb4dWLfRmh14="; + hash = "sha256-U7KxkPYVAy3/olXsEgPMX/kzg0KvYMovLO4LWw8guE4="; # 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; @@ -23,7 +23,7 @@ let ''; }; - vendorHash = "sha256-AIXoq/sYQRCR1pllwBhflAnanUD0aGo54drBOsaxiDQ="; + vendorHash = "sha256-hZyoVlNrPKE6ub94jVEOLGvxWoXKxFYcsEZyRrZuNkQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ronin/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/ronin/Gemfile.lock index a085fb531b..74d8228919 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ronin/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/ronin/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.0.5.1) - activesupport (= 7.0.5.1) - activerecord (7.0.5.1) - activemodel (= 7.0.5.1) - activesupport (= 7.0.5.1) - activesupport (7.0.5.1) + activemodel (7.0.6) + activesupport (= 7.0.6) + activerecord (7.0.6) + activemodel (= 7.0.6) + activesupport (= 7.0.6) + activesupport (7.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -26,7 +26,7 @@ GEM command_mapper (0.3.1) concurrent-ruby (1.2.2) connection_pool (2.4.1) - console (1.17.2) + console (1.18.0) fiber-annotation fiber-local date (3.3.3) @@ -42,8 +42,8 @@ GEM concurrent-ruby (~> 1.0) io-console (0.6.0) io-event (1.2.2) - irb (1.7.0) - reline (>= 0.3.0) + irb (1.7.4) + reline (>= 0.3.6) mechanize (2.9.1) addressable (~> 2.8) domain_name (~> 0.5, >= 0.5.20190701) @@ -58,7 +58,7 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) - mini_portile2 (2.8.2) + mini_portile2 (2.8.4) minitest (5.18.1) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) @@ -77,7 +77,7 @@ GEM timeout net-smtp (0.3.3) net-protocol - nokogiri (1.15.2) + nokogiri (1.15.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) nokogiri-diff (0.2.0) @@ -86,7 +86,7 @@ GEM nokogiri-ext (0.1.0) nokogiri (~> 1.0) open_namespace (0.4.1) - public_suffix (5.0.1) + public_suffix (5.0.3) racc (1.7.1) rack (2.2.7) rack-protection (3.0.6) @@ -94,14 +94,14 @@ GEM rack-user_agent (0.5.3) rack (>= 1.5) woothee (>= 1.0.0) - reline (0.3.5) + reline (0.3.6) io-console (~> 0.5) - ronin (2.0.3) + ronin (2.0.4) async-io (~> 1.0) open_namespace (~> 0.4) ronin-code-asm (~> 1.0) ronin-code-sql (~> 2.0) - ronin-core (~> 0.1, >= 0.1.1) + ronin-core (~> 0.1, >= 0.1.2) ronin-db (~> 0.1) ronin-exploits (~> 1.0, >= 1.0.1) ronin-fuzzer (~> 0.1) @@ -111,12 +111,12 @@ GEM ronin-vulns (~> 0.1, >= 0.1.2) ronin-web (~> 1.0, >= 1.0.1) rouge (~> 3.0) - wordlist (~> 1.0) + wordlist (~> 1.0, >= 1.0.2) ronin-code-asm (1.0.0) ruby-yasm (~> 0.3) ronin-code-sql (2.1.0) ronin-support (~> 1.0) - ronin-core (0.1.1) + ronin-core (0.1.2) command_kit (~> 0.4) irb (~> 1.0) reline (~> 0.1) @@ -159,7 +159,7 @@ GEM combinatorics (~> 0.4) hexdump (~> 1.0) uri-query_params (~> 0.8) - ronin-vulns (0.1.2) + ronin-vulns (0.1.3) ronin-core (~> 0.1) ronin-support (~> 1.0, >= 1.0.1) ronin-web (1.0.2) @@ -212,7 +212,7 @@ GEM webrick (1.8.1) webrobots (0.1.2) woothee (1.13.0) - wordlist (1.0.0) + wordlist (1.0.2) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/tools/security/ronin/default.nix b/third_party/nixpkgs/pkgs/tools/security/ronin/default.nix index bdde1df369..1bf98ae9ea 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ronin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ronin/default.nix @@ -15,6 +15,11 @@ bundlerEnv { }; }; + postBuild = '' + shopt -s extglob + rm $out/bin/!(ronin*) + ''; + passthru.updateScript = bundlerUpdateScript "ronin"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/ronin/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/ronin/gemset.nix index c979749c7d..2171841a42 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ronin/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ronin/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -131,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kxcxm3ynrsv6d60r2pzbw6rzdbg506hn3536pflaf747c5y2db7"; + sha256 = "133csy1c80wh144hzr0pwcwg7i553pqn2byzsdw6kq5s0kg0pg8m"; type = "gem"; }; - version = "1.17.2"; + version = "1.18.0"; }; date = { groups = ["default"]; @@ -245,10 +245,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7ksjik7phf6ygshg9bp6ldd38dfgxmgr73yipkpqq7b426hclq"; + sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.4"; }; mechanize = { dependencies = ["addressable" "domain_name" "http-cookie" "mime-types" "net-http-digest_auth" "net-http-persistent" "nokogiri" "rubyntlm" "webrick" "webrobots"]; @@ -287,10 +287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minitest = { groups = ["default"]; @@ -395,10 +395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.3"; }; nokogiri-diff = { dependencies = ["nokogiri" "tdiff"]; @@ -437,10 +437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; racc = { groups = ["default"]; @@ -490,10 +490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5rqi4b7qnwxslc54k0nnfg97842i6hmjnyy79pqyydwwcjhj0i"; + sha256 = "1rgsfxm3sb9mgsxa7gks40wy4sb41w33j30y6izmih70ss34x4dh"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; ronin = { dependencies = ["async-io" "open_namespace" "ronin-code-asm" "ronin-code-sql" "ronin-core" "ronin-db" "ronin-exploits" "ronin-fuzzer" "ronin-payloads" "ronin-repos" "ronin-support" "ronin-vulns" "ronin-web" "rouge" "wordlist"]; @@ -501,10 +501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z56vz0ndakxyngivpa6zn4ja2g5lzaz51aws9778bpcai5i300x"; + sha256 = "1ssh8hijpiw4m9pazr3gqqrlsk8bsjk200fp0m15lbnjv4hc713b"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; ronin-code-asm = { dependencies = ["ruby-yasm"]; @@ -534,10 +534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2244i8im55mm3mdj88fg98avlmzjq581aazrhcaxm7qv0cl6bh"; + sha256 = "1s2hndkdh4pw6xppq4jqn30fk2b26gk08yym5gavlzkcg5k17vvd"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.2"; }; ronin-db = { dependencies = ["ronin-core" "ronin-db-activerecord" "ronin-support" "sqlite3"]; @@ -633,10 +633,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13yyn331cj8wip99s0km17v9vcx3gpyb9v4nkcmpzhg9rq5w4x57"; + sha256 = "1xw029nfxnbjs9nhnb0fgyhksismswap393zm3cnjjw46d643jl8"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; ronin-web = { dependencies = ["mechanize" "nokogiri" "nokogiri-diff" "nokogiri-ext" "open_namespace" "ronin-core" "ronin-support" "ronin-web-server" "ronin-web-spider" "ronin-web-user_agents"]; @@ -883,9 +883,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07h4kgycf72w9gbnf95d5h9zcdcgl3gjadfajjicl2xkiffvpcmf"; + sha256 = "133v1v0b8l7v7vdvyhxa2szaf1nb4hsfcqflx1avax93ah3n7ikn"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index c461c83e12..1ae0ac170d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.9"; + version = "2.36.10"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-eV922fUtNAHGFxuDwTKoakSzf1lMzVg+vOeaBbOP4V0="; + sha256 = "sha256-YoQ22AJOpNW7WVy9lCb/KzZ7/CkOMHSsgzh0gAfnqP0="; }; - vendorHash = "sha256-20IggKOPS+Pu4tQIdYU5SXQhu2FrW0MdCdB9dvmqs7E="; + vendorHash = "sha256-hbsURcFOLYP//1UXmxWfnNEb6PqJDqwAjJc5Au5+BOQ="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix b/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix index 0ad680b0dd..9a7efb9b0d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.27.0"; + version = "1.34.1"; - srcHash = "sha256-F6n3LQY4a5sO6c8SMQF9YjjgOS+v2SH+UQPwhg2EX7Q="; + srcHash = "sha256-jbwG3Xyb/rEyz7aR51/pfc+bU/KY9k6BsByZg6KDY5s="; # submodule dependencies # these are fetched so we: @@ -13,8 +13,8 @@ rec { "cli/src/semgrep/semgrep_interfaces" = { owner = "returntocorp"; repo = "semgrep-interfaces"; - rev = "213f67abea73546ca6111e1bbf0ef96aa917c940"; - hash = "sha256-HeNHJkTje9j16+dwsfyMhoqQn/J18q/7XvQPRwgTw/Y="; + rev = "f7fed064dadb859f0b802b11fb60f7f77008c4d7"; + hash = "sha256-EXYRc6p94QxkOBMPOdr608JqLY6kN1AanlRfOFXxPm8="; }; }; @@ -25,15 +25,15 @@ rec { core = { x86_64-linux = { platform = "any"; - hash = "sha256-cRj81dXpAE6S0EXajsRikOIAPzlUf42FhiDCWjv+wZQ="; + hash = "sha256-XogITZZtuNmWBrCfL5qpHJNm6jFxzraZMXWhUotXA4c="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-jqfGVZGF/DFgXkr7kQg6QyqEELSr8AKE3Ga8kTftnIY="; + hash = "sha256-YjV915SZ2L8t6huToErTHRd82m4I+evPyeuwpVzi26o="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-e/uCSRMdbVD0lvc0hukbiUzheqRNIIh1LgMq6Ae7JYI="; + hash = "sha256-BAnYYeUWosAorcHpqUMpRXJFl4NQDPbWTsykDN3w5UQ="; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix b/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix index 23749643a4..ff41daacac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix @@ -102,6 +102,10 @@ buildPythonApplication rec { makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ semgrep-core ]}) ''; + postInstall = '' + chmod +x $out/bin/{,py}semgrep + ''; + passthru = { inherit common; submodulesSubset = lib.mapAttrs (k: args: fetchFromGitHub args) common.submodules; diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/semgrep-core.nix b/third_party/nixpkgs/pkgs/tools/security/semgrep/semgrep-core.nix index c4846c6d91..b924dd1657 100644 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/semgrep-core.nix +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/semgrep-core.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { inherit version; format = "wheel"; dist = python; - python = "cp37.cp38.cp39.py37.py38.py39"; + python = "cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311"; inherit (data) platform hash; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh b/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh index 090d607a69..c66180cf8f 100755 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/update.sh @@ -15,7 +15,6 @@ fi ROOT="$(dirname "$(readlink -f "$0")")" NIXPKGS_ROOT="$ROOT/../../../.." -NIX_DRV="$ROOT/default.nix" COMMON_FILE="$ROOT/common.nix" @@ -59,7 +58,7 @@ fetchPypi rec { version = \"$VERSION\"; format = \"wheel\"; dist = python; - python = \"cp37.cp38.cp39.py37.py38.py39\"; + python = \"cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\"; platform = \"$PLATFORM\"; } " @@ -131,8 +130,6 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas continue fi - NEW_URL=$(instantiateClean semgrep.passthru.submodulesSubset."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g") - TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE" replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE" diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index 345e36756f..95d0426729 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -5,21 +5,22 @@ , pkg-config , nettle , openssl +, sqlite , darwin }: rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "0.2.0"; + version = "0.3.2"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - hash = "sha256-8aKT39gq6o7dnbhKbDxewd4R2e2IsbYU8vaDwYemes8="; + hash = "sha256-Qe9KKZh0Zim/BdPn2aMxkH6FBOBB6zijkp5ft9YfzzU="; }; - cargoHash = "sha256-Z6cXCHLrK+BcIeVCKH2l8n9SivZsZPhXGhaMObn6rjo="; + cargoHash = "sha256-KuVSpbAfLVIy5YJ/8qb+Rfw1TgZkWfR+Ai9gDcf4EQ4="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -29,6 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ nettle openssl + sqlite ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia-sq/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia-sq/default.nix index fbb5ff956a..d8bac3e707 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia-sq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia-sq/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sq"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; rev = "v${version}"; - hash = "sha256-uFcmuyz0JsUTvKqCb+3t8JdB4Dn4hJq00jeEhvMNW18="; + hash = "sha256-rrNN52tDM3CEGyNvsT3x4GmfWIpU8yoT2XsgOhPyLjo="; }; - cargoHash = "sha256-PWqwTGodQ7LBTgHFB2AWX5wIOVJja2GzPoocX59Dr/0="; + cargoHash = "sha256-B+gtUzUB99At+kusupsN/v6sCbpXs36/EbpTL3gUxnc="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/security/shhgit/default.nix b/third_party/nixpkgs/pkgs/tools/security/shhgit/default.nix index fa714622fe..48b9c144a8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/shhgit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/shhgit/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/eth0izzle/shhgit"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix index ea4b05b79a..1580b946e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules - installShellCompletion target/*/release/solo2.{bash,fish,zsh} + installShellCompletion target/*/release/solo2.{bash,fish} + installShellCompletion --zsh target/*/release/_solo2 ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix b/third_party/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix index cf85ed9310..529da45579 100644 --- a/third_party/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }: +{ lib +, stdenv +, fetchFromGitHub +, makeBinaryWrapper +, coreutils +, binutils-unwrapped +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spectre-meltdown-checker"; - version = "0.45"; + version = "0.46"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; - rev = "v${version}"; - sha256 = "sha256-yGrsiPBux4YeiQ3BL2fnne5P55R/sQZ4FwzSkE6BqPc="; + rev = "v${finalAttrs.version}"; + hash = "sha256-M4ngdtp2esZ+CSqZAiAeOnKtaK8Ra+TmQfMsr5q5gkg="; }; prePatch = '' @@ -16,23 +22,23 @@ stdenv.mkDerivation rec { --replace /bin/echo ${coreutils}/bin/echo ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - installPhase = with lib; '' + installPhase = '' runHook preInstall install -Dm755 spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker wrapProgram $out/bin/spectre-meltdown-checker \ - --prefix PATH : ${makeBinPath [ binutils-unwrapped ]} + --prefix PATH : ${lib.makeBinPath [ binutils-unwrapped ]} runHook postInstall ''; - meta = with lib; { + meta = { description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; homepage = "https://github.com/speed47/spectre-meltdown-checker"; - license = licenses.gpl3; - maintainers = with maintainers; [ dotlambda ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.dotlambda ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix index b76a03e42c..6c64e19043 100644 --- a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.7.0"; + version = "1.7.1"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aJ9T8OUsHNeWV05MWLet35V0YFyD7QoiExN6PTmHs3w="; + sha256 = "sha256-42UEFil9b2z8vfnA5oJvkqcPuSApi61m//RZ4pKZZ5w="; }; - vendorHash = "sha256-4KJysqByDVuK2OU/+sGtpXtSJe4YkVe4OhRyn9tkgsg="; + vendorHash = "sha256-H4INblBEWc/AuOn59lXmj5XX6mKrhmRTRVWtVhusW9k="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ssb/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssb/default.nix index a461fad2fd..aed2dd79ae 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssb/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { homepage = "https://github.com/kitabisa/ssb"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix index fa222cf5fe..6263a33f70 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix @@ -44,6 +44,6 @@ python3Packages.buildPythonApplication rec { Works with Linux and Mac OS and supports DNS tunneling. ''; license = licenses.lgpl21; - maintainers = with maintainers; [ domenkozar carlosdagos SuperSandro2000 ]; + maintainers = with maintainers; [ domenkozar carlosdagos ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/stoken/default.nix b/third_party/nixpkgs/pkgs/tools/security/stoken/default.nix index 04e47dcb84..526caf44d6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/stoken/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/stoken/default.nix @@ -1,30 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config -, libxml2, nettle -, withGTK3 ? true, gtk3 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libxml2 +, nettle +, withGTK3 ? true +, gtk3 +}: stdenv.mkDerivation rec { pname = "stoken"; - version = "0.92"; + version = "0.93"; + src = fetchFromGitHub { owner = "cernekee"; - repo = pname; + repo = "stoken"; rev = "v${version}"; - sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y"; + hash = "sha256-8N7TXdBu37eXWIKCBdaXVW0pvN094oRWrdlcy9raddI="; }; - preConfigure = '' - aclocal - libtoolize --automake --copy - autoheader - automake --add-missing --copy - autoconf - ''; - strictDeps = true; - nativeBuildInputs = [ pkg-config autoconf automake libtool ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ - libxml2 nettle - ] ++ lib.optional withGTK3 gtk3; + libxml2 + nettle + ] ++ lib.optionals withGTK3 [ + gtk3 + ]; meta = with lib; { description = "Software Token for Linux/UNIX"; diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix index 8aaea88579..6cf8349b09 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sudo/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , buildPackages , coreutils , pam @@ -14,13 +15,22 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.13p3"; + version = "1.9.14p3"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-kjNKEruT4MBWsJ9T4lXMt9b2fGNQ4oE82Vk87sp4Vgs="; + hash = "sha256-oIMYscS8hYLABNTNmuKQOrxUnn5GuoFeQf6B0cB4K2I="; }; + patches = [ + # Extra bugfix not included in 1.9.14p3 to address a bug that impacts the + # NixOS test suite for sudo. + (fetchpatch { + url = "https://github.com/sudo-project/sudo/commit/760c9c11074cb921ecc0da9fbb5f0a12afd46233.patch"; + hash = "sha256-smwyoYEkaqfQYz9C4VVz59YMtKabOPpwhS+RBwXbWuE="; + }) + ]; + prePatch = '' # do not set sticky bit in nix store substituteInPlace src/Makefile.in --replace 04755 0755 diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index bb71c3134d..8cc4212fbb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-w0ZOkPw8Y6Z1hyZecZfjd/YrTP8v6S0jNhgNzLjMRrY="; + hash = "sha256-ZWkuzblPIvYcOllmIjk2RQZdkcPYZLGOuxwgX3NMydg="; }; - vendorHash = "sha256-0WkOIgIA1fKn2SeS5QFeLGCGMstdlkU+eDRUVAs3ETA="; + vendorHash = "sha256-e09F4dA/uT50Cted3HqE08d04+l0V6U95AdKGKBFDpI="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index 06e4315819..28e38d6ad1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.7.13"; + version = "0.4.7.14"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-IHkXLM4DRVbxEASOJgg86b6nUfMVSwrSgJdRgVsR6p0="; + sha256 = "sha256-paxn9kZjgPwF6AQ9AcWB5Oiisi/glDABNHPnEGXmXfg="; }; outputs = [ "out" "geoip" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix index a2687103e3..4e8fd919f9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib +{ stdenv, fetchurl, lib, fetchpatch , pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss, libuuid , abrmdSupport ? true, tpm2-abrmd ? null }: @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM="; }; + patches = [ + # https://github.com/tpm2-software/tpm2-tools/pull/3271 + (fetchpatch { + url = "https://github.com/tpm2-software/tpm2-tools/commit/b98be08f6f88b0cca9e0667760c4e1e5eb417fbd.patch"; + sha256 = "sha256-2sEam9i4gwscJhLwraX2EAjVM8Dh1vmNnG3zYsOF0fc="; + }) + ]; + nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; buildInputs = [ curl openssl tpm2-tss libuuid diff --git a/third_party/nixpkgs/pkgs/tools/security/truecrack/default.nix b/third_party/nixpkgs/pkgs/tools/security/truecrack/default.nix index aebbbc79f8..c58ce4ae57 100644 --- a/third_party/nixpkgs/pkgs/tools/security/truecrack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/truecrack/default.nix @@ -1,5 +1,6 @@ { lib, gccStdenv, fetchFromGitLab, cudatoolkit -, cudaSupport ? false +, config +, cudaSupport ? config.cudaSupport , pkg-config }: gccStdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 8260978f41..6b6e970a38 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.44.0"; + version = "3.46.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-2AGdF+E3YNRiM8So+i6XWkQxgDgF8wu2z6hnuuzh4NQ="; + hash = "sha256-IdLNDJYg86dTj+E2w7+sXmNf/MY7eqW9NMAmuhrzm10="; }; - vendorHash = "sha256-IJZSYwF71pbRr+k8dCE8OOEQwK3srPtGbrJIltfVNBU="; + vendorHash = "sha256-ecEms2Zf4EckP2OLoL41S1ZTTnGJhpdMDhknq/mO7qI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix index e26cbda2aa..0e86d644c8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vals/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vals/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vals"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-MofzTQM/dREw9b+IzjvexKoYZZ/ptbdWICROtwYK4X8="; + sha256 = "sha256-gICEqwt34pllvxA8JVc0rCQ2F3w6wT96eKTTxE0j398="; }; vendorHash = "sha256-6DJiqDEgEHQbyIt4iShoBnagBvspd3W3vD56/FGjESs="; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 87d4e02cb2..666a8ff427 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-kx60OMIw7F9osF1u6GGp/xfUXo9XUhHmsrh3gCud0iI="; + sha256 = "sha256-3/oGuK+n0NGDdRYb+c0QNbJrCD2MBQDXWUDpdGsOY2k="; }; - vendorHash = "sha256-gQ+n/UtZn07lyi48sRCulZ7R4gtwKVu1tklFwRAUIZo="; + vendorHash = "sha256-W5XsUWb3uZGX7RAQQMy67j9LM3KiEl/+XZAGDKTRwd0="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 9321537539..cfe65eb332 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -9,13 +9,13 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - hash = "sha256-dF27b29n4JUHdXG68UfQwlacZE1SXqk0h854cMR8Ii8="; + hash = "sha256-uASoPZRBQ9IKJHtMGeeZzmr0fCYDWl56EzaJVj6LwMk="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix b/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix index 2c02e1249d..3d47dfa3ab 100644 --- a/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix @@ -31,6 +31,5 @@ buildGoModule rec { description = "Cryptographic protocol analysis for students and engineers"; maintainers = with lib.maintainers; [ zimbatm ]; license = with lib.licenses; [ gpl3 ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/zeekscript/default.nix b/third_party/nixpkgs/pkgs/tools/security/zeekscript/default.nix index cf5e44ea8f..c1ab0cb4a1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/zeekscript/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/zeekscript/default.nix @@ -13,8 +13,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-LogI9sJHvLN5WHJGdW47D09XZInKln/I2hNmG62d1JU="; }; + postPatch = '' + sed -i '/name = "zeekscript"/a version = "${version}"' pyproject.toml + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools + wheel ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock b/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock index 3b0788defc..4cdf083101 100644 --- a/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock @@ -18,6 +18,16 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" +[[package]] +name = "accesskit" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c98a5d094590335462354da402d754fe2cb78f0e6ce5024611c28ed539c1de" +dependencies = [ + "enumn", + "serde", +] + [[package]] name = "adler" version = "1.0.2" @@ -33,12 +43,13 @@ dependencies = [ "cfg-if", "getrandom", "once_cell", + "serde", "version_check", ] [[package]] name = "amdgpu_top" -version = "0.1.9" +version = "0.1.11" dependencies = [ "amdgpu_top_gui", "amdgpu_top_json", @@ -142,6 +153,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "bitflags" version = "1.3.2" @@ -199,6 +216,12 @@ dependencies = [ "syn 2.0.15", ] +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + [[package]] name = "bytes" version = "1.4.0" @@ -265,6 +288,43 @@ dependencies = [ "winapi", ] +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +dependencies = [ + "bitflags", + "block", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + [[package]] name = "combine" version = "4.6.6" @@ -442,6 +502,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "directories-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + [[package]] name = "dirs" version = "4.0.0" @@ -462,6 +532,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "dispatch" version = "0.2.0" @@ -485,87 +566,100 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9" +checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63" dependencies = [ "bytemuck", + "serde", ] [[package]] name = "eframe" -version = "0.21.3" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df3ce60931e5f2d83bab4484d1a283908534d5308cc6b0c5c22c59cd15ee7cc" +checksum = "bf4596583a2c680c55b6feaa748f74890c4f9cb9c7cb69d6117110444cb65b2f" dependencies = [ "bytemuck", + "cocoa", + "directories-next", "egui", "egui-winit", "egui_glow", "glow", "glutin", "glutin-winit", + "image", "js-sys", + "log", + "objc", "percent-encoding", "raw-window-handle", + "ron", + "serde", "thiserror", - "tracing", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "winapi", "winit", ] [[package]] name = "egui" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe" +checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7" dependencies = [ + "accesskit", "ahash", "epaint", + "log", "nohash-hasher", - "tracing", + "ron", + "serde", ] [[package]] name = "egui-winit" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab43597ba41f0ce39a364ad83185594578bfd8b3409b99dbcbb01df23afc3dbb" +checksum = "4a49155fd4a0a4fb21224407a91de0030847972ef90fc64edb63621caea61cb2" dependencies = [ - "android-activity", "arboard", "egui", "instant", + "log", + "raw-window-handle", + "serde", "smithay-clipboard", - "tracing", "webbrowser", "winit", ] [[package]] name = "egui_glow" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8257332fb168a965b3dca81d6a344e053153773c889cabdba0b3b76f1629ae81" +checksum = "1f8c2752cdf1b0ef5fcda59a898cacabad974d4f5880e92a420b2c917022da64" dependencies = [ "bytemuck", "egui", "glow", + "log", "memoffset", - "tracing", "wasm-bindgen", "web-sys", ] [[package]] name = "emath" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e" +checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b" dependencies = [ "bytemuck", + "serde", ] [[package]] @@ -588,6 +682,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enumn" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "enumset" version = "1.0.12" @@ -611,9 +716,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95" +checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b" dependencies = [ "ab_glyph", "ahash", @@ -621,8 +726,10 @@ dependencies = [ "bytemuck", "ecolor", "emath", + "log", "nohash-hasher", "parking_lot", + "serde", ] [[package]] @@ -814,6 +921,20 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", + "png", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -896,7 +1017,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libamdgpu_top" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "libdrm_amdgpu_sys", @@ -910,9 +1031,9 @@ checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libdrm_amdgpu_sys" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbba2720dc87ad23aaa9bbfb7f8cc25a826edfbe0fcfbb99fec1774ad1fb81a0" +checksum = "8e6441089848c428085639f12ef420bcae8ac6650f4cf1d7f9215611a34176bb" dependencies = [ "libc", ] @@ -1299,12 +1420,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - [[package]] name = "pkg-config" version = "0.3.26" @@ -1387,6 +1502,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ron" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +dependencies = [ + "base64", + "bitflags", + "serde", +] + [[package]] name = "ryu" version = "1.0.13" @@ -1432,6 +1558,20 @@ name = "serde" version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] [[package]] name = "serde_json" @@ -1670,26 +1810,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - [[package]] name = "ttf-parser" version = "0.18.1" @@ -1770,9 +1890,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1780,16 +1900,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", "wasm-bindgen-shared", ] @@ -1807,9 +1927,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1817,22 +1937,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wayland-client" diff --git a/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix b/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix index f6397fa28c..b8f753bc5a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix @@ -14,16 +14,18 @@ rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; - version = "0.1.9"; + version = "0.1.11"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = pname; rev = "v${version}"; - hash = "sha256-RR+YK8LyrPz7Pfv8moSOPei+56088lhoz8HxoB6+0B8="; + hash = "sha256-jeKwvecB67U+TACr4uXGjRWvRG3GUleiqyu5MYlFwq0="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoLock = { + lockFile = ./Cargo.lock; + }; buildInputs = [ libdrm @@ -51,5 +53,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Umio-Yasuno/amdgpu_top/releases"; license = licenses.mit; maintainers = with maintainers; [ geri1701 ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix b/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix index b72ee7a691..faa280575e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix @@ -43,5 +43,6 @@ python3Packages.buildPythonPackage rec { license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.Technical27 ]; + mainProgram = "auto-cpufreq"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index 1d8120063b..6b48b6f642 100644 --- a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.108"; + version = "1.0.116"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WPSwm11yVSuFTsLmNDn2xGaucyUoSu4EpFVjTpkAMS8="; + sha256 = "sha256-BS44/bN76iD659j1ISMBBw0o2uwLasd7CDJMh8LDII4="; }; - cargoHash = "sha256-XR6SpZhsuMfqx4Ns9g/+DOTm622OU8tltwW9Oe1PE2I="; + cargoHash = "sha256-tscxMeSS0BGJT7HlMrDsd3zMZXE0nUtd5qSzsSE2o/s="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix index 3bef287ccf..9ca18b0620 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix @@ -1,6 +1,5 @@ { lib, stdenv , curl -, darwin , hiredis , iptables , jdk @@ -19,7 +18,6 @@ , libsigrok , libvirt , libxml2 -, libapparmor, libcap_ng, numactl , lua , lvm2 , lm_sensors diff --git a/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix b/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix index cd8c755e1a..550fb7827a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { description = "Top-like interface for container metrics"; homepage = "https://ctop.sh/"; license = licenses.mit; - maintainers = with maintainers; [ apeyroux marsam SuperSandro2000 ]; + maintainers = with maintainers; [ apeyroux marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix b/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix index 079b6b6943..d83e4aa383 100644 --- a/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/datefudge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchpatch, makeWrapper, coreutils }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "datefudge"; diff --git a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix index 00c5b6c68f..441e359e13 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ python3 zlib ] ++ lib.optional (!stdenv.isDarwin) libaio; + # ./configure does not support autoconf-style --build=/--host=. + # We use $CC instead. + configurePlatforms = [ ]; + nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/system/gtop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gtop/default.nix new file mode 100644 index 0000000000..766719dfb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/gtop/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "gtop"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "aksakalli"; + repo = "gtop"; + rev = "v${version}"; + hash = "sha256-7jcfJOdy3PKT6+07iaZnjWnlPLk9BhPn8LApk23E8l4="; + }; + + npmDepsHash = "sha256-CUfoVkG74C7HpcO3T9HmwbxHsYAgW1vYBAgNvx2av0k="; + + dontNpmBuild = true; + + meta = { + description = "System monitoring dashboard for the terminal"; + homepage = "https://github.com/aksakalli/gtop"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tfc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix b/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix index c7e25e5785..1fef47933b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix @@ -1,9 +1,7 @@ { lib, fetchFromGitHub, python3Packages }: let - inherit (python3Packages) python; pname = "honcho"; - in python3Packages.buildPythonApplication rec { diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index 215818862c..c00f257808 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ rob relrod SuperSandro2000 ]; changelog = "https://github.com/htop-dev/htop/blob/${version}/ChangeLog"; + mainProgram = "htop"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix b/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix index ee538f9266..501ae69dbf 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix @@ -1,6 +1,5 @@ -{ config +{ lib , stdenv -, lib , fetchFromGitHub , makeWrapper , makePerlPath diff --git a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix index df5138268a..610a8ab776 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "22.2"; + version = "23.2"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - hash = "sha256-Z/brrDrT2J4RAS+pm1xaBqWO7PG6cAVgRpH3G6Nn39E="; + hash = "sha256-YAhsnE1DJ5UlYAuhDxS/5IpfIJB6DrhCT3E0YiKENjU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix index 0b55c3522f..6e86812ece 100644 --- a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix @@ -1,22 +1,21 @@ -{ fetchFromGitHub -, fetchpatch -, lib +{ lib , rustPlatform +, fetchFromGitHub , withCmd ? false }: rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gHkcOn37MNpcP6ra1Eur9O4/trPGmAOAGVU1NwiuQGY="; + sha256 = "sha256-Tenh2LARajYAFHJ5gddeozY7rfySSvqFhudc/7b9cGg="; }; - cargoHash = "sha256-C2d7QdgWd9RTQtXLD4mO0txpzo/SbemJx9YYu62QbqA="; + cargoHash = "sha256-oJVGZhKJVK8q5lgK+G+KhVupOF05u37B7Nmv4rrI28I="; buildFeatures = lib.optional withCmd "cmd"; @@ -30,5 +29,6 @@ rustPlatform.buildRustPackage rec { license = licenses.lgpl3Only; maintainers = with maintainers; [ linj ]; platforms = platforms.linux; + mainProgram = "kanata"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix b/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix index 743265caf2..c878ea9066 100644 --- a/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.4.2"; + version = "1.4.3"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "sha256-DGUd6zHcIB8VhOzqKSslmTK65uPozvhG2zEJ6Jp/IX4="; + sha256 = "sha256-rYOugL14C9rl7v1ArVmj6XuFrTpJYqp8ANmO073/zdA="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix b/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix index caaba84c08..f54e767776 100644 --- a/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix +++ b/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, pkgsBuildTarget, python, minijail }: +{ lib, buildPythonApplication, pkgsBuildTarget, python, minijail }: let targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index 1ccb04789f..6c89a3d2e5 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.40.1"; + version = "1.41.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-4bYCsEeB0kEYtVFVXymFv7ELUo9RXoKbPjOlDKav8Rg="; + sha256 = "sha256-MZQ1ZTghH4bN7kCMqbyQlAGSgE70sYJxjiamTTH/6ds="; fetchSubmodules = true; }; @@ -49,11 +49,6 @@ stdenv.mkDerivation rec { # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch - # The current IPC location is unsafe as it writes - # a fixed path in /tmp, which is world-writable. - # Therefore we put it into `/run/netdata`, which is owned - # by netdata only. - ./ipc-socket-in-run.patch # Avoid build-only inputs in closure leaked by configure command: # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162 diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 3a05d3bbf8..6e24d707d0 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,8 +1,8 @@ diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 24e4c3f09..b3c354943 100644 +index 2aec3dd3e..27385ec28 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -62,7 +62,7 @@ index c8144c137..f8aaa89b6 100644 +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index ea1b6e961..071fdd564 100644 +index 20e000860..add0137b3 100644 --- a/health/Makefile.am +++ b/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ @@ -75,10 +75,10 @@ index ea1b6e961..071fdd564 100644 healthconfigdir=$(libconfigdir)/health.d diff --git a/system/Makefile.am b/system/Makefile.am -index 13466639d..e7cc7acea 100644 +index 54e9278c8..e7cc7acea 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -21,11 +21,9 @@ include $(top_srcdir)/build/subst.inc +@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -87,10 +87,11 @@ index 13466639d..e7cc7acea 100644 dist_config_DATA = \ - .install-type \ +- netdata-updater.conf \ $(NULL) libconfigvnodesdir=$(libconfigdir)/vnodes -@@ -45,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit +@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit libsyssystemddir=$(libsysdir)/systemd # Explicitly install directories to avoid permission issues due to umask @@ -112,6 +113,3 @@ index be2c545c3..55f373114 100644 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) dist_noinst_DATA = \ --- -2.40.1 - diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/third_party/nixpkgs/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch index a03593896d..472da27079 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -1,16 +1,16 @@ Shrink closure size by avoiding paths embedded from configure call. https://github.com/NixOS/nixpkgs/issues/175693 +diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c +index 56cde84fc..011e7579d 100644 --- a/daemon/buildinfo.c +++ b/daemon/buildinfo.c -@@ -247,7 +247,9 @@ void print_build_info(void) { - char *prebuilt_distro = NULL; - get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro); +@@ -1040,7 +1040,7 @@ static void build_info_set_status(BUILD_INFO_SLOT slot, bool status) { -- printf("Configure options: %s\n", CONFIGURE_COMMAND); -+ // To minimize closure size do not persist configure options -+ // with build-time inputs. -+ printf("Configure options: REMOVED\n"); + __attribute__((constructor)) void initialize_build_info(void) { + build_info_set_value(BIB_PACKAGING_NETDATA_VERSION, program_version); +- build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, CONFIGURE_COMMAND); ++ build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, "REMOVED FOR CLOSURE SIZE REASONS"); - if (install_type == NULL) { - printf("Install type: unknown\n"); + #ifdef COMPILED_FOR_LINUX + build_info_set_status(BIB_FEATURE_BUILT_FOR, true); diff --git a/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix b/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix index 8e3f3766ce..dc1adc7ccd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/nvitop/default.nix @@ -5,15 +5,19 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+Yq/UHjrR2nT+TLXEDbNP2yMy4+LZGgbMrDLmWcrxqg="; + hash = "sha256-Za2NJ4gx+aE/cfl2wzbwLxIFNL1UzgKVbb6VqopkNxs="; }; + pythonRelaxDeps = [ "nvidia-ml-py" ]; + + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3Packages; [ cachetools psutil diff --git a/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-circular-definition-of-AUDIT_FILTER_EXCLUDE.patch b/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-circular-definition-of-AUDIT_FILTER_EXCLUDE.patch new file mode 100644 index 0000000000..d3aeca1c30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-circular-definition-of-AUDIT_FILTER_EXCLUDE.patch @@ -0,0 +1,25 @@ +From: Jack Baldry +Date: Tue, 15 Nov 2022 15:40:31 -0400 +Subject: [PATCH] Remove circular definition of AUDIT_FILTER_EXCLUDE + +https://github.com/osquery/osquery/issues/6551 + +Signed-off-by: Jack Baldry +--- + libraries/cmake/source/libaudit/src/lib/libaudit.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libraries/cmake/source/libaudit/src/lib/libaudit.h b/libraries/cmake/source/libaudit/src/libaudit.h +--- a/libraries/cmake/source/libaudit/src/lib/libaudit.h ++++ b/libraries/cmake/source/libaudit/src/lib/libaudit.h +@@ -260,7 +260,6 @@ extern "C" { + #define AUDIT_KEY_SEPARATOR 0x01 + + /* These are used in filter control */ +-#define AUDIT_FILTER_EXCLUDE AUDIT_FILTER_TYPE + #define AUDIT_FILTER_MASK 0x07 /* Mask to get actual filter */ + #define AUDIT_FILTER_UNSET 0x80 /* This value means filter is unset */ + +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-git-reset.patch b/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-git-reset.patch new file mode 100644 index 0000000000..af5b165a85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-git-reset.patch @@ -0,0 +1,37 @@ +From: Jack Baldry +Date: Tue, 15 Nov 2022 13:48:07 -0400 +Subject: [PATCH] Remove git reset + +This is not required for nixpkgs builds because we are not working in +the source repository and therefore do not need to be careful about +updating submodule content. + +Signed-off-by: Jack Baldry +--- + libraries/cmake/source/modules/utils.cmake | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/libraries/cmake/source/modules/utils.cmake b/libraries/cmake/source/modules/utils.cmake +--- a/libraries/cmake/source/modules/utils.cmake ++++ b/libraries/cmake/source/modules/utils.cmake +@@ -102,17 +102,6 @@ function(patchSubmoduleSourceCode library_name patches_dir source_dir apply_to_d + file(COPY "${source_dir}" DESTINATION "${parent_dir}") + endif() + +- # We need to restore the source code to its original state, pre patch +- execute_process( +- COMMAND "${GIT_EXECUTABLE}" reset --hard HEAD +- RESULT_VARIABLE process_exit_code +- WORKING_DIRECTORY "${source_dir}" +- ) +- +- if(NOT ${process_exit_code} EQUAL 0) +- message(FATAL_ERROR "Failed to git reset the following submodule: \"${source_dir}\"") +- endif() +- + set(patchSubmoduleSourceCode_Patched TRUE PARENT_SCOPE) + endfunction() + +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-system-controls-table.patch b/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-system-controls-table.patch new file mode 100644 index 0000000000..e448f70a3d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/osquery/Remove-system-controls-table.patch @@ -0,0 +1,157 @@ +From: Jack Baldry +Date: Wed, 16 Nov 2022 22:00:06 -0400 +Subject: [PATCH] Remove system controls table + +Relies on which is not present in glibc since 2.32. + +Signed-off-by: Jack Baldry +--- + osquery/tables/system/CMakeLists.txt | 4 -- + specs/CMakeLists.txt | 1 - + specs/posix/system_controls.table | 21 ------- + tests/integration/tables/system_controls.cpp | 61 -------------------- + 4 files changed, 87 deletions(-) + delete mode 100644 specs/posix/system_controls.table + delete mode 100644 tests/integration/tables/system_controls.cpp + +diff --git a/osquery/tables/system/CMakeLists.txt b/osquery/tables/system/CMakeLists.txt +--- a/osquery/tables/system/CMakeLists.txt ++++ b/osquery/tables/system/CMakeLists.txt +@@ -43,7 +43,6 @@ function(generateOsqueryTablesSystemSystemtable) + posix/smbios_utils.cpp + posix/sudoers.cpp + posix/suid_bin.cpp +- posix/system_controls.cpp + posix/ulimit_info.cpp + ) + endif() +@@ -82,7 +81,6 @@ function(generateOsqueryTablesSystemSystemtable) + linux/shared_memory.cpp + linux/smbios_tables.cpp + linux/startup_items.cpp +- linux/sysctl_utils.cpp + linux/system_info.cpp + linux/usb_devices.cpp + linux/user_groups.cpp +@@ -156,7 +154,6 @@ function(generateOsqueryTablesSystemSystemtable) + darwin/smbios_tables.cpp + darwin/smc_keys.cpp + darwin/startup_items.cpp +- darwin/sysctl_utils.cpp + darwin/system_extensions.mm + darwin/system_info.cpp + darwin/time_machine.cpp +@@ -326,7 +323,6 @@ function(generateOsqueryTablesSystemSystemtable) + posix/shell_history.h + posix/ssh_keys.h + posix/sudoers.h +- posix/sysctl_utils.h + posix/last.h + posix/openssl_utils.h + posix/authorized_keys.h +diff --git a/specs/CMakeLists.txt b/specs/CMakeLists.txt +--- a/specs/CMakeLists.txt ++++ b/specs/CMakeLists.txt +@@ -246,7 +246,6 @@ function(generateNativeTables) + "posix/socket_events.table:linux,macos" + "posix/sudoers.table:linux,macos,freebsd" + "posix/suid_bin.table:linux,macos,freebsd" +- "posix/system_controls.table:linux,macos,freebsd" + "posix/ulimit_info.table:linux,macos,freebsd" + "posix/usb_devices.table:linux,macos" + "posix/user_events.table:linux,macos,freebsd" +diff --git a/specs/posix/system_controls.table b/specs/posix/system_controls.table +deleted file mode 100644 +--- a/specs/posix/system_controls.table ++++ /dev/null +@@ -1,21 +0,0 @@ +-table_name("system_controls") +-description("sysctl names, values, and settings information.") +-schema([ +- Column("name", TEXT, "Full sysctl MIB name", index=True), +- Column("oid", TEXT, "Control MIB", additional=True), +- Column("subsystem", TEXT, "Subsystem ID, control type", additional=True), +- Column("current_value", TEXT, "Value of setting"), +- Column("config_value", TEXT, "The MIB value set in /etc/sysctl.conf"), +- Column("type", TEXT, "Data type"), +-]) +-extended_schema(DARWIN, [ +- Column("field_name", TEXT, "Specific attribute of opaque type"), +-]) +- +-implementation("system_controls@genSystemControls") +-fuzz_paths([ +- "/run/sysctl.d/", +- "/usr/lib/sysctl.d/", +- "/lib/sysctl.d/", +- "/sys" +-]) +diff --git a/tests/integration/tables/system_controls.cpp b/tests/integration/tables/system_controls.cpp +deleted file mode 100644 +--- a/tests/integration/tables/system_controls.cpp ++++ /dev/null +@@ -1,61 +0,0 @@ +-/** +- * Copyright (c) 2014-present, The osquery authors +- * +- * This source code is licensed as defined by the LICENSE file found in the +- * root directory of this source tree. +- * +- * SPDX-License-Identifier: (Apache-2.0 OR GPL-2.0-only) +- */ +- +-// Sanity check integration test for system_controls +-// Spec file: specs/posix/system_controls.table +- +-#include +- +-namespace osquery { +-namespace table_tests { +-namespace { +- +-class SystemControlsTest : public testing::Test { +- protected: +- void SetUp() override { +- setUpEnvironment(); +- } +-}; +- +-TEST_F(SystemControlsTest, test_sanity) { +- auto const rows = execute_query("select * from system_controls"); +- auto const row_map = ValidationMap{ +- {"name", NonEmptyString}, +- {"oid", NormalType}, +- {"subsystem", +- SpecificValuesCheck{"", +- "abi", +- "debug", +- "dev", +- "fs", +- "fscache", +- "hw", +- "kern", +- "kernel", +- "machdep", +- "net", +- "sunrpc", +- "user", +- "vfs", +- "vm"}}, +- {"current_value", NormalType}, +- {"config_value", NormalType}, +- {"type", +- SpecificValuesCheck{ +- "", "node", "int", "string", "quad", "opaque", "struct"}}, +-#ifdef __APPLE__ +- {"field_name", NormalType}, +-#endif +- }; +- validate_rows(rows, row_map); +-} +- +-} // namespace +-} // namespace table_tests +-} // namespace osquery +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch b/third_party/nixpkgs/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch new file mode 100644 index 0000000000..63dd5a387f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/osquery/Use-locale.h-instead-of-removed-xlocale.h-header.patch @@ -0,0 +1,29 @@ +From: Jack Baldry +Date: Tue, 15 Nov 2022 14:34:33 -0400 +Subject: [PATCH] Use locale.h instead of removed xlocale.h header + +https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 + +Signed-off-by: Jack Baldry +--- + libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h b/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h +--- a/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h ++++ b/libraries/cmake/source/augeas/gnulib/generated/linux/x86_64/lib/locale.h +@@ -48,9 +48,9 @@ + /* NetBSD 5.0 mis-defines NULL. */ + #include + +-/* Mac OS X 10.5 defines the locale_t type in . */ ++/* Mac OS X 10.5 defines the locale_t type in . */ + #if 1 +-# include ++# include + #endif + + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/tools/system/osquery/default.nix b/third_party/nixpkgs/pkgs/tools/system/osquery/default.nix new file mode 100644 index 0000000000..a7c8f18214 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/osquery/default.nix @@ -0,0 +1,87 @@ +{ lib +, cmake +, fetchFromGitHub +, git +, llvmPackages +, nixosTests +, overrideCC +, perl +, python3 +, stdenv +, openssl_1_1 +}: + +let + buildStdenv = overrideCC stdenv llvmPackages.clangUseLLVM; +in +buildStdenv.mkDerivation rec { + pname = "osquery"; + version = "5.5.1"; + + src = fetchFromGitHub { + owner = "osquery"; + repo = "osquery"; + rev = version; + fetchSubmodules = true; + sha256 = "sha256-Q6PQVnBjAjAlR725fyny+RhQFUNwxWGjLDuS5p9JKlU="; + }; + + patches = [ + ./Remove-git-reset.patch + ./Use-locale.h-instead-of-removed-xlocale.h-header.patch + ./Remove-circular-definition-of-AUDIT_FILTER_EXCLUDE.patch + # For current state of compilation against glibc in the clangWithLLVM toolchain, refer to the upstream issue in https://github.com/osquery/osquery/issues/7823. + ./Remove-system-controls-table.patch + ]; + + + buildInputs = [ + llvmPackages.libunwind + ]; + nativeBuildInputs = [ + cmake + git + perl + python3 + ]; + + postPatch = '' + substituteInPlace cmake/install_directives.cmake --replace "/control" "control" + # This is required to build libarchive with our glibc version + # which provides the ARC4RANDOM_BUF function + substituteInPlace libraries/cmake/source/libarchive/CMakeLists.txt --replace " target_compile_definitions(thirdparty_libarchive PRIVATE" " target_compile_definitions(thirdparty_libarchive PRIVATE HAVE_ARC4RANDOM_BUF" + # We need to override this hash because we use our own openssl 1.1 version + substituteInPlace libraries/cmake/formula/openssl/CMakeLists.txt --replace \ + "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca" \ + "$(sha256sum ${openssl_1_1.src} | cut -f1 '-d ')" + cat libraries/cmake/formula/openssl/CMakeLists.txt + ''; + + # For explanation of these deletions, refer to the ./Use-locale.h-instead-of-removed-xlocale.h-header.patch file. + preConfigure = '' + find libraries/cmake/source -name 'config.h' -exec sed -i '/#define HAVE_XLOCALE_H 1/d' {} \; + ''; + + cmakeFlags = [ + "-DOSQUERY_VERSION=${version}" + "-DOSQUERY_OPENSSL_ARCHIVE_PATH=${openssl_1_1.src}" + ]; + + postFixup = '' + patchelf --set-rpath "${llvmPackages.libunwind}/lib:$(patchelf --print-rpath $out/bin/osqueryd)" "$out/bin/osqueryd" + ''; + + passthru.tests.osquery = nixosTests.osquery; + + meta = with lib; { + description = "SQL powered operating system instrumentation, monitoring, and analytics."; + longDescription = '' + The system controls table is not included as it does not presently compile with glibc >= 2.32. + For more information, refer to https://github.com/osquery/osquery/issues/7823 + ''; + homepage = "https://osquery.io"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ znewman01 lewo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix b/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix index 02a214259c..8e45896632 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pcstat/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pcstat"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "tobert"; repo = "pcstat"; rev = "v${version}"; - sha256 = "sha256-rN6oqhvrzMBhwNLm8+r4rZWZYZUhOq2h764KVhSycNo="; + sha256 = "sha256-e8fQZEfsS5dATPgshJktfKVTdZ9CvN1CttYipMjpGNM="; }; - vendorSha256 = "sha256-1y6rzarkFNX8G4E9FzCLfWxULbdNYK3DeelNCJ+7Y9Q="; + vendorHash = "sha256-fdfiHTE8lySfyiKKiYJsQNCY6MBfjaVYSIZXtofIz3E="; meta = with lib; { description = "Page Cache stat: get page cache stats for files on Linux"; diff --git a/third_party/nixpkgs/pkgs/tools/system/proot/default.nix b/third_party/nixpkgs/pkgs/tools/system/proot/default.nix index 8ccb540e4e..665be5cbab 100644 --- a/third_party/nixpkgs/pkgs/tools/system/proot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/proot/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub , talloc , pkg-config -, git , ncurses , docutils, swig, python3, coreutils, enablePython ? true }: diff --git a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 364ce66de8..ceb83ff202 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2304.0"; + version = "8.2306.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-0JDpAoPrS4Dei0Pl/8bktZxOOXDyqpHmO+7woRcg100="; + hash = "sha256-9ig++q3GCVQKVua+yIo2LJZud/Kf5I5rc0vWwRI+C+U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix b/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix index 193fbb0aef..f75ba42ac9 100644 --- a/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/s0ix-selftest-tool/default.nix @@ -12,7 +12,6 @@ pciutils, powertop, resholve, - stdenv, util-linux, xorg, xxd, diff --git a/third_party/nixpkgs/pkgs/tools/system/stacer/default.nix b/third_party/nixpkgs/pkgs/tools/system/stacer/default.nix new file mode 100644 index 0000000000..75068148bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/stacer/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtcharts +, qttools +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "stacer"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "oguzhaninan"; + repo = pname; + rev = "v${version}"; + sha256 = "0qndzzkbq6abapvwq202kva8j619jdn9977sbqmmfs9zkjz4mbsd"; + }; + + postPatch = '' + substituteInPlace stacer/Managers/app_manager.cpp \ + --replace 'qApp->applicationDirPath() + "/translations"' \ + 'QStandardPaths::locate(QStandardPaths::AppDataLocation, "translations", QStandardPaths::LocateDirectory)' + ''; + + buildInputs = [ + qtcharts + qttools + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + preConfigure = '' + lrelease stacer/stacer.pro + ''; + + postInstall = '' + install -Dm644 ../translations/*.qm -t $out/share/stacer/translations + ''; + + meta = with lib; { + description = "Linux System Optimizer and Monitoring"; + homepage = "https://github.com/oguzhaninan/stacer"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix b/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix index 299312a5d9..b16a7613cd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "More powerful alternative to sysctl(8) with a terminal user interface"; homepage = "https://github.com/orhun/systeroid"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix b/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix index 8bc290d6a6..9fe76c5905 100644 --- a/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/testdisk/default.nix @@ -26,6 +26,11 @@ assert enableQt -> qwt != null; sha256 = "1zlh44w67py416hkvw6nrfmjickc2d43v51vcli5p374d5sw84ql"; }; + postPatch = '' + substituteInPlace linux/qphotorec.desktop \ + --replace "/usr" "$out" + ''; + enableParallelBuilding = true; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/tree/default.nix b/third_party/nixpkgs/pkgs/tools/system/tree/default.nix index 87333dd1c8..108edfb063 100644 --- a/third_party/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/tree/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { the LS_COLORS environment variable is set and output is to tty. ''; platforms = platforms.all; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/zx/default.nix b/third_party/nixpkgs/pkgs/tools/system/zx/default.nix new file mode 100644 index 0000000000..857661c31f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/zx/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "zx"; + version = "7.2.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = "zx"; + rev = version; + hash = "sha256-YMfecNazmL8J+f80FdIRvr2upQ7VgXSkQQnm8z0Swhw="; + }; + + npmDepsHash = "sha256-ywNd2LGjM35ecW4dnj0oNwdSX2CRy8i9OGKPIdI0UEQ="; + + meta = { + description = "Tool for writing scripts using JavaScript"; + homepage = "https://github.com/google/zx"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hlolli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/base16384/default.nix b/third_party/nixpkgs/pkgs/tools/text/base16384/default.nix index f3c5156793..624ab070df 100644 --- a/third_party/nixpkgs/pkgs/tools/text/base16384/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/base16384/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "base16384"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "fumiama"; repo = pname; rev = "v${version}"; - hash = "sha256-E/dcicqu/i+GpLDqgkwZfEIoUxAuNGsoLLnG0blMNaw="; + hash = "sha256-nHr7S3UrNaR/5YGwfDUxVXqTkaT3EYzA8CaS0lWZxN0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix index 86e5fe7692..6ef96b287b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/chroma/default.nix @@ -6,7 +6,7 @@ in buildGoModule rec { pname = "chroma"; - version = "2.7.0"; + version = "2.8.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -17,7 +17,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorSha256 = "0kw53983bjrmh9nk2xcv4d9104krxnc1jh1g44xjmaq8i6f3q0k1"; + vendorSha256 = "1qawayihklidfzln3jr899wh4zp9w7yq3i18klaylqndrg47k286"; modRoot = "./cmd/chroma"; diff --git a/third_party/nixpkgs/pkgs/tools/text/chroma/src.json b/third_party/nixpkgs/pkgs/tools/text/chroma/src.json index 4b0a5aeb8e..8bba14faf1 100644 --- a/third_party/nixpkgs/pkgs/tools/text/chroma/src.json +++ b/third_party/nixpkgs/pkgs/tools/text/chroma/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "b9e37581208ea7d7f167c59e6f635721617c381b", - "date": "2023-03-21T13:55:45+11:00", - "path": "/nix/store/52c919gjqdwva73ajwz11iv5gg18vi8y-chroma", - "sha256": "0i4ck23gn0v7x6r8wa2k7qiwhxpxqqnaknb9iy9rz8pjcj14ai75", + "rev": "e8acfc274c22a76fd38030d2977a2246cd4322b3", + "date": "2023-06-30T08:43:39+10:00", + "path": "/nix/store/57y15g11dmdy2s6vxrjzl03s03j509gy-chroma", + "sha256": "0fdgpi5r0k42qzdn4lxh81ww1zcn9mwfildwrqf1s7crsqmr9dc5", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix index 05f0c972ea..cfebb56743 100644 --- a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix @@ -13,12 +13,9 @@ let inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; - nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ - pytest-xdist - ]); - disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ - "test/aaa_profiling" - "test/ext/mypy" + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" ]; }); }; diff --git a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix b/third_party/nixpkgs/pkgs/tools/text/d2/default.nix index 839e36bba8..a60c9114e0 100644 --- a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/d2/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "d2"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-Oq6bJ/cX+kDyVUVP/RpCIcNeWpT3HESUMmR6mEi9X4Q="; + hash = "sha256-MF8RqwoMc48JYgNUJTQKHlGl59xyHOALnFL2BWQAl24="; }; vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk="; diff --git a/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock b/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock index 2711be4d25..25e3c8e41f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock @@ -187,9 +187,9 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ "bitflags", "crossterm_winapi", @@ -217,7 +217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", - "syn", + "syn 1.0.95", ] [[package]] @@ -234,7 +234,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.48.0" +version = "0.49.0" dependencies = [ "assert_cmd", "bumpalo", @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -636,9 +636,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -774,24 +774,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn", + "syn 2.0.27", ] [[package]] @@ -805,6 +805,17 @@ dependencies = [ "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 = "termcolor" version = "1.1.3" diff --git a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix index 86b8fd3eac..3842fb6b14 100644 --- a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -16,13 +16,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-kCCORQKqt9rDydxvddD30RMQ1eS73rgvJzCCx93lRuI="; + hash = "sha256-jFBvMRkuAaQAi/28BBf/9cm6FcNMOYS5M69YoSXsX4Q="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix b/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix index 0780f4a33b..7d27a45b56 100644 --- a/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "4.24.0"; + version = "4.25.0"; src = fetchPypi { inherit pname version; - hash = "sha256-DQaiP0EIvP0gT0b0nqJT18xqd5J5tuwIp6y7bpNH6tA="; + hash = "sha256-ky6N/AcfoXJahW7tw++WtnpTnpRv4ZUraMTWjVXDjEE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/text/frogmouth/default.nix b/third_party/nixpkgs/pkgs/tools/text/frogmouth/default.nix index 649e500143..1fadb827d0 100644 --- a/third_party/nixpkgs/pkgs/tools/text/frogmouth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/frogmouth/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "frogmouth"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Textualize"; repo = "frogmouth"; rev = "v${version}"; - hash = "sha256-XKIGZ100aK5ZCsPxxakXhymYXXFYo7S+chMFs7jwXtw="; + hash = "sha256-GVXzYPYvqgWRFOZW+dfYVI6Dhk9yUmuJ7V8wtM0VjR0="; }; nativeBuildInputs = [ @@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "httpx" + "textual" "xdg" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix index 8fe044a9e2..d85880e82e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; + mainProgram = "gawk"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix index c3b6288ece..8db2143f1b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.23.3"; + version = "1.24.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - hash = "sha256-E7oxi0rwVCzA/pBJ9SS6t+zR+J+dF7SW+oP+vXXN2FQ="; + hash = "sha256-pce7g0MI23244t5ZK4UDOfQNt1m3tRpCahne0s+NRRE="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/text/gtree/default.nix b/third_party/nixpkgs/pkgs/tools/text/gtree/default.nix index c0242aaa69..2f9035bf87 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gtree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.8.6"; + version = "1.9.3"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-0jRCQsRiJbQQcz8d7rXkAk4W4EurJ5OOcMAUn11k+ko="; + hash = "sha256-cQO34m78lvgfbDf+Ok0Yo3rnou8ndGfegeIy1Z8xuPU="; }; - vendorHash = "sha256-BMfJFR4sqJNNlJ7Y3q2GlXWjMDH+DXhuFQVX5I9Czkc="; + vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; subPackages = [ "cmd/gtree" diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix b/third_party/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix index 23e3d3805a..013a246868 100644 --- a/third_party/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "languagetool-rust"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "jeertmans"; repo = pname; rev = "v${version}"; - hash = "sha256-2RIfavAPxi8986f1hz7cnuIuKsPQ13PYy66FTnozIp0="; + hash = "sha256-iiJSdr7TF1f8/Ve+OKbTDHYWdFkd2IEOzp7Lhlpwb50="; }; - cargoHash = "sha256-PE/q8laWos8K9b+sWg47iw/w0g4c3utkVd+KXXPJKhY="; + cargoHash = "sha256-oCRlWYCTmJWTi6LCDEKimsLmqm3JTaQEsKJXrvQP/p8="; buildFeatures = [ "full" ]; @@ -37,6 +37,35 @@ rustPlatform.buildRustPackage rec { "--skip=test_match_positions_3" "--skip=test_match_positions_4" "--skip=src/lib/lib.rs" + "--skip=test_basic_check_data" + "--skip=test_basic_check_file" + "--skip=test_basic_check_files" + "--skip=test_basic_check_piped" + "--skip=test_basic_check_text" + "--skip=test_check_with_dict" + "--skip=test_check_with_dicts" + "--skip=test_check_with_disabled_categories" + "--skip=test_check_with_disabled_category" + "--skip=test_check_with_disabled_rule" + "--skip=test_check_with_disabled_rules" + "--skip=test_check_with_enabled_categories" + "--skip=test_check_with_enabled_category" + "--skip=test_check_with_enabled_only_category" + "--skip=test_check_with_enabled_only_rule" + "--skip=test_check_with_enabled_only_without_enabled" + "--skip=test_check_with_enabled_rule" + "--skip=test_check_with_enabled_rules" + "--skip=test_check_with_language" + "--skip=test_check_with_picky_level" + "--skip=test_check_with_preferred_variant" + "--skip=test_check_with_preferred_variants" + "--skip=test_check_with_unexisting_language" + "--skip=test_check_with_username_and_key" + "--skip=test_languages" + "--skip=test_ping" + "--skip=test_words" + "--skip=test_words_add" + "--skip=test_words_delete" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix index c567968ca5..65fcb5b71e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "6.1"; + version = "6.2"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "sha256-4icKkcTKwaD3C8doxwdhsro+YIB6MCUj6POjRhg2YJM="; + sha256 = "sha256-I0Blp3o+NVL0b/86UTztufwKVkgO9KNXtBuUrUnbWco="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/markdown-pp/default.nix b/third_party/nixpkgs/pkgs/tools/text/markdown-pp/default.nix deleted file mode 100644 index c6e937eab2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/markdown-pp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "MarkdownPP"; - version = "1.5.1"; - propagatedBuildInputs = with python3.pkgs; [ pillow watchdog ]; - checkPhase = '' - cd test - PATH=$out/bin:$PATH ${python3}/bin/${python3.executable} test.py - ''; - src = fetchFromGitHub { - owner = "jreese"; - repo = "markdown-pp"; - rev = "v${version}"; - sha256 = "180i5wn9z6vdk2k2bh8345z3g80hj7zf5s2pq0h7k9vaxqpp7avc"; - }; - meta = with lib; { - description = "Preprocessor for Markdown files to generate a table of contents and other documentation needs"; - license = licenses.mit; - homepage = "https://github.com/jreese/markdown-pp"; - maintainers = with maintainers; [ zgrannan ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/text/markscribe/default.nix b/third_party/nixpkgs/pkgs/tools/text/markscribe/default.nix new file mode 100644 index 0000000000..d542fe2811 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/markscribe/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "markscribe"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "markscribe"; + rev = "v${version}"; + hash = "sha256-I8WSG9rMqgf2QADQetlYTSUIQH1Iv8cMVw/3uIwEDPc="; + }; + + vendorHash = "sha256-leeP2+W+bnYASls3k0l4jpz1rc1mAkMWUfrY2uBUUdQ="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Your personal markdown scribe with template-engine and Git(Hub) & RSS powers"; + homepage = "https://github.com/muesli/markscribe"; + changelog = "https://github.com/muesli/markscribe/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix index df7348d352..49edcf8659 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.5.4"; + version = "0.5.5"; src = fetchCrate { inherit pname version; - hash = "sha256-PbnoTqVgo3qypnC1GT4pmvAmYbWV0F+FvEiaL3D9MmE="; + hash = "sha256-ZiMMO3v//re6rCwDojJqaXChKL4wTK1fKVdQ8plHv9Q="; }; - cargoHash = "sha256-H+yb6h3ipXZwD96GxI8Ep0PMxkd7EfAyVZvi25/U3YA="; + cargoHash = "sha256-FEyUWR5WcKZsGTFAnvysYReH1wOrKYoKQ0wlrPaW4ok="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-toc/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-toc/default.nix index 9d92c7e941..3fc144ff84 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-toc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-toc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - sha256 = "sha256-3lAi9ZNtwhA2OtIR4tN2wiztp3pnRxtaGG0MwGEk0u0="; + sha256 = "sha256-Z3ZspXD7M3VVi70+dRz7NhO6msw5htmPRX6VzhA9NPY="; }; - cargoHash = "sha256-l3ETQ/ARBZmU1wMCK6F/4g6tlxHsEV9D5LO1wue1Jps="; + cargoHash = "sha256-5EC9xfjSg0sIkZ2fIkX3SrwL0wzBfpIObFQpkMRj6oM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix index 14d5635243..084980ebda 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.31"; + version = "0.4.32"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-OUhZ94bW1+tmUPm/NLlL+Ummm2rtkJTBnNZ00hsTO5I="; + sha256 = "sha256-+Cb4ZFkJu6z2x/HqQkVqb2J0tFuj78TAmzhp2VPiai0="; }; - cargoHash = "sha256-u8764RKgC35Z18KHw4AAxETPlACrMnVyz4/Aa2HQyEw="; + cargoHash = "sha256-Jj5AWapZUzd/ZZQvvlSWOv2dX4AhJyHKEncIPdLL7cA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix index 20d7a40b7f..ac07611063 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "ov"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-xTnUTtMm986MnQEKgExWfABU8E8C+ZiRZvOpg3FY5cY="; + hash = "sha256-UtYFr5eFdEU/oZqwy84W/GQiFrMPWRIomqgJY3P52Ws="; }; - vendorHash = "sha256-bQREazHu0SQrMKyNPtUvzeKR/zb0FJOLpHBwHml43Hs="; + vendorHash = "sha256-0Gs/GFlAl+ttprAVq9NxRLYzP/U2PD4IrY+drSIWJ/c="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/text/pru/default.nix b/third_party/nixpkgs/pkgs/tools/text/pru/default.nix index 26e7434424..5126c6dc0e 100644 --- a/third_party/nixpkgs/pkgs/tools/text/pru/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/pru/default.nix @@ -3,12 +3,12 @@ , bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "pru"; gemdir = ./.; exes = [ "pru" ]; - meta = with lib; { + meta = { homepage = "https://github.com/grosser/pru"; description = "Pipeable Ruby"; longDescription = '' @@ -16,9 +16,9 @@ bundlerApp rec { higher-level replacement of typical text processing tools (like sed, awk, grep etc.). ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; - passthru.updateScript = bundlerUpdateScript pname; + passthru.updateScript = bundlerUpdateScript "pru"; } diff --git a/third_party/nixpkgs/pkgs/tools/text/pyp/default.nix b/third_party/nixpkgs/pkgs/tools/text/pyp/default.nix new file mode 100644 index 0000000000..1ba4629220 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/pyp/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitHub +, python3 +, bc +, jq +}: + +let + version = "1.1.0"; +in python3.pkgs.buildPythonApplication { + pname = "pyp"; + inherit version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hauntsaninja"; + repo = "pyp"; + rev = "v${version}"; + hash = "sha256-A1Ip41kxH17BakHEWEuymfa24eBEl5FIHAWL+iZFM4I="; + }; + + nativeBuildInputs = [ + python3.pkgs.flit-core + ]; + + nativeCheckInputs = [ + python3.pkgs.pytestCheckHook + bc + jq + ]; + + # without this, the tests fail because they are unable to find the pyp tool + # itself... + preCheck = '' + _OLD_PATH_=$PATH + PATH=$out/bin:$PATH + ''; + + # And a cleanup + postCheck = '' + PATH=$_OLD_PATH_ + ''; + + meta = { + homepage = "https://github.com/hauntsaninja/pyp"; + description = "Easily run Python at the shell"; + changelog = "https://github.com/hauntsaninja/pyp/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/repgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/repgrep/default.nix index d732687b34..5bce7d2f2b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/repgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/repgrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "repgrep"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "acheronfail"; repo = "repgrep"; rev = version; - hash = "sha256-B3p1h1A8To7yDdioTr7d+C4/231YA7F45QKnzPb0AZs="; + hash = "sha256-sclBzv3F3M3oARRm0cNg/ABomzfgbDp0cFOXkRYjGEY="; }; - cargoHash = "sha256-V2jsH48QavHlCQQ3w3IoqlgOkY3SKXwVYhoa4KURruk="; + cargoHash = "sha256-o6pF32sNiDuCjsBaa5beZyFCv1PoqALZOhAb0GF0XyQ="; nativeBuildInputs = [ asciidoctor diff --git a/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix b/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix new file mode 100644 index 0000000000..0ae05e5902 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/reveal-md/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "reveal-md"; + version = "5.5.1"; + + src = fetchFromGitHub { + owner = "webpro"; + repo = "reveal-md"; + rev = version; + hash = "sha256-BlUZsETMdOmnz+OFGQhQ9aLHxIIAZ12X1ipy3u59zxo="; + }; + + npmDepsHash = "sha256-xaDBB16egGi8zThHRrhcN8TVf6Nqkx8fkbxWqvJwJb4="; + + env = { + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true; + }; + + dontNpmBuild = true; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + npm run test + + runHook postCheck + ''; + + meta = { + description = "Get beautiful reveal.js presentations from your Markdown files"; + homepage = "https://github.com/webpro/reveal-md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sagikazarmark ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix index 022f8bd25b..456956986c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; - maintainers = with maintainers; [ tailhook globin ma27 zowoq ]; + maintainers = with maintainers; [ globin ma27 zowoq ]; mainProgram = "rg"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/tesh/default.nix b/third_party/nixpkgs/pkgs/tools/text/tesh/default.nix new file mode 100644 index 0000000000..7961b120d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/tesh/default.nix @@ -0,0 +1,26 @@ +{ python3Packages, fetchFromGitHub }: + +let + version = "0.3.0"; +in python3Packages.buildPythonPackage rec { + pname = "tesh"; + inherit version; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "OceanSprint"; + repo = "tesh"; + rev = version; + sha256 = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4="; + }; + + prePatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry" "poetry.core.masonry" + ''; + + checkInputs = [ python3Packages.pytest ]; + nativeBuildInputs = [ python3Packages.poetry-core ]; + propagatedBuildInputs = with python3Packages; [ click pexpect ]; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/to-html/default.nix b/third_party/nixpkgs/pkgs/tools/text/to-html/default.nix new file mode 100644 index 0000000000..0b49fd8be2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/to-html/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + version = "0.1.4"; + pname = "to-html"; + + src = fetchFromGitHub { + owner = "Aloso"; + repo = "to-html"; + rev = "v${version}"; + hash = "sha256-zkTBjsMFhRz7lVRh8i+XkaJ/qWmTAMPnkH5aDhbHf8U="; + }; + + cargoHash = "sha256-hXc+lB3DKnRZkp1U5wW/vPKSZ0c1UknQCAxDfE7Eubg="; + + # Requires external resources + doCheck = false; + + meta = { + description = "Terminal wrapper for rendering a terminal on a website by converting ANSI escape sequences to HTML."; + homepage = "https://github.com/Aloso/to-html"; + changelog = "https://github.com/Aloso/to-html/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ icewind1991 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix index 6bbe4fac2a..9ec13678f2 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "3.12.2"; + version = "3.12.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-h5BMqv8gv+e7pBSyQva5lmH83lxSnu86BF3KwziFdps="; + hash = "sha256-KP8SpeHGOdIKnA+xavdkoj3XRU572RZtFH0DaW28m+k="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 645ab6e62d..4fc1c8c52f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.28.0"; + version = "2.28.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-AalZFc2GGIA7CV3+OGEmNZEQk0OUsbfQDq8d3Z708XU="; + hash = "sha256-40JCZo7wxI2ysquW/r+LEcC+TUdmBEHak8b3AcmNq4c="; }; vendorHash = "sha256-KB1mRWDYejc38tUv316MiGfmq2riNnpEMIUpjgfSasU="; @@ -27,8 +27,9 @@ buildGoModule rec { doCheck = false; meta = with lib; { - homepage = "https://vale.sh/"; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; + homepage = "https://vale.sh/"; + changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix b/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix index aeafda70a2..728cad2c3f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/wrap/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { homepage = "https://github.com/Wraparound/wrap"; license = licenses.gpl3Only; maintainers = [ maintainers.austinbutler ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; } diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix new file mode 100644 index 0000000000..7aeaf13fb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "bibtex-tidy"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "FlamingTempura"; + repo = "bibtex-tidy"; + rev = "v${version}"; + hash = "sha256-VjQuMQr3OJgjgX6FdH/C4mehf8H7XjDZ9Rxs92hyQVo="; + }; + + patches = [ + # downloads Google fonts during `npm run build` + ./remove-google-font-loader.patch + ]; + + npmDepsHash = "sha256-u2lyG95F00S/bvsVwu0hIuUw2UZYQWFakCF31LIijSU="; + + env = { + PUPPETEER_SKIP_DOWNLOAD = true; + }; + + meta = { + changelog = "https://github.com/FlamingTempura/bibtex-tidy/blob/${src.rev}/CHANGELOG.md"; + description = "Cleaner and Formatter for BibTeX files"; + homepage = "https://github.com/FlamingTempura/bibtex-tidy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bertof ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch b/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch new file mode 100644 index 0000000000..79c6850cf6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/typesetting/bibtex-tidy/remove-google-font-loader.patch @@ -0,0 +1,52 @@ +diff --git a/build.ts b/build.ts +index ae4e350..3498ae7 100644 +--- a/build.ts ++++ b/build.ts +@@ -312,7 +312,6 @@ async function buildWebBundle() { + target: ['esnext'], + plugins: [ + sveltePlugin({ preprocess: autoPreprocess() }), +- googleFontPlugin, + regexpuPlugin, + ], + }); +@@ -344,7 +343,6 @@ async function serveWeb() { + preprocess: autoPreprocess(), + compilerOptions: { enableSourcemap: true }, + }), +- googleFontPlugin, + ], + }); + const server = await ctx.serve({ servedir: WEB_PATH }); +@@ -375,31 +373,6 @@ const regexpuPlugin: Plugin = { + }, + }; + +-// Downloads google fonts and injects them as base64 urls into bundle css +-const googleFontPlugin: Plugin = { +- name: 'google-font-loader', +- setup(build) { +- build.onResolve({ filter: /^https?:\/\/fonts\./ }, (args) => ({ +- path: args.path, +- namespace: 'http-url', +- })); +- build.onLoad( +- { filter: /.*/, namespace: 'http-url' }, +- async (args): Promise => { +- const res = await fetch(args.path, { +- headers: { +- // ensures google responds with woff2 fonts +- 'User-Agent': 'Mozilla/5.0 Firefox/90.0', +- }, +- }); +- const contents = Buffer.from(await res.arrayBuffer()); +- const loader = args.path.endsWith('.woff2') ? 'dataurl' : 'css'; +- return { contents, loader }; +- } +- ); +- }, +-}; +- + /** + * swc converts js syntax to support older browsers. ESBuild can kinda do this + * but only for more recent browsers. swc is also far easier to configure than diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index e4c904fffb..3a108d7c8e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook -, enableShared ? !(stdenv.hostPlatform.isStatic) +, enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic # for passthru.tests , nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = let - inherit (stdenv.hostPlatform.extensions) sharedLibrary; soVersion = "3"; in diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index 16fe6c579c..8b341298f3 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, ruby, ocamlPackages +{ lib, fetchFromGitHub, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let - camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: { + camlpdf = ocamlPackages.camlpdf.overrideAttrs { src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; rev = "v2.3.1+satysfi"; sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; - }); + }; otfm = ocamlPackages.otfm.overrideAttrs (o: { src = fetchFromGitHub { owner = "gfngfn"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix index 24b579c49a..264eeea52e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/skribilo/default.nix @@ -10,9 +10,9 @@ , imagemagick , makeWrapper , pkg-config -, ploticus , enableEmacs ? false, emacs -, enableLout ? true, lout +, enableLout ? stdenv.isLinux, lout +, enablePloticus ? stdenv.isLinux, ploticus , enableTex ? true, tex }: @@ -40,10 +40,10 @@ in stdenv.mkDerivation (finalAttrs: { guile-lib guile-reader imagemagick - ploticus ] ++ optional enableEmacs emacs ++ optional enableLout lout + ++ optional enablePloticus ploticus ++ optional enableTex tex; postInstall = diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/mftrace/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/mftrace/default.nix index 9f061630e2..4b8a0350c8 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/mftrace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/mftrace/default.nix @@ -3,7 +3,6 @@ , lib , makeWrapper , autoreconfHook -, buildEnv , python3 , fontforge , potrace diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix index fe08d68233..4fd32aadf8 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/pgf-tikz/pgf-umlsd.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "pgf-umlcd"; version = "unstable-2020-05-28"; @@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md index 12416dee8c..c9d4a81a2c 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/UPGRADING.md @@ -72,6 +72,23 @@ CTAN and the various mirrors) and that the build recipe continues to produce the same output. Should those assumptions not hold, remove the previous fixed hashes for the relevant package, or for all packages. +### Updating the licensing information + +The license of each package in texlive is automatically extracted from texlive's +texlive.tlpdb into tlpdb.nix. The combined licenses of the schemes is stored +separately in `default.nix` and must be kept in sync with the licenses of the +actual contents of these schemes. Whether this is the case can be verified with the +`pkgs.tests.texlive.licenses` test. In case of a mismatch, copy the “correct” +license lists reported by the test into `default.nix`. + +### Running the testsuite + +There are a some other useful tests that haven't been mentioned before. Build them with +``` +nix-build ../../../../.. -A tests.texlive --no-out-link +``` + + ### Commit changes Commit the updated `tlpdb.nix` and `fixed-hashes.nix` to the repository with diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index c62b1165bb..b48886e100 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -102,6 +102,12 @@ core = stdenv.mkDerivation rec { perl ]; + patches = [ + # Fix implicit `int` on `main`, which results in an error when building with clang 16. + # This is fixed upstream and can be dropped with the 2023 release. + ./fix-implicit-int.patch + ]; + hardeningDisable = [ "format" ]; preConfigure = '' @@ -224,6 +230,9 @@ core-big = stdenv.mkDerivation { #TODO: upmendex stripLen = 1; extraPrefix = "libs/luajit/LuaJIT-src/"; }) + # Fix implicit `int` on `main`, which results in an error when building with clang 16. + # This is fixed upstream and can be dropped with the 2023 release. + ./fix-implicit-int.patch ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index 008b519cd8..38a26721ab 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -103,7 +103,7 @@ in (buildEnv { passthru = { # This is set primarily to help find-tarballs.nix to do its job packages = pkgList.all; - # useful for inclusion in the `fonts.fonts` nixos option or for use in devshells + # useful for inclusion in the `fonts.packages` nixos option or for use in devshells fonts = "${texmfroot}/texmf-dist/fonts"; }; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 6ed1ba7e79..f5696eba4f 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -43,6 +43,7 @@ let # it seems to need it to transform fonts xdvi.deps = (orig.xdvi.deps or []) ++ [ "metafont" ]; + # TODO: remove when updating to texlive-2023, metadata has been corrected in the TeX catalogue # tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README arabi-add.license = [ "lppl13c" ]; @@ -254,13 +255,38 @@ in # Pre-defined combined packages for TeX Live schemes, # to make nix-env usage more comfortable and build selected on Hydra. - combined = with lib; recurseIntoAttrs ( + combined = with lib; + let + # these license lists should be the sorted union of the licenses of the packages the schemes contain. + # The correctness of this collation is tested by tests.texlive.licenses + licenses = with lib.licenses; { + scheme-basic = [ free gfl gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-context = [ bsd2 bsd3 cc-by-sa-40 free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 + lppl1 lppl13c mit ofl publicDomain x11 ]; + scheme-full = [ artistic1 artistic1-cl8 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-40 cc-by-sa-10 cc-by-sa-20 + cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl1Plus gpl2 gpl2Plus gpl3 gpl3Plus isc knuth + lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2 + gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-infraonly = [ gpl2 lgpl21 ]; + scheme-medium = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only + free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl + publicDomain x11 ]; + scheme-minimal = [ free gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth + lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-tetex = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 + fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a + lppl13c mit ofl publicDomain x11]; + }; + in recurseIntoAttrs ( mapAttrs (pname: attrs: addMetaAttrs rec { description = "TeX Live environment for ${pname}"; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ veprbl ]; + license = licenses.${pname}; } (combine { ${pname} = attrs; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fix-implicit-int.patch b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fix-implicit-int.patch new file mode 100644 index 0000000000..f74409fe10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/fix-implicit-int.patch @@ -0,0 +1,22 @@ +diff -ur a/utils/m-tx/mtx-src/prepmx.c b/utils/m-tx/mtx-src/prepmx.c +--- a/utils/m-tx/mtx-src/prepmx.c 2018-04-28 17:56:18.000000000 -0600 ++++ b/utils/m-tx/mtx-src/prepmx.c 2023-07-11 15:21:26.351024424 -0600 +@@ -769,6 +769,7 @@ + } + + ++int + main(int argc, Char *argv[]) + { /* ---- Main program ------------------------ */ + PASCAL_MAIN(argc, argv); +diff -ur a/utils/pmx/pmx-src/libf2c/main.c b/utils/pmx/pmx-src/libf2c/main.c +--- a/utils/pmx/pmx-src/libf2c/main.c 2016-02-09 22:31:26.000000000 -0700 ++++ b/utils/pmx/pmx-src/libf2c/main.c 2023-07-11 15:49:35.043438384 -0600 +@@ -106,6 +106,7 @@ + #ifdef KR_headers + main(argc, argv) int argc; char **argv; + #else ++int + main(int argc, char **argv) + #endif + { diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix index cd1a97c2da..69c48120b0 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { popt ]; - sourceRoot = "source/xmlroff/"; + sourceRoot = "${src.name}/xmlroff/"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix b/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix index b35a1b0e6a..ec787a0b1d 100644 --- a/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-QRyzhNGdE7aGXyPxznA0FuVazu96Rd6NiiG1GHjN2ns="; + hash = "sha256-LKaVspv9R2N7og+3gb/vZuiWzWt1w+LEQ1Sk737+O7c="; }; vendorHash = "sha256-C2bRSzLp86aMF3UIGJ2G5WXvUaLjyhqzPsQkDSI0qb0="; diff --git a/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix b/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix index 1ad38489c5..02f2da598d 100644 --- a/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/recyclarr/default.nix @@ -26,10 +26,10 @@ let or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-aEcinTJlO++rTeyqGJea0TWtleH6fyooA8RhT0Qj24c="; - arm64-linux_hash = "sha256-9Gyk09zAGzahP8FCGxj037vaK8h++3M5R2Qqop99Gs4="; - x64-osx_hash = "sha256-c87eOZBz+RtbIi+dlXKKVMyPI8JqYDuiaL4xOkDRFn0="; - arm64-osx_hash = "sha256-zSHgLXRDB6UA7V0LFgLq9ChqB40IHIJJxRqAYyVFlB8="; + x64-linux_hash = "sha256-LSnMXNXQDx45AlQi1IBbMQBBgMc0gJsSa0GV5G5UBPk="; + arm64-linux_hash = "sha256-KkWAPXHaGCc8hsAMohbO7R0ZcfySlu1z+dRjNICaH+Y="; + x64-osx_hash = "sha256-cFerz4g2hPcIqOAeIURD06v6Wr+Rs0xpMHYmG8xl250="; + arm64-osx_hash = "sha256-Kl7lcJUaNeJ/xyd4Fh0f5Li8AyxrcQQgDSfxB3j2L1g="; }."${arch}-${os}_hash"; libPath = { @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "recyclarr"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix b/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix index 49d431285a..9b2a9a7be0 100644 --- a/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/wtwitch/default.nix @@ -10,24 +10,22 @@ , makeWrapper , mplayer , mpv -, ncurses , procps , scdoc , stdenv , streamlink -, sudo , vlc }: stdenv.mkDerivation rec { pname = "wtwitch"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "krathalan"; repo = pname; rev = version; - hash = "sha256-kXUocEBxEyjWOEUPVO1oPWEu7MAVoD2r4Umi1LPNKjc="; + hash = "sha256-2YLBuxGwGkav3zB2qMqM6yRXf7ZLqgULoJV4s5p+hSw="; }; # hardcode SCRIPT_NAME because #150841 diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index f9828abe62..696b0b822e 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -18,7 +18,7 @@ let cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI="; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE="; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ="; - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + pyyaml = super.pyyaml.overridePythonAttrs rec { version = "5.4.1"; checkPhase = '' runHook preCheck @@ -30,7 +30,7 @@ let inherit version; hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4="; }; - }); + }; }; }; in diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 5df0e53905..5b85bae033 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.2.1"; + version = "23.2.2"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-2e05ExF6JOeFR0BUd/iCIYV0XoKTgoI7xz20GQ/bmO4="; + hash = "sha256-lOeLVgT/qTB6JhRcLv9QIfNLMnMyNlUp3dMCqva9Tes="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index a6ae67b07e..ac65ea3f54 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { patches = [ # go.mod update: needed to to include a newer lxd which contains - # https://github.com/lxc/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52 + # https://github.com/canonical/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52 # which is needed to fix the build w/glibc-2.36. (fetchpatch { url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch"; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix index ad187544ae..c980a45bbe 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , bash , bashInteractive -, systemd , util-linux , boto , setuptools diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix index d5f6e2dba8..bf53f43a57 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -1,19 +1,19 @@ -{ buildGoModule, fetchFromGitHub, fetchpatch, lib, coreutils, makeWrapper -, google-guest-configs, google-guest-oslogin, iproute2, dhcp, procps +{ buildGoModule, fetchFromGitHub, lib, coreutils, makeWrapper +, google-guest-configs, google-guest-oslogin, iproute2, procps }: buildGoModule rec { pname = "guest-agent"; - version = "20230707.00"; + version = "20230726.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-lGybidp/dZRe65L2fQlNTNHYNmMDrbYfBPeC9isER2I="; + sha256 = "sha256-p+gjiaUaBBGhCVkbXrubfV/xZWvanC8ktlfIfjyUQSA="; }; - vendorHash = "sha256-ULGpgygBVC4SRLhPiUlZgBH93w84WlNbvq3S7cVHLaQ="; + vendorHash = "sha256-Xw/5yHW9DRtZFC6cECLI0RncgzSGB5/Y0yjW7hz247s="; patches = [ ./disable-etc-mutation.patch ]; @@ -27,7 +27,7 @@ buildGoModule rec { ''; # We don't add `shadow` here; it's added to PATH if `mutableUsers` is enabled. - binPath = lib.makeBinPath [ google-guest-configs google-guest-oslogin iproute2 dhcp procps ]; + binPath = lib.makeBinPath [ google-guest-configs google-guest-oslogin iproute2 procps ]; # Skip tests which require networking. preCheck = '' diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix index dd3c01c622..73dd3c93d2 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-configs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, substituteAll +{ stdenv, lib, fetchFromGitHub, makeWrapper , ipcalc, iproute2, util-linux, coreutils, ethtool, gnugrep, gnused, nvme-cli }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 68ca58fb64..84e6a865dc 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -1,6 +1,5 @@ -{ stdenv -, lib -, bashInteractive +{ lib +, stdenv , curl , fetchFromGitHub , json_c diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix index d35eb13c77..ee5980e28e 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.30.5"; + version = "0.30.6"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-qnoun4DiiFpGal9uLyW7Vir+zMOpbDRj2fCIWfiAyLU="; + sha256 = "sha256-gk8V7/4N8+KDy0lRu04xwbrnXQWxZQTkvdb2ZI3AfM8="; }; - vendorHash = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; + vendorHash = "sha256-iLmQdjN0EXJuwC3NT5FKdHhJ4KvNAvnsBGAO9bypdqg="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix index 0b33c176a9..50a240cce7 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "0.59.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-J0HFWBhrzkDpQLJlp3kPlZeqHRhtZj0xMbNi3+y2FmY="; + sha256 = "sha256-1Idfz2cMiIivroEkdRAA1x4v0BVACLoNCKSBS5o+wr4="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh index 0fe8ab811a..5298b5b120 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh +++ b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh @@ -5,7 +5,7 @@ _nixos-container() { COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" - opts="list create destroy start stop status update login root-login run show-ip show-host-key" + opts="list create destroy restart start stop status update login root-login run show-ip show-host-key" startstop_opts=$(nixos-container list) update_opts="--config" diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 38f4c8d316..854557eb72 100755 --- a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -39,6 +39,7 @@ Usage: nixos-container list [--host-address ] [--local-address ] nixos-container destroy + nixos-container restart nixos-container start nixos-container stop nixos-container terminate diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix index b004f04a25..7e324fc03c 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix @@ -34,6 +34,6 @@ buildGoModule rec { description = "Onmetal OCI Image Specification, Library and Tooling"; homepage = "https://github.com/onmetal/onmetal-image"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix index bbd80391c7..5f50164778 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/ovftool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {} -, requireFile, autoPatchelfHook, makeWrapper, unzip +, autoPatchelfHook, makeWrapper, unzip , glibc, c-ares, libxcrypt-legacy, expat, icu60, xercesc, zlib }: diff --git a/third_party/nixpkgs/pkgs/tools/wayland/clapboard/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/clapboard/default.nix new file mode 100644 index 0000000000..151675bf3c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/clapboard/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "clapboard"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "bjesus"; + repo = "clapboard"; + rev = "v${version}"; + hash = "sha256-/4HBhsW2C3xYzKVw9TuSj8b7LdirWbNg4OxLm/ebf40="; + }; + + cargoHash = "sha256-bq+r2J2lhhZKTEV69OnsXiAGKspOZ0kF0q2hDnbIXn8="; + + meta = with lib; { + description = "Wayland clipboard manager that will make you clap"; + homepage = "https://github.com/bjesus/clapboard"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/wayland/gtklock/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/gtklock/default.nix index 8a57fd5810..c5146532e4 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/gtklock/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/gtklock/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pkgs , pam , scdoc , gtk3 @@ -53,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ dit7ya ]; platforms = platforms.linux; + mainProgram = "gtklock"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/hyprland-per-window-layout/default.nix new file mode 100644 index 0000000000..32dcddea6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/hyprland-per-window-layout/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "hyprland-per-window-layout"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "coffebar"; + repo = pname; + rev = version; + hash = "sha256-eqhGX9rjvOHh6RuWj5dqWPKlFdTnZpAcDUuJbT3Z/E8="; + }; + + cargoHash = "sha256-AUkBTHShtY3ZJ8pxCuW9baVuxb2QxzXxJQMgbuVTlPY="; + + meta = with lib; { + description = "Per window keyboard layout (language) for Hyprland wayland compositor"; + homepage = "https://github.com/coffebar/hyprland-per-window-layout"; + license = licenses.mit; + maintainers = [ maintainers.azazak123 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix index 3f98e8ef8c..51edcc0ea3 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , meson -, cmake , ninja , wlroots , wayland diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix index 34b43347af..d97c8ea28d 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/swww/default.nix @@ -1,25 +1,58 @@ -{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, lz4 +, libxkbcommon +, installShellFiles +, scdoc +}: + rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.7.3"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Horus645"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-58zUi6tftTvNoc/R/HO4RDC7n+NODKOrBCHH8QntKSY="; + hash = "sha256-9c/qBmk//NpfvPYjK2QscubFneiQYBU/7PLtTvVRmTA="; }; - cargoSha256 = "sha256-hL5rOf0G+UBO8kyRXA1TqMCta00jGSZtF7n8ibjGi9k="; - buildInputs = [ lz4 libxkbcommon ]; + cargoSha256 = "sha256-AE9bQtW5r1cjIsXA7YEP8TR94wBjaM7emOroVFq9ldE="; + + buildInputs = [ + lz4 + libxkbcommon + ]; + doCheck = false; # Integration tests do not work in sandbox environment - nativeBuildInputs = [ pkg-config ]; + + nativeBuildInputs = [ + pkg-config + installShellFiles + scdoc + ]; + + postInstall = '' + for f in doc/*.scd; do + local page="doc/$(basename "$f" .scd)" + scdoc < "$f" > "$page" + installManPage "$page" + done + + installShellCompletion --cmd swww \ + --bash <(cat completions/swww.bash) \ + --fish <(cat completions/swww.fish) \ + --zsh <(cat completions/_swww) + ''; meta = with lib; { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/Horus645/swww"; license = licenses.gpl3; - maintainers = with maintainers; [ mateodd25 ]; + maintainers = with maintainers; [ mateodd25 donovanglover ]; platforms = platforms.linux; + mainProgram = "swww"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/wayland/waylogout/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/waylogout/default.nix new file mode 100644 index 0000000000..553d1a9fd5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/waylogout/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +, wayland-protocols +, libxkbcommon +, cairo +, gdk-pixbuf +, scdoc +}: + +stdenv.mkDerivation { + pname = "waylogout"; + version = "unstable-2023-06-09"; + + src = fetchFromGitHub { + owner = "loserMcloser"; + repo = "waylogout"; + rev = "f90e1b8b0f67a2694fafca7beb32828493f3f78e"; + hash = "sha256-YQtX4t6q2NybuKU3lVcn5XhC0nXcPfEbcXbuFmDZOrw="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + scdoc + ]; + + buildInputs = [ + wayland + wayland-protocols + libxkbcommon + cairo + gdk-pixbuf + ]; + + meta = with lib; { + description = "A graphical logout/suspend/reboot/shutdown dialog for wayland"; + homepage = "https://github.com/loserMcloser/waylogout"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/wayland/waynergy/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/waynergy/default.nix index dd2e6502bc..646ed36985 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/waynergy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/waynergy/default.nix @@ -10,7 +10,6 @@ , wayland-protocols , wl-clipboard , libxkbcommon -, cmake , libressl }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix index 041c3dfe8c..ca3a3f4191 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromSourcehut , rustPlatform +, fetchFromSourcehut }: rustPlatform.buildRustPackage rec { diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix index 923391b799..141e2e11d0 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "wl-clipboard"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "bugaevc"; repo = "wl-clipboard"; rev = "v${version}"; - sha256 = "sha256-lqtLHLsSChWcYWsfFigj0Xveo9doAr7G31fRSaxm0Lw="; + hash = "sha256-L4k2jOZ2YtkFpDs2+LAUElYl5aNSC42QxkbMNJ2ZhWQ="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlay/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlay/default.nix index a766a49d25..3a80e0627e 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wlay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlay/default.nix @@ -15,7 +15,7 @@ , wayland-scanner }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "wlay"; version = "unstable-2022-01-26"; @@ -54,4 +54,4 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlogout/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlogout/default.nix index de150c3af3..2be33bee6a 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wlogout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlogout/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; + mainProgram = "wlogout"; }; } # TODO: shell completions diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix new file mode 100644 index 0000000000..470242871c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, cairo +, glib +, libxkbcommon +, pango +}: + +rustPlatform.buildRustPackage rec { + pname = "wlr-which-key"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "MaxVerevkin"; + repo = "wlr-which-key"; + rev = "v${version}"; + hash = "sha256-GLTbUa5EfpJV7OACTlewAgGjd5Ub0fYHoW8f+EVrT14="; + }; + + cargoHash = "sha256-TtA4Ley5bwymF8Yiqso5fGAwGsT0GRlfAlGS5j4s0Qw="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cairo + glib + libxkbcommon + pango + ]; + + meta = with lib; { + description = "Keymap manager for wlroots-based compositors"; + homepage = "https://github.com/MaxVerevkin/wlr-which-key"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ xlambein ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index a98e482db1..f3b8e51201 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -351,6 +351,7 @@ mapAliases ({ cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 + curl-impersonate-bin = throw "'curl-impersonate-bin' has been replaced by 'curl-impersonate'"; # Added 2022-10-08 curlcpp = throw "curlcpp has been removed, no active maintainers and no usage within nixpkgs"; # Added 2022-05-10 curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages"; # Added 2022-01-12 curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 @@ -398,6 +399,7 @@ mapAliases ({ devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 + dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 dirmngr = throw "dirmngr has been removed: merged into gnupg"; # Added 2022-05-13 disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 @@ -492,6 +494,7 @@ mapAliases ({ facette = throw "facette has been removed"; # Added 2020-01-06 faustStk = faustPhysicalModeling; # Added 2023-05-16 + faust1 = throw "faust1 has been removed, use faust2 instead"; # Added 2022-12-03 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 fastnlo = fastnlo_toolkit; # Added 2021-04-24 fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26 @@ -554,6 +557,7 @@ mapAliases ({ fuse_exfat = throw "'fuse_exfat' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 fuseki = throw "'fuseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. + fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13 @@ -848,6 +852,7 @@ mapAliases ({ larynx = piper-tts; # Added 2023-05-09 lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; + ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 lfs = dysk; # Added 2023-07-03 libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 @@ -1050,6 +1055,7 @@ mapAliases ({ mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 @@ -1207,6 +1213,7 @@ mapAliases ({ odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 ofp = throw "ofp is not compatible with odp-dpdk"; ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 + ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 @@ -1271,6 +1278,10 @@ mapAliases ({ pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 + pharo-spur64 = pharo; # Added 2022-08-03 + pharo-spur32 = throw "pharo on 32bits is currently not supported due to lack of maintenance"; # Added 2022-08-03 + pharo-cog32 = throw "the cog32 VM has been outdated for about a decade now, time to move on"; # Added 2022-08-03 + pharo-launcher = throw "pharo launcher has been dropped due to lack of maintenance"; # Added 2022-08-03 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 @@ -1410,6 +1421,8 @@ mapAliases ({ protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 protonup = protonup-ng; # Added 2022-11-06 + proxmark3-rrg = proxmark3; # Added 2023-07-25 + proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 @@ -1426,7 +1439,7 @@ mapAliases ({ pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 pyext = throw "pyext was removed because it does not support python 3.11, is upstream unmaintained and was unused"; # Added 2022-11-21 pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 - pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21 + pyload = throw "pyload has been removed from nixpkgs. Use pyload-ng instead."; # Added 2021-03-21 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; @@ -1448,6 +1461,7 @@ mapAliases ({ qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 + qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 @@ -1665,6 +1679,7 @@ mapAliases ({ tdesktop = telegram-desktop; # Added 2023-04-07 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 + telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 @@ -1689,7 +1704,7 @@ mapAliases ({ tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22 tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22 tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 - textadept11 = textadept; # Added 2022-06-07 + textadept11 = throw "textadept11 has been removed. Please use textadept instead"; # Added 2022-12-23 TODO: UPDATE THE DATE tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25"; thunderbird-bin-68 = thunderbird-68; @@ -1797,6 +1812,13 @@ mapAliases ({ wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 + wayfireApplications-unwrapped = throw '' + 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' + 'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins' + 'wayfireApplications-unwrapped.wcm' has been renamed to/replaced by 'wayfirePlugins.wcm' + 'wayfireApplications-unwrapped.wlroots' has been removed + ''; # Add 2023-07-29 + wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 @@ -1814,6 +1836,7 @@ mapAliases ({ winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 + wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wmii_hg = wmii; wmc-mpris = throw "wmc-mpris has been abandoned by upstream due to its redundancy"; # Added 2022-11-13 @@ -2015,4 +2038,32 @@ mapAliases ({ sddm ; + inherit (pidginPackages) + pidgin-indicator + pidgin-latex + pidgin-msn-pecan + pidgin-mra + pidgin-skypeweb + pidgin-carbons + pidgin-xmpp-receipts + pidgin-otr + pidgin-osd + pidgin-sipe + pidgin-window-merge + purple-discord + purple-googlechat + purple-hangouts + purple-lurch + purple-matrix + purple-mm-sms + purple-plugin-pack + purple-signald + purple-slack + purple-vk-plugin + purple-xmpp-http-upload + tdlib-purple + pidgin-opensteamworks + purple-facebook + ; + }) diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index eb598ddda4..23af6b6182 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -234,6 +234,8 @@ with pkgs; align = callPackage ../tools/text/align { }; + alire = callPackage ../development/tools/build-managers/alire { }; + althttpd = callPackage ../servers/althttpd { }; amqpcat = callPackage ../development/tools/amqpcat { }; @@ -260,6 +262,10 @@ with pkgs; alterx = callPackage ../tools/security/alterx { }; + alt-server = callPackage ../tools/misc/alt-server { }; + + asciicam = callPackage ../applications/video/asciicam { }; + asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { }; asn = callPackage ../applications/networking/asn { }; @@ -336,7 +342,7 @@ with pkgs; beyond-identity = callPackage ../tools/security/beyond-identity { }; - bibtex-tidy = nodePackages.bibtex-tidy; + bibtex-tidy = callPackage ../tools/typesetting/bibtex-tidy { }; binbloom = callPackage ../tools/security/binbloom { }; @@ -399,12 +405,16 @@ with pkgs; caroline = callPackage ../development/libraries/caroline { }; + cartridges = callPackage ../applications/misc/cartridges { }; + castget = callPackage ../applications/networking/feedreaders/castget { }; castxml = callPackage ../development/tools/castxml { }; catatonit = callPackage ../applications/virtualization/catatonit { }; + catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; + catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; @@ -415,11 +425,15 @@ with pkgs; catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { }; + catppuccin-sddm-corners = callPackage ../data/themes/catppuccin-sddm-corners { }; + btdu = callPackage ../tools/misc/btdu { }; ccal = callPackage ../tools/misc/ccal { }; - cereal = callPackage ../development/libraries/cereal { }; + cereal = cereal_1_3_0; + cereal_1_3_0 = callPackage ../development/libraries/cereal/1.3.0.nix { }; + cereal_1_3_2 = callPackage ../development/libraries/cereal/1.3.2.nix { }; cdecrypt = callPackage ../development/tools/cdecrypt { }; @@ -473,6 +487,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + codeberg-cli = callPackage ../applications/version-management/codeberg-cli { + inherit (darwin.apple_sdk.frameworks) Security CoreServices; + }; + conftest = callPackage ../development/tools/conftest { }; coldsnap = callPackage ../tools/admin/coldsnap { @@ -481,6 +499,8 @@ with pkgs; colemak-dh = callPackage ../data/misc/colemak-dh { }; + collision = callPackage ../applications/misc/collision { }; + colmena = callPackage ../tools/admin/colmena { }; colorz = callPackage ../tools/misc/colorz { }; @@ -509,12 +529,16 @@ with pkgs; crc = callPackage ../applications/networking/cluster/crc { }; + confetty = callPackage ../applications/misc/confetty { }; + confy = callPackage ../applications/misc/confy { }; coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; copilot-cli = callPackage ../tools/admin/copilot-cli { }; + cp210x-program = callPackage ../tools/misc/cp210x-program { }; + cp437 = callPackage ../tools/misc/cp437 { }; cpm-cmake = callPackage ../development/tools/cpm-cmake { }; @@ -537,6 +561,8 @@ with pkgs; dbip-country-lite = callPackage ../data/misc/dbip-country-lite { }; + dcgm = callPackage ../os-specific/linux/dcgm { }; + dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { }; dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { }; @@ -557,6 +583,8 @@ with pkgs; dec-decode = callPackage ../development/tools/dec-decode { }; + devour-flake = callPackage ../tools/nix/devour-flake { }; + dnf5 = callPackage ../tools/package-management/dnf5 { }; dsq = callPackage ../tools/misc/dsq { }; @@ -575,8 +603,21 @@ with pkgs; each = callPackage ../tools/text/each { }; + ebusd = callPackage ../servers/ebusd { }; + eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + ebpf-verifier = callPackage ../tools/networking/ebpf-verifier { + # Replace this to `catch2 = catch2_3` when catch2 3.4.0 is merged + # https://github.com/NixOS/nixpkgs/pull/243485 + catch2.src = fetchFromGitHub { + owner = "catchorg"; + repo = "Catch2"; + rev = "v3.4.0"; + hash = "sha256-DqGGfNjKPW9HFJrX9arFHyNYjB61uoL6NabZatTWrr0="; + }; + }; + edgedb = callPackage ../tools/networking/edgedb { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -589,6 +630,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { }; + enumer = callPackage ../tools/misc/enumer { }; evans = callPackage ../development/tools/evans { }; @@ -746,6 +789,8 @@ with pkgs; oletools = with python3.pkgs; toPythonApplication oletools; + ollama = callPackage ../tools/misc/ollama { }; + ots = callPackage ../tools/security/ots { }; credential-detector = callPackage ../tools/security/credential-detector { }; @@ -796,6 +841,8 @@ with pkgs; docker-slim = callPackage ../applications/virtualization/docker-slim { }; + doc2go = callPackage ../development/tools/doc2go { }; + docker-sync = callPackage ../tools/misc/docker-sync { }; undocker = callPackage ../tools/misc/undocker { }; @@ -921,6 +968,8 @@ with pkgs; fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; + fetchpijul = callPackage ../build-support/fetchpijul { }; + inherit (callPackage ../build-support/node/fetch-yarn-deps { }) prefetch-yarn-deps fetchYarnDeps; @@ -991,6 +1040,8 @@ with pkgs; mongosh = callPackage ../development/tools/mongosh { }; + mya = callPackage ../applications/misc/mya { }; + mysql-shell = callPackage ../development/tools/mysql-shell { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -1122,6 +1173,8 @@ with pkgs; fetchFromGitiles = callPackage ../build-support/fetchgitiles { }; + fetchFrom9Front = callPackage ../build-support/fetch9front { }; + fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz { }; fetchgx = callPackage ../build-support/fetchgx { }; @@ -1369,6 +1422,8 @@ with pkgs; _9pfs = callPackage ../tools/filesystems/9pfs { }; + _9ptls = callPackage ../os-specific/linux/9ptls { }; + aaa = callPackage ../tools/misc/aaa { }; aardvark-dns = callPackage ../tools/networking/aardvark-dns { }; @@ -1631,6 +1686,14 @@ with pkgs; etlegacy = callPackage ../games/etlegacy { lua = lua5_4; }; + fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch { + inherit (darwin.apple_sdk_11_0.frameworks) + AppKit Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices + Foundation IOBluetooth MediaRemote OpenCL; + + inherit (darwin) moltenvk; + }; + fscan = callPackage ../tools/security/fscan { }; copier = callPackage ../tools/misc/copier { }; @@ -1661,6 +1724,10 @@ with pkgs; gen6dns = callPackage ../tools/networking/gen6dns { }; + gen-license = callPackage ../development/tools/gen-license { + inherit (darwin.apple_sdk.frameworks) Security; + }; + github-copilot-cli = callPackage ../tools/misc/github-copilot-cli { }; gfshare = callPackage ../tools/security/gfshare { }; @@ -1727,6 +1794,8 @@ with pkgs; kaufkauflist = callPackage ../applications/misc/kaufkauflist { }; + kdocker = libsForQt5.callPackage ../tools/X11/kdocker { }; + kicli = callPackage ../tools/misc/kicli { }; ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { }; @@ -1779,6 +1848,8 @@ with pkgs; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; + osquery = callPackage ../tools/system/osquery { }; + paperview = callPackage ../tools/X11/paperview { }; pferd = callPackage ../tools/misc/pferd { }; @@ -1821,8 +1892,14 @@ with pkgs; sitespeed-io = callPackage ../tools/networking/sitespeed-io { }; + slipstream = callPackage ../tools/games/slipstream { + jdk = jdk8; + }; + sorted-grep = callPackage ../tools/text/sorted-grep { }; + smb3-foundry = callPackage ../applications/misc/smb3-foundry { }; + smbmap = callPackage ../tools/security/smbmap { }; smbscan = callPackage ../tools/security/smbscan { }; @@ -1875,6 +1952,8 @@ with pkgs; unflac = callPackage ../tools/audio/unflac { }; + valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { }; + veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; ventoy = callPackage ../tools/cd-dvd/ventoy { }; @@ -2055,6 +2134,8 @@ with pkgs; git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { }; + git-backdate = callPackage ../applications/version-management/git-backdate { }; + git-backup = callPackage ../applications/version-management/git-backup { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2404,6 +2485,7 @@ with pkgs; dlx = callPackage ../applications/emulators/dlx { }; dosbox = callPackage ../applications/emulators/dosbox { + inherit (darwin.apple_sdk.frameworks ) OpenGL; SDL = if stdenv.isDarwin then SDL else SDL_compat; }; @@ -2442,9 +2524,7 @@ with pkgs; fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { }; - fw = callPackage ../tools/misc/fw { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fw = callPackage ../tools/misc/fw { }; g810-led = callPackage ../misc/g810-led { }; @@ -2537,7 +2617,7 @@ with pkgs; punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { }; - py65 = python3Packages.callPackage ../applications/emulators/py65 { }; + py65 = with python3.pkgs; toPythonApplication py65; resim = callPackage ../applications/emulators/resim { }; @@ -2569,6 +2649,8 @@ with pkgs; stella = callPackage ../applications/emulators/stella { }; + tamatool = callPackage ../applications/emulators/tamatool { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tilem = callPackage ../applications/emulators/tilem { }; @@ -2634,19 +2716,23 @@ with pkgs; (builtins.attrValues libretro); }; - wrapRetroArch = { retroarch }: + wrapRetroArch = { retroarch, settings ? {} }: callPackage ../applications/emulators/retroarch/wrapper.nix - { inherit retroarch; }; + { inherit retroarch settings; }; retroarch = wrapRetroArch { - retroarch = retroarchBare.override { - withAssets = true; - withCoreInfo = true; + retroarch = retroarchBare; + settings = { + assets_directory = "${retroarch-assets}/share/retroarch/assets"; + joypad_autoconfig_dir = "${retroarch-joypad-autoconfig}/share/libretro/autoconfig"; + libretro_info_path = "${libretro-core-info}/share/retroarch/cores"; }; }; retroarch-assets = callPackage ../applications/emulators/retroarch/retroarch-assets.nix { }; + retroarch-joypad-autoconfig = callPackage ../applications/emulators/retroarch/retroarch-joypad-autoconfig.nix { }; + libretranslate = with python3.pkgs; toPythonApplication libretranslate; libretro = recurseIntoAttrs @@ -2983,6 +3069,8 @@ with pkgs; apfsprogs = callPackage ../tools/filesystems/apfsprogs { }; + api-linter = callPackage ../development/tools/api-linter { }; + apk-tools = callPackage ../tools/package-management/apk-tools { lua = lua5_3; }; @@ -2995,9 +3083,7 @@ with pkgs; apksigner = callPackage ../development/tools/apksigner { }; - apktool = callPackage ../development/tools/apktool { - inherit (androidenv.androidPkgs_9_0) build-tools; - }; + apktool = callPackage ../development/tools/apktool { }; appimage-run = callPackage ../tools/package-management/appimage-run { }; appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix { @@ -3074,6 +3160,8 @@ with pkgs; owl-lisp = callPackage ../development/compilers/owl-lisp { }; + otus-lisp = callPackage ../development/compilers/otus-lisp { }; + ascii = callPackage ../tools/text/ascii { }; asciinema = callPackage ../tools/misc/asciinema { }; @@ -3192,6 +3280,10 @@ with pkgs; blanket = callPackage ../applications/audio/blanket { }; + blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp { + inherit (darwin.apple_sdk_11_0.frameworks) IOKit; + }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; @@ -3312,7 +3404,7 @@ with pkgs; bitwarden = callPackage ../tools/security/bitwarden { }; - inherit (nodePackages) bitwarden-cli; + bitwarden-cli = callPackage ../tools/security/bitwarden/cli.nix { }; bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; @@ -3562,7 +3654,7 @@ with pkgs; readline = readline63; }; - flood = nodePackages.flood; + flood = callPackage ../applications/networking/p2p/flood { }; font-config-info = callPackage ../tools/misc/font-config-info { }; @@ -3744,6 +3836,8 @@ with pkgs; kavita = callPackage ../servers/web-apps/kavita { }; + keka = callPackage ../tools/compression/keka { }; + kord = callPackage ../applications/misc/kord { }; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; @@ -3866,8 +3960,8 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; - skhd = callPackage ../os-specific/darwin/skhd { - inherit (darwin.apple_sdk.frameworks) Carbon; + skhd = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/skhd { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; }; qes = callPackage ../os-specific/darwin/qes { @@ -4143,7 +4237,7 @@ with pkgs; libtensorflow = python3.pkgs.tensorflow.libtensorflow; libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { - cudaSupport = config.cudaSupport or false; + inherit (config) cudaSupport; }; tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; @@ -4502,7 +4596,9 @@ with pkgs; cowsay = callPackage ../tools/misc/cowsay { }; - czkawka = callPackage ../tools/misc/czkawka { }; + czkawka = callPackage ../tools/misc/czkawka { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; cherrytree = callPackage ../applications/misc/cherrytree { }; @@ -4510,6 +4606,8 @@ with pkgs; chopchop = callPackage ../tools/security/chopchop { }; + clapboard = callPackage ../tools/wayland/clapboard { }; + cliphist = callPackage ../tools/wayland/cliphist { }; clipman = callPackage ../tools/wayland/clipman { }; @@ -4548,6 +4646,8 @@ with pkgs; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; + waylogout = callPackage ../tools/wayland/waylogout { }; + waynergy = callPackage ../tools/wayland/waynergy { }; wayout = callPackage ../tools/wayland/wayout { }; @@ -4582,6 +4682,8 @@ with pkgs; wlr-randr = callPackage ../tools/wayland/wlr-randr { }; + wlr-which-key = callPackage ../tools/wayland/wlr-which-key { }; + wlrctl = callPackage ../tools/wayland/wlrctl { }; wlsunset = callPackage ../tools/wayland/wlsunset { }; @@ -4791,6 +4893,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + diesel-cli-ext = callPackage ../development/tools/diesel-cli-ext { }; + refinery-cli = callPackage ../development/tools/refinery-cli { }; digitemp = callPackage ../tools/misc/digitemp { }; @@ -4828,6 +4932,8 @@ with pkgs; disk-filltest = callPackage ../tools/system/disk-filltest { }; + disk-inventory-x = callPackage ../tools/filesystems/disk-inventory-x { }; + diskscan = callPackage ../tools/misc/diskscan { }; disorderfs = callPackage ../tools/filesystems/disorderfs { @@ -5202,7 +5308,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) DiskArbitration; }; - fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; + fx-cast-bridge = callPackage ../tools/misc/fx-cast-bridge { }; fzf = callPackage ../tools/misc/fzf { }; @@ -5312,6 +5418,8 @@ with pkgs; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; + gorilla-cli = callPackage ../tools/llm/gorilla-cli { }; + godu = callPackage ../tools/misc/godu { }; goss = callPackage ../tools/misc/goss { }; @@ -5390,7 +5498,10 @@ with pkgs; home-manager = callPackage ../tools/package-management/home-manager { }; - homepage-dashboard = callPackage ../servers/homepage-dashboard { }; + homepage-dashboard = callPackage ../servers/homepage-dashboard { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; hostsblock = callPackage ../tools/misc/hostsblock { }; @@ -5409,11 +5520,15 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; + hyprdim = callPackage ../applications/misc/hyprdim { }; + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; + hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; + hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { }; @@ -5428,6 +5543,8 @@ with pkgs; icdiff = callPackage ../tools/text/icdiff { }; + ictree = callPackage ../tools/misc/ictree { }; + inchi = callPackage ../development/libraries/inchi { }; icon-slicer = callPackage ../tools/X11/icon-slicer { }; @@ -5644,6 +5761,7 @@ with pkgs; maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF; maple-mono-otf = (callPackage ../data/fonts/maple-font { }).opentype; maple-mono-woff2 = (callPackage ../data/fonts/maple-font { }).woff2; + maple-mono-autohint = (callPackage ../data/fonts/maple-font { }).autohint; marl = callPackage ../development/libraries/marl { }; @@ -5657,6 +5775,8 @@ with pkgs; maxcso = callPackage ../tools/archivers/maxcso { }; + measureme = callPackage ../development/tools/rust/measureme { }; + medusa = callPackage ../tools/security/medusa { }; megasync = libsForQt5.callPackage ../applications/misc/megasync { @@ -5850,7 +5970,7 @@ with pkgs; online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; onnxruntime = callPackage ../development/libraries/onnxruntime { - protobuf = protobuf3_19; + inherit (darwin.apple_sdk.frameworks) Foundation; }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -5899,6 +6019,8 @@ with pkgs; pbzx = callPackage ../tools/compression/pbzx { }; + pc = callPackage ../tools/misc/pc { }; + pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; pcp = callPackage ../tools/misc/pcp { }; @@ -6207,6 +6329,8 @@ with pkgs; mountain-duck = callPackage ../tools/filesystems/mountain-duck { }; + mox = callPackage ../servers/mail/mox { }; + mozlz4a = callPackage ../tools/compression/mozlz4a { }; msr-tools = callPackage ../os-specific/linux/msr-tools { }; @@ -6441,7 +6565,9 @@ with pkgs; cdpr = callPackage ../tools/networking/cdpr { }; - cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { + inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; + }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; @@ -6525,7 +6651,7 @@ with pkgs; circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; - circus = callPackage ../tools/networking/circus { }; + circus = with python3Packages; toPythonApplication circus; cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; @@ -6732,6 +6858,10 @@ with pkgs; agebox = callPackage ../tools/security/agebox { }; + age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + age-plugin-tpm = callPackage ../tools/security/age-plugin-tpm { }; age-plugin-yubikey = darwin.apple_sdk_11_0.callPackage ../tools/security/age-plugin-yubikey { @@ -6961,7 +7091,8 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate-bin = callPackage ../tools/networking/curl-impersonate { }; + curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; + inherit (curl-impersonate) curl-impersonate-ff curl-impersonate-chrome; curlie = callPackage ../tools/networking/curlie { }; @@ -7109,8 +7240,6 @@ with pkgs; dnsx = callPackage ../tools/security/dnsx { }; - dhcp = callPackage ../tools/networking/dhcp { }; - dhcpdump = callPackage ../tools/networking/dhcpdump { }; dhcpcd = callPackage ../tools/networking/dhcpcd { }; @@ -7297,6 +7426,8 @@ with pkgs; dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { }; + a4term = callPackage ../tools/misc/a4term { }; + ecmtools = callPackage ../tools/cd-dvd/ecm-tools { }; erofs-utils = callPackage ../tools/filesystems/erofs-utils { }; @@ -7496,6 +7627,8 @@ with pkgs; wsl-open = callPackage ../tools/misc/wsl-open { }; + wsl-vpnkit = callPackage ../tools/networking/wsl-vpnkit { }; + xkcdpass = with python3Packages; toPythonApplication xkcdpass; xjobs = callPackage ../tools/misc/xjobs { }; @@ -7681,6 +7814,10 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; + eza = callPackage ../tools/misc/eza { + inherit (darwin.apple_sdk.frameworks) Security; + }; + f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication fabric; @@ -7869,6 +8006,8 @@ with pkgs; faraday-cli = callPackage ../tools/security/faraday-cli { }; + farge = callPackage ../tools/misc/farge { }; + fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize { }; @@ -7976,9 +8115,7 @@ with pkgs; freeipmi = callPackage ../tools/system/freeipmi { }; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - guile = guile_2_0; - }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; freetds = callPackage ../development/libraries/freetds { }; @@ -8161,6 +8298,8 @@ with pkgs; ghz = callPackage ../tools/networking/ghz { }; + gi-crystal = callPackage ../development/tools/gi-crystal { }; + gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; gibo = callPackage ../tools/misc/gibo { }; @@ -8216,6 +8355,8 @@ with pkgs; forgejo = callPackage ../applications/version-management/forgejo { }; + forgejo-actions-runner = callPackage ../development/tools/continuous-integration/forgejo-actions-runner { }; + gokart = callPackage ../development/tools/gokart { }; gl2ps = callPackage ../development/libraries/gl2ps { }; @@ -8685,7 +8826,9 @@ with pkgs; hashcash = callPackage ../tools/security/hashcash { }; - hashcat = callPackage ../tools/security/hashcat { }; + hashcat = callPackage ../tools/security/hashcat { + inherit (darwin.apple_sdk.frameworks) Foundation IOKit Metal OpenCL; + }; hashcat-utils = callPackage ../tools/security/hashcat-utils { }; @@ -8976,6 +9119,10 @@ with pkgs; ike-scan = callPackage ../tools/security/ike-scan { }; + ilspycmd = callPackage ../development/tools/ilspycmd { + inherit (darwin) autoSignDarwinBinariesHook; + }; + imapsync = callPackage ../tools/networking/imapsync { }; imgur-screenshot = callPackage ../tools/graphics/imgur-screenshot { }; @@ -9075,6 +9222,8 @@ with pkgs; ipmiutil = callPackage ../tools/system/ipmiutil { }; + ipatool = callPackage ../applications/misc/ipatool { }; + ipmicfg = callPackage ../applications/misc/ipmicfg { }; ipmiview = callPackage ../applications/misc/ipmiview { }; @@ -9097,6 +9246,8 @@ with pkgs; iroh = callPackage ../applications/networking/iroh { }; + irrd = callPackage ../servers/misc/irrd { }; + ised = callPackage ../tools/misc/ised { }; isl = isl_0_20; @@ -9108,7 +9259,7 @@ with pkgs; ispike = callPackage ../development/libraries/science/robotics/ispike { }; - isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; @@ -9136,9 +9287,7 @@ with pkgs; usePulseaudio = true; }; - jaq = callPackage ../development/tools/jaq { - inherit (darwin.apple_sdk.frameworks) Security; - }; + jaq = callPackage ../development/tools/jaq { }; jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { }; @@ -9191,10 +9340,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + stalwart-mail = callPackage ../servers/mail/stalwart { }; + jmespath = callPackage ../development/tools/jmespath { }; juicefs = callPackage ../tools/filesystems/juicefs { }; + juicity = callPackage ../tools/networking/juicity { }; + jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; jnettop = callPackage ../tools/networking/jnettop { }; @@ -9396,6 +9549,8 @@ with pkgs; klystrack = callPackage ../applications/audio/klystrack { }; + knit = callPackage ../development/tools/build-managers/knit { }; + knockpy = callPackage ../tools/security/knockpy { }; kool = callPackage ../development/tools/misc/kool { }; @@ -9472,10 +9627,6 @@ with pkgs; coq = coq_8_14; }; - ldgallery = callPackage ../tools/graphics/ldgallery { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - lego = callPackage ../tools/admin/lego { }; leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; @@ -9610,6 +9761,8 @@ with pkgs; maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { }; + mastotool = callPackage ../tools/misc/mastotool { }; + mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; matrix-conduit = callPackage ../servers/matrix-conduit { }; @@ -9777,6 +9930,8 @@ with pkgs; pythonPackages = python3Packages; }; + nanoemoji = python3Packages.callPackage ../tools/misc/nanoemoji { }; + nagelfar = callPackage ../development/tools/nagelfar { }; nats-top = callPackage ../tools/system/nats-top { }; @@ -9868,6 +10023,10 @@ with pkgs; node2nix = nodePackages.node2nix; + notesnook = callPackage ../applications/misc/notesnook { }; + + oddjob = callPackage ../os-specific/linux/oddjob { }; + openipmi = callPackage ../tools/system/openipmi { }; ox = callPackage ../applications/editors/ox { }; @@ -10047,6 +10206,8 @@ with pkgs; libtirpc = callPackage ../development/libraries/ti-rpc { }; + libtickit = callPackage ../development/libraries/libtickit { }; + libtins = callPackage ../development/libraries/libtins { }; libtree = callPackage ../development/tools/misc/libtree { }; @@ -10149,6 +10310,8 @@ with pkgs; lmp = callPackage ../tools/security/lmp { }; + localproxy = callPackage ../applications/networking/localproxy { }; + localstack = with python3Packages; toPythonApplication localstack; localtime = callPackage ../tools/system/localtime { }; @@ -10491,12 +10654,16 @@ with pkgs; motrix = callPackage ../tools/networking/motrix { }; + mount-zip = callPackage ../tools/filesystems/mount-zip { }; + mpage = callPackage ../tools/text/mpage { }; mprime = callPackage ../tools/misc/mprime { }; mpw = callPackage ../tools/security/mpw { }; + mqtt_cpp = callPackage ../development/libraries/mqtt_cpp { }; + mr = callPackage ../applications/version-management/mr { }; mrsh = callPackage ../shells/mrsh { }; @@ -10755,6 +10922,7 @@ with pkgs; nomad_1_3 nomad_1_4 nomad_1_5 + nomad_1_6 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -10789,7 +10957,7 @@ with pkgs; nvidia-thrust-intel = callPackage ../development/libraries/nvidia-thrust { hostSystem = "TBB"; - deviceSystem = if config.cudaSupport or false then "CUDA" else "TBB"; + deviceSystem = if config.cudaSupport then "CUDA" else "TBB"; }; nvidia-thrust-cuda = callPackage ../development/libraries/nvidia-thrust { @@ -10906,6 +11074,10 @@ with pkgs; notify-osd = callPackage ../applications/misc/notify-osd { }; + notes = qt6Packages.callPackage ../applications/office/notes { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + notes-up = callPackage ../applications/office/notes-up { }; notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { }; @@ -11004,6 +11176,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + onthespot = libsForQt5.callPackage ../applications/misc/onthespot { }; + opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; @@ -11550,7 +11724,8 @@ with pkgs; pim6sd = callPackage ../servers/pim6sd { }; - piper-train = with python3Packages; toPythonApplication piper-train; + piper-phonemize = callPackage ../development/libraries/piper-phonemize { }; + piper-train = callPackage ../tools/audio/piper/train.nix { }; piper-tts = callPackage ../tools/audio/piper { }; phosh = callPackage ../applications/window-managers/phosh { }; @@ -11660,6 +11835,8 @@ with pkgs; plotinus = callPackage ../tools/misc/plotinus { }; + plots = callPackage ../applications/misc/plots { }; + plotutils = callPackage ../tools/graphics/plotutils { }; plowshare = callPackage ../tools/misc/plowshare { }; @@ -11795,10 +11972,7 @@ with pkgs; prototypejs = callPackage ../development/libraries/prototypejs { }; - inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) - proxmark3 proxmark3-unstable; - - proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { + proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { inherit (darwin.apple_sdk.frameworks) Foundation AppKit; }; @@ -11840,6 +12014,8 @@ with pkgs; pscircle = callPackage ../os-specific/linux/pscircle { }; + psitop = callPackage ../applications/system/psitop { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -11850,6 +12026,8 @@ with pkgs; psutils = callPackage ../tools/typesetting/psutils { }; + psudohash = callPackage ../tools/security/psudohash { }; + psensor = callPackage ../tools/system/psensor { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; @@ -11916,9 +12094,7 @@ with pkgs; revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { }; - rbw = callPackage ../tools/security/rbw { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rbw = callPackage ../tools/security/rbw { }; remarshal = with python3Packages; toPythonApplication remarshal; @@ -12251,7 +12427,7 @@ with pkgs; reuse = callPackage ../tools/package-management/reuse { }; - inherit (nodePackages) reveal-md; + reveal-md = callPackage ../tools/text/reveal-md { }; rewritefs = callPackage ../os-specific/linux/rewritefs { }; @@ -12368,10 +12544,14 @@ with pkgs; rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; + rtz = callPackage ../tools/misc/rtz { }; + rubber = callPackage ../tools/typesetting/rubber { }; rubocop = rubyPackages.rubocop; + ruby-lsp = rubyPackages.ruby-lsp; + runningx = callPackage ../tools/X11/runningx { }; rund = callPackage ../development/tools/rund { }; @@ -12406,6 +12586,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + rustdesk-server = callPackage ../servers/rustdesk-server { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rustypaste = callPackage ../servers/rustypaste { }; rustypaste-cli = callPackage ../tools/misc/rustypaste-cli { }; @@ -12725,9 +12909,11 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair { }; sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices SkyLight; + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight; }; + sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; + skippy-xd = callPackage ../tools/X11/skippy-xd { }; sks = callPackage ../servers/sks { @@ -13060,6 +13246,8 @@ with pkgs; stabber = callPackage ../misc/stabber { }; + stacer = libsForQt5.callPackage ../tools/system/stacer { }; + starcharts = callPackage ../servers/misc/starcharts { }; staticjinja = with python3.pkgs; toPythonApplication staticjinja; @@ -13305,9 +13493,9 @@ with pkgs; texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; - texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; + texstudio = qt6Packages.callPackage ../applications/editors/texstudio { }; - textadept = callPackage ../applications/editors/textadept { }; + textadept = libsForQt5.callPackage ../applications/editors/textadept { }; texworks = qt6Packages.callPackage ../applications/editors/texworks { }; @@ -13439,6 +13627,8 @@ with pkgs; tncattach = callPackage ../applications/radio/tncattach { }; + to-html = callPackage ../tools/text/to-html { }; + toilet = callPackage ../tools/misc/toilet { }; tokei = callPackage ../development/tools/misc/tokei { @@ -13689,6 +13879,8 @@ with pkgs; tydra = callPackage ../tools/misc/tydra { }; + typesense = callPackage ../servers/search/typesense { }; + typos = callPackage ../development/tools/typos { }; typst = callPackage ../tools/typesetting/typst { }; @@ -14025,6 +14217,8 @@ with pkgs; wasmi = callPackage ../development/tools/wasmi { }; + wasmserve = callPackage ../development/tools/wasmserve {}; + welkin = callPackage ../tools/graphics/welkin { }; wemux = callPackage ../tools/misc/wemux { }; @@ -14079,6 +14273,8 @@ with pkgs; woodpecker-pipeline-transform = callPackage ../development/tools/continuous-integration/woodpecker-pipeline-transform { }; + woodpecker-plugin-git = callPackage ../development/tools/continuous-integration/woodpecker-plugin-git { }; + woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { woodpecker-frontend = callPackage ../development/tools/continuous-integration/woodpecker/frontend.nix { }; }; @@ -14231,6 +14427,8 @@ with pkgs; unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; + unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { }; + unrar = callPackage ../tools/archivers/unrar { }; unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; @@ -14267,6 +14465,8 @@ with pkgs; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng { }; + xssstate = callPackage ../tools/X11/xssstate { }; + xscast = callPackage ../applications/video/xscast { }; xsettingsd = callPackage ../tools/X11/xsettingsd { }; @@ -14371,6 +14571,8 @@ with pkgs; wdisplays = callPackage ../tools/graphics/wdisplays { }; + weaviate = callPackage ../servers/search/weaviate { }; + webalizer = callPackage ../tools/networking/webalizer { }; wget = callPackage ../tools/networking/wget { }; @@ -14583,6 +14785,8 @@ with pkgs; yarn = callPackage ../development/tools/yarn { }; + yarn-berry = callPackage ../development/tools/yarn-berry { }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; inherit (yarn2nix-moretea) @@ -14717,6 +14921,8 @@ with pkgs; zstxtns-utils = callPackage ../tools/text/zstxtns-utils { }; + zsh-abbr = callPackage ../shells/zsh/zsh-abbr { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-autopair = callPackage ../shells/zsh/zsh-autopair { }; @@ -15036,7 +15242,7 @@ with pkgs; colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt5.callPackage ../applications/science/misc/colmap { cudaSupport = config.cudaSupport or false; }; + colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; colmapWithCuda = colmap.override { cudaSupport = true; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; @@ -15171,7 +15377,7 @@ with pkgs; comby = callPackage ../development/tools/comby { }; - inherit (coqPackages_8_16) compcert; + inherit (coqPackages) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp { }; computecpp = wrapCCWith rec { @@ -15428,145 +15634,41 @@ with pkgs; extraPackages = []; }; - gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.8" else { }; - - isl = if !stdenv.isDarwin then isl_0_14 else null; - cloog = if !stdenv.isDarwin then cloog else null; - texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump - })); - - gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.9" else { }; - - isl = if !stdenv.isDarwin then isl_0_11 else null; - - cloog = if !stdenv.isDarwin then cloog_0_18_0 else null; - - # Build fails on Darwin with clang - stdenv = if stdenv.isDarwin then gccStdenv else stdenv; - })); - - gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "6" else { }; - - # gcc 10 is too strict to cross compile gcc <= 8 - stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; - - isl = if stdenv.isDarwin - then null - else if stdenv.targetPlatform.isRedox - then isl_0_17 - else isl_0_14; - })); - - gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "7" else { }; - - # gcc 10 is too strict to cross compile gcc <= 8 - stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; - - isl = if !stdenv.isDarwin then isl_0_17 else null; - })); - - gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "8" else { }; - - # gcc 10 is too strict to cross compile gcc <= 8 - stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; - - isl = if !stdenv.isDarwin then isl_0_17 else null; - })); - - gcc9 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/9 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "9" else { }; - - isl = if !stdenv.isDarwin then isl_0_20 else null; - })); - - gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "10" else { }; - - isl = if !stdenv.isDarwin then isl_0_20 else null; - })); - - gcc11 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/11 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "11" else { }; - - isl = if !stdenv.isDarwin then isl_0_20 else null; - })); - - gcc12 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/12 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "12" else { }; - - isl = if !stdenv.isDarwin then isl_0_20 else null; - })); - - gcc13 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/13 { - inherit noSysDirs; - - reproducibleBuild = true; - profiledCompiler = false; - - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "13" else { }; - - isl = if !stdenv.isDarwin then isl_0_20 else null; - })); + # This expression will be pushed into pkgs/development/compilers/gcc/common + # once the top-level gcc/${version}/default.nix files are deduplicated. + inherit + (lib.listToAttrs (map (version: + let atLeast = lib.versionAtLeast version; + attrName = "gcc${lib.replaceStrings ["."] [""] version}"; + pkg = lowPrio (wrapCC (callPackage (../development/compilers/gcc + "/${version}") ({ + inherit noSysDirs; + reproducibleBuild = true; + profiledCompiler = false; + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor version else { }; + isl = if stdenv.isDarwin then null + else if atLeast "9" then isl_0_20 + else if atLeast "7" then isl_0_17 + else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) + else if atLeast "4.9" then isl_0_11 + else /* "4.8" */ isl_0_14; + } // lib.optionalAttrs (version == "4.8") { + texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump + } // lib.optionalAttrs (version == "4.9") { + # Build fails on Darwin with clang + stdenv = if stdenv.isDarwin then gccStdenv else stdenv; + } // lib.optionalAttrs (!(atLeast "6")) { + cloog = if stdenv.isDarwin + then null + else if atLeast "4.9" then cloog_0_18_0 + else /* 4.8 */ cloog; + } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + }))); + in lib.nameValuePair attrName pkg + ) [ "4.8" "4.9" "6" "7" "8" "9" "10" "11" "12" "13" ])) + gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13; gcc_latest = gcc13; @@ -15812,9 +15914,10 @@ with pkgs; gcc-arm-embedded-12 = callPackage ../development/compilers/gcc-arm-embedded/12 { }; gcc-arm-embedded = gcc-arm-embedded-12; - # Has to match the default gcc so that there are no linking errors when - # using C/C++ libraries in D packages - gdc = wrapCC (gcc.cc.override { + # It would be better to match the default gcc so that there are no linking errors + # when using C/C++ libraries in D packages, but right now versions >= 12 are broken. + gdc = gdc11; + gdc11 = wrapCC (gcc11.cc.override { name = "gdc"; langCC = false; langC = false; @@ -15925,6 +16028,10 @@ with pkgs; hop = callPackage ../development/compilers/hop { }; + hop-cli = callPackage ../tools/admin/hop-cli { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + falcon = callPackage ../development/interpreters/falcon { stdenv = gcc10Stdenv; }; @@ -16122,6 +16229,8 @@ with pkgs; kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; + kingstvis = callPackage ../applications/science/electronics/kingstvis { }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; regenkfs = callPackage ../development/tools/knightos/regenkfs { }; @@ -16438,7 +16547,8 @@ with pkgs; inherit (ocamlPackages) ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1; + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 + ocamlformat_0_26_0; orc = callPackage ../development/compilers/orc { }; @@ -16694,7 +16804,7 @@ with pkgs; inherit (llvmPackages_rocm) llvm clang-tools-extra; stdenv = rocmClangStdenv; rocmlir = rocmlir-rock; - boost = boost.override { enableStatic = true; }; + boost = boost179.override { enableStatic = true; }; }; miopen-hip = miopen.override { @@ -16968,8 +17078,13 @@ with pkgs; opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { }; + opensycl = darwin.apple_sdk_11_0.callPackage ../development/compilers/opensycl { }; + opensyclWithRocm = opensycl.override { rocmSupport = true; }; + ravedude = callPackage ../development/tools/rust/ravedude { }; + ra-multiplex = callPackage ../development/tools/rust/ra-multiplex {}; + rhack = callPackage ../development/tools/rust/rhack { }; roogle = callPackage ../development/tools/rust/roogle { }; rustfmt = rustPackages.rustfmt; @@ -16991,6 +17106,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; rusty-man = callPackage ../development/tools/rust/rusty-man { }; + rustycli = callPackage ../development/tools/rust/rustycli { }; + specr-transpile = callPackage ../development/tools/rust/specr-transpile { }; typeshare = callPackage ../development/tools/rust/typeshare { }; sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme { }; @@ -17143,6 +17260,8 @@ with pkgs; vala-lint = callPackage ../development/tools/vala-lint { }; + vcard = python3Packages.toPythonApplication python3Packages.vcard; + inherit (callPackage ../development/compilers/vala { }) vala_0_48 vala_0_54 @@ -17351,6 +17470,8 @@ with pkgs; dhall-nixpkgs = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-nixpkgs; + dhall-yaml = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-yaml; + dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); duktape = callPackage ../development/interpreters/duktape { }; @@ -17767,6 +17888,11 @@ with pkgs; rbenv = callPackage ../development/ruby-modules/rbenv { }; + rubyfmt = callPackage ../development/tools/rubyfmt { + inherit (darwin.apple_sdk.frameworks) Foundation Security; + inherit (darwin) libobjc; + }; + inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -17776,7 +17902,8 @@ with pkgs; ruby_2_7 ruby_3_0 ruby_3_1 - ruby_3_2; + ruby_3_2 + ruby_3_3; ruby = ruby_3_1; rubyPackages = rubyPackages_3_1; @@ -17785,6 +17912,7 @@ with pkgs; rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; + rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; mruby = callPackage ../development/compilers/mruby { }; @@ -17908,7 +18036,7 @@ with pkgs; guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { }; - guile = guile_2_2; + guile = guile_3_0; guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; @@ -17934,7 +18062,9 @@ with pkgs; guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-sdl = callPackage ../development/guile-modules/guile-sdl { + guile = guile_2_2; + }; guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; @@ -17943,7 +18073,7 @@ with pkgs; guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; guile-xcb = callPackage ../development/guile-modules/guile-xcb { - guile = guile_2_0; + guile = guile_2_2; }; inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { }; @@ -17970,12 +18100,7 @@ with pkgs; rappel = callPackage ../development/misc/rappel { }; - pharo-vms = callPackage ../development/pharo/vm { }; - pharo = pharo-vms.multi-vm-wrapper; - pharo-cog32 = pharo-vms.cog32; - pharo-spur32 = pharo-vms.spur32; - pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; - pharo-launcher = callPackage ../development/pharo/launcher { }; + pharo = callPackage ../development/pharo { }; protege-distribution = callPackage ../development/web/protege-distribution { }; @@ -18061,6 +18186,8 @@ with pkgs; doq = callPackage ../development/tools/misc/doq { }; + espup = callPackage ../development/tools/espup { }; + phpunit = callPackage ../development/tools/misc/phpunit { }; teller = callPackage ../development/tools/teller { }; @@ -18097,6 +18224,7 @@ with pkgs; lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/lua-language-server { inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; + inherit (darwin) ditto; }; metals = callPackage ../development/tools/language-servers/metals { }; @@ -18384,7 +18512,7 @@ with pkgs; in if linker == "lld" then llvmPackages.bintools-unwrapped else if linker == "cctools" then darwin.binutils-unwrapped else if linker == "bfd" then binutils-unwrapped - else if linker == "gold" then binutils-unwrapped + else if linker == "gold" then binutils-unwrapped.override { enableGoldDefault = true; } else null; bintoolsNoLibc = wrapBintoolsWith { bintools = bintools-unwrapped; @@ -18468,12 +18596,11 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; bcc = callPackage ../os-specific/linux/bcc { - python = python3; - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_16; }; bpftrace = callPackage ../os-specific/linux/bpftrace { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_16; }; bpm-tools = callPackage ../tools/audio/bpm-tools { }; @@ -18671,6 +18798,8 @@ with pkgs; cwltool = callPackage ../applications/science/misc/cwltool { }; + dbt = with python3Packages; toPythonApplication dbt-core; + dprint = callPackage ../development/tools/dprint { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -18872,6 +19001,8 @@ with pkgs; fastgron = callPackage ../development/tools/fastgron { }; + fatcat = callPackage ../development/tools/fatcat { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; findnewest = callPackage ../development/tools/misc/findnewest { }; @@ -19053,7 +19184,7 @@ with pkgs; }; gwrap = callPackage ../development/tools/guile/g-wrap { - guile = guile_2_0; + guile = guile_2_2; }; hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; @@ -19087,7 +19218,8 @@ with pkgs; iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { }; ikos = callPackage ../development/tools/analysis/ikos { - inherit (llvmPackages_9) stdenv clang llvm; + inherit (llvmPackages_14) stdenv clang llvm; + tbb = tbb_2021_8; }; img = callPackage ../development/tools/img { }; @@ -19534,11 +19666,7 @@ with pkgs; qc = callPackage ../development/tools/qc { }; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { - inherit (linuxPackages) perf; - }; - - qtcreator-qt6 = qt6Packages.callPackage ../development/tools/qtcreator/qt6.nix { + qtcreator = qt6Packages.callPackage ../development/tools/qtcreator { inherit (linuxPackages) perf; stdenv = llvmPackages_14.stdenv; llvmPackages = llvmPackages_14; @@ -19641,8 +19769,9 @@ with pkgs; rufo = callPackage ../development/tools/rufo { }; - rye = callPackage ../development/tools/rye { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + rye = darwin.apple_sdk_11_0.callPackage ../development/tools/rye { + inherit (darwin.apple_sdk_11_0) Libsystem; + inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; }; samurai = callPackage ../development/tools/build-managers/samurai { }; @@ -19657,6 +19786,8 @@ with pkgs; saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { }; + samply = callPackage ../development/tools/misc/samply { }; + sauce-connect = callPackage ../development/tools/sauce-connect { }; sawjap = callPackage ../development/tools/java/sawjap { }; @@ -19785,6 +19916,8 @@ with pkgs; spruce = callPackage ../development/tools/misc/spruce { }; + sqlboiler-crdb = callPackage ../development/tools/database/sqlboiler-crdb { }; + sqlc = callPackage ../development/tools/database/sqlc { }; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; @@ -19881,8 +20014,12 @@ with pkgs; terraformer = callPackage ../development/tools/misc/terraformer { }; + terramate = callPackage ../development/tools/misc/terramate { }; + terrascan = callPackage ../tools/security/terrascan { }; + tesh = callPackage ../tools/text/tesh {}; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; @@ -20043,6 +20180,8 @@ with pkgs; xeus = callPackage ../development/libraries/xeus { }; + xeus-zmq = callPackage ../development/libraries/xeus-zmq { }; + xmlindent = callPackage ../development/web/xmlindent { }; xpwn = callPackage ../development/mobile/xpwn { }; @@ -20304,7 +20443,7 @@ with pkgs; boost182 ; - boost = boost179; + boost = boost181; boost_process = callPackage ../development/libraries/boost-process { }; @@ -20314,6 +20453,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + # may add CoreServices and Security again, when MacOS uses Clang 14.0+ by default. + botan3 = callPackage ../development/libraries/botan/3.0.nix { }; + box2d = callPackage ../development/libraries/box2d { }; boxfort = callPackage ../development/libraries/boxfort { }; @@ -20402,9 +20544,7 @@ with pkgs; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { }; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { }; - cegui = callPackage ../development/libraries/cegui { - ogre = ogre1_10; - }; + cegui = callPackage ../development/libraries/cegui { }; certbot = python3.pkgs.toPythonApplication python3.pkgs.certbot; @@ -21081,10 +21221,16 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; + gr-framework = libsForQt5.callPackage ../development/libraries/gr-framework { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; + graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; graphinder = callPackage ../tools/security/graphinder { }; + hnswlib = callPackage ../development/libraries/hnswlib { }; + httplib = callPackage ../development/libraries/httplib { }; icon-lang = callPackage ../development/interpreters/icon-lang { }; @@ -21207,8 +21353,7 @@ with pkgs; threadsCross = threadsCrossFor null; threadsCrossFor = cc_version: - if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) - then { + lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) { # other possible values: win32 or posix model = "mcf"; # For win32 or posix set this to null @@ -21216,7 +21361,7 @@ with pkgs; if cc_version == null || lib.versionAtLeast cc_version "13" then targetPackages.windows.mcfgthreads or windows.mcfgthreads else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13; - } else { }; + }; wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; @@ -21777,8 +21922,8 @@ with pkgs; isort = with python3Packages; toPythonApplication isort; ispc = callPackage ../development/compilers/ispc { - inherit (llvmPackages) stdenv; xcode = darwin.xcode_14; + llvmPackages = llvmPackages_14; }; isso = callPackage ../servers/isso { @@ -22383,6 +22528,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit; }; + libspelling = callPackage ../development/libraries/libspelling { }; + libsystemtap = callPackage ../development/libraries/libsystemtap { }; libgtop = callPackage ../development/libraries/libgtop { }; @@ -22777,10 +22924,7 @@ with pkgs; libmatchbox = callPackage ../development/libraries/libmatchbox { }; - libmatheval = callPackage ../development/libraries/libmatheval { - autoconf = buildPackages.autoconf269; - guile = guile_2_0; - }; + libmatheval = callPackage ../development/libraries/libmatheval { }; libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -23749,6 +23893,7 @@ with pkgs; nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { }; nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; + nv-codec-headers-12 = callPackage ../development/libraries/nv-codec-headers/12_x.nix { }; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let @@ -23795,10 +23940,10 @@ with pkgs; ode = callPackage ../development/libraries/ode { }; - ogre = callPackage ../development/libraries/ogre { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix { }; + inherit (callPackages ../development/libraries/ogre { }) + ogre_13 ogre_14; + + ogre = ogre_14; olm = callPackage ../development/libraries/olm { }; @@ -24110,6 +24255,8 @@ with pkgs; buildPythonApplication click future six; }; + pyp = callPackage ../tools/text/pyp { }; + pru = callPackage ../tools/text/pru { }; prospector = callPackage ../development/tools/prospector { }; @@ -24344,6 +24491,8 @@ with pkgs; restinio = callPackage ../development/libraries/restinio { }; + restish = callPackage ../tools/networking/restish { }; + rhino = callPackage ../development/libraries/java/rhino { javac = jdk8; jvm = jre8; @@ -24749,6 +24898,8 @@ with pkgs; stxxl = callPackage ../development/libraries/stxxl { }; + sv-lang = callPackage ../applications/science/electronics/sv-lang { }; + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); unqlite = lowPrio (callPackage ../development/libraries/unqlite { }); @@ -24835,7 +24986,11 @@ with pkgs; taskflow = callPackage ../development/libraries/taskflow { }; - tclap = callPackage ../development/libraries/tclap { }; + tclap = tclap_1_2; + + tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { }; + + tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { }; tcllib = callPackage ../development/libraries/tcllib { }; @@ -25137,7 +25292,9 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; - wildmidi = callPackage ../development/libraries/wildmidi { }; + wildmidi = callPackage ../development/libraries/wildmidi { + inherit (darwin.apple_sdk.frameworks) OpenAL; + }; wiredtiger = callPackage ../development/libraries/wiredtiger { }; @@ -25199,8 +25356,6 @@ with pkgs; xedit = callPackage ../applications/editors/xedit { }; - xine-lib = callPackage ../development/libraries/xine-lib { }; - xautolock = callPackage ../misc/screensavers/xautolock { }; xercesc = callPackage ../development/libraries/xercesc { }; @@ -25303,6 +25458,8 @@ with pkgs; }; zig = zig_0_10; + zigHook = callPackage ../development/compilers/zig/hook.nix { }; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -25588,17 +25745,17 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_3_5 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.5"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_3_6 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.6"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_3_6; + sbcl_2_3_7 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.7"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_3_7; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25974,6 +26131,8 @@ with pkgs; glabels = callPackage ../applications/graphics/glabels { }; + glabels-qt = libsForQt5.callPackage ../applications/graphics/glabels-qt { }; + nats-server = callPackage ../servers/nats-server { }; go-autoconfig = callPackage ../servers/go-autoconfig { }; @@ -26356,10 +26515,7 @@ with pkgs; petidomo = callPackage ../servers/mail/petidomo { }; - pict-rs = callPackage ../servers/web-apps/pict-rs { - inherit (darwin.apple_sdk.frameworks) Security; - ffmpeg = ffmpeg_4; - }; + pict-rs = callPackage ../servers/web-apps/pict-rs { }; pict-rs_0_3 = callPackage ../servers/web-apps/pict-rs/0.3.nix { inherit (darwin.apple_sdk.frameworks) Security; @@ -26601,6 +26757,8 @@ with pkgs; pgbouncer = callPackage ../servers/sql/pgbouncer { }; + pgcat = callPackage ../servers/sql/pgcat {}; + pgpool = callPackage ../servers/sql/pgpool { }; tang = callPackage ../servers/tang { @@ -26664,6 +26822,7 @@ with pkgs; prometheus-cloudflare-exporter = callPackage ../servers/monitoring/prometheus/cloudflare-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; + prometheus-dcgm-exporter = callPackage ../servers/monitoring/prometheus/dcgm-exporter { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; @@ -27215,6 +27374,8 @@ with pkgs; bpf-linker = callPackage ../development/tools/bpf-linker { }; + bpftune = callPackage ../os-specific/linux/bpftune { }; + bpfmon = callPackage ../os-specific/linux/bpfmon { }; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; @@ -27243,6 +27404,8 @@ with pkgs; cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb-bin = callPackage ../servers/sql/cockroachdb/cockroachdb-bin.nix { }; + coconutbattery = callPackage ../os-specific/darwin/coconutbattery { }; conky = callPackage ../os-specific/linux/conky ({ @@ -27421,7 +27584,7 @@ with pkgs; gt = callPackage ../os-specific/linux/gt { }; - inherit (nodePackages) gtop; + gtop = callPackage ../tools/system/gtop { }; hd-idle = callPackage ../os-specific/linux/hd-idle { }; @@ -27682,8 +27845,6 @@ with pkgs; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; - linuxPackages_6_3_hardened = linuxKernel.packages.linux_6_3_hardened; - linux_6_3_hardened = linuxKernel.kernels.linux_6_3_hardened; linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened; linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened; @@ -27956,6 +28117,8 @@ with pkgs; godef = callPackage ../development/tools/godef { }; + goimports-reviser = callPackage ../development/tools/goimports-reviser { }; + gopkgs = callPackage ../development/tools/gopkgs { }; gosec = callPackage ../development/tools/gosec { }; @@ -28088,6 +28251,8 @@ with pkgs; perf-tools = callPackage ../os-specific/linux/perf-tools { }; + pgrok = callPackage ../tools/networking/pgrok { }; + picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { }; pipes = callPackage ../misc/screensavers/pipes { }; @@ -28614,6 +28779,8 @@ with pkgs; bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; + banana-cursor = callPackage ../data/icons/banana-cursor { }; + barlow = callPackage ../data/fonts/barlow { }; base16-schemes = callPackage ../data/themes/base16-schemes { }; @@ -28765,6 +28932,8 @@ with pkgs; combinatorial_designs = callPackage ../data/misc/combinatorial_designs { }; + commit-mono = callPackage ../data/fonts/commit-mono { }; + conway_polynomials = callPackage ../data/misc/conway_polynomials { }; cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { }; @@ -28837,6 +29006,9 @@ with pkgs; fira-code = callPackage ../data/fonts/fira-code { }; fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; + fira-code-nerdfont = nerdfonts.override { + fonts = [ "FiraCode" ]; + }; fira-go = callPackage ../data/fonts/fira-go { }; @@ -29845,6 +30017,8 @@ with pkgs; abaddon = callPackage ../applications/networking/instant-messengers/abaddon { }; + acpic = callPackage ../applications/misc/acpic/default.nix { }; + adguardian = callPackage ../applications/networking/adguardian { }; aeolus = callPackage ../applications/audio/aeolus { }; @@ -30044,7 +30218,9 @@ with pkgs; cutecapture = callPackage ../applications/video/cutecapture { }; - milkytracker = callPackage ../applications/audio/milkytracker { }; + milkytracker = callPackage ../applications/audio/milkytracker { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation; + }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; @@ -30173,8 +30349,11 @@ with pkgs; bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { libjpeg = libjpeg.override { enableJpeg8 = true; }; }; + bitwig-studio5 = callPackage ../applications/audio/bitwig-studio/bitwig-studio5.nix { + libjpeg = libjpeg.override { enableJpeg8 = true; }; + }; - bitwig-studio = bitwig-studio4; + bitwig-studio = bitwig-studio5; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -30200,6 +30379,8 @@ with pkgs; blogc = callPackage ../applications/misc/blogc { }; + bloodhound = callPackage ../applications/misc/bloodhound { }; + blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix { inherit (haskellPackages) ghcWithPackages; }; @@ -30272,7 +30453,7 @@ with pkgs; cardo = callPackage ../data/fonts/cardo { }; cage = callPackage ../applications/window-managers/cage { - wlroots = wlroots_0_14; + wlroots = wlroots_0_16; }; calf = callPackage ../applications/audio/calf { @@ -30547,6 +30728,8 @@ with pkgs; cwm = callPackage ../applications/window-managers/cwm { }; + cyberduck = callPackage ../applications/networking/cyberduck { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; dablin = callPackage ../applications/radio/dablin { }; @@ -30573,6 +30756,8 @@ with pkgs; extraIntegrations = extras; }; + dayon = callPackage ../applications/networking/remote/dayon { }; + ddgr = callPackage ../applications/misc/ddgr { }; deadbeef = callPackage ../applications/audio/deadbeef { }; @@ -30636,8 +30821,10 @@ with pkgs; dnd-tools = callPackage ../applications/misc/dnd-tools { }; + dnglab = callPackage ../tools/graphics/dnglab { }; + inherit (callPackage ../applications/virtualization/docker {}) - docker_20_10; + docker_20_10 docker_24; docker = docker_20_10; docker-client = docker.override { clientOnly = true; }; @@ -31123,6 +31310,8 @@ with pkgs; globe-cli = callPackage ../applications/misc/globe-cli { }; + gnmic = callPackage ../applications/networking/gnmic { }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { @@ -31234,6 +31423,7 @@ with pkgs; }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; + goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { }; gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; @@ -31343,6 +31533,8 @@ with pkgs; imlib2 = imlib2Full; }; + feishin = callPackage ../applications/audio/feishin { }; + feishu = callPackage ../applications/networking/instant-messengers/feishu { }; filezilla = callPackage ../applications/networking/ftp/filezilla { }; @@ -31361,7 +31553,7 @@ with pkgs; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102; firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; - firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-115; firefox = wrapFirefox firefox-unwrapped { }; firefox-beta = wrapFirefox firefox-beta-unwrapped { }; @@ -31369,7 +31561,7 @@ with pkgs; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; - firefox-esr = firefox-esr-102; + firefox-esr = firefox-esr-115; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { }; @@ -31573,6 +31765,7 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; gum = callPackage ../applications/misc/gum { }; + pop = callPackage ../applications/misc/pop { }; hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc swftools; @@ -31633,6 +31826,8 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; + multiviewer-for-f1 = callPackage ../applications/video/multiviewer-for-f1 { }; + muzika = callPackage ../applications/audio/muzika { }; pattypan = callPackage ../applications/misc/pattypan { @@ -31867,6 +32062,12 @@ with pkgs; hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; + hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; + + hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix { + conf = config.hydrogen-web.conf or { }; + }; + hivelytracker = callPackage ../applications/audio/hivelytracker { }; hledger = haskell.lib.compose.justStaticExecutables haskellPackages.hledger; @@ -32010,6 +32211,8 @@ with pkgs; passky-desktop = callPackage ../applications/misc/passky-desktop { }; + pat = callPackage ../applications/radio/pat { }; + pinboard = with python3Packages; toPythonApplication pinboard; pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup; @@ -32091,7 +32294,6 @@ with pkgs; super-productivity = callPackage ../applications/office/super-productivity { }; inherit (callPackages ../development/libraries/wlroots {}) - wlroots_0_14 wlroots_0_15 wlroots_0_16 wlroots; @@ -32366,7 +32568,7 @@ with pkgs; lua = lua5_1; }; - ipe = libsForQt5.callPackage ../applications/graphics/ipe { + ipe = qt6Packages.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; @@ -32476,6 +32678,8 @@ with pkgs; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; + kbt = callPackage ../applications/misc/kbt { }; + kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { }; kappanhang = callPackage ../applications/radio/kappanhang { }; @@ -32632,6 +32836,8 @@ with pkgs; kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; + kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; + kubectl-gadget = callPackage ../applications/networking/cluster/kubectl-gadget { }; kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; @@ -32650,6 +32856,8 @@ with pkgs; kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; + kubevpn = callPackage ../applications/networking/cluster/kubevpn { }; + k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { }; k9s = callPackage ../applications/networking/cluster/k9s { }; @@ -32735,6 +32943,8 @@ with pkgs; electron = electron_22; }; + timoni = callPackage ../applications/networking/cluster/timoni { }; + kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; @@ -32815,6 +33025,7 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + boost = boost179; }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { @@ -33007,8 +33218,6 @@ with pkgs; marathonctl = callPackage ../tools/virtualization/marathonctl { }; - markdown-pp = callPackage ../tools/text/markdown-pp { }; - mark = callPackage ../tools/text/mark { }; markets = callPackage ../applications/misc/markets { }; @@ -33017,6 +33226,8 @@ with pkgs; electron = electron_9; }; + markscribe = callPackage ../tools/text/markscribe { }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; mastodon-bot = nodePackages.mastodon-bot; @@ -33146,6 +33357,8 @@ with pkgs; mimic = callPackage ../applications/audio/mimic { }; + mission-center = callPackage ../applications/misc/mission-center { }; + meh = callPackage ../applications/graphics/meh { }; mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; @@ -33338,6 +33551,8 @@ with pkgs; rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { }; + rofi-screenshot = callPackage ../applications/misc/rofi-screenshot { }; + rofi-top = callPackage ../applications/misc/rofi-top { }; rofi-vpn = callPackage ../applications/networking/rofi-vpn { }; @@ -33374,6 +33589,7 @@ with pkgs; } // (config.mplayer or {})); mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { + stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; inherit lua; }; @@ -33422,12 +33638,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - # TODO: we should probably merge these 2 - musescore = - if stdenv.isDarwin then - callPackage ../applications/audio/musescore/darwin.nix { } - else - libsForQt5.callPackage ../applications/audio/musescore { }; + musescore = libsForQt5.callPackage ../applications/audio/musescore { }; music-player = callPackage ../applications/audio/music-player { }; @@ -33483,8 +33694,12 @@ with pkgs; novnc = callPackage ../applications/networking/novnc { }; + ns-usbloader = callPackage ../applications/misc/ns-usbloader { }; + nwg-bar = callPackage ../applications/misc/nwg-bar { }; + nwg-displays = callPackage ../applications/misc/nwg-displays { }; + nwg-dock = callPackage ../applications/misc/nwg-dock { }; nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { }; @@ -33515,7 +33730,7 @@ with pkgs; opcr-policy = callPackage ../development/tools/opcr-policy { }; - opcua-client-gui = callPackage ../misc/opcua-client-gui { }; + opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { }; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; @@ -34126,68 +34341,14 @@ with pkgs; picosnitch = callPackage ../tools/networking/picosnitch { }; - pidgin = callPackage ../applications/networking/instant-messengers/pidgin { - withOpenssl = config.pidgin.openssl or true; - withGnutls = config.pidgin.gnutls or false; - plugins = []; - }; + pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); - pidgin-indicator = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator { }; - - pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { - texLive = texlive.combined.scheme-basic; - }; - - pidgin-msn-pecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; - - pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { }; - - pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; - - pidgin-carbons = callPackage ../applications/networking/instant-messengers/pidgin-plugins/carbons { }; - - pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; - - pidgin-otr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; - - pidgin-osd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; - - pidgin-sipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; - - pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + inherit (pidginPackages) pidgin; pika-backup = callPackage ../applications/backup/pika-backup { }; pur = callPackage ../development/tools/pur { }; - purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; - - purple-googlechat = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-googlechat { }; - - purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; - - purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; - - purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; - - purple-mm-sms = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms { }; - - purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; - - purple-signald = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-signald { }; - - purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; - - purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; - - purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { }; - - tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { }; - - pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; - - purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; - purpur = callPackage ../games/purpur { }; pikopixel = callPackage ../applications/graphics/pikopixel { }; @@ -34325,6 +34486,8 @@ with pkgs; pwdsafety = callPackage ../tools/security/pwdsafety { }; + pyload-ng = callPackage ../applications/networking/pyload-ng {}; + pyrosimple = callPackage ../applications/networking/p2p/pyrosimple { }; qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; @@ -34544,6 +34707,7 @@ with pkgs; reaper = callPackage ../applications/audio/reaper { jackLibrary = libjack2; # Another option is "pipewire.jack". + ffmpeg = ffmpeg_4-headless; }; recapp = callPackage ../applications/video/recapp { }; @@ -34595,6 +34759,9 @@ with pkgs; }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; + rofi-pass-wayland = callPackage ../tools/security/pass/rofi-pass.nix { + backend = "wayland"; + }; rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; @@ -34617,6 +34784,8 @@ with pkgs; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix { }; + rtfm = callPackage ../applications/misc/rtfm { }; + rtl_433 = callPackage ../applications/radio/rtl_433 { }; rtl-ais = callPackage ../applications/radio/rtl-ais { }; @@ -34708,7 +34877,7 @@ with pkgs; shavee = callPackage ../applications/misc/shavee { }; - shell_gpt = callPackage ../tools/misc/shell_gpt { }; + shell_gpt = callPackage ../tools/llm/shell_gpt { }; shfmt = callPackage ../tools/text/shfmt { }; @@ -34748,6 +34917,8 @@ with pkgs; slrn = callPackage ../applications/networking/newsreaders/slrn { }; + smartcrop = callPackage ../tools/graphics/smartcrop { }; + sniffnet = callPackage ../applications/networking/sniffnet { }; sniproxy = callPackage ../applications/networking/sniproxy { }; @@ -34851,6 +35022,8 @@ with pkgs; insync = callPackage ../applications/networking/insync { }; + lemurs = callPackage ../applications/display-managers/lemurs { }; + libstrangle = callPackage ../tools/X11/libstrangle { stdenv = stdenv_32bit; }; @@ -34940,6 +35113,8 @@ with pkgs; soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; + soundsource = callPackage ../applications/audio/soundsource { }; + sox = callPackage ../applications/misc/audio/sox { inherit (darwin.apple_sdk.frameworks) CoreAudio; }; @@ -35162,8 +35337,6 @@ with pkgs; tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; - tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { }; telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; @@ -35261,6 +35434,8 @@ with pkgs; tickrs = callPackage ../applications/misc/tickrs { }; + tijolo = callPackage ../applications/editors/tijolo { }; + tilemaker = callPackage ../applications/misc/tilemaker { }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { @@ -35463,9 +35638,15 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + typer = callPackage ../applications/misc/typer { }; + + typioca = callPackage ../applications/misc/typioca { }; + ueberzug = with python3Packages; toPythonApplication ueberzug; - ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; + ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; + }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; @@ -35823,22 +36004,20 @@ with pkgs; wapiti = callPackage ../tools/security/wapiti { }; - wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); - inherit (wayfireApplications) wayfire wcm; - wayfireApplications-unwrapped = recurseIntoAttrs ( - (callPackage ../applications/window-managers/wayfire/applications.nix { }). - extend (_: _: { wlroots = wlroots_0_16; }) - ); - wayfirePlugins = recurseIntoAttrs ( - callPackage ../applications/window-managers/wayfire/plugins.nix { - inherit (wayfireApplications-unwrapped) wayfire; - } - ); - weave-gitops = callPackage ../applications/networking/cluster/weave-gitops { }; + wayfire = callPackage ../applications/window-managers/wayfire/default.nix { + wlroots = wlroots_0_16; + }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; + wayfirePlugins = recurseIntoAttrs ( + callPackage ../applications/window-managers/wayfire/plugins.nix { } + ); + wayfire-with-plugins = callPackage ../applications/window-managers/wayfire/wrapper.nix { + plugins = with wayfirePlugins; [ wcm wf-shell ]; + }; + waypipe = callPackage ../applications/networking/remote/waypipe { }; wayv = callPackage ../tools/X11/wayv { }; @@ -36002,9 +36181,7 @@ with pkgs; xaos = libsForQt5.callPackage ../applications/graphics/xaos { }; - xastir = callPackage ../applications/misc/xastir { - rastermagick = imagemagick6; - }; + xastir = callPackage ../applications/misc/xastir { }; xautomation = callPackage ../tools/X11/xautomation { }; @@ -36118,7 +36295,8 @@ with pkgs; xfractint = callPackage ../applications/graphics/xfractint { }; - xine-ui = callPackage ../applications/video/xine-ui { }; + xine-ui = callPackage ../applications/video/xine/ui.nix { }; + xine-lib = callPackage ../applications/video/xine/lib.nix { }; xlsxgrep = callPackage ../applications/search/xlsxgrep { }; @@ -36249,6 +36427,8 @@ with pkgs; xnotify = callPackage ../tools/X11/xnotify { }; + xpano = callPackage ../applications/graphics/xpano { }; + xv = callPackage ../applications/graphics/xv { }; xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; @@ -36379,7 +36559,7 @@ with pkgs; zsteg = callPackage ../tools/security/zsteg { }; - inherit (nodePackages) zx; + zx = callPackage ../tools/system/zx { }; zxfer = callPackage ../applications/system/zxfer { }; @@ -36408,6 +36588,8 @@ with pkgs; withGui = false; }; + aperture = callPackage ../applications/blockchains/aperture { }; + balanceofsatoshis = nodePackages.balanceofsatoshis; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { @@ -36519,6 +36701,10 @@ with pkgs; go-exploitdb = callPackage ../tools/security/go-exploitdb { }; + gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research { + boost = boost179; + }; + groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { stdenv = darwin.apple_sdk_11_0.stdenv; withGui = true; @@ -36739,6 +36925,11 @@ with pkgs; freenukum = callPackage ../games/freenukum { }; + inherit (callPackages ../games/fteqw {}) + fteqw + fteqw-dedicated + fteqcc; + gamepad-tool = callPackage ../games/gamepad-tool { }; gnome-hexgl = callPackage ../games/gnome-hexgl { }; @@ -36993,6 +37184,8 @@ with pkgs; chiaki = libsForQt5.callPackage ../games/chiaki { }; + chiaki4deck = libsForQt5.callPackage ../games/chiaki4deck { }; + chromium-bsu = callPackage ../games/chromium-bsu { }; clonehero = callPackage ../games/clonehero { }; @@ -37054,6 +37247,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security; }; + ddns-go = callPackage ../tools/networking/ddns-go { }; + devilutionx = callPackage ../games/devilutionx { fmt = fmt_9; SDL2 = SDL2.override { @@ -37081,7 +37276,9 @@ with pkgs; d1x-rebirth-full d2x-rebirth-full; - easyrpg-player = callPackage ../games/easyrpg-player { }; + easyrpg-player = callPackage ../games/easyrpg-player { + inherit (darwin.apple_sdk.frameworks) Foundation AudioUnit AudioToolbox; + }; eboard = callPackage ../games/eboard { }; @@ -37191,6 +37388,8 @@ with pkgs; gambatte = callPackage ../games/gambatte { }; + gambit-chess = callPackage ../games/gambit { }; + garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; gargoyle = callPackage ../games/gargoyle { @@ -37265,8 +37464,12 @@ with pkgs; hikounomizu = callPackage ../games/hikounomizu { }; + hmcl = callPackage ../games/hmcl { }; + hyperrogue = callPackage ../games/hyperrogue { }; + ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; }; + icbm3d = callPackage ../games/icbm3d { }; infra = callPackage ../tools/admin/infra { }; @@ -37295,6 +37498,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + jfsw = callPackage ../games/jfsw { }; + katago = callPackage ../games/katago { }; katagoWithCuda = katago.override { @@ -37475,9 +37680,7 @@ with pkgs; openarena = callPackage ../games/openarena { }; - opendungeons = callPackage ../games/opendungeons { - ogre = ogre1_10; - }; + opendungeons = callPackage ../games/opendungeons { }; openlierox = callPackage ../games/openlierox { }; @@ -37567,11 +37770,15 @@ with pkgs; principia = callPackage ../games/principia { }; - prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { }; + prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher/wrapper.nix { prismlauncher-unwrapped = prismlauncher-qt5-unwrapped; }; - prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { }; + prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; prismlauncher = qt6Packages.callPackage ../games/prismlauncher/wrapper.nix { }; @@ -37775,6 +37982,8 @@ with pkgs; stepmania = callPackage ../games/stepmania { }; + stone-kingdoms = callPackage ../games/stone-kingdoms { }; + streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { }; stt = callPackage ../tools/audio/stt { }; @@ -38027,6 +38236,8 @@ with pkgs; hhexen = callPackage ../games/hhexen { }; + hheretic = callPackage ../games/hheretic { }; + wyvern = callPackage ../games/wyvern { }; hsetroot = callPackage ../tools/X11/hsetroot { }; @@ -38051,6 +38262,8 @@ with pkgs; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); + expidus = recurseIntoAttrs (callPackage ../desktops/expidus {}); + gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); gnome = recurseIntoAttrs (callPackage ../desktops/gnome { }); @@ -39108,7 +39321,7 @@ with pkgs; fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { - guile = guile_2_0; + guile = guile_2_2; }; gedit = callPackage ../applications/editors/gedit { }; @@ -39176,7 +39389,7 @@ with pkgs; ### SCIENCE / MATH caffe = callPackage ../applications/science/math/caffe ({ - cudaSupport = config.cudaSupport or false; + inherit (config) cudaSupport; cudaPackages = cudaPackages_10_1; opencv3 = opencv3WithoutCuda; # Used only for image loading. blas = openblas; @@ -39191,7 +39404,7 @@ with pkgs; stdenv = gcc7Stdenv; inherit (linuxPackages) nvidia_x11; opencv3 = opencv3WithoutCuda; # Used only for image loading. - cudaSupport = config.cudaSupport or false; + inherit (config) cudaSupport; }; dap = callPackage ../applications/science/math/dap { }; @@ -39288,6 +39501,8 @@ with pkgs; boinc = callPackage ../applications/science/misc/boinc { }; + boinc-headless = callPackage ../applications/science/misc/boinc { headless = true; }; + celestia = callPackage ../applications/science/astronomy/celestia { autoreconfHook = buildPackages.autoreconfHook269; inherit (gnome2) gtkglext; @@ -39632,14 +39847,14 @@ with pkgs; aaphoto = callPackage ../tools/graphics/aaphoto { }; + aapt = callPackage ../development/tools/aapt { }; + flam3 = callPackage ../tools/graphics/flam3 { }; glee = callPackage ../tools/graphics/glee { }; faust = res.faust2; - faust1 = callPackage ../applications/audio/faust/faust1.nix { }; - faust2 = callPackage ../applications/audio/faust/faust2.nix { }; faust2alqt = libsForQt5.callPackage ../applications/audio/faust/faust2alqt.nix { }; @@ -39732,6 +39947,10 @@ with pkgs; helmfile = callPackage ../applications/networking/cluster/helmfile { }; + helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile { + inherit (kubernetes-helm-wrapped.passthru) pluginsDir; + }; + helm-dashboard = callPackage ../applications/networking/cluster/helm-dashboard { }; helmsman = callPackage ../applications/networking/cluster/helmsman { }; @@ -39838,11 +40057,11 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_24 kops_1_25 kops_1_26 + kops_1_27 ; - kops = kops_1_26; + kops = kops_1_27; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -39885,6 +40104,8 @@ with pkgs; mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { }; + mongocxx = callPackage ../development/libraries/mongocxx/default.nix { }; + mongoose = callPackage ../development/libraries/science/math/mongoose { }; morph = callPackage ../tools/package-management/morph { }; @@ -40107,6 +40328,10 @@ with pkgs; alejandra = callPackage ../tools/nix/alejandra { }; + nixci = callPackage ../tools/nix/nixci { + inherit (darwin.apple_sdk.frameworks) Security; + }; + nixfmt = haskellPackages.nixfmt.bin; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -40165,6 +40390,8 @@ with pkgs; mnemonicode = callPackage ../misc/mnemonicode { }; + moonfire-nvr = callPackage ../misc/moonfire-nvr { }; + mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql80; in { gdal = gdal.override { libmysqlclient = mysql; @@ -40174,6 +40401,10 @@ with pkgs; jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); + owmods-cli = callPackage ../applications/misc/owmods-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + r128gain = callPackage ../applications/audio/r128gain { }; resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; @@ -40905,9 +41136,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; - spdlog = callPackage ../development/libraries/spdlog { - fmt = fmt_9; - }; + spdlog = callPackage ../development/libraries/spdlog { }; dart = callPackage ../development/compilers/dart { }; @@ -41178,9 +41407,7 @@ with pkgs; dapper = callPackage ../development/tools/dapper { }; - k3d = callPackage ../applications/networking/cluster/k3d { - buildGoModule = buildGo118Module; # tests fail with 1.19 - }; + k3d = callPackage ../applications/networking/cluster/k3d { }; zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots { }; @@ -41277,9 +41504,9 @@ with pkgs; zalgo = callPackage ../tools/misc/zalgo { }; - zettlr = callPackage ../applications/misc/zettlr { + inherit (callPackage ../applications/misc/zettlr { texlive = texlive.combined.scheme-medium; - }; + }) zettlr zettlr-beta; unpoller = callPackage ../servers/monitoring/unpoller { }; @@ -41303,6 +41530,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + ldid-procursus = callPackage ../development/tools/ldid-procursus { }; + xcolor = callPackage ../tools/graphics/xcolor { }; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; @@ -41389,7 +41618,17 @@ with pkgs; charasay = callPackage ../tools/misc/charasay { }; + libvoikko = callPackage ../development/libraries/libvoikko { }; + + hfst = callPackage ../development/libraries/hfst { }; + + omorfi = callPackage ../development/libraries/omorfi { }; + + hfst-ospell = callPackage ../development/libraries/hfst-ospell { }; + waylyrics = callPackage ../applications/audio/waylyrics { }; gitrs = callPackage ../tools/misc/gitrs { }; + + wttrbar = callPackage ../applications/misc/wttrbar { }; } diff --git a/third_party/nixpkgs/pkgs/top-level/config.nix b/third_party/nixpkgs/pkgs/top-level/config.nix index 42053ce95d..5e25231d95 100644 --- a/third_party/nixpkgs/pkgs/top-level/config.nix +++ b/third_party/nixpkgs/pkgs/top-level/config.nix @@ -117,6 +117,12 @@ let ''; }; + cudaSupport = mkMassRebuild { + type = types.bool; + default = false; + feature = "build packages with CUDA support by default"; + }; + showDerivationWarnings = mkOption { type = types.listOf (types.enum [ "maintainerless" ]); default = []; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index e83f18786f..46f1ad0565 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -26,7 +26,11 @@ let category-theory = callPackage ../development/coq-modules/category-theory { }; ceres = callPackage ../development/coq-modules/ceres {}; Cheerios = callPackage ../development/coq-modules/Cheerios {}; - CoLoR = callPackage ../development/coq-modules/CoLoR {}; + CoLoR = callPackage ../development/coq-modules/CoLoR ( + (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") { + bignums = self.bignums.override { version = "8.13.0"; }; + }) + ); compcert = callPackage ../development/coq-modules/compcert { inherit fetchpatch makeWrapper coq2html lib stdenv; }; @@ -36,7 +40,11 @@ let coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; coq-lsp = callPackage ../development/coq-modules/coq-lsp {}; coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; - coqeal = callPackage ../development/coq-modules/coqeal {}; + coqeal = callPackage ../development/coq-modules/coqeal ( + (lib.optionalAttrs (lib.versions.range "8.13" "8.14" self.coq.coq-version) { + bignums = self.bignums.override { version = "${self.coq.coq-version}.0"; }; + }) + ); coqhammer = callPackage ../development/coq-modules/coqhammer {}; coqide = callPackage ../development/coq-modules/coqide {}; coqprime = callPackage ../development/coq-modules/coqprime {}; @@ -118,7 +126,10 @@ let (lib.versionAtLeast self.coq.version "8.14") { compcert = self.compcert.override { version = "3.11"; }; }) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") { - ITree = self.ITree.override { version = "4.0.0"; }; + ITree = self.ITree.override { + version = "4.0.0"; + paco = self.paco.override { version = "4.1.2"; }; + }; })); zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; diff --git a/third_party/nixpkgs/pkgs/top-level/java-packages.nix b/third_party/nixpkgs/pkgs/top-level/java-packages.nix index 7439ba7892..5d938a12e8 100644 --- a/third_party/nixpkgs/pkgs/top-level/java-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/java-packages.nix @@ -223,7 +223,6 @@ in { ) {}); }; - inherit (callPackage ../development/java-modules/jogl { }) - jogl_2_3_2 + inherit (pkgs.darwin.apple_sdk_11_0.callPackage ../development/java-modules/jogl { }) jogl_2_4_0; } diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index d0710f6ef3..9adf0f20ab 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -127,7 +127,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.CVE-2023-32233 ]; }; @@ -176,13 +175,6 @@ in { ]; }; - linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -267,7 +259,6 @@ in { linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; - linux_6_3_hardened = hardenedKernelFor kernels.linux_6_3 { }; linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; } // lib.optionalAttrs config.allowAliases { @@ -276,6 +267,7 @@ in { linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; + linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -350,6 +342,8 @@ in { evdi = callPackage ../os-specific/linux/evdi { }; + fanout = callPackage ../os-specific/linux/fanout { }; + fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; @@ -577,7 +571,6 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); - linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3); linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -585,6 +578,7 @@ in { linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 + linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22 }; rtPackages = { @@ -616,7 +610,6 @@ in { linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); - linux_6_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened); linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); diff --git a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix index f2780bb9e6..014cf6d394 100644 --- a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix @@ -54,10 +54,10 @@ rec { inherit (pkgs.buildPackages) makeSetupHook makeWrapper; }; - luarocks = callPackage ../development/tools/misc/luarocks/default.nix { }; + luarocks = toLuaModule (callPackage ../development/tools/misc/luarocks/default.nix { }); # a fork of luarocks used to generate nix lua derivations from rockspecs - luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; + luarocks-nix = toLuaModule (callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }); lua-resty-core = callPackage ({ fetchFromGitHub }: buildLuaPackage rec { pname = "lua-resty-core"; @@ -76,7 +76,7 @@ rec { description = "New FFI-based API for lua-nginx-module"; homepage = "https://github.com/openresty/lua-resty-core"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }) {}; @@ -95,7 +95,7 @@ rec { description = "Lua-land LRU Cache based on LuaJIT FFI"; homepage = "https://github.com/openresty/lua-resty-lrucache"; license = licenses.bsd3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; }) {}; diff --git a/third_party/nixpkgs/pkgs/top-level/nim-packages.nix b/third_party/nixpkgs/pkgs/top-level/nim-packages.nix index da443780e6..9bd4db77d2 100644 --- a/third_party/nixpkgs/pkgs/top-level/nim-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/nim-packages.nix @@ -45,6 +45,8 @@ lib.makeScope newScope (self: getdns = callPackage ../development/nim-packages/getdns { inherit (pkgs) getdns; }; + hashlib = callPackage ../development/nim-packages/hashlib { }; + hts-nim = callPackage ../development/nim-packages/hts-nim { }; illwill = callPackage ../development/nim-packages/illwill { }; @@ -130,6 +132,8 @@ lib.makeScope newScope (self: vmath = callPackage ../development/nim-packages/vmath { }; + ws = callPackage ../development/nim-packages/ws { }; + x11 = callPackage ../development/nim-packages/x11 { }; zippy = callPackage ../development/nim-packages/zippy { }; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 9b6d183f51..de2acdd372 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1181,6 +1181,7 @@ let ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; + ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; @@ -1432,7 +1433,10 @@ let psq = callPackage ../development/ocaml-modules/psq { }; - ptime = callPackage ../development/ocaml-modules/ptime { }; + ptime = + if lib.versionAtLeast ocaml.version "4.08" + then callPackage ../development/ocaml-modules/ptime { } + else null; ptmap = callPackage ../development/ocaml-modules/ptmap { }; @@ -1639,6 +1643,10 @@ let inherit (pkgs.python3Packages) torch; }; + trace = callPackage ../development/ocaml-modules/trace { }; + + trace-tef = callPackage ../development/ocaml-modules/trace/tef.nix { }; + trie = callPackage ../development/ocaml-modules/trie { }; tsdl = callPackage ../development/ocaml-modules/tsdl { diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 2217a2d544..7d5f13dc00 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -6083,6 +6083,9 @@ with self; { url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.226.tar.gz"; hash = "sha256-CT1X/6DUEalLr6+uSVaX2yb1ydAncZj+P3zyviKZZFM="; }; + patches = [ + ../development/perl-modules/Data-UUID-CVE-2013-4184.patch + ]; meta = { description = "Globally/Universally Unique Identifiers (GUIDs/UUIDs)"; license = with lib.licenses; [ bsd0 ]; @@ -27608,14 +27611,18 @@ with self; { XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0207"; + version = "2.0208"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0207.tar.gz"; - hash = "sha256-kDQ2yYWYdb71WTJDquhc7TKa0PtLV7v0WXXjJUfFDBU="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0208.tar.gz"; + hash = "sha256-DABrA7+NDrUx+1a9o64VdUylbYiN17noBauesZ1f1lM="; }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); + # Remove test that fails after LibXML 2.11 upgrade + postPatch = '' + rm t/35huge_mode.t + ''; propagatedBuildInputs = [ XMLSAX ]; meta = { description = "Perl Binding for libxml2"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index e6cd378e4b..63addfa58a 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -48,6 +48,11 @@ mapAliases ({ asyncio-nats-client = nats-py; # added 2022-02-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 + backports_csv = throw "backports_csv has been removed, since we no longer need to backport to python2"; # added 2023-07-28 + backports_functools_lru_cache = throw "backports_functools_lru_cache has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28 + backports_tempfile = throw "backports_tempfile has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28 + backports_unittest-mock = throw "backports_unittest-mock has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28 + backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 BlinkStick = blinkstick; # added 2023-02-19 @@ -85,6 +90,10 @@ mapAliases ({ django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 + django_classytags = django-classy-tags; # added 2023-07-25 + django_colorful = django-colorful; # added 2023-07-25 + django_compat = django-compat; # added 2023-07-25 + django_contrib_comments = django-contrib-comments; # added 2023-07-25 django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 @@ -93,10 +102,14 @@ mapAliases ({ django_hijack_admin = django-hijack-admin; # added 2023-05-16 django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21 django_modelcluster = django-modelcluster; # added 2022-04-02 + django_nose = django-nose; # added 2023-07-25 django_reversion = django-reversion; # added 2022-06-18 django_polymorphic = django-polymorphic; # added 2022-05-24 django_redis = django-redis; # added 2021-10-11 + django_silk = django-silk; # added 2023-07-25 + django_tagging = django-tagging; # added 2023-07-25 django_taggit = django-taggit; # added 2021-10-11 + django_treebeard = django-treebeard; # added 2023-07-25 dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 @@ -154,7 +167,14 @@ mapAliases ({ intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 - itanium_demangler = itanium-demangler; # added 2022-1017 + itanium_demangler = itanium-demangler; # added 2022-10-17 + jaraco_classes = jaraco-classes; # added 2023-07-14 + jaraco_collections = jaraco-collections; # added 2023-07-14 + jaraco_functools = jaraco-functools; # added 2023-07-14 + jaraco_itertools = jaraco-itertools; # added 2023-07-14 + jaraco_logging = jaraco-logging; # added 2023-07-14 + jaraco_text = jaraco-text; # added 2023-07-14 + jaraco_stream = jaraco-stream; # added 2023-07-14 JayDeBeApi = jaydebeapi; # added 2023-02-19 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 @@ -164,7 +184,6 @@ mapAliases ({ jupyter_server = jupyter-server; # added 2023-01-05 Kajiki = kajiki; # added 2023-02-19 Keras = keras; # added 2021-11-25 - larynx-train = piper-train; # added 2023-06-09 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 @@ -361,4 +380,6 @@ mapAliases ({ zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; + zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 + zope_component = zope-component; # added 2023-07-28 }) diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 98c7804a67..e3fc86e21b 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -194,6 +194,8 @@ self: super: with self; { aiogithubapi = callPackage ../development/python-modules/aiogithubapi { }; + aiogram = callPackage ../development/python-modules/aiogram { }; + aioharmony = callPackage ../development/python-modules/aioharmony { }; aiohomekit = callPackage ../development/python-modules/aiohomekit { }; @@ -266,6 +268,8 @@ self: super: with self; { aiomodernforms = callPackage ../development/python-modules/aiomodernforms { }; + aiomqtt = callPackage ../development/python-modules/aiomqtt { }; + aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; aiomusiccast = callPackage ../development/python-modules/aiomusiccast { }; @@ -404,6 +408,8 @@ self: super: with self; { alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + albumentations = callPackage ../development/python-modules/albumentations { }; + ale-py = callPackage ../development/python-modules/ale-py { }; alectryon = callPackage ../development/python-modules/alectryon { }; @@ -442,6 +448,8 @@ self: super: with self; { altair = callPackage ../development/python-modules/altair { }; + altgraph = callPackage ../development/python-modules/altgraph { }; + amarna = callPackage ../development/python-modules/amarna { }; amazon-ion = callPackage ../development/python-modules/amazon-ion { }; @@ -506,6 +514,8 @@ self: super: with self; { ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { }; + ansi = callPackage ../development/python-modules/ansi { }; ansicolor = callPackage ../development/python-modules/ansicolor { }; @@ -728,6 +738,8 @@ self: super: with self; { async-dns = callPackage ../development/python-modules/async-dns { }; + async-interrupt = callPackage ../development/python-modules/async-interrupt { }; + async-lru = callPackage ../development/python-modules/async-lru { }; async-modbus = callPackage ../development/python-modules/async-modbus { }; @@ -1167,7 +1179,7 @@ self: super: with self; { pad4pi = callPackage ../development/python-modules/pad4pi { }; - paddle_bfloat = callPackage ../development/python-modules/paddle_bfloat { }; + paddle-bfloat = callPackage ../development/python-modules/paddle-bfloat { }; paddle2onnx = callPackage ../development/python-modules/paddle2onnx { }; @@ -1189,24 +1201,14 @@ self: super: with self; { backports-cached-property = callPackage ../development/python-modules/backports-cached-property { }; - backports_csv = callPackage ../development/python-modules/backports_csv { }; - backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; - backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; - backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; - - backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock { }; - - backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; bacpypes = callPackage ../development/python-modules/bacpypes { }; @@ -1267,6 +1269,12 @@ self: super: with self; { bcdoc = callPackage ../development/python-modules/bcdoc { }; + bcf = callPackage ../development/python-modules/bcf { }; + + bcg = callPackage ../development/python-modules/bcg { }; + + bch = callPackage ../development/python-modules/bch { }; + bcrypt = if stdenv.hostPlatform.system == "i686-linux" then callPackage ../development/python-modules/bcrypt/3.nix { } else @@ -1306,6 +1314,8 @@ self: super: with self; { beniget = callPackage ../development/python-modules/beniget { }; + bentoml = callPackage ../development/python-modules/bentoml { }; + bespon = callPackage ../development/python-modules/bespon { }; betacode = callPackage ../development/python-modules/betacode { }; @@ -1808,7 +1818,7 @@ self: super: with self; { chai = callPackage ../development/python-modules/chai { }; chainer = callPackage ../development/python-modules/chainer { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; chainmap = callPackage ../development/python-modules/chainmap { }; @@ -1869,6 +1879,8 @@ self: super: with self; { circuitbreaker = callPackage ../development/python-modules/circuitbreaker { }; + circus = callPackage ../development/python-modules/circus { }; + cirq = callPackage ../development/python-modules/cirq { }; cirq-aqt = callPackage ../development/python-modules/cirq-aqt { }; @@ -2165,6 +2177,8 @@ self: super: with self; { coreapi = callPackage ../development/python-modules/coreapi { }; + coredis = callPackage ../development/python-modules/coredis { }; + coreschema = callPackage ../development/python-modules/coreschema { }; cornice = callPackage ../development/python-modules/cornice { }; @@ -2453,6 +2467,18 @@ self: super: with self; { dbfread = callPackage ../development/python-modules/dbfread { }; + dbt-bigquery = callPackage ../development/python-modules/dbt-bigquery { }; + + dbt-core = callPackage ../development/python-modules/dbt-core { }; + + dbt-extractor = callPackage ../development/python-modules/dbt-extractor { }; + + dbt-postgres = callPackage ../development/python-modules/dbt-postgres { }; + + dbt-redshift = callPackage ../development/python-modules/dbt-redshift { }; + + dbt-snowflake = callPackage ../development/python-modules/dbt-snowflake { }; + dbus-client-gen = callPackage ../development/python-modules/dbus-client-gen { }; dbus-deviation = callPackage ../development/python-modules/dbus-deviation { }; @@ -2745,13 +2771,13 @@ self: super: with self; { django-ckeditor = callPackage ../development/python-modules/django-ckeditor { }; - django_classytags = callPackage ../development/python-modules/django_classytags { }; + django-classy-tags = callPackage ../development/python-modules/django-classy-tags { }; django-cleanup = callPackage ../development/python-modules/django-cleanup { }; - django_colorful = callPackage ../development/python-modules/django_colorful { }; + django-colorful = callPackage ../development/python-modules/django-colorful { }; - django_compat = callPackage ../development/python-modules/django-compat { }; + django-compat = callPackage ../development/python-modules/django-compat { }; django-compressor = callPackage ../development/python-modules/django-compressor { }; @@ -2761,7 +2787,7 @@ self: super: with self; { django-context-decorator = callPackage ../development/python-modules/django-context-decorator { }; - django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + django-contrib-comments = callPackage ../development/python-modules/django-contrib-comments { }; django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; @@ -2779,7 +2805,7 @@ self: super: with self; { django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { }; - django-environ = callPackage ../development/python-modules/django_environ { }; + django-environ = callPackage ../development/python-modules/django-environ { }; django-extensions = callPackage ../development/python-modules/django-extensions { }; @@ -2835,7 +2861,7 @@ self: super: with self; { django-model-utils = callPackage ../development/python-modules/django-model-utils { }; - django-modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + django-modelcluster = callPackage ../development/python-modules/django-modelcluster { }; django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; @@ -2845,7 +2871,7 @@ self: super: with self; { django-mysql = callPackage ../development/python-modules/django-mysql { }; - django_nose = callPackage ../development/python-modules/django_nose { }; + django-nose = callPackage ../development/python-modules/django-nose { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -2917,7 +2943,7 @@ self: super: with self; { django-sesame = callPackage ../development/python-modules/django-sesame { }; - django_silk = callPackage ../development/python-modules/django_silk { }; + django-silk = callPackage ../development/python-modules/django-silk { }; django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; @@ -2935,7 +2961,7 @@ self: super: with self; { django-tables2 = callPackage ../development/python-modules/django-tables2 { }; - django_tagging = callPackage ../development/python-modules/django_tagging { }; + django-tagging = callPackage ../development/python-modules/django-tagging { }; django-taggit = callPackage ../development/python-modules/django-taggit { }; @@ -2943,7 +2969,7 @@ self: super: with self; { django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; - django_treebeard = callPackage ../development/python-modules/django_treebeard { }; + django-treebeard = callPackage ../development/python-modules/django-treebeard { }; django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { }; @@ -3051,6 +3077,8 @@ self: super: with self; { doit-py = callPackage ../development/python-modules/doit-py { }; + dokuwiki = callPackage ../development/python-modules/dokuwiki { }; + domeneshop = callPackage ../development/python-modules/domeneshop { }; dominate = callPackage ../development/python-modules/dominate { }; @@ -3135,6 +3163,8 @@ self: super: with self; { duckduckgo-search = callPackage ../development/python-modules/duckduckgo-search { }; + duct-py = callPackage ../development/python-modules/duct-py { }; + duecredit = callPackage ../development/python-modules/duecredit { }; duet = callPackage ../development/python-modules/duet { }; @@ -3324,6 +3354,8 @@ self: super: with self; { enocean = callPackage ../development/python-modules/enocean { }; + enochecker-core = callPackage ../development/python-modules/enochecker-core { }; + enrich = callPackage ../development/python-modules/enrich { }; entrance = callPackage ../development/python-modules/entrance { @@ -3828,6 +3860,8 @@ self: super: with self; { flask-testing = callPackage ../development/python-modules/flask-testing { }; + flask-themes2 = callPackage ../development/python-modules/flask-themes2 { }; + flask-versioned = callPackage ../development/python-modules/flask-versioned { }; flask-wtf = callPackage ../development/python-modules/flask-wtf { }; @@ -3888,6 +3922,8 @@ self: super: with self; { folium = callPackage ../development/python-modules/folium { }; + fontawesomefree = callPackage ../development/python-modules/fontawesomefree { }; + fontforge = toPythonModule (pkgs.fontforge.override { withPython = true; inherit python; @@ -4241,6 +4277,8 @@ self: super: with self; { goalzero = callPackage ../development/python-modules/goalzero { }; + gocardless-pro = callPackage ../development/python-modules/gocardless-pro { }; + goobook = callPackage ../development/python-modules/goobook { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -4267,6 +4305,8 @@ self: super: with self; { google-cloud-appengine-logging = callPackage ../development/python-modules/google-cloud-appengine-logging { }; + google-cloud-artifact-registry = callPackage ../development/python-modules/google-cloud-artifact-registry { }; + google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; google-cloud-audit-log = callPackage ../development/python-modules/google-cloud-audit-log { }; @@ -4420,6 +4460,8 @@ self: super: with self; { gpt-2-simple = callPackage ../development/python-modules/gpt-2-simple { }; + gptcache = callPackage ../development/python-modules/gptcache { }; + gql = callPackage ../development/python-modules/gql { }; grad-cam = callPackage ../development/python-modules/grad-cam { }; @@ -4495,8 +4537,14 @@ self: super: with self; { grpcio = callPackage ../development/python-modules/grpcio { }; + grpcio-channelz = callPackage ../development/python-modules/grpcio-channelz { }; + grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + grpcio-health-checking = callPackage ../development/python-modules/grpcio-health-checking { }; + + grpcio-reflection = callPackage ../development/python-modules/grpcio-reflection { }; + grpcio-status = callPackage ../development/python-modules/grpcio-status { }; grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; @@ -4539,6 +4587,8 @@ self: super: with self; { gudhi = callPackage ../development/python-modules/gudhi { }; + guidance = callPackage ../development/python-modules/guidance { }; + gumath = callPackage ../development/python-modules/gumath { }; gunicorn = callPackage ../development/python-modules/gunicorn { }; @@ -4674,6 +4724,8 @@ self: super: with self; { hexdump = callPackage ../development/python-modules/hexdump { }; + hfst = callPackage ../development/python-modules/hfst { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; hg-evolve = callPackage ../development/python-modules/hg-evolve { }; @@ -4692,6 +4744,8 @@ self: super: with self; { inherit (pkgs) udev libusb1; }; + hid-parser = callPackage ../development/python-modules/hid-parser { }; + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; hijri-converter = callPackage ../development/python-modules/hijri-converter { }; @@ -4718,6 +4772,10 @@ self: super: with self; { hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { }; + hnswlib = callPackage ../development/python-modules/hnswlib { + inherit (pkgs) hnswlib; + }; + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; hocr-tools = callPackage ../development/python-modules/hocr-tools { }; @@ -4726,6 +4784,8 @@ self: super: with self; { holidays = callPackage ../development/python-modules/holidays { }; + hologram = callPackage ../development/python-modules/hologram { }; + holoviews = callPackage ../development/python-modules/holoviews { }; home-assistant-bluetooth = callPackage ../development/python-modules/home-assistant-bluetooth { }; @@ -5053,6 +5113,8 @@ self: super: with self; { insegel = callPackage ../development/python-modules/insegel { }; + insightface = callPackage ../development/python-modules/insightface { }; + installer = callPackage ../development/python-modules/installer { }; insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { }; @@ -5209,27 +5271,27 @@ self: super: with self; { jaraco-abode = callPackage ../development/python-modules/jaraco-abode { }; - jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + jaraco-classes = callPackage ../development/python-modules/jaraco-classes { }; - jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + jaraco-collections = callPackage ../development/python-modules/jaraco-collections { }; jaraco-email = callPackage ../development/python-modules/jaraco-email { }; jaraco-context = callPackage ../development/python-modules/jaraco-context { }; - jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; + jaraco-functools = callPackage ../development/python-modules/jaraco-functools { }; - jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + jaraco-itertools = callPackage ../development/python-modules/jaraco-itertools { }; - jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + jaraco-logging = callPackage ../development/python-modules/jaraco-logging { }; jaraco-net = callPackage ../development/python-modules/jaraco-net { }; - jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; + jaraco-stream = callPackage ../development/python-modules/jaraco-stream { }; jaraco-test = callPackage ../development/python-modules/jaraco-test { }; - jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + jaraco-text = callPackage ../development/python-modules/jaraco-text { }; jarowinkler = callPackage ../development/python-modules/jarowinkler { }; @@ -5242,13 +5304,13 @@ self: super: with self; { jax-jumpy = callPackage ../development/python-modules/jax-jumpy { }; jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; jaxlib-build = callPackage ../development/python-modules/jaxlib rec { inherit (pkgs.darwin) cctools; # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21 }; @@ -5367,6 +5429,8 @@ self: super: with self; { json-stream-rs-tokenizer = callPackage ../development/python-modules/json-stream-rs-tokenizer { }; + jsonable = callPackage ../development/python-modules/jsonable { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; jsonpatch = callPackage ../development/python-modules/jsonpatch { }; @@ -5423,14 +5487,22 @@ self: super: with self; { jupyter-client = callPackage ../development/python-modules/jupyter-client { }; + jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { }; + + jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { }; + jupyter_console = callPackage ../development/python-modules/jupyter_console { }; jupyter-core = callPackage ../development/python-modules/jupyter-core { }; jupyter-events = callPackage ../development/python-modules/jupyter-events { }; + jupyter-highlight-selected-word = callPackage ../development/python-modules/jupyter-highlight-selected-word { }; + jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { }; + jupyter-nbextensions-configurator = callPackage ../development/python-modules/jupyter-nbextensions-configurator { }; + jupyter-server = callPackage ../development/python-modules/jupyter-server { }; jupyter-server-fileid = callPackage ../development/python-modules/jupyter-server-fileid { }; @@ -5648,6 +5720,8 @@ self: super: with self; { langdetect = callPackage ../development/python-modules/langdetect { }; + langsmith = callPackage ../development/python-modules/langsmith { }; + language-data = callPackage ../development/python-modules/language-data { }; language-tags = callPackage ../development/python-modules/language-tags { }; @@ -5781,7 +5855,7 @@ self: super: with self; { libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { inherit (self) boost; }; - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; @@ -5838,6 +5912,8 @@ self: super: with self; { (p: p.py) ]; + librespot = callPackage ../development/python-modules/librespot { }; + libretranslate = callPackage ../development/python-modules/libretranslate { }; librosa = callPackage ../development/python-modules/librosa { }; @@ -6107,6 +6183,8 @@ self: super: with self; { mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { }; + macaddress = callPackage ../development/python-modules/macaddress{ }; + macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; @@ -6119,6 +6197,8 @@ self: super: with self; { magicgui = callPackage ../development/python-modules/magicgui { }; + magic-filter = callPackage ../development/python-modules/magic-filter { }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; @@ -6422,6 +6502,8 @@ self: super: with self; { minikerberos = callPackage ../development/python-modules/minikerberos { }; + minimal-snowplow-tracker = callPackage ../development/python-modules/minimal-snowplow-tracker { }; + minimock = callPackage ../development/python-modules/minimock { }; mininet-python = (toPythonModule (pkgs.mininet.override { @@ -6464,6 +6546,8 @@ self: super: with self; { mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; + mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; + mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { }; mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; @@ -6688,6 +6772,8 @@ self: super: with self; { musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; + music-tag = callPackage ../development/python-modules/music-tag { }; + mutag = callPackage ../development/python-modules/mutag { }; mutagen = callPackage ../development/python-modules/mutagen { }; @@ -6700,6 +6786,8 @@ self: super: with self; { mujson = callPackage ../development/python-modules/mujson { }; + mwcli = callPackage ../development/python-modules/mwcli { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; @@ -6708,6 +6796,10 @@ self: super: with self; { mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; + mwtypes = callPackage ../development/python-modules/mwtypes { }; + + mwxml = callPackage ../development/python-modules/mwxml { }; + mxnet = callPackage ../development/python-modules/mxnet { }; myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; @@ -6950,6 +7042,8 @@ self: super: with self; { nine = callPackage ../development/python-modules/nine { }; + ninja-python = callPackage ../development/python-modules/ninja { }; + nipy = callPackage ../development/python-modules/nipy { }; nipype = callPackage ../development/python-modules/nipype { @@ -7083,7 +7177,7 @@ self: super: with self; { num2words = callPackage ../development/python-modules/num2words { }; numba = callPackage ../development/python-modules/numba { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; numbaWithCuda = self.numba.override { @@ -7124,12 +7218,18 @@ self: super: with self; { python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; + python-youtube = callPackage ../development/python-modules/python-youtube { }; + py-deprecate = callPackage ../development/python-modules/py-deprecate { }; py-ecc = callPackage ../development/python-modules/py-ecc { }; py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { }; + py-expression-eval = callPackage ../development/python-modules/py-expression-eval { }; + + py-radix-sr = callPackage ../development/python-modules/py-radix-sr { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; oasatelematics = callPackage ../development/python-modules/oasatelematics { }; @@ -7205,6 +7305,8 @@ self: super: with self; { omnilogic = callPackage ../development/python-modules/omnilogic { }; + omorfi = callPackage ../development/python-modules/omorfi { }; + omrdatasettools = callPackage ../development/python-modules/omrdatasettools { }; ondilo = callPackage ../development/python-modules/ondilo { }; @@ -7223,6 +7325,8 @@ self: super: with self; { onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { }; + onnxmltools = callPackage ../development/python-modules/onnxmltools { }; + onnxruntime = callPackage ../development/python-modules/onnxruntime { onnxruntime = pkgs.onnxruntime.override { python3Packages = self; @@ -7247,7 +7351,7 @@ self: super: with self; { openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { }; openai-whisper = callPackage ../development/python-modules/openai-whisper { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; openant = callPackage ../development/python-modules/openant { }; @@ -7333,10 +7437,14 @@ self: super: with self; { opentelemetry-instrumentation = callPackage ../development/python-modules/opentelemetry-instrumentation { }; + opentelemetry-instrumentation-aiohttp-client = callPackage ../development/python-modules/opentelemetry-instrumentation-aiohttp-client { }; + opentelemetry-instrumentation-asgi = callPackage ../development/python-modules/opentelemetry-instrumentation-asgi { }; opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { }; + opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { }; + opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { }; opentelemetry-proto = callPackage ../development/python-modules/opentelemetry-proto { }; @@ -7513,6 +7621,8 @@ self: super: with self; { papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; + para = callPackage ../development/python-modules/para { }; + param = callPackage ../development/python-modules/param { }; parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { }; @@ -7738,6 +7848,8 @@ self: super: with self; { micloud = callPackage ../development/python-modules/micloud { }; + mqtt2influxdb = callPackage ../development/python-modules/mqtt2influxdb { }; + msgraph-core = callPackage ../development/python-modules/msgraph-core { }; multipart = callPackage ../development/python-modules/multipart { }; @@ -7802,6 +7914,8 @@ self: super: with self; { picos = callPackage ../development/python-modules/picos { }; + picosvg = callPackage ../development/python-modules/picosvg { }; + piccolo-theme = callPackage ../development/python-modules/piccolo-theme { }; pid = callPackage ../development/python-modules/pid { }; @@ -7853,7 +7967,10 @@ self: super: with self; { pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; - piper-train = callPackage ../development/python-modules/piper-train { }; + piper-phonemize = callPackage ../development/python-modules/piper-phonemize { + onnxruntime-native = pkgs.onnxruntime; + piper-phonemize-native = pkgs.piper-phonemize; + }; pip-api = callPackage ../development/python-modules/pip-api { }; @@ -7899,6 +8016,8 @@ self: super: with self; { py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { }; + py65 = callPackage ../development/python-modules/py65 { }; + pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { }; pyatag = callPackage ../development/python-modules/pyatag { }; @@ -8866,6 +8985,8 @@ self: super: with self; { pyglet = callPackage ../development/python-modules/pyglet { }; + pyglm = callPackage ../development/python-modules/pyglm { }; + pygls = callPackage ../development/python-modules/pygls { }; pygmars = callPackage ../development/python-modules/pygmars { }; @@ -9109,6 +9230,8 @@ self: super: with self; { pymatgen = callPackage ../development/python-modules/pymatgen { }; + pymatting = callPackage ../development/python-modules/pymatting { }; + pymaven-patch = callPackage ../development/python-modules/pymaven-patch { }; pymavlink = callPackage ../development/python-modules/pymavlink { }; @@ -10630,6 +10753,8 @@ self: super: with self; { quart-cors = callPackage ../development/python-modules/quart-cors { }; + qudida = callPackage ../development/python-modules/qudida { }; + querystring_parser = callPackage ../development/python-modules/querystring-parser { }; questionary = callPackage ../development/python-modules/questionary { }; @@ -10692,6 +10817,8 @@ self: super: with self; { ratelimiter = callPackage ../development/python-modules/ratelimiter { }; + rauth = callPackage ../development/python-modules/rauth { }; + raven = callPackage ../development/python-modules/raven { }; rawkit = callPackage ../development/python-modules/rawkit { }; @@ -10813,6 +10940,8 @@ self: super: with self; { reproject = callPackage ../development/python-modules/reproject { }; + reprshed = callPackage ../development/python-modules/reprshed { }; + reqif = callPackage ../development/python-modules/reqif { }; requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; @@ -11543,6 +11672,8 @@ self: super: with self; { skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { }; + slack-bolt = callPackage ../development/python-modules/slack-bolt { }; + slack-sdk = callPackage ../development/python-modules/slack-sdk { }; slackclient = callPackage ../development/python-modules/slackclient { }; @@ -11701,6 +11832,8 @@ self: super: with self; { spacy-loggers = callPackage ../development/python-modules/spacy-loggers { }; + spacy-lookups-data = callPackage ../development/python-modules/spacy/lookups-data.nix { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { inherit (pkgs) jq; }; @@ -12270,12 +12403,12 @@ self: super: with self; { tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; }; tensorflow-build = callPackage ../development/python-modules/tensorflow { inherit (pkgs.darwin) cctools; - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; inherit (self.tensorflow-bin) cudaPackages; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; @@ -12383,6 +12516,8 @@ self: super: with self; { textx = callPackage ../development/python-modules/textx { }; + tf2onnx = callPackage ../development/python-modules/tf2onnx { }; + tflearn = callPackage ../development/python-modules/tflearn { }; tftpy = callPackage ../development/python-modules/tftpy { }; @@ -12392,7 +12527,7 @@ self: super: with self; { theano-pymc = callPackage ../development/python-modules/theano-pymc { }; theano = callPackage ../development/python-modules/theano rec { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; cudnnSupport = cudaSupport; }; @@ -12559,9 +12694,9 @@ self: super: with self; { toposort = callPackage ../development/python-modules/toposort { }; torch = callPackage ../development/python-modules/torch { - cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.config) cudaSupport; magma = - if pkgs.config.cudaSupport or false + if pkgs.config.cudaSupport then pkgs.magma-cuda-static else pkgs.magma; inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreServices; @@ -12735,6 +12870,8 @@ self: super: with self; { ttp-templates = callPackage ../development/python-modules/ttp-templates { }; + ttstokenizer = callPackage ../development/python-modules/ttstokenizer { }; + tubes = callPackage ../development/python-modules/tubes { }; tunigo = callPackage ../development/python-modules/tunigo { }; @@ -12909,6 +13046,8 @@ self: super: with self; { uc-micro-py = callPackage ../development/python-modules/uc-micro-py { }; + ucsmsdk = callPackage ../development/python-modules/ucsmsdk { }; + udatetime = callPackage ../development/python-modules/udatetime { }; ueberzug = callPackage ../development/python-modules/ueberzug { @@ -13005,6 +13144,12 @@ self: super: with self; { unrpa = callPackage ../development/python-modules/unrpa { }; + unstructured = callPackage ../development/python-modules/unstructured { }; + + unstructured-api-tools = callPackage ../development/python-modules/unstructured-api-tools { }; + + unstructured-inference = callPackage ../development/python-modules/unstructured-inference { }; + untangle = callPackage ../development/python-modules/untangle { }; untokenize = callPackage ../development/python-modules/untokenize { }; @@ -13109,6 +13254,8 @@ self: super: with self; { vat-moss = callPackage ../development/python-modules/vat-moss { }; + vcard = callPackage ../development/python-modules/vcard { }; + vcrpy = callPackage ../development/python-modules/vcrpy { }; vcver = callPackage ../development/python-modules/vcver { }; @@ -13779,11 +13926,9 @@ self: super: with self; { zodbpickle = callPackage ../development/python-modules/zodbpickle { }; - zope_broken = callPackage ../development/python-modules/zope_broken { }; - zope-cachedescriptors = callPackage ../development/python-modules/zope-cachedescriptors { }; - zope_component = callPackage ../development/python-modules/zope_component { }; + zope-component = callPackage ../development/python-modules/zope-component { }; zope_configuration = callPackage ../development/python-modules/zope_configuration { }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix index b3fd53eae2..4fda684b54 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix @@ -33,6 +33,8 @@ in qt6ct = callPackage ../tools/misc/qt6ct { }; + qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { }; + qtkeychain = callPackage ../development/libraries/qtkeychain { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-small.nix b/third_party/nixpkgs/pkgs/top-level/release-small.nix index f2cc7ae471..37ef0a50c2 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-small.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-small.nix @@ -36,7 +36,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; cron = linux; cups = linux; dbus = linux; - dhcp = linux; diffutils = all; e2fsprogs = linux; emacs = linux; diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index 8f470925fa..2ac81d0a23 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -26,7 +26,7 @@ # for no real reason. # Remove them for 23.11. "nodejs-16.20.1" - "openssl-1.1.1u" + "openssl-1.1.1v" ]; }; } }: diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix index 3fe149acae..4d1b6136a8 100644 --- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001cwsb6496wp8g0nkyjqxgmii63aljydq132yb2ksdp8ml5zlgj"; + sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d990xy3jin8qa4l989r43kl5ykmi2kdlxqpnla10n5c7xp7xmci"; + sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033981lhbq0vl8ppfpamqpqj3sq15x759899hvwli2imp3yw49r5"; + sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w717izq6k7wl2j6zn4516kg2iwg3zgdzja6b6gpk6y5nccr04hw"; + sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcpjhhbq6gl4h7hq2fianfz8vpdxf53gsj1ng04bkh5bxxrmrc1"; + sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z0xvdal339w7jvk7a5py0c1q5xh588vqrilgxizkvzm3hwf48a2"; + sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18gsxi7vlg8y8k2fbhq44zd0mivjpnn4nrlfj037c7wvq5h8367v"; + sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cjbk1xl6jl2d6sczpxnr8da7zbmshmrghqhqdcwqqzl6chcy2si"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04x0bz3051linhmi52cfg31nsm4sgg27m7wp9p0cxrxdwc7q0bjl"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mg236x3rkmdargkk9y6j9gqhkajzbk852gwnp1crp0difk7a4r8"; + sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -168,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dk1dxz6rshll9hk33halpnfrab1gzr8dgrb4d1zdhw5n30k3zsa"; + sha256 = "0r3g92r9dnvbwklm8dx6w3ym8xhz90a2hs2sdarwhhydfyzxdcrj"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; atomos = { groups = ["default"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v5j3szb30d0i5x9bx85bmqz028qcaxswifvhgh7qy1bby4j5mis"; + sha256 = "1vbq8gprb99anlxijc7hwamfvshd6w1k6kwwg5gs2c674nln1hqf"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; camping = { dependencies = ["mab" "rack"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5khhp71q1hysg2b541pdlw1fjrjibgfsfl7fcy8zm9hil9rrkb"; + sha256 = "0rn46vga5c1ww2vkf4dbg0w5g4h0vwx9idvdz3284188q4ksfbmg"; type = "gem"; }; - version = "3.5.3"; + version = "3.6.0"; }; cocoapods = { dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; @@ -964,10 +964,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai4cxnymjp7c2xqbfksks82aah0pbyjsl3r2cgc4iimrw2wg8qy"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.7"; + version = "2.7.10"; }; faraday-net_http = { groups = ["default"]; @@ -1100,10 +1100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9hyhfcdzp8ikidilwkiicz5zw2zpvmq7sa85bpf5sra82syvxg"; + sha256 = "0qr0dn4p3nrqnb8qjdlnsfhz80viv4fn86a450imabr76mr88fs3"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; gemoji = { groups = ["default"]; @@ -1131,10 +1131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpjg0d4f0l0fyx96h4djq6jsbd20ai65vbwh2f19359bpmad1yh"; + sha256 = "1jl1ng4db6iaa6yddvp69c61r7483kwvcr57hj3qm9pddkgf0bp0"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -1185,10 +1185,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19pwbfjc8px03jsh26sbsszrmhil3zbvkpq8cjm5953s8zc8yygl"; + sha256 = "00r3357m7fdvhsy1xi93bvvih4jgwf8lbg8dwrz2mggi1v6nh6n4"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; globalid = { dependencies = ["activesupport"]; @@ -1207,10 +1207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bgzjfzvb2fb04c5dfzyx3qsq0d8xz1hy24nidy6a7dbg88aj6hy"; + sha256 = "00lai12z92y6kidsrwnw0d386bwyzjrw0z07ifjxqn5zpyasgvkb"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1868,15 +1868,15 @@ version = "2.2.1"; }; jekyll-webmention_io = { - dependencies = ["htmlbeautifier" "jekyll" "json" "openssl" "string_inflection" "uglifier" "webmention"]; + dependencies = ["activesupport" "htmlbeautifier" "jekyll" "json" "jsonpath" "openssl" "uglifier" "webmention"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003lwcl00l13c5r1i1zk5q1p8m50nv83w6h3j2mij6hs2aaz1zwb"; + sha256 = "0kkxvr1gfbmfbhy13syq4pqwmfqwhnbfcwjiqrwahf99gfcj5izh"; type = "gem"; }; - version = "3.3.7"; + version = "4.0.0"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; @@ -1919,6 +1919,17 @@ }; version = "2.6.3"; }; + jsonpath = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xxklfvmwz8z6l08704x65gnq6r8r1pb9qk125qjbndnb1zz6fsp"; + type = "gem"; + }; + version = "1.0.7"; + }; jwt = { groups = ["default"]; platforms = []; @@ -2174,10 +2185,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minima = { dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"]; @@ -2195,10 +2206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.1"; + version = "5.19.0"; }; molinillo = { groups = ["default"]; @@ -2215,10 +2226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06n7556vxr3awh92xy1k5bli98bvq4pjm08mnl68ay4fzln7lcsg"; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -2297,10 +2308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; net-pop = { dependencies = ["net-protocol"]; @@ -2382,10 +2393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2468,10 +2479,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hak6b4j0xvq2n12wfmd8666284nwig3fgwi5chcirpp5c0mgj2h"; + sha256 = "1707vylw6yix9q92bpnvn5dflnywx5bh69awyirvn4g39p2yjc2b"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; parallel = { groups = ["default"]; @@ -2499,10 +2510,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "146x3jhipg55q9ig7l0x8sryanz1zfhai2vszmih7wmf8zi043gl"; + sha256 = "07jn3rndwfrqlziknhrqlvn523xb5kirnpbcmb4h4hw5npf67nii"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; pastel = { dependencies = ["tty-color"]; @@ -2582,10 +2593,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pxk8pl4gmdmvm4jjhi8apwc23cyqs7rgp5bi4q2gi93k927w3x8"; + sha256 = "1y7p5712grf8sd4kmk9i62qs9mak2fd8685i78qv95wdz3g2csaa"; type = "gem"; }; - version = "3.2.2"; + version = "4.0.2"; }; prettier_print = { groups = ["default"]; @@ -2699,21 +2710,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zip0qhk7pp6cvrir77p6v76wj68zaqik875qr5rapqz9am2pvsp"; + sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rails-html-sanitizer = { dependencies = ["loofah" "nokogiri"]; @@ -2732,10 +2743,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kn3cx00jnb7bjnh1k2q0dxk0r7nl1a0krgyk5ykxw1wcac81wyw"; + sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; rainbow = { groups = ["default"]; @@ -2824,10 +2835,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; + sha256 = "00yryimbkm1k85n99f81n7cripkmh14459c9pmb7prl9nbiikkqc"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; red-colors = { dependencies = ["matrix"]; @@ -2931,10 +2942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rmagick = { dependencies = ["pkg-config"]; @@ -2942,10 +2953,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vcfjv6miia6qfnig2yqs42cwnj6jphi2llys7dsh4xykgcs6298"; + sha256 = "080h8755lks9395a2s4ijavzcsgp62367damj0dxif92jdayllzs"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.0"; }; rouge = { groups = ["default"]; @@ -3006,20 +3017,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; type = "gem"; }; - version = "3.12.5"; + version = "3.12.6"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rubocop = { dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -3027,10 +3038,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b7pf8916k7ps9jdnkn0774n37jpdzp88mzcqdij3h9hvpn6vr81"; + sha256 = "17c94wl2abqzf4fj469mdxzap1sd3410x421nl6mh2w49jsgvpki"; type = "gem"; }; - version = "1.53.0"; + version = "1.55.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3086,6 +3097,17 @@ }; version = "0.8.0"; }; + ruby-lsp = { + dependencies = ["language_server-protocol" "sorbet-runtime" "syntax_tree"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyxcr34p3hy7rjgrrlg6z9libiqy1als62rk3d37ixsbjdy6iyd"; + type = "gem"; + }; + version = "0.7.4"; + }; ruby-lxc = { groups = ["default"]; platforms = []; @@ -3247,10 +3269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1brf6h0kg5ssl1sb99gv41y8lk814jqa3nzakb79ywlhyzbn1513"; + sha256 = "0zm5lfvhc1j7nq73s7i4g93kfbb3fg81jicf3sbfh2w5gm59nq7v"; type = "gem"; }; - version = "5.69.0"; + version = "5.70.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3368,6 +3390,16 @@ }; version = "0.49.0"; }; + sorbet-runtime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n197kk9nqf955lsphns835sbkz7wcgbpppad482iqx95bhf8i6l"; + type = "gem"; + }; + version = "0.5.10932"; + }; sqlite3 = { dependencies = ["mini_portile2"]; groups = ["default"]; @@ -3379,16 +3411,6 @@ }; version = "1.6.3"; }; - string_inflection = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v57afc7rdr58xd6mayf9giifqgav3hqjr54kagi7iki3hn6vjag"; - type = "gem"; - }; - version = "0.1.2"; - }; syntax_tree = { dependencies = ["prettier_print"]; groups = ["default"]; @@ -3635,10 +3657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -3696,10 +3718,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "0v14hl814knwi8pm2n09bpgcd107jafv4lnj9zmcsgfwbqxin3sq"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.9"; }; zookeeper = { groups = ["default"];